update sources, remove mergiraf packageHEADmain

mergiraf is now packaged upstream (and probably has been for a while),
and the bundled old packaging also broke.

2 files changed, 22 insertions, 55 deletions

diff --git a/npins/sources.json b/npins/sources.json
index 9607e77..90751d9 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -9,9 +9,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "2fa0e9119cd8489ae2b140bf6e67aeb22c84b210",
-      "url": "https://github.com/ai-robots-txt/ai.robots.txt/archive/2fa0e9119cd8489ae2b140bf6e67aeb22c84b210.tar.gz",
-      "hash": "05nnc0r4zz8sq8mhp299d9d6hpd8qcm81wkn30i4bzq0a220si07"
+      "revision": "e87eb706e358af973621fa08f9a9b58465c00039",
+      "url": "https://github.com/ai-robots-txt/ai.robots.txt/archive/e87eb706e358af973621fa08f9a9b58465c00039.tar.gz",
+      "hash": "1zqdk47k3vcn8z4jr1abdxsnd94z9fc7n347gn1wzcs77w57g8cz"
     },
     "almanac": {
       "type": "Git",
@@ -122,9 +122,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "5346b2bc6884ab71c1d0fc858f3b11484d01cbfb",
+      "revision": "24054c110787d725ac0bbdafd40c71c83bf1f9a0",
       "url": null,
-      "hash": "0m193qmvlykh91pfhvz1aq6qcjg6bcc6l8fxfw0559svmhx58pgm"
+      "hash": "16v2p2ph3m4hx56iaq418s18lk003d400y4h5hrckbdgwbvqnm5w"
     },
     "lix-nixos-module": {
       "type": "Git",
@@ -134,9 +134,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "7c31a18259b8358ac196cf803a26967c0fa1d3e4",
+      "revision": "c47f62187601ea2991b79a9bacdbfdf76cd29fbe",
       "url": null,
-      "hash": "0a3ih14vp5mibwkxb8lz6blxs4mc25jcci8bmlfvzzxph00535wz"
+      "hash": "19wsk3dllqscar4cfcarx1wki59yzmmz3avj9dlm48cdkv1q1yqn"
     },
     "nixos-mailserver": {
       "type": "Git",
@@ -147,9 +147,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "6005d88bed7a5418f9772b4058a73cd0fd1e69a1",
-      "url": "https://gitlab.com/api/v4/projects/simple-nixos-mailserver%2Fnixos-mailserver/repository/archive.tar.gz?sha=6005d88bed7a5418f9772b4058a73cd0fd1e69a1",
-      "hash": "0dkcnnmbfc2hydszhr3053fglbq1bah129dspqv75nssk25zcm6s"
+      "revision": "58659fbdfd8aba9bd8f4517d3e5c388c4d8266c4",
+      "url": "https://gitlab.com/api/v4/projects/simple-nixos-mailserver%2Fnixos-mailserver/repository/archive.tar.gz?sha=58659fbdfd8aba9bd8f4517d3e5c388c4d8266c4",
+      "hash": "0ks8r6mfkg46b3s4rfm2cfjcjbsy9v9a4n8115prsksg4kl5wz3z"
     },
     "nixpkgs": {
       "type": "Git",
@@ -160,9 +160,9 @@
       },
       "branch": "nixos-25.05",
       "submodules": false,
-      "revision": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c",
-      "url": "https://github.com/NixOS/nixpkgs/archive/33c6dca0c0cb31d6addcd34e90a63ad61826b28c.tar.gz",
-      "hash": "13asggd2xh2pw1n04a2yn4ypfgxqjsqjsy6w1hxly4iv6g8hcz1x"
+      "revision": "ca534a76c4afb2bdc07b681dbc11b453bab21af8",
+      "url": "https://github.com/NixOS/nixpkgs/archive/ca534a76c4afb2bdc07b681dbc11b453bab21af8.tar.gz",
+      "hash": "12dg8slqvwi1nvpi1rs0w6bwhk4yl1hj22gj7z2cdfnqnjabfr3h"
     },
     "nixpkgs-unstable": {
       "type": "Git",
@@ -173,9 +173,9 @@
       },
       "branch": "nixpkgs-unstable",
       "submodules": false,
