A fork of attic a self-hostable Nix Binary Cache server
Merge pull request #172 from zhaofengli/flake-cleanup
flake: Remove flake-utils, misc cleanup
authored by
Zhaofeng Li
and committed by
GitHub
aec90814
bea72d75
+13
-40
-34
flake.lock
-34
flake.lock
···
56
56
"type": "github"
57
57
}
58
58
},
59
-
"flake-utils": {
60
-
"inputs": {
61
-
"systems": "systems"
62
-
},
63
-
"locked": {
64
-
"lastModified": 1710146030,
65
-
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
66
-
"owner": "numtide",
67
-
"repo": "flake-utils",
68
-
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
69
-
"type": "github"
70
-
},
71
-
"original": {
72
-
"owner": "numtide",
73
-
"repo": "flake-utils",
74
-
"type": "github"
75
-
}
76
-
},
77
59
"nixpkgs": {
78
60
"locked": {
79
61
"lastModified": 1724999960,
···
111
93
"crane": "crane",
112
94
"flake-compat": "flake-compat",
113
95
"flake-parts": "flake-parts",
114
-
"flake-utils": "flake-utils",
115
96
"nixpkgs": "nixpkgs",
116
97
"nixpkgs-stable": "nixpkgs-stable"
117
-
}
118
-
},
119
-
"systems": {
120
-
"locked": {
121
-
"lastModified": 1681028828,
122
-
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
123
-
"owner": "nix-systems",
124
-
"repo": "default",
125
-
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
126
-
"type": "github"
127
-
},
128
-
"original": {
129
-
"owner": "nix-systems",
130
-
"repo": "default",
131
-
"type": "github"
132
98
}
133
99
}
134
100
},
+7
-2
flake.nix
+7
-2
flake.nix
···
4
4
inputs = {
5
5
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
6
6
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05";
7
-
flake-utils.url = "github:numtide/flake-utils";
8
7
9
8
flake-parts = {
10
9
url = "github:hercules-ci/flake-parts";
···
23
22
};
24
23
25
24
outputs = inputs @ { self, flake-parts, ... }: let
26
-
supportedSystems = inputs.flake-utils.lib.defaultSystems ++ [ "riscv64-linux" ];
25
+
supportedSystems = [
26
+
"x86_64-linux"
27
+
"aarch64-linux"
28
+
"riscv64-linux"
29
+
"aarch64-darwin"
30
+
"x86_64-darwin"
31
+
];
27
32
28
33
inherit (inputs.nixpkgs) lib;
29
34
+3
-1
flake/devshells.nix
+3
-1
flake/devshells.nix
+3
-3
flake/packages.nix
+3
-3
flake/packages.nix
···
1
-
{ self, inputs, lib, ... }:
1
+
{ self, inputs, lib, makeCranePkgs, ... }:
2
2
let
3
-
makeCranePkgs = pkgs: let
3
+
defaultMakeCranePkgs = pkgs: let
4
4
craneLib = inputs.crane.mkLib pkgs;
5
5
in pkgs.callPackage ../crane.nix { inherit craneLib; };
6
6
in
7
7
{
8
-
_module.args.makeCranePkgs = makeCranePkgs;
8
+
_module.args.makeCranePkgs = lib.mkDefault defaultMakeCranePkgs;
9
9
10
10
perSystem = { self', pkgs, cranePkgs, ... }: (lib.mkMerge [
11
11
{