From e4fc6a0d98352ff03999077fa00b03f3284f23a0 Mon Sep 17 00:00:00 2001 From: DGNum Chores Date: Sun, 6 Oct 2024 13:29:20 +0000 Subject: [PATCH] chore(npins): Update --- machines/compute01/stirling-pdf/default.nix | 11 +++- machines/storage01/garage.nix | 2 +- npins/sources.json | 58 ++++++++++----------- 3 files changed, 40 insertions(+), 31 deletions(-) diff --git a/machines/compute01/stirling-pdf/default.nix b/machines/compute01/stirling-pdf/default.nix index 35977da..e8fdb09 100644 --- a/machines/compute01/stirling-pdf/default.nix +++ b/machines/compute01/stirling-pdf/default.nix @@ -1,7 +1,16 @@ { nixpkgs, ... }: let - dgn-id = "f756a0f47e704db815a7af6786f6eb0aec628d6b"; + ### + # How to update: + # - clone https://git.dgnum.eu/DGNum/Stirling-PDF + # - switch to the branch dgn-v0.X.Y where X.Y is the version in production + # - fetch upstream changes up to the tagged release in nixos-unstable + # - rebase onto the upstream branch, so that the last commit is "feat: Add DGNum customization" + # - push to a new branch dgn-v0.A.B where A.B is the new version + # - finally, update the commit hash of the customization patch + + dgn-id = "8f19cb1c9623f8da71f6512c1528d83acc35db57"; in { diff --git a/machines/storage01/garage.nix b/machines/storage01/garage.nix index a56cb02..4d74dcf 100644 --- a/machines/storage01/garage.nix +++ b/machines/storage01/garage.nix @@ -28,7 +28,7 @@ in services.garage = { enable = true; - package = pkgs.garage_1_0_0; + package = pkgs.garage_1_0_1; settings = { inherit data_dir metadata_dir; diff --git a/npins/sources.json b/npins/sources.json index c914b7f..8291994 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -59,10 +59,10 @@ "pre_releases": false, "version_upper_bound": null, "release_prefix": null, - "version": "v1.7.0", - "revision": "e55f9a8678adc02024a4877c2a403e3f6daf24fe", - "url": "https://api.github.com/repos/nix-community/disko/tarball/v1.7.0", - "hash": "16zjxysjhk3sgd8b4x5mvx9ilnq35z3zfpkv1la33sqkr8xh1amn" + "version": "v1.8.0", + "revision": "624fd86460e482017ed9c3c3c55a3758c06a4e7f", + "url": "https://api.github.com/repos/nix-community/disko/tarball/v1.8.0", + "hash": "06ifryv6rw25cz8zda4isczajdgrvcl3aqr145p8njxx5jya2d77" }, "dns.nix": { "type": "GitRelease", @@ -87,9 +87,9 @@ "repo": "git-hooks.nix" }, "branch": "master", - "revision": "7570de7b9b504cfe92025dd1be797bf546f66528", - "url": "https://github.com/cachix/git-hooks.nix/archive/7570de7b9b504cfe92025dd1be797bf546f66528.tar.gz", - "hash": "1snjia7d5x7nqz8j6zgj45fb9kvza86yrhgc8bpjn9b0lc1i88xp" + "revision": "1211305a5b237771e13fcca0c51e60ad47326a9a", + "url": "https://github.com/cachix/git-hooks.nix/archive/1211305a5b237771e13fcca0c51e60ad47326a9a.tar.gz", + "hash": "1qz8d9g7rhwjk4p2x0rx59alsf0dpjrb6kpzs681gi3rjr685ivq" }, "kadenios": { "type": "Git", @@ -144,9 +144,9 @@ "url": "https://git.lix.systems/lix-project/lix.git" }, "branch": "main", - "revision": "cc183fdbc14ce105a5661d646983f791978b9d5c", + "revision": "ed9b7f4f84fd60ad8618645cc1bae2d686ff0db6", "url": null, - "hash": "1bgh8z445yhv0b46yimr2ic33hplm33xj50ivgsbykdf30xks95n" + "hash": "05kxga8fs9h4qm0yvp5l7jvsda7hzqs7rvxcn8r52dqg3c80hva9" }, "lix-module": { "type": "Git", @@ -155,9 +155,9 @@ "url": "https://git.lix.systems/lix-project/nixos-module.git" }, "branch": "main", - "revision": "353b25f0b6da5ede15206d416345a2ec4195b5c8", + "revision": "fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d", "url": null, - "hash": "0aq9l1qhz01wm232gskq2mywik98zv2r8qn42bjw3kdb185wf9kl" + "hash": "0jxpqaz12lqibg03iv36sa0shfvamn2yhg937llv3kl4csijd34f" }, "lon": { "type": "Git", @@ -203,9 +203,9 @@ "url": "https://git.hubrecht.ovh/hubrecht/nix-modules.git" }, "branch": "main", - "revision": "32e76ee64352587663766e1a3945a6fe0917e35d", + "revision": "2fd7c7810b2a901020ddd2d0cc82810b83a313fc", "url": null, - "hash": "16vnpnby6s174y4nzb26z2pc49ba7lw7vpf6r7p4dqci92b0yg5j" + "hash": "0rag870ll745r5isnk6hlxv0b0sbgriba5k6nihahcwsal2f4830" }, "nix-patches": { "type": "GitRelease", @@ -228,9 +228,9 @@ "url": "https://git.hubrecht.ovh/hubrecht/nix-pkgs" }, "branch": "main", - "revision": "f3a79c8038b8847a0c93381db2b744b3153a0201", + "revision": "3e731378f3984313ef902c5e5a49e002e6e2c27e", "url": null, - "hash": "1l7xd5s7ycwnnmb3kn12ysc4kqnvg1p4g60sfndqc8q944wxmpab" + "hash": "1vy2dj9fyy653w6idvi1r73s0nd2a332a1xkppddjip6rk0i030p" }, "nixos-23.11": { "type": "Channel", @@ -241,8 +241,8 @@ "nixos-24.05": { "type": "Channel", "name": "nixos-24.05", - "url": "https://releases.nixos.org/nixos/24.05/nixos-24.05.4798.f4c846aee8e1/nixexprs.tar.xz", - "hash": "0i08jxfa55ifpdmcwg2isgszprxaikjalinmcqjfzk336hzvh7if" + "url": "https://releases.nixos.org/nixos/24.05/nixos-24.05.5518.ecbc1ca8ffd6/nixexprs.tar.xz", + "hash": "1yr2v17d8jg9567rvadv62bpr6i47fp73by2454yjxh1m9ric2cm" }, "nixos-generators": { "type": "Git", @@ -252,21 +252,21 @@ "repo": "nixos-generators" }, "branch": "master", - "revision": "214efbd73241d72a8f48b8b9a73bb54895cd51a7", - "url": "https://github.com/nix-community/nixos-generators/archive/214efbd73241d72a8f48b8b9a73bb54895cd51a7.tar.gz", - "hash": "00cavr7wlaa6mc16245gn5d5bq7y67fg7l4bgkx3q5109jay1837" + "revision": "9ae128172f823956e54947fe471bc6dfa670ecb4", + "url": "https://github.com/nix-community/nixos-generators/archive/9ae128172f823956e54947fe471bc6dfa670ecb4.tar.gz", + "hash": "1zn3lykymimzh21q4fixw6ql42n8j82dqwm5axifhcnl8dsdgrvr" }, "nixos-unstable": { "type": "Channel", "name": "nixos-unstable", - "url": "https://releases.nixos.org/nixos/unstable/nixos-24.11pre677397.574d1eac1c20/nixexprs.tar.xz", - "hash": "0j66kv4xq4csa5hwizlab5a7j47hd44182xvz541ll3cdfd5a7gx" + "url": "https://releases.nixos.org/nixos/unstable/nixos-24.11pre688563.bc947f541ae5/nixexprs.tar.xz", + "hash": "1jsaxwi128fiach3dj8rdj5agqivsr4sidb8lmdnl7g07fl9x0kj" }, "nixpkgs": { "type": "Channel", "name": "nixpkgs-unstable", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-24.11pre678893.5775c2583f18/nixexprs.tar.xz", - "hash": "09r3fc2xk4nxzhmkn7wvk99i8qibrhh6lhd3mz6iz64imj1k5r9r" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-24.11pre689466.7d49afd36b55/nixexprs.tar.xz", + "hash": "0r4zb6j8in4dk7gxciapfm49dqbdd0c7ajjzj9iy2xrrj5aj32qp" }, "signal-irc-bridge": { "type": "Git", @@ -275,9 +275,9 @@ "url": "https://git.dgnum.eu/mdebray/signal-irc-bridge" }, "branch": "master", - "revision": "688a5c324e032f7716aa69fb7097971fa26bed1d", + "revision": "9123e6fbe5cdc2d2ae16579d989d45398232f74c", "url": null, - "hash": "153mb2m3ap3v3y1inygqic551vawz1i08pbx2v1viaind3nd2l6m" + "hash": "15p61k0ylri7bbqz4vsy8rmhy62va4yd8cjiwm4lb0gvgbcbkdr2" }, "stateless-uptime-kuma": { "type": "Git", @@ -298,9 +298,9 @@ "server": "https://git.helsinki.tools/" }, "branch": "master", - "revision": "a1c485d16f0df1f55634787b63961846288b3d31", - "url": "https://git.helsinki.tools/api/v4/projects/helsinki-systems%2Fwp4nix/repository/archive.tar.gz?sha=a1c485d16f0df1f55634787b63961846288b3d31", - "hash": "09xmhv821x2w704lbg43ayr83ycb0rvqfh6fq0c9l4x9v23wv9cw" + "revision": "4c47608f349dd45e4895e1f61f19ad9e8dfcc0bf", + "url": "https://git.helsinki.tools/api/v4/projects/helsinki-systems%2Fwp4nix/repository/archive.tar.gz?sha=4c47608f349dd45e4895e1f61f19ad9e8dfcc0bf", + "hash": "1pnjhbljihf2ras9lbp1f6izzxghccfygkkf2ikkahjr1vbicdbq" } }, "version": 3