-      "revision": "87848bf0cc4f87717fc813a4575f07330c3e743c",
-      "url": "https://github.com/NixOS/nixpkgs/archive/87848bf0cc4f87717fc813a4575f07330c3e743c.tar.gz",
-      "hash": "0p5932jx87zph5avsv195fq8580yjjpm9f9fmxl20l155nq1i1gy"
+      "revision": "12c1f0253aa9a54fdf8ec8aecaafada64a111e24",
+      "url": "https://github.com/NixOS/nixpkgs/archive/12c1f0253aa9a54fdf8ec8aecaafada64a111e24.tar.gz",
+      "hash": "0zr033ybqjc5spwh7xnzkhbqgc6gh8waw6z76rpvadxckyqlfgiq"
     },
     "ntfy-matrix-bot": {
       "type": "Git",
@@ -210,9 +210,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "6b1e691089a62d0852f9d3fd6693ee027bc98ac3",
-      "url": "https://github.com/oxalica/rust-overlay/archive/6b1e691089a62d0852f9d3fd6693ee027bc98ac3.tar.gz",
-      "hash": "16d5wlabz1fydrh2hsh4vabidysh7ja9agx4d5sf79811j7fwf7r"
+      "revision": "4e8e5dfb8e649d3e05d9a173ce9a9cb0498e89c2",
+      "url": "https://github.com/oxalica/rust-overlay/archive/4e8e5dfb8e649d3e05d9a173ce9a9cb0498e89c2.tar.gz",
+      "hash": "0wxll43kf4dv0adxc1i73rf8v7bv4rgzrrz85bk6s2b7caag2vhi"
     },
     "showrt": {
       "type": "Git",
@@ -248,9 +248,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "9c9a9798be331ed3f4b2902933d7677d0659ee61",
-      "url": "https://github.com/Mic92/sops-nix/archive/9c9a9798be331ed3f4b2902933d7677d0659ee61.tar.gz",
-      "hash": "1cr96rpm1ipkgzrzg0zlwfbvw9rfspcvhvsmgx2awlqff59v609z"
+      "revision": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
+      "url": "https://github.com/Mic92/sops-nix/archive/5a7d18b5c55642df5c432aadb757140edfeb70b3.tar.gz",
+      "hash": "1dk0kjms9a6in9flaz4pxrlngxj235xivgwcy9bvw60yy3brxvbr"
     },
     "traveltext": {
       "type": "Git",
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
index 22d59ba..a3a58a7 100644
--- a/pkgs/overlay.nix
+++ b/pkgs/overlay.nix
@@ -53,39 +53,6 @@ in
     cargoLock.lockFile = "${src}/Cargo.lock";
   };
 
-  mergiraf = self.rustPlatform.buildRustPackage rec {
-    pname = "mergiraf";
-    version = "git";
-    src = self.fetchgit {
-      url = "https://codeberg.org/mergiraf/mergiraf";
-      rev = "v0.2.0";
-      hash = "sha256-egtX2daCbPXi5rX2OxbEZA/VI9R4HMj5LRKbUEBFo+E=";
-    };
-    # TODO: probably unnecessary once we are on nixpkgs 24.11; earlier version
-    # hardcode --frozen here, but cargo wants --offline.
-    # the postBuild hook is necessary to set up things for the install hook
-    buildPhase = ''
-      cargo build -j $NIX_BUILD_CORES \
-       --target x86_64-unknown-linux-gnu \
-       --release \
-       --offline
-
-      runHook postBuild
-    '';
-    # no idea why this didn't work with either test or build inputs ..
-    preCheck = ''
-      export PATH=$PATH:${self.gitMinimal}/bin
-    '';
-    cargoLock = {
-      lockFile = "${src}/Cargo.lock";
-      outputHashes = {
-        "tree-sitter-go-0.23.1" = "sha256-elPqkvVYs0vADOuN/umDteWP5hqcXhQAoSkqYDtTxaU=";
-        "tree-sitter-xml-0.7.0" = "sha256-RTWvOUAs3Uql9DKsP1jf9FZZHaZORE40GXd+6g6RQZw=";
-        "tree-sitter-yaml-0.6.1" = "sha256-gS+SjOnGl/86U9VV/y1ca7naYIe7DAOvOv++jCRLTKo=";
-      };
-    };
-  };
-
   rustex = rustPlatform.buildRustPackage rec {
     pname = "rustex";
     version = "git";