aboutsummaryrefslogtreecommitdiff
path: root/nix
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2022-10-18 12:48:31 +0200
committerAlex Auvolat <alex@adnab.me>2022-10-18 12:48:31 +0200
commit667ca9d3e3971d57d1c95defbff790ab5dc26221 (patch)
tree7796b09a07fe995087d88701f2a6f590c6e1fb53 /nix
parent6a5eba0b728dd24ea51aa1c7ad5902b77af77c88 (diff)
downloadgarage-667ca9d3e3971d57d1c95defbff790ab5dc26221.tar.gz
garage-667ca9d3e3971d57d1c95defbff790ab5dc26221.zip
Cleanup nix scripts
Diffstat (limited to 'nix')
-rw-r--r--nix/common.nix10
-rw-r--r--nix/compile.nix5
2 files changed, 4 insertions, 11 deletions
diff --git a/nix/common.nix b/nix/common.nix
index 576121e4..90e3afaf 100644
--- a/nix/common.nix
+++ b/nix/common.nix
@@ -3,20 +3,12 @@ rec {
* Fixed dependencies
*/
pkgsSrc = fetchTarball {
- # As of 2021-10-04
- #url = "https://github.com/NixOS/nixpkgs/archive/b27d18a412b071f5d7991d1648cfe78ee7afe68a.tar.gz";
- #sha256 = "1xy9zpypqfxs5gcq5dcla4bfkhxmh5nzn9dyqkr03lqycm9wg5cr";
-
- # NixOS 22.05
- #url = "https://github.com/NixOS/nixpkgs/archive/refs/tags/22.05.zip";
- #sha256 = "0d643wp3l77hv2pmg2fi7vyxn4rwy0iyr8djcw1h5x72315ck9ik";
-
# As of 2022-10-13
url = "https://github.com/NixOS/nixpkgs/archive/a3073c49bc0163fea6a121c276f526837672b555.zip";
sha256 = "1bz632psfbpmicyzjb8b4265y50shylccvfm6ry6mgnv5hvz324s";
};
cargo2nixSrc = fetchGit {
- # As of 2022-10-14: (TODO)
+ # As of 2022-10-18: two small patches over unstable branch, one for clippy and one to fix feature detection
url = "https://github.com/Alexis211/cargo2nix";
ref = "custom_unstable";
rev = "a7a61179b66054904ef6a195d8da736eaaa06c36";
diff --git a/nix/compile.nix b/nix/compile.nix
index 9406bb44..45c7efa1 100644
--- a/nix/compile.nix
+++ b/nix/compile.nix
@@ -23,8 +23,9 @@ let
/*
Cargo2nix is built for rustOverlay which installs Rust from Mozilla releases.
- We want our own Rust to avoid incompatibilities, like we had with musl 1.2.0.
- rustc was built with musl < 1.2.0 and nix shipped musl >= 1.2.0 which lead to compilation breakage.
+ This is fine for 64-bit platforms, but for 32-bit platforms, we need our own Rust
+ to avoid incompatibilities with time_t between different versions of musl
+ (>= 1.2.0 shipped by NixOS, < 1.2.0 with which rustc was built), which lead to compilation breakage.
So we want a Rust release that is bound to our Nix repository to avoid these problems.
See here for more info: https://musl.libc.org/time64.html
Because Cargo2nix does not support the Rust environment shipped by NixOS,