Merge master into staging-next

2024-08-08 10:12:08 +00:00 · 2024-08-08 10:12:08 +00:00 · 4f6f7d0791
commit 4f6f7d0791
parent 603f853d19 fa12935a32
60 changed files with 639 additions and 521 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -15885,6 +15885,13 @@
    githubId = 101753;
    keys = [ { fingerprint = "5D69 CF04 B7BC 2BC1 A567  9267 00BC F29B 3208 0700"; } ];
  };
+  phanirithvij = {
+    name = "Phani Rithvij";
+    email = "phanirithvij2000@gmail.com";
+    github = "phanirithvij";
+    githubId = 29627898;
+    matrix = "@phanirithvij:matrix.org";
+  };
  phdcybersec = {
    name = "Léo Lavaur";
    email = "phdcybersec@pm.me";
--- a/nixos/modules/system/boot/systemd/tmpfiles.nix
+++ b/nixos/modules/system/boot/systemd/tmpfiles.nix
@ -200,6 +200,10 @@ in
          rm -f $out/${removePrefix "tmpfiles.d/" name}
        '') config.system.build.etc.passthru.targets;
      }) + "/*";
+      "mtab" = {
+        mode = "direct-symlink";
+        source = "/proc/mounts";
+      };
    };

    systemd.tmpfiles.packages = [
@ -244,13 +248,11 @@ in
      "L+ /nix/var/nix/gcroots/booted-system 0755 root root - /run/booted-system"
      "d  /run/lock                          0755 root root - -"
      "d  /var/db                            0755 root root - -"
-      "L  /etc/mtab                          -    -    -    - ../proc/mounts"
      "L  /var/lock                          -    -    -    - ../run/lock"
      # Boot-time cleanup
      "R! /etc/group.lock                    -    -    -    - -"
      "R! /etc/passwd.lock                   -    -    -    - -"
      "R! /etc/shadow.lock                   -    -    -    - -"
-      "R! /etc/mtab*                         -    -    -    - -"
      "R! /nix/var/nix/gcroots/tmp           -    -    -    - -"
      "R! /nix/var/nix/temproots             -    -    -    - -"
    ];
--- a/nixos/tests/activation/etc-overlay-immutable.nix
+++ b/nixos/tests/activation/etc-overlay-immutable.nix
@ -32,6 +32,9 @@
    with subtest("direct symlinks point to the target without indirection"):
      assert machine.succeed("readlink -n /etc/localtime") == "/etc/zoneinfo/Utc"

+    with subtest("/etc/mtab points to the right file"):
+      assert "/proc/mounts" == machine.succeed("readlink --no-newline /etc/mtab")
+
    with subtest("Correct mode on the source password files"):
      assert machine.succeed("stat -c '%a' /var/lib/nixos/etc/passwd") == "644\n"
      assert machine.succeed("stat -c '%a' /var/lib/nixos/etc/group") == "644\n"
--- a/nixos/tests/misc.nix
+++ b/nixos/tests/misc.nix
@ -99,6 +99,9 @@ in {
      with subtest("whether systemd-tmpfiles settings works"):
          machine.succeed("[ -e /tmp/somefile ]")

+      with subtest("/etc/mtab"):
+          assert "/proc/mounts" == machine.succeed("readlink --no-newline /etc/mtab")
+
      with subtest("whether automounting works"):
          machine.fail("grep '/tmp2 tmpfs' /proc/mounts")
          machine.succeed("touch /tmp2/x")
--- a/pkgs/by-name/de/devenv/package.nix
+++ b/pkgs/by-name/de/devenv/package.nix
@ -43,6 +43,8 @@ in rustPlatform.buildRustPackage {

  cargoHash = "sha256-fCXAFVmKns8uglbzyCznoVFGCU+Veq0t1h8T7i1P5XQ=";

+  buildAndTestSubdir = "devenv";
+
  nativeBuildInputs = [ makeWrapper pkg-config ];

  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
--- a/pkgs/by-name/di/distrobox-tui/package.nix
+++ b/pkgs/by-name/di/distrobox-tui/package.nix
@ -0,0 +1,30 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "distrobox-tui";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "phanirithvij";
+    repo = "distrobox-tui";
+    rev = "v${version}";
+    hash = "sha256-J5stvhUNaU9YMczE56vC5bw2g67zsdVWiCi8k6KV/pU=";
+  };
+
+  vendorHash = "sha256-F7X3FBM/F0uPxbM3en0sk9a58O/meKnVsASgIlL7FCo=";
+
+  ldflags = [ "-s" ];
+
+  meta = with lib; {
+    description = "A TUI for DistroBox";
+    changelog = "https://github.com/phanirithvij/distrobox-tui/releases/tag/v${version}";
+    homepage = "https://github.com/phanirithvij/distrobox-tui";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ phanirithvij ];
+    mainProgram = "distrobox-tui";
+  };
+}
--- a/pkgs/by-name/gh/gh-i/package.nix
+++ b/pkgs/by-name/gh/gh-i/package.nix
@ -0,0 +1,30 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "gh-i";
+  version = "0.0.7";
+
+  src = fetchFromGitHub {
+    owner = "gennaro-tedesco";
+    repo = "gh-i";
+    rev = "v${version}";
+    hash = "sha256-nVMWeXssSpfWsD20+qLvQp6Wlrp/DiVNLBR6qnvuD2M=";
+  };
+
+  vendorHash = "sha256-TSl+7N3W3BeW8UWxUdTv3cob2P7eLvO+80BLqcbhanQ=";
+
+  ldflags = [ "-s" ];
+
+  meta = with lib; {
+    description = "Search github issues interactively";
+    changelog = "https://github.com/gennaro-tedesco/gh-i/releases/tag/v${version}";
+    homepage = "https://github.com/gennaro-tedesco/gh-i";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ phanirithvij ];
+    mainProgram = "gh-i";
+  };
+}
--- a/pkgs/by-name/gi/git-gr/package.nix
+++ b/pkgs/by-name/gi/git-gr/package.nix
@ -15,7 +15,7 @@ let
  canRunGitGr = stdenv.hostPlatform.emulatorAvailable buildPackages;
  gitGr = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/git-gr";
  pname = "git-gr";
