feat: better locking tot he rust version
This commit is contained in:
parent
b00b5cac6d
commit
73013f41f0
2 changed files with 40 additions and 4 deletions
17
flake.lock
generated
17
flake.lock
generated
|
@ -32,6 +32,22 @@
|
||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs-mozilla": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1740762144,
|
||||||
|
"narHash": "sha256-I7a6e3IYJAp9u3PwUSW1+oilO1tAfnbeN3/YJQ+ObCo=",
|
||||||
|
"owner": "mozilla",
|
||||||
|
"repo": "nixpkgs-mozilla",
|
||||||
|
"rev": "e35b0e071cae97469d80222be988fdd972b22c3b",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "mozilla",
|
||||||
|
"repo": "nixpkgs-mozilla",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1741513245,
|
"lastModified": 1741513245,
|
||||||
|
@ -51,6 +67,7 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"naersk": "naersk",
|
"naersk": "naersk",
|
||||||
"nixpkgs": "nixpkgs_2",
|
"nixpkgs": "nixpkgs_2",
|
||||||
|
"nixpkgs-mozilla": "nixpkgs-mozilla",
|
||||||
"utils": "utils"
|
"utils": "utils"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
27
flake.nix
27
flake.nix
|
@ -5,6 +5,10 @@
|
||||||
nixpkgs.url = "nixpkgs/nixos-unstable";
|
nixpkgs.url = "nixpkgs/nixos-unstable";
|
||||||
naersk.url = "github:nix-community/naersk";
|
naersk.url = "github:nix-community/naersk";
|
||||||
utils.url = "github:numtide/flake-utils";
|
utils.url = "github:numtide/flake-utils";
|
||||||
|
nixpkgs-mozilla = {
|
||||||
|
url = "github:mozilla/nixpkgs-mozilla";
|
||||||
|
flake = false;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
nixConfig = {
|
nixConfig = {
|
||||||
|
@ -12,18 +16,33 @@
|
||||||
extra-trusted-public-keys = "skynet-cache:zMFLzcRZPhUpjXUy8SF8Cf7KGAZwo98SKrzeXvdWABo=";
|
extra-trusted-public-keys = "skynet-cache:zMFLzcRZPhUpjXUy8SF8Cf7KGAZwo98SKrzeXvdWABo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, utils, naersk }: utils.lib.eachDefaultSystem (system:
|
outputs = { self, nixpkgs, utils, nixpkgs-mozilla, naersk }: utils.lib.eachDefaultSystem (system:
|
||||||
let
|
let
|
||||||
overrides = (builtins.fromTOML (builtins.readFile ./rust-toolchain.toml));
|
overrides = (builtins.fromTOML (builtins.readFile ./rust-toolchain.toml));
|
||||||
pkgs = nixpkgs.legacyPackages."${system}";
|
pkgs = (import nixpkgs) {
|
||||||
naersk-lib = naersk.lib."${system}";
|
inherit system;
|
||||||
|
|
||||||
|
overlays = [
|
||||||
|
(import nixpkgs-mozilla)
|
||||||
|
];
|
||||||
|
};
|
||||||
|
toolchain = (pkgs.rustChannelOf {
|
||||||
|
rustToolchain = ./rust-toolchain.toml;
|
||||||
|
sha256 = "sha256-PjvuouwTsYfNKW5Vi5Ye7y+lL7SsWGBxCtBOOm2z14c=";
|
||||||
|
}).rust;
|
||||||
|
|
||||||
|
naersk' = pkgs.callPackage naersk {
|
||||||
|
cargo = toolchain;
|
||||||
|
rustc = toolchain;
|
||||||
|
};
|
||||||
|
|
||||||
package_name = "skynet_ldap_backend";
|
package_name = "skynet_ldap_backend";
|
||||||
package_update = "update_groups";
|
package_update = "update_groups";
|
||||||
desc = "Skynet LDAP backend";
|
desc = "Skynet LDAP backend";
|
||||||
in rec {
|
in rec {
|
||||||
|
|
||||||
# `nix build`
|
# `nix build`
|
||||||
packages."${package_name}" = naersk-lib.buildPackage {
|
packages."${package_name}" = naersk'.buildPackage {
|
||||||
pname = "${package_name}";
|
pname = "${package_name}";
|
||||||
root = ./.;
|
root = ./.;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue