diff --git a/flake.lock b/flake.lock index e66988b..c1aa448 100644 --- a/flake.lock +++ b/flake.lock @@ -100,8 +100,8 @@ }, "deploy-rs": { "inputs": { - "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs_3", + "flake-compat": "flake-compat_3", + "nixpkgs": "nixpkgs_4", "utils": "utils" }, "locked": { @@ -195,6 +195,22 @@ } }, "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1648199409, @@ -210,7 +226,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1627913399, @@ -225,7 +241,7 @@ "type": "indirect" } }, - "flake-compat_4": { + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1672831974, @@ -242,7 +258,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1650374568, @@ -386,7 +402,7 @@ }, "gomod2nix": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "utils": "utils_2" }, "locked": { @@ -426,7 +442,7 @@ "cabal-34": "cabal-34", "cabal-36": "cabal-36", "cardano-shell": "cardano-shell", - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_5", "flake-utils": "flake-utils_3", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", "hackage": "hackage", @@ -479,7 +495,7 @@ }, "hydra": { "inputs": { - "nix": "nix", + "nix": "nix_2", "nixpkgs": [ "serokell-nix", "haskell-nix", @@ -542,6 +558,22 @@ "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" } }, + "libgit2": { + "flake": false, + "locked": { + "lastModified": 1697646580, + "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", + "type": "github" + }, + "original": { + "owner": "libgit2", + "repo": "libgit2", + "type": "github" + } + }, "lowdown-src": { "flake": false, "locked": { @@ -625,28 +657,29 @@ }, "nix": { "inputs": { - "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_4", + "flake-compat": "flake-compat_2", + "libgit2": "libgit2", + "nixpkgs": "nixpkgs_2", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1661606874, - "narHash": "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ=", - "owner": "NixOS", + "lastModified": 1720195145, + "narHash": "sha256-c6nVZ0pSrfhFX3eVKqayS+ioqyAGp3zG9ZPO5rkXFRQ=", + "owner": "nixos", "repo": "nix", - "rev": "11e45768b34fdafdcf019ddbd337afa16127ff0f", + "rev": "09e46fef00d11a05c926f770b1b470d693132481", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "2.11.0", + "owner": "nixos", + "ref": "2.21.4", "repo": "nix", "type": "github" } }, "nix-nomad": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_6", "flake-utils": [ "serokell-nix", "haskell-nix", @@ -685,7 +718,7 @@ "nix2container": { "inputs": { "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1658567952, @@ -702,9 +735,30 @@ } }, "nix_2": { + "inputs": { + "lowdown-src": "lowdown-src", + "nixpkgs": "nixpkgs_5", + "nixpkgs-regression": "nixpkgs-regression_2" + }, + "locked": { + "lastModified": 1661606874, + "narHash": "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ=", + "owner": "NixOS", + "repo": "nix", + "rev": "11e45768b34fdafdcf019ddbd337afa16127ff0f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "2.11.0", + "repo": "nix", + "type": "github" + } + }, + "nix_3": { "inputs": { "lowdown-src": "lowdown-src_2", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1633098935, @@ -757,21 +811,6 @@ "type": "github" } }, - "nixos-nixpkgs": { - "locked": { - "lastModified": 1724956629, - "narHash": "sha256-ZX4gCiRd9VnfDDetgu02VIYvPTBPvfzNK53OJ3aGab0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "cc223bad7ef2ad0ac4c2db75136864233e40465b", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1714555275, @@ -882,6 +921,22 @@ "type": "github" } }, + "nixpkgs-regression_2": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1675758091, @@ -898,7 +953,37 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1702386253, + "narHash": "sha256-gWyY0ZnlyugHRthZQBmFfxeKNDq2o6g7kaSU1lwyj74=", + "owner": "serokell", + "repo": "nixpkgs", + "rev": "4a0f28c92f803406ca2eed0cce08230447ad9d01", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "nixpkgs_2": { + "locked": { + "lastModified": 1709083642, + "narHash": "sha256-7kkJQd4rZ+vFrzWu8sTRtta5D1kBG0LSRYAfhtmMlSo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b550fe4b4776908ac2a861124307045f8e717c8e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1716813161, "narHash": "sha256-o3TvfBnorelY5bgMld1if0VsbJdt+LQ+CPCKMGDcDLE=", @@ -912,7 +997,7 @@ "type": "indirect" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1648219316, "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", @@ -928,7 +1013,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1657693803, "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", @@ -944,7 +1029,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1653581809, "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", @@ -960,7 +1045,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -975,7 +1060,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1665087388, "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", @@ -991,7 +1076,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -1006,20 +1091,6 @@ "type": "indirect" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1702386253, - "narHash": "sha256-gWyY0ZnlyugHRthZQBmFfxeKNDq2o6g7kaSU1lwyj74=", - "owner": "serokell", - "repo": "nixpkgs", - "rev": "4a0f28c92f803406ca2eed0cce08230447ad9d01", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nosys": { "locked": { "lastModified": 1667881534, @@ -1057,21 +1128,42 @@ "flake-compat": "flake-compat", "flake-utils": "flake-utils", "naersk": "naersk", - "nixos-nixpkgs": "nixos-nixpkgs", - "nixpkgs": "nixpkgs_2", + "nix": "nix", + "nixpkgs": "nixpkgs_3", + "rust-overlay": "rust-overlay", "serokell-nix": "serokell-nix" } }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1726799228, + "narHash": "sha256-wn1leQyMAc/TrLRKcPc0GX6YtoziKQpc/MtZjPNiJ2Q=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "ab150c7412db7bea5879ce2776718f53fba37aa2", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "serokell-nix": { "inputs": { "deploy-rs": "deploy-rs", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-utils": "flake-utils_2", "get-tested-src": "get-tested-src", "gitignore-nix": "gitignore-nix", "haskell-nix": "haskell-nix", - "nix": "nix_2", - "nixpkgs": "nixpkgs_9" + "nix": "nix_3", + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1714382435, @@ -1132,7 +1224,7 @@ ], "n2c": "n2c", "nixago": "nixago", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nosys": "nosys", "yants": "yants" }, diff --git a/flake.nix b/flake.nix index 2d392d0..2a14437 100644 --- a/flake.nix +++ b/flake.nix @@ -12,13 +12,36 @@ flake-compat.flake = false; naersk.url = "github:nix-community/naersk"; nix.url = "github:nixos/nix?ref=2.21.4"; + rust-overlay = { + url = "github:oxalica/rust-overlay"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = { self, nixpkgs, flake-utils, serokell-nix, naersk, ... }@inputs: + outputs = { self, nixpkgs, flake-utils, serokell-nix, naersk, rust-overlay, ... }@inputs: flake-utils.lib.eachSystem [ "x86_64-linux" ] (system: let - pkgs = nixpkgs.legacyPackages.${system}.extend serokell-nix.overlay; - naersk' = pkgs.callPackage naersk {}; + pkgs = import nixpkgs { + inherit system; + overlays = [ + serokell-nix.overlay + rust-overlay.overlays.default + ]; + }; + rustChannel = (pkgs.rust-bin.fromRustupToolchain { channel = "1.77.1"; }).override({ + extensions = [ + "clippy" + "rust-analysis" + "rust-analyzer" + "rust-docs" + "rust-src" + "rustfmt" + ]; + }); + naersk' = pkgs.callPackage naersk { + rustc = rustChannel; + cargo = rustChannel; + }; nix = inputs.nix.packages.${system}.nix; update-daemon = naersk'.buildPackage { @@ -71,15 +94,9 @@ devShells.default = pkgs.mkShell { #RUST_LOG = "trace"; inputsFrom = builtins.attrValues self.packages.${system}; - RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}"; buildInputs = with pkgs; [ - rustc - rust.packages.stable.rustPlatform.rustLibSrc + rustChannel nix - cargo - rust-analyzer - rustfmt - clippy openssl pkg-config reuse