diff --git a/server/default.nix b/server/default.nix index 57739a8..23b62c9 100644 --- a/server/default.nix +++ b/server/default.nix @@ -1,11 +1,15 @@ let sources = import ./nix/sources.nix { }; pkgs = import sources.nixpkgs { overlays = [ (import sources.mozilla) ]; }; + rust = pkgs.rustChannelOfTargets "nightly" "2022-07-04" [ "x86_64-unknown-linux-musl" ]; in pkgs.mkShell { buildInputs = [ - (pkgs.rustChannelOf { date = "2021-12-05"; channel = "nightly"; }).rust + rust pkgs.gcc + pkgs.glibc pkgs.patchelf + pkgs.musl + pkgs.musl.dev ]; } diff --git a/server/nix/sources.json b/server/nix/sources.json index d195a56..9206e04 100644 --- a/server/nix/sources.json +++ b/server/nix/sources.json @@ -5,10 +5,10 @@ "homepage": "", "owner": "mozilla", "repo": "nixpkgs-mozilla", - "rev": "0510159186dd2ef46e5464484fbdf119393afa58", - "sha256": "1c6r5ldkh71v6acsfhni7f9sxvi7xrqzshcwd8w0hl2rrqyzi58w", + "rev": "e1f7540fc0a8b989fb8cf701dc4fd7fc76bcf168", + "sha256": "1b6p0rly0rywq60ks84ghc0n5zrqiafc2r64nlbnlkh9whmh5fmj", "type": "tarball", - "url": "https://github.com/mozilla/nixpkgs-mozilla/archive/0510159186dd2ef46e5464484fbdf119393afa58.tar.gz", + "url": "https://github.com/mozilla/nixpkgs-mozilla/archive/e1f7540fc0a8b989fb8cf701dc4fd7fc76bcf168.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "niv": { @@ -17,22 +17,22 @@ "homepage": "https://github.com/nmattia/niv", "owner": "nmattia", "repo": "niv", - "rev": "65a61b147f307d24bfd0a5cd56ce7d7b7cc61d2e", - "sha256": "17mirpsx5wyw262fpsd6n6m47jcgw8k2bwcp1iwdnrlzy4dhcgqh", + "rev": "82e5cd1ad3c387863f0545d7591512e76ab0fc41", + "sha256": "090l219mzc0gi33i3psgph6s2pwsc8qy4lyrqjdj4qzkvmaj65a7", "type": "tarball", - "url": "https://github.com/nmattia/niv/archive/65a61b147f307d24bfd0a5cd56ce7d7b7cc61d2e.tar.gz", + "url": "https://github.com/nmattia/niv/archive/82e5cd1ad3c387863f0545d7591512e76ab0fc41.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { - "branch": "release-20.03", + "branch": "release-22.05", "description": "Nix Packages collection", "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eb73405ecceb1dc505b7cbbd234f8f94165e2696", - "sha256": "06k21wbyhhvq2f1xczszh3c2934p0m02by3l2ixvd6nkwrqklax7", + "rev": "edaee6c8d8d126dee69eaf1c515f9e39d26515d8", + "sha256": "04krg1idccks34x4p27kfgqg3yl15ihh4j00lg7njxhjms6pjw51", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/eb73405ecceb1dc505b7cbbd234f8f94165e2696.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/edaee6c8d8d126dee69eaf1c515f9e39d26515d8.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } }