DGNum/infrastructure
13
6
Fork 3
Code Issues 19 Pull requests 8 Projects 1 Releases Packages Wiki Activity Actions

chore(npins): Update
Some checks failed
build configuration / build_vault01 (push) Successful in 1m25s
Details
build configuration / build_compute01 (push) Successful in 1m36s
Details
build configuration / build_web02 (push) Successful in 53s
Details
build configuration / build_web01 (push) Successful in 1m16s
Details
lint / check (push) Failing after 24s
Details
build configuration / build_rescue01 (push) Successful in 48s
Details
build configuration / build_storage01 (push) Successful in 38m44s
Details

Browse source 
Remove the patched version of garage as the upstream version contains it
This commit is contained in:
Tom Hubrecht 2024-03-09 17:31:06 +01:00
parent 3bccda09db
commit d946894d8f
2 changed files with 19 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
machines/storage01/garage.nix
View file

@ -16,17 +16,7 @@ in
services.garage = { services.garage = {
enable = true; enable = true;
package = pkgs.garage_0_9.overrideAttrs ( package = pkgs.garage_0_9;
old: {
patches = (old.patches or [ ]) ++ [
# Allow 0 as a part number marker
(pkgs.fetchpatch {
url = "https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/670.patch";
hash = "sha256-28ctLl1qscMRj2JEVnmhuLyK1Avub8QeyfQFxAK0y08=";
})
];
}
);
settings = { settings = {
inherit data_dir metadata_dir; inherit data_dir metadata_dir;

36
npins/sources.json
View file

@ -47,10 +47,10 @@
}, },
"pre_releases": false, "pre_releases": false,
"version_upper_bound": null, "version_upper_bound": null,
"version": "v1.3.0", "version": "v1.4.0",
"revision": "aef9a509db64a081186af2dc185654d78dc8e344", "revision": "ad5e8bd14df2e6bdb836582577dc163318617738",
"url": "https://api.github.com/repos/nix-community/disko/tarball/v1.3.0", "url": "https://api.github.com/repos/nix-community/disko/tarball/v1.4.0",
"hash": "1lrnvgd5w41wrgidp3vwv2ahpvl0a61c2lai6qs16ri71g00kqn0" "hash": "0yl2hwnzqpr898n07gj5rjcmn8rf2sp2c5amx39h1j2vhkmvym7g"
}, },
"liminix": { "liminix": {
"type": "Git", "type": "Git",
@ -60,9 +60,9 @@
"repo": "liminix" "repo": "liminix"
}, },
"branch": "nwa50ax", "branch": "nwa50ax",
"revision": "baf3cf741301e696a5f614f8fb98d182a0ab0f1d", "revision": "a4aa10dcc30225a8bb8eb465abfe908629175f2c",
"url": "https://github.com/RaitoBezarius/liminix/archive/baf3cf741301e696a5f614f8fb98d182a0ab0f1d.tar.gz", "url": "https://github.com/RaitoBezarius/liminix/archive/a4aa10dcc30225a8bb8eb465abfe908629175f2c.tar.gz",
"hash": "1k29bz7gxlv12pq9rqji4s27rxwg4zx93l8f7n7c0s5wza9cyzdp" "hash": "1m1sc6agg5z65lmyjl48i7sddlwm8d0zgvs8z81iammfy4jpy7qd"
}, },
"linkal": { "linkal": {
"type": "Git", "type": "Git",
@ -107,9 +107,9 @@
"url": "https://git.hubrecht.ovh/hubrecht/nix-modules.git" "url": "https://git.hubrecht.ovh/hubrecht/nix-modules.git"
}, },
"branch": "main", "branch": "main",
"revision": "654a8a5cd185860aa2c77fc97e3630cb75fedeae", "revision": "fe28e8a99556eab977210c8959d4a7901d69a996",
"url": null, "url": null,
"hash": "0h0kxs2fg4413yj2fh5l6319vwq1xmfkqd8q179014qvc9fimrvx" "hash": "12fj5sjwp0smi0qy0nsaknfcps3jk5y0q6dn1z924cbs0q6zpsff"
}, },
"nix-patches": { "nix-patches": {
"type": "GitRelease", "type": "GitRelease",
@ -127,20 +127,20 @@
"nixos-23.11": { "nixos-23.11": {
"type": "Channel", "type": "Channel",
"name": "nixos-23.11", "name": "nixos-23.11",
"url": "https://releases.nixos.org/nixos/23.11/nixos-23.11.4761.5bf1cadb72ab/nixexprs.tar.xz", "url": "https://releases.nixos.org/nixos/23.11/nixos-23.11.5195.2be119add7b3/nixexprs.tar.xz",
"hash": "0s7vpavflvzf4gniy1s3mrmwfrcz39zlb4xnb5015bc64msh22g7" "hash": "0sshmyr69yl7hslywfrpnhlzr8l2ly2bs9psy20w3rknxswyb464"
}, },
"nixos-unstable": { "nixos-unstable": {
"type": "Channel", "type": "Channel",
"name": "nixos-unstable", "name": "nixos-unstable",
"url": "https://releases.nixos.org/nixos/unstable/nixos-24.05pre588267.73de017ef2d1/nixexprs.tar.xz", "url": "https://releases.nixos.org/nixos/unstable/nixos-24.05pre592007.9df3e30ce24f/nixexprs.tar.xz",
"hash": "1hcnwcankhqh0pk7g0njszm3553a6845dzy1yzq3jy5msrr4l2qy" "hash": "169nmkixa0k3x8m3jfkrmhyy44zjzy24q5biypz9khly4da72n7y"
}, },
"nixpkgs": { "nixpkgs": {
"type": "Channel", "type": "Channel",
"name": "nixpkgs-unstable", "name": "nixpkgs-unstable",
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-24.05pre588366.9a9dae8f6319/nixexprs.tar.xz", "url": "https://releases.nixos.org/nixpkgs/nixpkgs-24.05pre594687.0e7f98a5f301/nixexprs.tar.xz",
"hash": "11zjywladdaw8jb86rqrccqzf4w13ffp86w2q6lgrm3xibx363jb" "hash": "0hbil2vaa34v3k8d29bcv8p626y6j0m3wap27p5sxx62rapl5zcq"
}, },
"pre-commit-hooks": { "pre-commit-hooks": {
"type": "Git", "type": "Git",
@ -173,9 +173,9 @@
"server": "https://git.helsinki.tools/" "server": "https://git.helsinki.tools/"
}, },
"branch": "master", "branch": "master",
"revision": "1b537ad1fadd30173b0b728d4e1003eb5d19e468", "revision": "27b7af74edf09a4df1b852cc4c0b14b7985c4abe",
"url": "https://git.helsinki.tools/api/v4/projects/helsinki-systems%2Fwp4nix/repository/archive.tar.gz?sha=1b537ad1fadd30173b0b728d4e1003eb5d19e468", "url": "https://git.helsinki.tools/api/v4/projects/helsinki-systems%2Fwp4nix/repository/archive.tar.gz?sha=27b7af74edf09a4df1b852cc4c0b14b7985c4abe",
"hash": "148z9n9n6g3qk2v5iik24a1nr82hfq4kwg6akip5q5rpq4lmx0bh" "hash": "1ry8xdfh7gaxfz8xjsyah1yfx99m4s0h8j8gc4js62pldf65nhwn"
} }
}, },
"version": 3 "version": 3