depot: fix up after nixpkgs update

nix/pkgs/alertmanager-discord.nix

@@ -3,23 +3,24 @@
 # SPDX-License-Identifier: Apache-2.0
 
 { fetchFromGitHub
-, buildGoPackage
+, buildGoModule
 , lib
 }:
 let
-  version = "unstable-20210223";
+  version = "unstable-20220812";
   src = fetchFromGitHub {
     owner = "benjojo";
     repo = "alertmanager-discord";
-    rev = "c27d983dda1eca908cdb04aafe995f61a7d0ca2f";
+    rev = "89ef841a7ef43c5520df49d0c28335d899230eb9";
-    hash = "sha256:1ps5jxysy9w0ns7sjkp4p3109f8pl22ri24vgkfrkggf3mc1lakf";
+    hash = "sha256-6P90c3ECUtmXxr2b0/yVscSI/bBgpXkrhou7Cne/bEM=";
   };
 in
-buildGoPackage rec {
+buildGoModule rec {
   pname = "alertmanager-discord";
   inherit version src;
 
   goPackagePath = "github.com/benjojo/alertmanager-discord";
+  vendorHash = null;
 
   meta = with lib; {
     homepage = "https://github.com/benjojo/alertmanager-discord";

nix/pkgs/authentik/pythonapp/default.nix

@@ -17,11 +17,25 @@ let
     cp ${pyproject} $out/pyproject.toml
     cp ${poetrylock} $out/poetry.lock
   '';
-  maturin = pkgs.python311.pkgs.buildPythonPackage rec {
+
+  python = pkgs.python311.override {
+    self = python;
+    packageOverrides = final: prev: {
+      wheel = prev.wheel.overridePythonAttrs (oldAttrs: rec {
+        version = "0.45.0";
+        src = oldAttrs.src.override (oldAttrs: {
+          rev = "refs/tags/${version}";
+          hash = "sha256-SkviTE0tRB++JJoJpl+CWhi1kEss0u8iwyShFArV+vw=";
+        });
+      });
+    };
+  };
+
+  maturin = python.pkgs.buildPythonPackage rec {
     inherit (pkgs.maturin) pname version meta src cargoDeps;
     format = "pyproject";
     nativeBuildInputs = [
-      pkgs.python311.pkgs.setuptools-rust
+      python.pkgs.setuptools-rust
       pkgs.rustPlatform.cargoSetupHook
       pkgs.cargo
       pkgs.rustc
@@ -29,11 +43,14 @@ let
   };
   app = poetry2nix.mkPoetryApplication rec {
     projectDir = fixedSrc;
-    python = pkgs.python311;
+    inherit python;
     overrides = let
       assertVersion = pkg: wantVersion: lib.assertMsg (pkg.version == wantVersion) "${pkg.pname} (${pkg.version}) is different to what I expected (${wantVersion}); maybe remove the override?";
     in poetry2nix.overrides.withDefaults (self: super: {
       pytest-runner = null;
+      sphinx = super.sphinx.overridePythonAttrs (oldAttrs: {
+        doCheck = false;
+      });
       cython = super.cython.overridePythonAttrs (oldAttrs: rec {
         version = "0.29.33";
         src = self.fetchPypi {

nix/pkgs/baserow/default.nix

@@ -12,7 +12,19 @@
 }:
 
 let
-  python3 = python312;
+  python3 = python312.override {
+    self = python3;
+    packageOverrides = final: prev: {
+      wheel = prev.wheel.overridePythonAttrs (oldAttrs: rec {
+        version = "0.45.0";
+        src = oldAttrs.src.override (oldAttrs: {
+          rev = "refs/tags/${version}";
+          hash = "sha256-SkviTE0tRB++JJoJpl+CWhi1kEss0u8iwyShFArV+vw=";
+        });
+      });
+    };
+  };
+
   nodejs = nodejs_22;
   version = "1.29.1";
   suffix = lib.optionalString ossOnly "-oss";

nix/pkgs/default.nix

@@ -29,7 +29,6 @@
     (hg-git.override { mercurial = pkgs.mercurialFull; })
   ]);
   ubi_reader = pkgs.python3Packages.callPackage ./ubi_reader {};
-  prometheus-bird-exporter-lfty = pkgs.callPackage ./prometheus-bird-exporter-lfty.nix {};
   eapol-test = pkgs.callPackage ./eapol-test.nix {};
   datez = pkgs.callPackage ./datez {};
 

nix/pkgs/flipperzero-firmware/version.json

@@ -1,16 +1,16 @@
 {
   "src": {
     "url": "https://github.com/RogueMaster/flipperzero-firmware-wPlugins",
-    "rev": "56daaa4fc27ce534eaae9af58c4b4b8e28d37511",
+    "rev": "7add7d382a0e56732be19e57849071f8163fadee",
-    "date": "2024-11-22T23:15:00-05:00",
+    "date": "2024-12-04T12:33:02-05:00",
-    "path": "/nix/store/bk7s9zszi88d9wvdspd1jslx89jz22m0-flipperzero-firmware-wPlugins-56daaa4",
+    "path": "/nix/store/m3793a8nphsmv5bw6k83zacdbhm1njaq-flipperzero-firmware-wPlugins-7add7d3",
-    "sha256": "006ckp959mh03qyrwc17y8b83wcg56sr5mb4wqaqzaa94fw4mkgy",
+    "sha256": "1dfb8a52b9li4dyi337n147j5kh3jhh6px72i2ci223sv8gb2fhc",
-    "hash": "sha256-/s1KuCNJqY8V5mTVkrUpj/GBFvInMJ49HgDWVNKdzAA=",
+    "hash": "sha256-DDqxHtp6CBGZiOL0ayCUA84iDwn2jBF9I5GmJYpCy7U=",
     "fetchLFS": false,
     "fetchSubmodules": true,
     "deepClone": false,
     "leaveDotGit": false
   },
-  "version": "RM1123-0051-0.420.0-56daaa4",
+  "version": "RM1204-1241-0.420.0-7add7d3s",
   "upstreamVersion": "0.420.0"
 }

nix/pkgs/prometheus-bird-exporter-lfty.nix

@@ -1,24 +0,0 @@
-{ buildGoPackage
-, prometheus-bird-exporter
-, fetchFromGitea
-}:
-
-buildGoPackage rec {
-  pname = "prometheus-bird-exporter-lfty";
-  version = "1.2.5";
-  name = "${pname}-${version}";
-
-  src = fetchFromGitea {
-    domain = "scm.linefinity.com";
-    owner = "common";
-    repo = pname;
-    rev = "ea2538b4391508f5c23b6c6874a36cc68180cb24";
-    sha256 = "sha256:0c1wj43kfwvyhi1p45akfqrincf8n36pffx2kyb050a2llsgx70z";
-  };
-
-  goPackagePath = "github.com/czerwonk/bird_exporter";
-
-  passthru.tests = null;
-
-  inherit (prometheus-bird-exporter) meta;
-}

nix/pkgs/prometheus-snmp-config/default.nix

@@ -24,7 +24,10 @@ let
     version = "lukegb-${prometheus-snmp-exporter.version}";
 
     outputHashMode = "recursive";
-    outputHash = "sha256:00saap4wwyak0q54066akhrg2694a263d6rl2pqbbprnqyvjqqiz";
+    outputHash = {
+      x86_64-linux = "sha256-Z+TdmISyOC0UWqxLEaNu86LLlVRue+hq8mEfEQWpZhM=";
+      aarch64-linux = "sha256-dTvqPxNmA4B0NP47KXp5C+IHV4/TqfG+YT4TDov1gAE=";
+    }.${pkgs.system};
 
     buildInputs = [
       curl
@@ -45,7 +48,7 @@ let
     '';
 
     patchPhase = ''
-      sed -i $NIX_BUILD_TOP/build/Makefile -e 's,powernet446,powernet451,g' -e 's,POWERNETMIB_446,POWERNETMIB_451,g'
+      sed -i $NIX_BUILD_TOP/build/Makefile -e 's,powernet451,powernet452,g' -e 's,POWERNETMIB_451,POWERNETMIB_452,g'
       cat $NIX_BUILD_TOP/build/Makefile
     '';
 

ops/nixos/swann/default.nix

@@ -1114,14 +1114,6 @@ in {
       '';
     };
 
-    systemd.services.prometheus-bird-exporter.serviceConfig.ExecStart = lib.mkForce ''
-      ${depot.pkgs.prometheus-bird-exporter-lfty}/bin/bird_exporter \
-        -web.listen-address 0.0.0.0:9324 \
-        -bird.socket /var/run/bird/bird.ctl \
-        -bird.v2=true \
-        -format.new=true
-    '';
-
     systemd.services.ee-scrape-data = let
       scriptFile = ./ee-scrape-data.py;
       python = pkgs.python3.withPackages (pm: with pm; [

third_party/default.nix

@@ -20,6 +20,12 @@ let
       "python3.10-cryptography-40.0.2"
       "python3.11-requests-2.29.0"
       "python3.11-cryptography-40.0.2"
+
+      # for sonarr
+      "aspnetcore-runtime-wrapped-6.0.36"
+      "aspnetcore-runtime-6.0.36"
+      "dotnet-sdk-wrapped-6.0.428"
+      "dotnet-sdk-6.0.428"
     ];
     packageOverrides = pkgs: rec {
       factorio = pkgs.factorio.override depot.ops.secrets.factorio;

third_party/lanzaboote.nix

@@ -5,61 +5,42 @@ let
   src = pkgs.fetchFromGitHub {
     owner = "nix-community";
     repo = "lanzaboote";
-    rev = "614b538f0fcd4eda423abc36819a57eb4b241b1b";
+    rev = "2f48272f34174fd2a5ab3df4d8a46919247be879";
-    hash = "sha256:0m94c82yqvfz7y3wv9r3qxqp4w68swhd0q35ni4r84r163cbah31";
+    hash = "sha256-zpmAzrvK8KdssBSwiIwwRxaUJ77oWORbW0XFvgCFpTE=";
   };
 
   flake-parts-src = pkgs.fetchFromGitHub {
     owner = "hercules-ci";
     repo = "flake-parts";
-    rev = "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f";
+    rev = "506278e768c2a08bec68eb62932193e341f55c90";
-    hash = "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=";
+    hash = "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=";
   };
   flake-parts-flake = import "${flake-parts-src}/flake.nix";
   flake-parts = flake-parts-flake.outputs {
     nixpkgs-lib = pkgs;
   };
 
-  nix-systems-src = pkgs.fetchFromGitHub {
-    owner = "nix-systems";
-    repo = "default";
-    rev = "da67096a3b9bf56a91d16901293e51ba5b49a27e";
-    hash = "sha256:1bzg89hgcr2gvza35vqi4n1jbb2gz1yg4b8p7gry4ihsj2mnnbap";
-  };
-
-  flake-utils-src = pkgs.fetchFromGitHub {
-    owner = "numtide";
-    repo = "flake-utils";
-    rev = "1ef2e671c3b0c19053962c07dbda38332dcebf26";
-    hash = "sha256:0843cqkssadi6wm2xqrprln839cjh4ddacpz1f8j09x628sm3m5q";
-  };
-  flake-utils = (import "${flake-utils-src}/flake.nix").outputs {
-    self = flake-utils;
-    systems = nix-systems-src;
-  };
-
   rust-overlay-src = pkgs.fetchFromGitHub {
     owner = "oxalica";
     repo = "rust-overlay";
-    rev = "e0626adabd5ea461f80b1b11390da2a6575adb30";
+    rev = "8d1b40f8dfd7539aaa3de56e207e22b3cc451825";
-    hash = "sha256:0syfyblhbmbnrzbn9yblxj4jyf0cr7yq9lqjcjh8xqdljgm544x0";
+    hash = "sha256-Sgax33jGuvVHTjl1P78IwzlhAGyOxtx5Q26inKja8S4=";
   };
   rust-overlay-flake = import "${rust-overlay-src}/flake.nix";
   rust-overlay = rust-overlay-flake.outputs {
     self = rust-overlay;
     nixpkgs = pkgs;
-    flake-utils = flake-utils;
   };
 
   crane-src = pkgs.fetchFromGitHub {
     owner = "ipetkov";
     repo = "crane";
-    rev = "v0.12.0";
+    rev = "a4ca93905455c07cb7e3aca95d4faf7601cba458";
-    hash = "sha256:0znn7rhg5141v9sdmsain4z02cky2xkp5yibm5790rsg0sdp0i50";
+    hash = "sha256-+XVYfmVXAiYA0FZT7ijHf555dxCe+AoAT5A6RU+6vSo=";
   };
   crane = (import "${crane-src}/flake.nix").outputs {
     nixpkgs = flakify pkgs ./nixpkgs;
-    inherit flake-utils rust-overlay;
+    inherit rust-overlay;
   };
 
   flakeInputs = {