-  version = "1.4.1";
+  version = "1.4.2";
 in
 rustPlatform.buildRustPackage {
  inherit pname version;
@ -24,12 +24,12 @@ rustPlatform.buildRustPackage {
    owner = "9999years";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-8Z4ZLejNS6KQ/MXmQuZ0Tq9VmuJ5Nhxo4TS0tOlg/R4=";
+    hash = "sha256-/g5EpSwnYI0fYZKsstfwApmMxvdFKVfeXDi0dUn5bxU=";
  };

  buildFeatures = [ "clap_mangen" ];

-  cargoHash = "sha256-REtY+UgtJCoTDgpI/+O341WsC4WJ4PS7/yFwWSVKKRo=";
+  cargoHash = "sha256-qVOCnJD/VNoi6Ur7mjtar1likNd26Fuggwp9m9/K2/w=";

  OPENSSL_NO_VENDOR = true;

--- a/pkgs/by-name/gi/gitcs/package.nix
+++ b/pkgs/by-name/gi/gitcs/package.nix
@ -0,0 +1,30 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "gitcs";
+  version = "1.2.0";
+
+  src = fetchFromGitHub {
+    owner = "knbr13";
+    repo = "gitcs";
+    rev = "v${version}";
+    hash = "sha256-IyhVVRTKftZIzqMH5pBUMLPIk8bk0rVAxPKD6bABP68=";
+  };
+
+  vendorHash = "sha256-8yzPdVljnODOeI5yWh19BHsF4Pa9BWc49IwenMCVGZo=";
+
+  ldflags = [ "-s" ];
+
+  meta = with lib; {
+    description = "Scan local git repositories and generate a visual contributions graph";
+    changelog = "https://github.com/knbr13/gitcs/releases/tag/v${version}";
+    homepage = "https://github.com/knbr13/gitcs";
+    license = licenses.mit;
+    maintainers = with maintainers; [ phanirithvij ];
+    mainProgram = "gitcs";
+  };
+}
--- a/pkgs/by-name/go/gogup/package.nix
+++ b/pkgs/by-name/go/gogup/package.nix
@ -0,0 +1,34 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "gogup";
+  version = "0.27.3";
+
+  src = fetchFromGitHub {
+    owner = "nao1215";
+    repo = "gup";
+    rev = "v${version}";
+    hash = "sha256-8DtD22kvGez2iX0VqoZ1zSydcNYnDz3r698nXEwtoZE=";
+  };
+
+  vendorHash = "sha256-yqCmo33ihkaPK8iL5cnCIGbOLkdXjuIWLwtgAa+KB8Y=";
+  doCheck = false;
+
+  ldflags = [
+    "-s"
+    "-X github.com/nao1215/gup/internal/cmdinfo.Version=v${version}"
+  ];
+
+  meta = with lib; {
+    description = "Update binaries installed by 'go install' with goroutines";
+    changelog = "https://github.com/nao1215/gup/blob/v${version}/CHANGELOG.md";
+    homepage = "https://github.com/nao1215/gup";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ phanirithvij ];
+    mainProgram = "gup";
+  };
+}
--- a/pkgs/by-name/go/gomtree/package.nix
+++ b/pkgs/by-name/go/gomtree/package.nix
@ -0,0 +1,38 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "gomtree";
+  version = "0.5.4";
+
+  src = fetchFromGitHub {
+    owner = "vbatts";
+    repo = "go-mtree";
+    rev = "v${version}";
+    hash = "sha256-MDX16z4H1fyuV5atEsZHReJyvC+MRdeA54DORCFtpqI=";
+  };
+
+  vendorHash = null;
+
+  # test fails with nix due to ro file system
+  checkFlags = [ "-skip=^TestXattr$" ];
+
+  subPackages = [ "cmd/gomtree" ];
+
+  ldflags = [
+    "-s"
+    "-X main.Version=${version}"
+  ];
+
+  meta = with lib; {
+    description = "File systems verification utility and library, in likeness of mtree(8)";
+    changelog = "https://github.com/vbatts/go-mtree/releases/tag/v${version}";
+    homepage = "https://github.com/vbatts/go-mtree";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ phanirithvij ];
+    mainProgram = "gomtree";
+  };
+}
--- a/pkgs/by-name/mo/mold/package.nix
+++ b/pkgs/by-name/mo/mold/package.nix
@ -23,13 +23,13 @@

 stdenv.mkDerivation rec {
  pname = "mold";
-  version = "2.32.1";
+  version = "2.33.0";

  src = fetchFromGitHub {
    owner = "rui314";
    repo = "mold";
    rev = "v${version}";
-    hash = "sha256-pKq4Vw7vPoT76OvCAeh+XEwI5klz2LPxXAWsr+RsTeU=";
+    hash = "sha256-685Tn2/XFhGSk7Onnw1W9VfgDSFNwDETc3KoiKMCS3M=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/nh/nhost-cli/package.nix
+++ b/pkgs/by-name/nh/nhost-cli/package.nix
@ -6,13 +6,13 @@

 buildGoModule rec {
  pname = "nhost-cli";
-  version = "1.20.0";
+  version = "1.21.0";

  src = fetchFromGitHub {
    owner = "nhost";
    repo = "cli";
    rev = "v${version}";
-    hash = "sha256-FrAyK50D0EbGygg7R8KX2LxuS8y2B+6i3F6olLuAqDM=";
+    hash = "sha256-xnSIWDKWi4weMjs8WOVqJ77DGqtw/EhLAmVa8CNjXb0=";
  };

  vendorHash = null;
--- a/pkgs/by-name/sd/sd-mux-ctrl/package.nix
+++ b/pkgs/by-name/sd/sd-mux-ctrl/package.nix
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {

  meta = with lib; {
    description = "Tool for controlling multiple sd-mux devices";
-    homepage = "https://wiki.tizen.org/SD_MUX";
+    homepage = "https://git.tizen.org/cgit/tools/testlab/sd-mux";
    license = licenses.asl20;
    maintainers =  with maintainers; [ newam sarcasticadmin ];
    platforms = platforms.unix;
--- a/pkgs/development/libraries/dqlite/default.nix
+++ b/pkgs/development/libraries/dqlite/default.nix
@ -3,13 +3,13 @@

 stdenv.mkDerivation rec {
  pname = "dqlite";
-  version = "1.16.6";
+  version = "1.16.7";

  src = fetchFromGitHub {
    owner = "canonical";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-NtBEhtK6PysRqCUNcbFvPMBEmDR9WWJkWdFdzTOKt/8=";
+    hash = "sha256-XQvJO4sFKRKDVdtoXP2Ue80otDC0Ry6EB1Z0shetuhw=";
  };

  nativeBuildInputs = [ autoreconfHook file pkg-config ];
--- a/pkgs/development/libraries/elpa/default.nix
+++ b/pkgs/development/libraries/elpa/default.nix
@ -19,13 +19,13 @@ assert blas.isILP64 == scalapack.isILP64;

 stdenv.mkDerivation rec {
  pname = "elpa";
-  version = "2023.11.001";
+  version = "2024.05.001";

  passthru = { inherit (blas) isILP64; };

  src = fetchurl {
    url = "https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${version}/elpa-${version}.tar.gz";
-    sha256 = "sha256-tXvRl85nvbbiRRJOn9q4mz/a3dvTTYEu5JDVdH7npBA=";
+    sha256 = "sha256-nK9Bo+YA4vb0zhkxvVQYUXna3pwXFVbQybQbvGlA8vY=";
  };

  patches = [
--- a/pkgs/development/libraries/netcdf/default.nix
+++ b/pkgs/development/libraries/netcdf/default.nix
@ -52,6 +52,11 @@ in stdenv.mkDerivation rec {
    inherit mpiSupport mpi;
  };

+  env.NIX_CFLAGS_COMPILE =
+    # Suppress incompatible function pointer errors when building with newer versions of clang 16.
+    # tracked upstream here: https://github.com/Unidata/netcdf-c/issues/2715
+    lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types";
+
  configureFlags = [
      "--enable-netcdf-4"
      "--enable-dap"
--- a/pkgs/development/python-modules/ailment/default.nix
+++ b/pkgs/development/python-modules/ailment/default.nix
@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "ailment";
-  version = "9.2.113";
+  version = "9.2.114";
  pyproject = true;

  disabled = pythonOlder "3.11";
@ -18,7 +18,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = "ailment";
    rev = "refs/tags/v${version}";
-    hash = "sha256-vrCWGteCVhvEYgXQTcJdeWxF9hkmk2Y8b5Bend4cv34=";
+    hash = "sha256-l/cAGUmvIscZjFzTYNb+tMUPgyDEHt6emYbGjwpuJyU=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/aiobiketrax/default.nix
+++ b/pkgs/development/python-modules/aiobiketrax/default.nix
@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "aiobiketrax";
-  version = "1.3.0";
+  version = "1.3.1";
  pyproject = true;

  disabled = pythonOlder "3.9";
@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "basilfx";
    repo = "aiobiketrax";
    rev = "refs/tags/v${version}";
-    hash = "sha256-6hSSPanagYKZxoyU8mp/1bWRcpJJkhNw3Rh82ogKGr4=";
+    hash = "sha256-N0v5SCTf3NkW/TCSTQL9VkrDj7/GXEejJGFCvJY4pIc=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/angr/default.nix
+++ b/pkgs/development/python-modules/angr/default.nix
@ -36,7 +36,7 @@

 buildPythonPackage rec {
  pname = "angr";
-  version = "9.2.113";
+  version = "9.2.114";
  pyproject = true;

  disabled = pythonOlder "3.11";
@ -45,7 +45,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = "angr";
    rev = "refs/tags/v${version}";
-    hash = "sha256-vj166aUVjyce3EJE/d8aY90Ho1VaIgiqRYGep1gNoW0=";
+    hash = "sha256-Juv1/N/QdV99P1QupXU+OTl2ycT0SNrQF3PfDvQjb3Y=";
  };

  pythonRelaxDeps = [ "capstone" ];
--- a/pkgs/development/python-modules/archinfo/default.nix
+++ b/pkgs/development/python-modules/archinfo/default.nix
@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "archinfo";
-  version = "9.2.113";
+  version = "9.2.114";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -19,7 +19,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = "archinfo";
    rev = "refs/tags/v${version}";
-    hash = "sha256-+cI6aZZxP8501UkiyKaP2nXulT8CVMImLUXkN7sy5i0=";
+    hash = "sha256-Ov7jEV4avhdslf6K36lSQpz/bA+riYUKGVtnd3ChXPI=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@ -366,7 +366,7 @@

 buildPythonPackage rec {
  pname = "boto3-stubs";
-  version = "1.34.155";
+  version = "1.34.156";
  pyproject = true;

  disabled = pythonOlder "3.7";
@ -374,7 +374,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "boto3_stubs";
    inherit version;
-    hash = "sha256-XIcATvHqOu6rO57TWlkWmih2h3JEVjbKiO9zAE5P7ts=";
+    hash = "sha256-w0IgoAtr0Ao80ya8XX4ylrfR2rGhVmDfb4+6SuMH/zk=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "botocore-stubs";
-  version = "1.34.155";
+  version = "1.34.156";
  pyproject = true;

  disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "botocore_stubs";
    inherit version;
-    hash = "sha256-VRS5NyUnwv6paQYafwQSXVOlFlns4M5Z2b+6+zCGRKM=";
+    hash = "sha256-u1rRaHzTYwNcPwAIVFQkdgQEVWKUY9Tk2x6/QQSKTAY=";
  };

  nativeBuildInputs = [ poetry-core ];
--- a/pkgs/development/python-modules/claripy/default.nix
+++ b/pkgs/development/python-modules/claripy/default.nix
@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "claripy";
-  version = "9.2.113";
+  version = "9.2.114";
  pyproject = true;

  disabled = pythonOlder "3.11";
@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = "claripy";
    rev = "refs/tags/v${version}";
-    hash = "sha256-lGXxu6xI0ndMH9/S8uQCqvpV0mStNzMsCT5mXjBgP9Q=";
+    hash = "sha256-VvYJQK2++wfH9aNR31Cbz8nQalWwbOwiE8YMOhAVG3c=";
  };

  # z3 does not provide a dist-info, so python-runtime-deps-check will fail
--- a/pkgs/development/python-modules/cle/default.nix
+++ b/pkgs/development/python-modules/cle/default.nix
@ -18,14 +18,14 @@

 let
  # The binaries are following the argr projects release cycle
-  version = "9.2.113";
+  version = "9.2.114";

  # Binary files from https://github.com/angr/binaries (only used for testing and only here)
  binaries = fetchFromGitHub {
    owner = "angr";
    repo = "binaries";
    rev = "refs/tags/v${version}";
-    hash = "sha256-SlML9os4ThZML77SBg2VosGzKWZdb1p9ClDf6nfB+yQ=";
+    hash = "sha256-M8agIZ4Gk67wKUfKI/13sYAYUta0sWk7cVkM5ayb0V0=";
  };
 in
 buildPythonPackage rec {
@ -39,7 +39,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = "cle";
    rev = "refs/tags/v${version}";
-    hash = "sha256-wyowItw7KgcIl0nu57s1cDdZc0oFQaL9yRxPa1Wjx90=";
+    hash = "sha256-PGAuLW0yTuKrAo+xxlLQnnxugiZAhXQmC89Ve2OY8aY=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/dask-expr/default.nix
+++ b/pkgs/development/python-modules/dask-expr/default.nix
@ -21,7 +21,7 @@

 buildPythonPackage rec {
  pname = "dask-expr";
-  version = "1.1.9";
+  version = "1.1.10";
  pyproject = true;

  disabled = pythonOlder "3.9";
@ -30,7 +30,7 @@ buildPythonPackage rec {
    owner = "dask";
    repo = "dask-expr";
    rev = "refs/tags/v${version}";
-    hash = "sha256-DfXGQ5/aOIWcM9qcALMr3T6qi/l9gMF9HLaQwbzPdE4=";
+    hash = "sha256-JLOTmpaKDyv4dgEM/dQFeQrD0OZcwNxBi7/pq/STJYY=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@ -40,7 +40,7 @@
 let
  self = buildPythonPackage rec {
    pname = "dask";
-    version = "2024.7.1";
+    version = "2024.8.0";
    pyproject = true;

    disabled = pythonOlder "3.9";
@ -49,7 +49,7 @@ let
      owner = "dask";
      repo = "dask";
      rev = "refs/tags/${version}";
-      hash = "sha256-aHira3GKtw674VQ5bc5lFEWyuLf4ZWexKQP6eaGwbzg=";
+      hash = "sha256-u8rkay2c4gr3IVShGD6z0FfHkIiUvQwDpl8U6B0JsEM=";
    };

    build-system = [ setuptools ];
--- a/pkgs/development/python-modules/distributed/default.nix
+++ b/pkgs/development/python-modules/distributed/default.nix
@ -25,7 +25,7 @@

 buildPythonPackage rec {
  pname = "distributed";
-  version = "2024.7.1";
+  version = "2024.8.0";
  pyproject = true;

  disabled = pythonOlder "3.9";
@ -34,7 +34,7 @@ buildPythonPackage rec {
    owner = "dask";
    repo = "distributed";
    rev = "refs/tags/${version}";
-    hash = "sha256-1VLYOUPo2esFltcoI6B/HMGyuyRq4vvkE55C8acdbG8=";
+    hash = "sha256-7Z/KKm9C/n4yFKv9KHmGhIUeddwCIZL1A/SBGJKDlbI=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/google-cloud-spanner/default.nix
+++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix
@ -21,7 +21,7 @@

 buildPythonPackage rec {
  pname = "google-cloud-spanner";
-  version = "3.47.0";
+  version = "3.48.0";
  pyproject = true;

  disabled = pythonOlder "3.7";
@ -30,7 +30,7 @@ buildPythonPackage rec {
    owner = "googleapis";
    repo = "python-spanner";
    rev = "refs/tags/v${version}";
-    hash = "sha256-eq4tXwXHDdGUyZfPtU/l5cpzYB6AMdqZtj03+2yK8Wk=";
+    hash = "sha256-QgLZQ0rgBEmYDAE16K84bSx4bFWJRviY1WqsVwKcO6w=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/incomfort-client/default.nix
+++ b/pkgs/development/python-modules/incomfort-client/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "incomfort-client";
-  version = "0.6.3";
+  version = "0.6.3-1";
  pyproject = true;

  disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "zxdavb";
    repo = "incomfort-client";
    rev = "refs/tags/v${version}";
-    hash = "sha256-GD5NsVvmuCuEXw8KvojSj5b67/i0skvhYW8ko+9iysU=";
+    hash = "sha256-I6MAFvODkw2QadzXJacFl/TwA6exfBB1PSDslmT7Ysw=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/lacuscore/default.nix
+++ b/pkgs/development/python-modules/lacuscore/default.nix
@ -17,7 +17,7 @@

 buildPythonPackage rec {
  pname = "lacuscore";
-  version = "1.10.8";
+  version = "1.10.9";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -26,7 +26,7 @@ buildPythonPackage rec {
    owner = "ail-project";
    repo = "LacusCore";
    rev = "refs/tags/v${version}";
-    hash = "sha256-LErxBhTajXHPDC2oZqygKRs6MLp6PLq4XoaluCeadcQ=";
+    hash = "sha256-6DBfmojU9p0QAojYxFSciQkc8uvQtRw37Fc8Mp5Eu/8=";
  };

  pythonRelaxDeps = [
--- a/pkgs/development/python-modules/lxml-html-clean/default.nix
+++ b/pkgs/development/python-modules/lxml-html-clean/default.nix
@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "lxml-html-clean";
-  version = "0.1.1";
+  version = "0.2.0";
  pyproject = true;

  disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
    owner = "fedora-python";
    repo = "lxml_html_clean";
    rev = "refs/tags/${version}";
-    hash = "sha256-vnRsSkhjeDxZ2bYbIe+2D4GjymZWcIVo2LAPuCaYIZo=";
+    hash = "sha256-3ifuEgjCLDj0dBh9AbjAT/hNFGfINbvyjgRuxIRuarw=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/playwrightcapture/default.nix
+++ b/pkgs/development/python-modules/playwrightcapture/default.nix
@ -22,7 +22,7 @@

 buildPythonPackage rec {
  pname = "playwrightcapture";
-  version = "1.25.9";
+  version = "1.25.10";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -31,10 +31,12 @@ buildPythonPackage rec {
    owner = "Lookyloo";
    repo = "PlaywrightCapture";
    rev = "refs/tags/v${version}";
-    hash = "sha256-p/Zy4roRG0xdk2w5O0CdYIr15D+wumiuGlCNxrHHWdw=";
+    hash = "sha256-aBex+29NGPELQY+uaOXzGOWxt8injSk2hmOtVqzodmM=";
  };

  pythonRelaxDeps = [
+    "aiohttp"
+    "aiohttp-socks"
    "beautifulsoup4"
    "playwright"
    "setuptools"
--- a/pkgs/development/python-modules/polyswarm-api/default.nix
+++ b/pkgs/development/python-modules/polyswarm-api/default.nix
@ -15,7 +15,7 @@

 buildPythonPackage rec {
  pname = "polyswarm-api";
-  version = "3.8.0";
+  version = "3.9.0";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -24,7 +24,7 @@ buildPythonPackage rec {
    owner = "polyswarm";
    repo = "polyswarm-api";
    rev = "refs/tags/${version}";
-    hash = "sha256-AH0DJYmZL+EejIkhy97JyekdB6ywf49kka0C2sDbdlY=";
+    hash = "sha256-RjzB7S3qTCl6fo+qZ+mVCsQg6CLUnSwutNse5QPQOHU=";
  };

  pythonRelaxDeps = [ "future" ];
--- a/pkgs/development/python-modules/pyexploitdb/default.nix
+++ b/pkgs/development/python-modules/pyexploitdb/default.nix
@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "pyexploitdb";
-  version = "0.2.28";
+  version = "0.2.29";
  pyproject = true;

  disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "pyExploitDb";
    inherit version;
-    hash = "sha256-dPDsehNQjPGaBh/+x+4/eq2WcyI5149IAiYduXsh8Vw=";
+    hash = "sha256-kS9VoEsXdXQOedbDkgAP2x+MuWG5kCAvpcquDQn7Jno=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/pylitterbot/default.nix
+++ b/pkgs/development/python-modules/pylitterbot/default.nix
@ -3,29 +3,30 @@
  aiohttp,
  aioresponses,
  buildPythonPackage,
+  deepdiff,
  fetchFromGitHub,
  poetry-core,
  poetry-dynamic-versioning,
+  pycognito,
  pyjwt,
  pytest-aiohttp,
  pytest-freezegun,
  pytestCheckHook,
  pythonOlder,
-  deepdiff,
 }:

 buildPythonPackage rec {
  pname = "pylitterbot";
-  version = "2023.5.0";
+  version = "2023.5.1";
  pyproject = true;

-  disabled = pythonOlder "3.9";
+  disabled = pythonOlder "3.10";

  src = fetchFromGitHub {
    owner = "natekspencer";
    repo = "pylitterbot";
    rev = "refs/tags/v${version}";
-    hash = "sha256-MSQdX2PKQohmPGqtRZnUmCCVgKgaf4+cHAUItiPv7pY=";
+    hash = "sha256-Mpqa7pMxnFdSL1KGTUbgjh1zd8bAcoyzgxRZZ4SGfYc=";
  };

  pythonRelaxDeps = [ "deepdiff" ];
@ -38,6 +39,7 @@ buildPythonPackage rec {
  dependencies = [
    aiohttp
    deepdiff
+    pycognito
    pyjwt
  ];

--- a/pkgs/development/python-modules/pylutron/default.nix
+++ b/pkgs/development/python-modules/pylutron/default.nix
@ -8,14 +8,14 @@

 buildPythonPackage rec {
  pname = "pylutron";
-  version = "0.2.13";
+  version = "0.2.15";
  pyproject = true;

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-s5qprIVPlq495XWKjgIuohDzPV0EfU43zkfQ2DvH04Y=";
+    hash = "sha256-1UUW3Ym11jR4dxSS1OOVPl6h69I6H782Q4ZeVitty0c=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/pyvex/default.nix
+++ b/pkgs/development/python-modules/pyvex/default.nix
@ -12,14 +12,14 @@

 buildPythonPackage rec {
  pname = "pyvex";
-  version = "9.2.113";
+  version = "9.2.114";
  pyproject = true;

  disabled = pythonOlder "3.11";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-mmtRFY++zxc97hgc7aVzRd+M5vHqkgNARfznrL2yLZg=";
+    hash = "sha256-zXPUuB/UyPabDZH370u0lf3LCf0oJNkrFtc08/O7RrI=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/reolink-aio/default.nix
+++ b/pkgs/development/python-modules/reolink-aio/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "reolink-aio";
-  version = "0.9.6";
+  version = "0.9.7";
  pyproject = true;

  disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "starkillerOG";
    repo = "reolink_aio";
    rev = "refs/tags/${version}";
-    hash = "sha256-/W0X5lFcVNp2qj8GX5mIZ5ucRlkcKHY+ESrM0gc5FYA=";
+    hash = "sha256-EWNnaLXgJ4ieLFVBT651d50eZ/s/NfdRwRAVQy49kpc=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/ruff-api/Cargo.lock
+++ b/pkgs/development/python-modules/ruff-api/Cargo.lock
--- a/pkgs/development/python-modules/ruff-api/default.nix
+++ b/pkgs/development/python-modules/ruff-api/default.nix
@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "ruff-api";
-  version = "0.0.6";
+  version = "0.0.7";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -22,13 +22,14 @@ buildPythonPackage rec {
    owner = "amyreese";
    repo = "ruff-api";
    rev = "refs/tags/v${version}";
-    hash = "sha256-nZKf0LpCoYwWoLDGoorJ+zQSLyuxfWu3LOygocVlYSs=";
+    hash = "sha256-wST5TfIcw5rezaL9ZygoK3RYsGA9wzfnC3aDdc3g4tU=";
  };

  cargoDeps = rustPlatform.importCargoLock {
    lockFile = ./Cargo.lock;
    outputHashes = {
-      "ruff-0.3.7" = "sha256-PS4YJpVut+KtEgSlTVtoVdlu6FVipPIzsl01/Io5N64=";
+      "lsp-types-0.95.1" = "sha256-8Oh299exWXVi6A39pALOISNfp8XBya8z+KT/Z7suRxQ=";
+      "ruff-0.4.10" = "sha256-FRBuvXtnbxRWoI0f8SM0U0Z5TRyX5Tbgq3d34Oh2bG4=";
    };
  };

--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "tencentcloud-sdk-python";
-  version = "3.0.1206";
+  version = "3.0.1207";
  pyproject = true;

  disabled = pythonOlder "3.9";
@ -19,7 +19,7 @@ buildPythonPackage rec {
    owner = "TencentCloud";
    repo = "tencentcloud-sdk-python";
    rev = "refs/tags/${version}";
-    hash = "sha256-GjbqBtNgSKYCx7TCTaszrtUiKcxPH0AMmu94/G1fgDE=";
+    hash = "sha256-TBN3k1FGoeTeQTTf73oF/Cva6iiMOq6HYAV8513ysFI=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/trafilatura/default.nix
+++ b/pkgs/development/python-modules/trafilatura/default.nix
@ -16,14 +16,14 @@

 buildPythonPackage rec {
  pname = "trafilatura";
-  version = "1.10.0";
+  version = "1.12.0";
  pyproject = true;

  disabled = pythonOlder "3.9";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-exBXPi3Ra2cC9W9WhYsl80/4HWsW5CmvCjsmbwdGru4=";
+    hash = "sha256-F9IHTs/ixWK/CGPefoOfrRTMZtX5gJB0HqqRjqv7+dU=";
  };

  # Patch out gui cli because it is not supported in this packaging and
@ -32,7 +32,8 @@ buildPythonPackage rec {
    substituteInPlace setup.py \
      --replace-fail '"trafilatura_gui=trafilatura.gui:main",' ""
    substituteInPlace tests/cli_tests.py \
-      --replace-fail "trafilatura_bin = 'trafilatura'" "trafilatura_bin = '$out/bin/trafilatura'"
+      --replace-fail 'trafilatura_bin = "trafilatura"' \
+                     'trafilatura_bin = "${placeholder "out"}/bin/trafilatura"'
  '';

  build-system = [ setuptools ];
@ -60,16 +61,17 @@ buildPythonPackage rec {
    "test_queue"
    "test_redirection"
    "test_whole"
+    "test_is_live_page"
  ];

  pythonImportsCheck = [ "trafilatura" ];

-  meta = with lib; {
+  meta = {
    description = "Python package and command-line tool designed to gather text on the Web";
    homepage = "https://trafilatura.readthedocs.io";
    changelog = "https://github.com/adbar/trafilatura/blob/v${version}/HISTORY.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ jokatzke ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ jokatzke ];
    mainProgram = "trafilatura";
  };
 }
--- a/pkgs/os-specific/linux/rdma-core/default.nix
+++ b/pkgs/os-specific/linux/rdma-core/default.nix
@ -15,13 +15,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "rdma-core";
-  version = "52.0";
+  version = "53.0";

  src = fetchFromGitHub {
    owner = "linux-rdma";
    repo = "rdma-core";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-M4nmnfeEIxsaFO1DJV9jKD/NnkaLHVNXtfTPf2pTDs4=";
+    hash = "sha256-PHqHQ1xAsOLvT8os3EDk38zWfJp0qmcBw3TuuCvK2Ns=";
  };

  strictDeps = true;
--- a/pkgs/servers/asterisk/versions.json
+++ b/pkgs/servers/asterisk/versions.json
@ -1,14 +1,14 @@
 {
  "asterisk_18": {
-    "sha256": "ddbaf55c222503fa393f3ff3e3d3d193c644e8eddcfba3e6d1d3c597869d9fed",
-    "version": "18.24.0"
+    "sha256": "f5649b3bdcfd22622643cc6c6e76bbd3f7651fb431c0f2be4d5b8f312b120783",
+    "version": "18.24.1"
  },
  "asterisk_20": {
-    "sha256": "1a783adbd7c3d96439ee1ca0ca5b1421ee809be5948ac6960021c0ad8c19679c",
-    "version": "20.9.0"
+    "sha256": "548cdb1e1d854bc466af5178a5ee1b51b6e52d07359a0b286bc9147a64c1adb1",
+    "version": "20.9.1"
  },
  "asterisk_21": {
-    "sha256": "dfa4f8262461d40480cbd6cc4f7abf5f61fcfdf358f360fed18bcd1f61a16880",
-    "version": "21.4.0"
+    "sha256": "dd19380704c36ff79ea2c1a0390278b83b5ca4a3380e508e30e0b617743e86a2",
+    "version": "21.4.1"
  }
 }
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix
@ -5,18 +5,18 @@

 buildNpmPackage rec {
  pname = "android-tv-card";
-  version = "3.9.3";
+  version = "3.9.4";

  src = fetchFromGitHub {
    owner = "Nerwyn";
    repo = "android-tv-card";
    rev = version;
-    hash = "sha256-le9FdGuYQBi9wlnzSmoumIdYJKh06pFanmJo3V1hkJI=";
+    hash = "sha256-I50WNH/OL7O6YrZ0yf+uPJc05STJrjP8DS/wfaSBTHU=";
  };

  patches = [ ./dont-call-git.patch ];

-  npmDepsHash = "sha256-dUJCmiAESlcK09CQweujtH6fN2HxvGUPmQaG7IQMm5U=";
+  npmDepsHash = "sha256-cuc7+QziclvJWp7MncLjkzfub5UbWYPVoUC/DZfs38g=";

  installPhase = ''
    runHook preInstall
--- a/pkgs/servers/osmocom/libosmo-netif/default.nix
+++ b/pkgs/servers/osmocom/libosmo-netif/default.nix
@ -9,13 +9,13 @@

 stdenv.mkDerivation rec {
  pname = "libosmo-netif";
-  version = "1.4.0";
+  version = "1.5.1";

  src = fetchFromGitHub {
    owner = "osmocom";
    repo = "libosmo-netif";
    rev = version;
-    hash = "sha256-NjclrjpgX2ZySxTTjdeiOTOXsOTESLmj2LY89goedKI=";
+    hash = "sha256-C8lIURQmu15RQij7c09+F/c8XSzTcgHt4MkgdkqTa3Q=";
  };

  postPatch = ''
--- a/pkgs/servers/osmocom/libosmo-sccp/default.nix
+++ b/pkgs/servers/osmocom/libosmo-sccp/default.nix
@ -10,13 +10,13 @@

 stdenv.mkDerivation rec {
  pname = "libosmo-sccp";
-  version = "1.8.2";
+  version = "1.9.0";

  src = fetchFromGitHub {
    owner = "osmocom";
    repo = "libosmo-sccp";
    rev = version;
-    hash = "sha256-MT3NM4sXCLUNKQ5wEbUmvf2KYJNdcSFqGYeQbg+eop8=";
+    hash = "sha256-XEpkLLOjq28ipAbAyR1uBpo3i77xRZyD9NJ35HlRWXU=";
  };

  configureFlags = [ "--with-systemdsystemunitdir=$out" ];
--- a/pkgs/servers/osmocom/libosmoabis/default.nix
+++ b/pkgs/servers/osmocom/libosmoabis/default.nix
@ -10,13 +10,13 @@

 stdenv.mkDerivation rec {
  pname = "libosmoabis";
-  version = "1.5.2";
+  version = "1.6.0";

  src = fetchFromGitHub {
    owner = "osmocom";
    repo = "libosmo-abis";
    rev = version;
-    hash = "sha256-B3M6sqFPecMR4/uiJ93C5ZWlq9IVpQwXCu9GZ4twHJw=";
+    hash = "sha256-So1iyxkLaK3Up+6hetY1TultXF3G3Bg0k1WWrfS+3kA=";
  };

  configureFlags = [ "enable_dahdi=false" ];
--- a/pkgs/servers/osmocom/libosmocore/default.nix
+++ b/pkgs/servers/osmocom/libosmocore/default.nix
@ -15,13 +15,13 @@

 stdenv.mkDerivation rec {
  pname = "libosmocore";
-  version = "1.9.3";
+  version = "1.10.0";

  src = fetchFromGitHub {
    owner = "osmocom";
    repo = "libosmocore";
    rev = version;
-    hash = "sha256-9b+wQoC3lOz7mlaxzSRIrXinRVoNj4UYW0ae+JBBKsE=";
+    hash = "sha256-qP5vGBgPs5y3InE3qgkVHiZgH3AW3mNyLIixgARAVRc=";
  };

  postPatch = ''
--- a/pkgs/servers/osmocom/osmo-bsc/default.nix
+++ b/pkgs/servers/osmocom/osmo-bsc/default.nix
@ -16,13 +16,13 @@ in

 stdenv.mkDerivation rec {
  pname = "osmo-bsc";
-  version = "1.11.1";
+  version = "1.12.1";

  src = fetchFromGitHub {
    owner = "osmocom";
    repo = "osmo-bsc";
    rev = version;
-    hash = "sha256-pMdQcIFWiawXYnmHSjTk+3YcZNMrv3qmgWr4gkTknJA=";
+    hash = "sha256-4ELOkxgtqV30r7xD1XcYXpscswvCQacJWUYcbfDNPhI=";
  };

  postPatch = ''
--- a/pkgs/servers/osmocom/osmo-bts/default.nix
+++ b/pkgs/servers/osmocom/osmo-bts/default.nix
@ -10,13 +10,13 @@

 stdenv.mkDerivation rec {
  pname = "osmo-bts";
-  version = "1.7.2";
+  version = "1.8.0";

  src = fetchFromGitHub {
    owner = "osmocom";
    repo = "osmo-bts";
    rev = version;
-    hash = "sha256-dje+B1jobsVdQZYyIkLTZzez4HQirCcjyosTQCo/v64=";
+    hash = "sha256-l0iCoiMeBGlJpMvnHUrUfGL3sQCT69D739wiYbnSFeI=";
  };

  postPatch = ''
--- a/pkgs/servers/osmocom/osmo-ggsn/default.nix
+++ b/pkgs/servers/osmocom/osmo-ggsn/default.nix
@ -12,13 +12,13 @@ in

 stdenv.mkDerivation rec {
  pname = "osmo-ggsn";
-  version = "1.11.0";
+  version = "1.12.0";

  src = fetchFromGitHub {
    owner = "osmocom";
    repo = "osmo-ggsn";
    rev = version;
-    hash = "sha256-TQQOj8DgsMI/+9Fpcpz95fuk746EWumYtTdPtYCXKTw=";
+    hash = "sha256-sSAIJI7iGNmyXr3t+PXPi1SSzS2Nd3Aze2nvzu/MNI4=";
  };

  postPatch = ''
--- a/pkgs/servers/osmocom/osmo-hlr/default.nix
+++ b/pkgs/servers/osmocom/osmo-hlr/default.nix
@ -14,13 +14,13 @@ in

 stdenv.mkDerivation rec {
  pname = "osmo-hlr";
-  version = "1.7.0";
+  version = "1.8.0";

  src = fetchFromGitHub {
    owner = "osmocom";
    repo = "osmo-hlr";
    rev = version;
-    hash = "sha256-snl4Ezvz28NJEjHwb68V+W3MvMJjkFvc/AlGaeSyiXc=";
+    hash = "sha256-c8dnDXZ5K8hjHWq/AjsPFJlamuuasz7mQS5iIBjWCG0=";
  };

  postPatch = ''
--- a/pkgs/servers/osmocom/osmo-mgw/default.nix
+++ b/pkgs/servers/osmocom/osmo-mgw/default.nix
@ -14,13 +14,13 @@ in

 stdenv.mkDerivation rec {
  pname = "osmo-mgw";
-  version = "1.12.2";
+  version = "1.13.0";

  src = fetchFromGitHub {
    owner = "osmocom";
    repo = "osmo-mgw";
    rev = version;
-    hash = "sha256-RE16qzL8CXjGzoDniB8gBF0fsIaWzDuIvpdQ/5vUdug=";
+    hash = "sha256-j0BYONYFU/TjYcxgP2b+tIm2ybWW/ta+ePy3LkrCWHA=";
  };

  postPatch = ''
--- a/pkgs/servers/osmocom/osmo-msc/default.nix
+++ b/pkgs/servers/osmocom/osmo-msc/default.nix
@ -19,13 +19,13 @@ in

 stdenv.mkDerivation rec {
  pname = "osmo-msc";
-  version = "1.11.1";
+  version = "1.12.0";

  src = fetchFromGitHub {
    owner = "osmocom";
    repo = "osmo-msc";
    rev = version;
-    hash = "sha256-JsfZUkXCpyLucaj0NL+MRCr2sWSCbuZRsipi4O7kFRQ=";
+    hash = "sha256-3yQKboodOBc55R6CdvqSFSwQpstvCVvtZMn7gFKASmI=";
  };

  postPatch = ''
--- a/pkgs/servers/osmocom/osmo-pcu/default.nix
+++ b/pkgs/servers/osmocom/osmo-pcu/default.nix
@ -13,13 +13,13 @@ in

 stdenv.mkDerivation rec {
  pname = "osmo-pcu";
-  version = "1.4.0";
+  version = "1.5.0";

  src = fetchFromGitHub {
    owner = "osmocom";
    repo = "osmo-pcu";
    rev = version;
-    hash = "sha256-rE5/wtzABEd6OVSRVrBvIJuo/CSfK19nf7tm+QQzljY=";
+    hash = "sha256-deFUitxcg0G3dXY13BqgqToJrB2FBEU/YE2yKxyaMvk=";
  };

  postPatch = ''
--- a/pkgs/servers/osmocom/osmo-sgsn/default.nix
+++ b/pkgs/servers/osmocom/osmo-sgsn/default.nix
@ -17,13 +17,13 @@ in

 stdenv.mkDerivation rec {
  pname = "osmo-sgsn";
-  version = "1.11.1";
+  version = "1.12.0";

  src = fetchFromGitHub {
    owner = "osmocom";
    repo = "osmo-sgsn";
    rev = version;
-    hash = "sha256-obslARttKN+ut1ubIQ7zsL3/mnXK/AUoJeBnRJoPoZ0=";
+    hash = "sha256-7roXf5+jZNtx9ZfPYIs5kojiTIHsGGh180cc7uv6hdk=";
  };

  postPatch = ''
--- a/pkgs/servers/osmocom/osmo-sip-connector/default.nix
+++ b/pkgs/servers/osmocom/osmo-sip-connector/default.nix
@ -14,13 +14,13 @@ in

 stdenv.mkDerivation rec {
  pname = "osmo-sip-connector";
-  version = "1.6.3";
+  version = "1.7.0";

  src = fetchFromGitHub {
    owner = "osmocom";
    repo = "osmo-sip-connector";
    rev = version;
-    hash = "sha256-5+bNqdQuobCwy99BLTIWLLNIpirMcb8w1xnIew5a9WE=";
+    hash = "sha256-rQzx3/XmhdXEPEuMsvgs39ELJaCX1DbeEJg3YbY4wdI=";
  };

  postPatch = ''
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -12485,8 +12485,6 @@ with pkgs;
    inherit (darwin.apple_sdk.frameworks) Security;
  };

-  sd-mux-ctrl = callPackage ../tools/misc/sd-mux-ctrl { };
-
  sd-switch = callPackage ../os-specific/linux/sd-switch { };

  sdate = callPackage ../tools/misc/sdate { };