Compare commits

...

2 commits

Author SHA1 Message Date
uku
c31b243a1f
feat: drop flake-parts
All checks were successful
Build packages / Build derivations (push) Successful in 2m50s
2024-11-05 09:21:39 +01:00
uku
1f638b9160
flake.lock: Update
Flake lock file updates:

• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/3d04084d54bedc3d6b8b736c70ef449225c361b1?narHash=sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0%3D' (2024-10-01)
  → 'github:hercules-ci/flake-parts/506278e768c2a08bec68eb62932193e341f55c90?narHash=sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS%2Bb4tfNFCwE%3D' (2024-11-01)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/5633bcff0c6162b9e4b5f1264264611e950c8ec7?narHash=sha256-9UTxR8eukdg%2BXZeHgxW5hQA9fIKHsKCdOIUycTryeVw%3D' (2024-10-09)
  → 'github:nixos/nixpkgs/7ffd9ae656aec493492b44d0ddfb28e79a1ea25d?narHash=sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY%3D' (2024-11-02)
2024-11-05 09:11:20 +01:00
2 changed files with 25 additions and 55 deletions

27
flake.lock generated
View file

@ -1,32 +1,12 @@
{ {
"nodes": { "nodes": {
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1727826117,
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1728492678, "lastModified": 1730531603,
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -38,7 +18,6 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }
} }

View file

@ -3,44 +3,35 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
flake-parts = {
url = "github:hercules-ci/flake-parts";
inputs.nixpkgs-lib.follows = "nixpkgs";
};
}; };
outputs = { outputs = {
self, self,
flake-parts, nixpkgs,
... }: let
} @ inputs: inherit (nixpkgs) lib;
flake-parts.lib.mkFlake {inherit inputs;} {
systems = ["x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"];
perSystem = { systems = ["x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"];
lib,
pkgs,
system,
...
}: {
# output packages only if they are available on the system
packages = let
isAvailable = name: drv: lib.meta.availableOn {inherit system;} drv;
flakePkgs = self.overlays.default {} pkgs;
in
lib.filterAttrs isAvailable flakePkgs;
formatter = pkgs.alejandra; pkgsFor = system: import nixpkgs {inherit system;};
}; forEachSystem = lib.genAttrs systems;
in {
packages = forEachSystem (
system: let
pkgs = pkgsFor system;
isAvailable = name: drv: lib.meta.availableOn {inherit system;} drv;
flakePkgs = self.overlays.default {} pkgs;
in
lib.filterAttrs isAvailable flakePkgs
);
flake = { overlays.default = import ./pkgs/all-packages.nix;
overlays.default = import ./pkgs/all-packages.nix;
nixosModules = { nixosModules = {
reposilite = import ./modules/reposilite.nix; reposilite = import ./modules/reposilite.nix;
asus-numpad = import ./modules/asus-numpad.nix self; asus-numpad = import ./modules/asus-numpad.nix self;
};
};
}; };
formatter = forEachSystem (system: (pkgsFor system).alejandra);
};
} }