Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nix/Nixos development #6947

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
if ! has nix_direnv_version || ! nix_direnv_version 3.0.6; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i don't like the hardcoded versions here?
is there a better way?
or can we just land flake.nix ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To explain what's going on, direnv naturally supports the use flake directive. However, with the default implementation, we are doomed to re-computing the flake each time we get in/out of the directory.

This line allows to use an implementation that is made by the nix community and which caches the flake's build.

As for the version check, I guess we could remove it. I'm not very familiar with the previous versions, so I don't really know what this will imply.

source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.6/direnvrc" "sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM="
fi

use flake
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@ lib*.a
*.iml
### macOS ###
.DS_Store

### direnv ###
/.direnv/
60 changes: 60 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

70 changes: 70 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{
inputs = {
nixpkgs.url = "github:nixos/nixpkgs";
flake-utils.url = "github:numtide/flake-utils";
};

outputs = {
self,
nixpkgs,
flake-utils,
}:
flake-utils.lib.eachDefaultSystem (system: let
pkgs = nixpkgs.legacyPackages.${system};
libselinuxPath = with pkgs;
lib.makeLibraryPath [
libselinux
];
libaclPath = with pkgs;
lib.makeLibraryPath [
acl
];

build_deps = with pkgs; [
clang
llvmPackages.bintools
rustup

pre-commit

# debugging
gdb
];
gnu_testing_deps = with pkgs; [
autoconf
automake
bison
gnum4
gperf
gettext
texinfo
];
in {
devShell = pkgs.mkShell {
buildInputs = build_deps ++ gnu_testing_deps;

RUSTC_VERSION = "1.75";
LIBCLANG_PATH = pkgs.lib.makeLibraryPath [pkgs.llvmPackages_latest.libclang.lib];
shellHook = ''
export PATH=$PATH:''${CARGO_HOME:-~/.cargo}/bin
export PATH=$PATH:''${RUSTUP_HOME:-~/.rustup}/toolchains/$RUSTC_VERSION-x86_64-unknown-linux-gnu/bin/
'';

SELINUX_INCLUDE_DIR = ''${pkgs.libselinux.dev}/include'';
SELINUX_LIB_DIR = libselinuxPath;
SELINUX_STATIC = "0";

# Necessary to build GNU.
LDFLAGS = ''-L ${libselinuxPath} -L ${libaclPath}'';

# Add precompiled library to rustc search path
RUSTFLAGS =
(builtins.map (a: ''-L ${a}/lib'') [
])
++ [
''-L ${libselinuxPath}''
''-L ${libaclPath}''
];
};
});
}
5 changes: 5 additions & 0 deletions util/build-gnu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -371,3 +371,8 @@ sed -i "s/color_code='0;31;42'/color_code='31;42'/" tests/ls/quote-align.sh

# Slightly different error message
sed -i 's/not supported/unexpected argument/' tests/mv/mv-exchange.sh
# Most tests check that `/usr/bin/tr` is working correctly before running.
# However in NixOS/Nix-based distros, the tr coreutil is located somewhere in
# /nix/store/xxxxxxxxxxxx...xxxx/bin/tr
# We just replace the references to `/usr/bin/tr` with the result of `$(which tr)`
sed -i 's/\/usr\/bin\/tr/$(which tr)/' tests/init.sh
Loading