Merge master into staging-next

2023-08-18 18:00:57 +00:00 · 2023-08-18 18:00:57 +00:00 · 1949ef2080
parent edeb36315b 4c254fe09d
commit 1949ef2080
35 changed files with 789 additions and 674 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -7489,6 +7489,12 @@
    githubId = 20320695;
    name = "Matan Bendix Shenhav";
  };
+  iynaix = {
+    email = "iynaix@gmail.com";
+    github = "iynaix";
+    githubId = 94313;
+    name = "Xianyi Lin";
+  };
  izorkin = {
    email = "Izorkin@gmail.com";
    github = "Izorkin";
@ -15955,6 +15961,12 @@
    githubId = 2600039;
    name = "Spencer Janssen";
  };
+  spikespaz = {
+    name = "Jacob Birkett";
+    email = "support@birkett.dev";
+    github = "spikespaz";
+    githubId = 12502988;
+  };
  spinus = {
    email = "tomasz.czyz@gmail.com";
    github = "spinus";
--- a/nixos/modules/services/databases/influxdb2.nix
+++ b/nixos/modules/services/databases/influxdb2.nix
@ -107,7 +107,7 @@ in
        LimitNOFILE = 65536;
        KillMode = "control-group";
        Restart = "on-failure";
-        LoadCredential = [
+        LoadCredential = mkIf cfg.provision.enable [
          "admin-password:${cfg.provision.initialSetup.passwordFile}"
          "admin-token:${cfg.provision.initialSetup.tokenFile}"
        ];
--- a/pkgs/applications/audio/tidal-hifi/default.nix
+++ b/pkgs/applications/audio/tidal-hifi/default.nix
@ -36,11 +36,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "tidal-hifi";
-  version = "5.5.0";
+  version = "5.6.0";

  src = fetchurl {
    url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb";
-    sha256 = "sha256-pUQgTz7KZt4icD4lDAs4Wg095HxYEAifTM8a4cDejQM=";
+    sha256 = "sha256-HKylyYhbMxYfRRP9irGMTtB497o75M+ryikQHMJWbtU=";
  };

  nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ];
@ -105,6 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
  postFixup = ''
    makeWrapper $out/opt/tidal-hifi/tidal-hifi $out/bin/tidal-hifi \
      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
      "''${gappsWrapperArgs[@]}"
    substituteInPlace $out/share/applications/tidal-hifi.desktop \
      --replace "/opt/tidal-hifi/tidal-hifi" "tidal-hifi"
@ -115,7 +116,8 @@ stdenv.mkDerivation (finalAttrs: {
    description = "The web version of Tidal running in electron with hifi support thanks to widevine";
    homepage = "https://github.com/Mastermindzh/tidal-hifi";
    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ qbit ];
+    maintainers = with lib.maintainers; [ qbit spikespaz ];
    platforms = lib.platforms.linux;
+    mainProgram = "tidal-hifi";
  };
 })
--- a/pkgs/applications/editors/neovim/neovide/default.nix
+++ b/pkgs/applications/editors/neovim/neovide/default.nix
@ -25,16 +25,16 @@

 rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
  pname = "neovide";
-  version = "0.11.0";
+  version = "0.11.1";

  src = fetchFromGitHub {
    owner = "neovide";
    repo = "neovide";
    rev = version;
-    sha256 = "sha256-OIAGqr34QcpYVUTcW+aPoGeBez/VuT6sSFC5JQaodOI=";
+    sha256 = "sha256-zvpeDaLQvFQn5VfG6lsula/20AF3Oitsq7bLn8TkUiE=";
  };

-  cargoSha256 = "sha256-SMix6lKBkje0o+SxTK7AVSd+QbUyTlu4yPZ3bxnpggg=";
+  cargoSha256 = "sha256-4PgwIdi511ScTLwrz89nf/YPJwEKMUgUKbKxLDzBViM=";

  SKIA_SOURCE_DIR =
    let
--- a/pkgs/applications/misc/oranda/default.nix
+++ b/pkgs/applications/misc/oranda/default.nix
@ -5,20 +5,28 @@
 , oniguruma
 , stdenv
 , darwin
+, tailwindcss
 }:

 rustPlatform.buildRustPackage rec {
  pname = "oranda";
-  version = "0.2.0";
+  version = "0.3.0";

  src = fetchFromGitHub {
    owner = "axodotdev";
    repo = "oranda";
    rev = "v${version}";
-    hash = "sha256-1pkAIz6Zh0ArIDmRSLHTnIgySWdxrDx0amTkdZhY6vY=";
+    hash = "sha256-R9b2T/Em3s4hwcXa3l2i8A3w/aBu0Dz+izFcE4Q8J/4=";
  };

-  cargoHash = "sha256-TKpPAzqwWBH2dlBNvU2kuqqOVu5WhSnSR3wW5FsW7yk=";
+  cargoHash = "sha256-0eH7LZfO5/YgXP9Hom7pgALKFksSTAiczgT7rrNnqow=";
+
+  patches = [
+    # oranda-generate-css which is used in the build script tries to download
+    # tailwindcss from the internet, so we have to patch it to use the
+    # tailwindcss from nixpkgs
+    ./tailwind.patch
+  ];

  nativeBuildInputs = [
    pkg-config
@ -33,10 +41,15 @@ rustPlatform.buildRustPackage rec {
  # requires internet access
  checkFlags = [
    "--skip=build"
+    "--skip=integration"
  ];

  env = {
    RUSTONIG_SYSTEM_LIBONIG = true;
+    TAILWINDCSS = lib.getExe tailwindcss;
+  } // lib.optionalAttrs stdenv.isDarwin {
+    # without this, tailwindcss fails with OpenSSL configuration error
+    OPENSSL_CONF = "";
  };

  meta = with lib; {
--- a/pkgs/applications/misc/oranda/tailwind.patch
+++ b/pkgs/applications/misc/oranda/tailwind.patch
@ -0,0 +1,52 @@
+--- a/generate-css/src/lib.rs
+++ b/generate-css/src/lib.rs
+@@ -28,48 +28,7 @@ pub fn default_css_output_dir() -> Utf8PathBuf {
+ }
+ 
+ pub fn build_css(dist_dir: &Utf8Path) -> Result<()> {
+-    // Fetch our cache dir
+-    let project_dir = ProjectDirs::from("dev", "axo", "oranda")
+-        .expect("Unable to create cache dir for downloading Tailwind!");
+-    let cache_dir = project_dir.cache_dir();
+-    // Figure out our target "double" (tailwind has weird naming around this)
+-    let double = match (env::consts::OS, env::consts::ARCH) {
+-        ("linux", "x86_64") => "linux-x64",
+-        ("linux", "aarch64") => "linux-arm64",
+-        ("linux", "arm") => "linux-armv7",
+-        ("macos", "x86_64") => "macos-x64",
+-        ("macos", "aarch64") => "macos-arm64",
+-        ("windows", "x86_64") => "windows-x64.exe",
+-        ("windows", "aarch64") => "windows-arm64.exe",
+-        _ => "linux-x64",
+-    };
+-    let mut binary_path = Utf8PathBuf::from(cache_dir.display().to_string());
+-    LocalAsset::create_dir_all(&binary_path)?;
+-    binary_path.push(format!("tailwindcss-{double}"));
+-    if !binary_path.exists() {
+-        // Fetch the binary from GitHub if it doesn't exist
+-        tracing::info!("Fetching Tailwind binary from GitHub release...");
+-        let url = format!(
+-			"https://github.com/tailwindlabs/tailwindcss/releases/latest/download/tailwindcss-{double}"
+-		);
+-        let handle = tokio::runtime::Handle::current();
+-        let response = handle.block_on(reqwest::get(url))?;
+-        let bytes = handle.block_on(response.bytes())?;
+-        let file = LocalAsset::new(&binary_path, Vec::from(bytes))?;
+-        file.write(
+-            binary_path
+-                .parent()
+-                .expect("Tailwind binary path has no parent!?"),
+-        )?;
+-
+-        // On non-Windows platforms, we need to mark the file as executable
+-        #[cfg(target_family = "unix")]
+-        {
+-            use std::os::unix::prelude::PermissionsExt;
+-            let user_execute = std::fs::Permissions::from_mode(0o755);
+-            std::fs::set_permissions(&binary_path, user_execute)?;
+-        }
+-    }
+    let binary_path = env!("TAILWINDCSS");
+ 
+     tracing::info!("Building oranda CSS using Tailwind...");
+     let css_src_path = manifest_dir().join(CSS_SRC_PATH);
--- a/pkgs/applications/misc/wallust/default.nix
+++ b/pkgs/applications/misc/wallust/default.nix
@ -4,23 +4,23 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "wallust";
-  version = "2.5.1";
+  version = "2.6.1";

  src = fetchFromGitea {
    domain = "codeberg.org";
    owner = "explosion-mental";
    repo = pname;
    rev = version;
-    hash = "sha256-v72ddWKK2TMHKeBihYjMoJvKXiPe/yqJtdh8VQzjmVU=";
+    hash = "sha256-xcsOOA6esvIhzeka8E9OvCT8aXMWWSHO4lNLtaocTSo=";
  };

-  cargoSha256 = "sha256-jDs4KeVN3P+4/T1cW4KDxoY79jE3GXiwzxLrR2HybWw=";
+  cargoSha256 = "sha256-YDIBn2fjlvNTYwMVn/MkID/EMmzz4oLieVgG2R95q4M=";

  meta = with lib; {
    description = "A better pywal";
    homepage = "https://codeberg.org/explosion-mental/wallust";
    license = licenses.mit;
-    maintainers = with maintainers; [ onemoresuza ];
+    maintainers = with maintainers; [onemoresuza iynaix];
    downloadPage = "https://codeberg.org/explosion-mental/wallust/releases/tag/${version}";
    platforms = platforms.unix;
    mainProgram = "wallust";
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@ -3,10 +3,10 @@
 {
  firefox = buildMozillaMach rec {
    pname = "firefox";
-    version = "116.0.2";
+    version = "116.0.3";
    src = fetchurl {
      url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "2c0ae18672fe22c75002744831130e13da764f83726951e5b58cfe74f7f473e22634ce08ebc11a98bac5baec0a4ac099a3a350a8b756af9c5bea6d5f4432da6d";
+      sha512 = "194c50e9ba5a918c37fbef8cd72ffb98e5e9f51955d8172b6666a758b5f20777ca0a7f79dff0328305fb6dafefb102ab002e326f47d0965a4dc6d3e9287c42b9";
    };

    meta = {
--- a/pkgs/applications/video/memento/default.nix
+++ b/pkgs/applications/video/memento/default.nix
@ -22,13 +22,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "memento";
-  version = "v1.1.0";
+  version = "1.2.1";

  src = fetchFromGitHub {
    owner = "ripose-jp";
    repo = "Memento";
-    rev = finalAttrs.version;
-    hash = "sha256-29AzQ+Z2PNs65Tvmt2Z5Ra2G3Yhm4LVBpAqvnSsnE0Y=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-DUAr+twlIzyi+PnQYsTz9j9KcbzI0GhtC+f4nTekhs0=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix
+++ b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix
@ -1,31 +1,74 @@
-{ lib, stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchurl }:

+let
+  # Upstream versioned download links are broken
+  # NOTE: the archive.org timestamp must be updated if the version changes.
+  # See https://xenproject.org/downloads/
+  files = [
+    {
+      url = "https://web.archive.org/web/20230817070451if_/https://xenbits.xenproject.org/pvdrivers/win/xenbus.tar";
+      hash = "sha256-sInkbVL/xkoUeZxgknLM3e2AXBVSqItF2Vpkon53Xec=";
+    }
+    {
+      url = "https://web.archive.org/web/20230817070811if_/https://xenbits.xenproject.org/pvdrivers/win/xencons.tar";
+      hash = "sha256-r8bxH5B4y0V9qgALi42KtpZW05UOevv29AqqXaIXMBo=";
+    }
+    {
+      url = "https://web.archive.org/web/20230817070811if_/https://xenbits.xenproject.org/pvdrivers/win/xenhid.tar";
+      hash = "sha256-e7ztzaXi/6irMus9IH0cfbW5HiKSaybXV1C/rd5mEfA=";
+    }
+    {
+      url = "https://web.archive.org/web/20230817071133if_/https://xenbits.xenproject.org/pvdrivers/win/xeniface.tar";
+      hash = "sha256-qPM0TjcGR2luPtOSAfXJ22k6yhwJOmOP3ot6kopEFsI=";
+    }
+    {
+      url = "https://web.archive.org/web/20230817071134if_/https://xenbits.xenproject.org/pvdrivers/win/xennet.tar";
+      hash = "sha256-Vg1wSfXjIVRd2iXCa19W4Jdaf2LTVin0yac/D70UjPM=";
+    }
+    {
+      url = "https://web.archive.org/web/20230817070811if_/https://xenbits.xenproject.org/pvdrivers/win/xenvbd.tar";
+      hash = "sha256-nLNM0TWqsEWiQBCYxARMldvRecRUcY5DBF5DNAG4490=";
+    }
+    {
+      url = "https://web.archive.org/web/20230817071225if_/https://xenbits.xenproject.org/pvdrivers/win/xenvif.tar";
+      hash = "sha256-R8G5vG6Q4g0/UkA2oxcc9/jaHZQYb+u64NShCNt7s7U=";
+    }
+    {
+      url = "https://web.archive.org/web/20230817071153if_/https://xenbits.xenproject.org/pvdrivers/win/xenvkbd.tar";
+      hash = "sha256-CaSxCKnT/KaZw8Ma60g2z+4lOOWIRisGRtzMveQqQmM=";
+    }
+  ];
+
+in
 stdenv.mkDerivation {
  pname = "win-pvdrivers";
-  version = "unstable-2015-07-01";
+  version = "unstable-2023-08-17";

-  src = fetchFromGitHub {
-    owner = "ts468";
-    repo = "win-pvdrivers";
-    rev = "3054d645fc3ee182bea3e97ff01869f01cc3637a";
-    sha256 = "6232ca2b7c9af874abbcb9262faf2c74c819727ed2eb64599c790879df535106";
-  };
+  srcs = map ({hash, url}: fetchurl {
+    inherit hash url;
+    # Wait & retry up to 3 times as archive.org can closes connection
+    # when an HTTP client makes too many requests
+    curlOpts = "--retry 3 --retry-delay 5";
+  }) files;

-  buildPhase =
-    let unpack = x: "tar xf $src/${x}.tar; mkdir -p x86/${x} amd64/${x}; cp ${x}/x86/* x86/${x}/.; cp ${x}/x64/* amd64/${x}/.";
-    in lib.concatStringsSep "\n" (map unpack [ "xenbus" "xeniface" "xenvif" "xennet" "xenvbd" ]);

-  installPhase = ''
-    mkdir -p $out
-    cp -r x86 $out/.
-    cp -r amd64 $out/.
+  unpackPhase = ''
+    runHook preUnpack
+
+    for _src in $srcs; do
+      mkdir -p $out
+      tar xfv $_src -C $out
+    done
+
+    runHook postUnpack
  '';

  meta = with lib; {
-    description = "Xen Subproject: Windows PV Driver";
-    homepage = "http://xenproject.org/downloads/windows-pv-drivers.html";
-    maintainers = with maintainers; [ ];
+    description = "Xen Subproject: Windows PV Drivers";
+    homepage = "https://xenproject.org/developers/teams/windows-pv-drivers/";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ anthonyroussel ];
    platforms = platforms.linux;
-    license = licenses.bsd3;
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
  };
 }
--- a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix
+++ b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix
@ -1,47 +0,0 @@
-{ lib, stdenv, fetchurl, p7zip }:
-
-let
-  src_x86 = fetchurl {
-    url = "http://apt.univention.de/download/addons/gplpv-drivers/gplpv_Vista2008x32_signed_0.11.0.373.msi";
-    sha256 = "04r11xw8ikjmcdhrsk878c86g0d0pvras5arsas3zs6dhgjykqap";
-  };
-
-  src_amd64 = fetchurl {
-    url = "http://apt.univention.de/download/addons/gplpv-drivers/gplpv_Vista2008x64_signed_0.11.0.373.msi";
-    sha256 = "00k628mg9b039p8lmg2l9n81dr15svy70p3m6xmq6f0frmci38ph";
-  };
-in
-
-stdenv.mkDerivation {
-  pname = "gplpv";
-  version = "0.11.0.373";
-
-  dontUnpack = true;
-
-  buildPhase = ''
-    mkdir -p x86
-    (cd x86; ${p7zip}/bin/7z e ${src_x86})
-    mkdir -p amd64
-    (cd amd64; ${p7zip}/bin/7z e ${src_amd64})
-  '';
-
-  installPhase = ''
-    mkdir -p $out/x86 $out/amd64
-    cp x86/* $out/x86/.
-    cp amd64/* $out/amd64/.
-  '';
-
-  meta = with lib; {
-    description = ''
-      A collection of open source Window PV drivers that allow
-      Windows to be para-virtualized.
-      The drivers are signed by Univention with a Software Publishers
-      Certificate obtained from the VeriSign CA.
-    '';
-    homepage = "http://wiki.univention.de/index.php?title=Installing-signed-GPLPV-drivers";
-    maintainers = [ ];
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    platforms = platforms.linux;
-    license = licenses.gpl2;
-  };
-  }
--- a/pkgs/desktops/mate/libmateweather/default.nix
+++ b/pkgs/desktops/mate/libmateweather/default.nix
@ -3,6 +3,8 @@
 , fetchurl
 , pkg-config
 , gettext
+, glib
+, libxml2
 , gtk3
 , libsoup
 , tzdata
@ -18,9 +20,13 @@ stdenv.mkDerivation rec {
    sha256 = "wgCZD0uOnU0OLG99MaWHY3TD0qNsa4y1kEQAQ6hg7zo=";
  };

+  strictDeps = true;
+
  nativeBuildInputs = [
    pkg-config
    gettext
+    glib # glib-compile-schemas
+    libxml2 # xmllint
  ];

  buildInputs = [
--- a/pkgs/development/interpreters/expr/default.nix
+++ b/pkgs/development/interpreters/expr/default.nix
@ -0,0 +1,31 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+  pname = "expr";
+  version = "1.14.0";
+
+  src = fetchFromGitHub {
+    owner = "antonmedv";
+    repo = "expr";
+    rev = "v${version}";
+    hash = "sha256-K5UIBkuTXsMaSUhys2Ij7JCwdLE/aZiiipiSucgtkIk=";
+  };
+
+  sourceRoot = "${src.name}/repl";
+
+  vendorHash = "sha256-Sc4Md9O32SOQIyEbIkkJUiowEhLtQN6JzTymk9o3nWE=";
+
+  ldflags = [ "-s" "-w" ];
+
+  meta = with lib; {
+    description = "Expression language and expression evaluation for Go";
+    homepage = "https://github.com/antonmedv/expr";
+    changelog = "https://github.com/antonmedv/expr/releases/tag/${src.rev}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+    mainProgram = "expr";
+  };
+}
--- a/pkgs/development/python-modules/correctionlib/default.nix
+++ b/pkgs/development/python-modules/correctionlib/default.nix
@ -1,11 +1,13 @@
 { lib
 , buildPythonPackage
+, fetchpatch
 , fetchPypi
 , cmake
 , numpy
 , scikit-build
 , setuptools
 , setuptools-scm
+, wheel
 , pybind11
 , pydantic
 , pytestCheckHook
@ -24,12 +26,27 @@ buildPythonPackage rec {
    hash = "sha256-h3eggtPLSF/8ShQ5xzowZW1KSlcI/YBsPu3lsSyzHkw=";
  };

+  patches = [
+    (fetchpatch {
+      name = "ci-maintenance.patch";
+      url = "https://github.com/cms-nanoAOD/correctionlib/commit/924031637b040f6e8e4930c46a9f7560c59db23d.patch";
+      hash = "sha256-jq3ojMsO2Ex9om8tVpEY9uwwelXPzgQ+KCPN0bgda8w=";
+      includes = [ "pyproject.toml" ];
+    })
+    (fetchpatch {
+      name = "clean-up-build-dependencies.patch";
+      url = "https://github.com/cms-nanoAOD/correctionlib/commit/c4fd64ca0e5ce806890e8f0ae8e792dcc4537d38.patch";
+      hash = "sha256-8ID2jEnmfYmPxWMtRviBc3t1W4p3Y+lAzijFtYBEtyk=";
+    })
+  ];
+
  nativeBuildInputs = [
    cmake
    numpy
    scikit-build
    setuptools
    setuptools-scm
+    wheel
    pybind11
  ];

@ -44,7 +61,7 @@ buildPythonPackage rec {

  dontUseCmakeConfigure = true;

-  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+  env.SETUPTOOLS_SCM_PRETEND_VERSION = version;

  nativeCheckInputs = [
    pytestCheckHook
--- a/pkgs/development/python-modules/experiment-utilities/default.nix
+++ b/pkgs/development/python-modules/experiment-utilities/default.nix
@ -19,20 +19,16 @@

 buildPythonPackage rec {
  pname = "experiment-utilities";
-  version = "0.3.4";
+  version = "0.3.5";

  src = fetchFromGitLab {
    owner = "creinke";
    repo = "exputils";
    domain = "gitlab.inria.fr";
    rev = "refs/tags/version_${version}";
-    hash = "sha256-zjmmLUpGjUhpw2+stLJE6cImesnBSvrcid5bHMftX/Q=";
+    hash = "sha256-y+I/TpEC1alP3145ByM6H//lZl2FrpLT/70lzn04P6w=";
  };

-  patches = [
-    ./unvendor-ipynbname.patch
-  ];
-
  # This dependency constraint (<=7.6.5) was due to a bug in qgrid that has been patched in its
  # owned derivation
  postPatch = ''
--- a/pkgs/development/python-modules/experiment-utilities/unvendor-ipynbname.patch
+++ b/pkgs/development/python-modules/experiment-utilities/unvendor-ipynbname.patch
@ -1,117 +0,0 @@
-diff --git a/exputils/gui/jupyter/__init__.py b/exputils/gui/jupyter/__init__.py
-index 6e9aefb..fdfdd28 100644
--- a/exputils/gui/jupyter/__init__.py
-+++ b/exputils/gui/jupyter/__init__.py
-@@ -30,8 +30,8 @@ from exputils.gui.jupyter.misc import remove_children_from_widget
- from exputils.gui.jupyter.misc import set_children_of_widget
- from exputils.gui.jupyter.misc import generate_random_state_backup_name
- 
-from exputils.gui.jupyter.ipynbname import get_notebook_name
-from exputils.gui.jupyter.ipynbname import get_notebook_path
-+from ipynbname import name as get_notebook_name
-+from ipynbname import path as get_notebook_path
- 
- DEFAULT_CONFIG_DIRECTORY = '.ipython_config'
- 
-diff --git a/exputils/gui/jupyter/ipynbname.py b/exputils/gui/jupyter/ipynbname.py
-deleted file mode 100644
-index 51e21b7..0000000
--- a/exputils/gui/jupyter/ipynbname.py
-+++ /dev/null
-@@ -1,86 +0,0 @@
-##
-## This file is part of the exputils package.
-##
-## Copyright: INRIA
-## Year: 2022, 2023
-## Contact: chris.reinke@inria.fr
-##
-## exputils is provided under GPL-3.0-or-later
-##
-# Taken from https://pypi.org/project/ipynbname/
-# TODO: add them to licence
-
-from notebook import notebookapp
-import urllib, json, os, ipykernel, ntpath
-
-FILE_ERROR = "Can't identify the notebook {}."
-CONN_ERROR = "Unable to access server;\n \
-            + ipynbname requires either no security or token based security."
-
-def _get_kernel_id():
-    """ Returns the kernel ID of the ipykernel.
-    """
-    connection_file = os.path.basename(ipykernel.get_connection_file())
-    kernel_id = connection_file.split('-', 1)[1].split('.')[0]
-    return kernel_id
-
-
-def _get_sessions(srv):
-    """ Given a server, returns sessions, or HTTPError if access is denied.
-        NOTE: Works only when either there is no security or there is token
-        based security. An HTTPError is raised if unable to connect to a
-        server.
-    """
-    try:
-        qry_str = ""
-        token = srv['token']
-        if token:
-            qry_str = f"?token={token}"
-        url = f"{srv['url']}api/sessions{qry_str}"
-        req = urllib.request.urlopen(url)
-        return json.load(req)
-    except:
-        raise urllib.error.HTTPError(CONN_ERROR)
-
-
-def _get_nb_path(sess, kernel_id):
-    """ Given a session and kernel ID, returns the notebook path for the
-        session, or None if there is no notebook for the session.
-    """
-    if sess['kernel']['id'] == kernel_id:
-        return sess['notebook']['path']
-    return None
-
-
-def get_notebook_name():
-    """ Returns the short name of the notebook w/o the .ipynb extension,
-        or raises a FileNotFoundError exception if it cannot be determined.
-    """
-    kernel_id = _get_kernel_id()
-    for srv in notebookapp.list_running_servers():
-        try:
-            sessions = _get_sessions(srv)
-            for sess in sessions:
-                nb_path = _get_nb_path(sess, kernel_id)
-                if nb_path:
-                    return ntpath.basename(nb_path).replace('.ipynb', '')
-        except:
-            pass  # There may be stale entries in the runtime directory
-    raise FileNotFoundError(FILE_ERROR.format('name'))
-
-
-def get_notebook_path():
-    """ Returns the absolute path of the notebook,
-        or raises a FileNotFoundError exception if it cannot be determined.
-    """
-    kernel_id = _get_kernel_id()
-    for srv in notebookapp.list_running_servers():
-        try:
-            sessions = _get_sessions(srv)
-            for sess in sessions:
-                nb_path = _get_nb_path(sess, kernel_id)
-                if nb_path:
-                    return os.path.join(srv['notebook_dir'], nb_path)
-        except:
-            pass  # There may be stale entries in the runtime directory
-    raise FileNotFoundError(FILE_ERROR.format('path'))
-\ No newline at end of file
-diff --git a/setup.cfg b/setup.cfg
-index 9d9cbb0..6080ed6 100644
--- a/setup.cfg
-+++ b/setup.cfg
-@@ -25,3 +25,4 @@ install_requires =
-   tensorboard >= 1.15.0
-   fasteners >= 0.18
-   pyyaml >= 6.0
-+  ipynbname
--- a/pkgs/development/python-modules/imagededup/default.nix
+++ b/pkgs/development/python-modules/imagededup/default.nix
@ -0,0 +1,78 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, fetchurl
+, cython
+, torch
+, torchvision
+, pillow
+, tqdm
+, scikit-learn
+, pywavelets
+, matplotlib
+, pytestCheckHook
+, pytest-mock
+}:
+let
+  MobileNetV3 = fetchurl {
+    url = "https://download.pytorch.org/models/mobilenet_v3_small-047dcff4.pth";
+    hash = "sha256-BH3P9K3e+G6lvC7/E8lhTcEfR6sRYNCnGiXn25lPTh8=";
+  };
+  ViT = fetchurl {
+    url = "https://download.pytorch.org/models/vit_b_16_swag-9ac1b537.pth";
+    hash = "sha256-msG1N42ZJ71sg3TODNVX74Dhs/j7wYWd8zLE3J0P2CU=";
+  };
+  EfficientNet = fetchurl {
+    url = "https://download.pytorch.org/models/efficientnet_b4_rwightman-7eb33cd5.pth";
+    hash = "sha256-I6uLzVvb72GnpDuRrcrYH2Iv1/NvtJNaVpgo13iIxE4=";
+  };
+in
+buildPythonPackage rec {
+  pname = "imagededup";
+  version = "0.3.2";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "idealo";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-B2IuNMTZnzBi6IxrHBoMDsmIcqGQpznd/2f1XKo1Oa4=";
+  };
+
+  nativeBuildInputs = [
+    cython
+  ];
+
+  propagatedBuildInputs = [
+    torch
+    torchvision
+    pillow
+    tqdm
+    scikit-learn
+    pywavelets
+    matplotlib
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook pytest-mock ];
+
+  preCheck = ''
+    # checks fail with: error: [Errno 13] Permission denied: '/homeless-shelter'
+    export HOME=$(mktemp -d)
+
+    # checks with CNN are preloaded to avoid downloads in check-phase
+    mkdir -p $HOME/.cache/torch/hub/checkpoints/
+    ln -s ${MobileNetV3} $HOME/.cache/torch/hub/checkpoints/${MobileNetV3.name}
+    ln -s ${ViT} $HOME/.cache/torch/hub/checkpoints/${ViT.name}
+    ln -s ${EfficientNet} $HOME/.cache/torch/hub/checkpoints/${EfficientNet.name}
+  '';
+
+  pythonImportsCheck = [ "imagededup" ];
+
+  meta = with lib; {
+    homepage = "https://idealo.github.io/imagededup/";
+    changelog = "https://github.com/idealo/imagededup/releases/tag/${src.rev}";
+    description = "Finding duplicate images made easy";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ stunkymonkey ];
+  };
+}
--- a/pkgs/development/python-modules/jupyterlab_server/default.nix
+++ b/pkgs/development/python-modules/jupyterlab_server/default.nix
@ -11,9 +11,10 @@
 , jupyter-server
 , tomli
 , openapi-core
-, pytest-timeout
-, pytest-tornasync
+, pytest-jupyter
+, requests-mock
 , ruamel-yaml
+, strict-rfc3339
 , importlib-metadata
 }:

@ -47,19 +48,16 @@ buildPythonPackage rec {
  nativeCheckInputs = [
    openapi-core
    pytestCheckHook
-    pytest-timeout
-    pytest-tornasync
+    pytest-jupyter
+    requests-mock
    ruamel-yaml
+    strict-rfc3339
  ];

  postPatch = ''
-    # translation tests try to install additional packages into read only paths
-    rm -r tests/translations/
+    sed -i "/timeout/d" pyproject.toml
  '';

-  # https://github.com/jupyterlab/jupyterlab_server/blob/v2.15.2/pyproject.toml#L61
-  doCheck = false;
-
  preCheck = ''
    export HOME=$(mktemp -d)
  '';
@ -70,6 +68,17 @@ buildPythonPackage rec {
    "-W ignore::DeprecationWarning"
  ];

+  disabledTestPaths = [
+    "tests/test_settings_api.py"
+    "tests/test_themes_api.py"
+    "tests/test_translation_api.py"
+    "tests/test_workspaces_api.py"
+  ];
+
+  disabledTests = [
+    "test_get_listing"
+  ];
+
  __darwinAllowLocalNetworking = true;

  meta = with lib; {
--- a/pkgs/development/python-modules/python-swiftclient/default.nix
+++ b/pkgs/development/python-modules/python-swiftclient/default.nix
@ -22,6 +22,13 @@ buildPythonPackage rec {
    hash = "sha256-Hj3fmYzL6n3CWqbfjrPffTi/S8lrBl8vhEMeglmBezM=";
  };

+  # remove duplicate script that will be created by setuptools from the
+  # entry_points section of setup.cfg
+  postPatch = ''
+    sed -i '/^scripts =/d' setup.cfg
+    sed -i '/bin\/swift/d' setup.cfg
+  '';
+
  nativeBuildInputs = [
    installShellFiles
  ];
--- a/pkgs/development/python-modules/qtpy/default.nix
+++ b/pkgs/development/python-modules/qtpy/default.nix
@ -8,7 +8,7 @@

 # tests
 , pyqt5
-, pyside
+, pyside2
 , pytestCheckHook
 }:

@ -30,7 +30,7 @@ buildPythonPackage rec {

  doCheck = false; # ModuleNotFoundError: No module named 'PyQt5.QtConnectivity'
  nativeCheckInputs = [
-    pyside
+    pyside2
    (pyqt5.override {
      withConnectivity = true;
      withMultimedia = true;
--- a/pkgs/development/python-modules/vdirsyncer/default.nix
+++ b/pkgs/development/python-modules/vdirsyncer/default.nix
@ -11,7 +11,9 @@
 , hypothesis
 , pytestCheckHook
 , pytest-subtesthack
+, setuptools
 , setuptools-scm
+, wheel
 , aiostream
 , aiohttp-oauthlib
 , aiohttp
@ -38,6 +40,12 @@ buildPythonPackage rec {
    sed -i -e '/--cov/d' -e '/--no-cov/d' pyproject.toml
  '';

+  nativeBuildInputs = [
+    setuptools
+    setuptools-scm
+    wheel
+  ];
+
  propagatedBuildInputs = [
    atomicwrites
    click
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@ -66,7 +66,7 @@ stdenv.mkDerivation rec {

  meta = with lib; {
    description = "An extendable open source continuous integration server";
-    homepage = "https://jenkins-ci.org";
+    homepage = "https://jenkins.io/";
    sourceProvenance = with sourceTypes; [ binaryBytecode ];
    license = licenses.mit;
    maintainers = with maintainers; [ coconnor earldouglas nequissimus ajs124 ];
--- a/pkgs/development/tools/go-tools/default.nix
+++ b/pkgs/development/tools/go-tools/default.nix
@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "go-tools";
-  version = "2023.1.3";
+  version = "2023.1.5";

  src = fetchFromGitHub {
    owner = "dominikh";
    repo = "go-tools";
    rev = version;
-    sha256 = "sha256-ZgPRUkvokHwMHWQMjQJ3Uprt+lf2CAv1kmpUI93J0Cs=";
+    sha256 = "sha256-SDVHkB5L8eARNhxiihZIE/GtBQp0QwRHweLKheSgsBE=";
  };

-  vendorHash = "sha256-o9UtS6AMgRYuAkOWdktG2Kr3QDBDQTOGSlya69K2br8=";
+  vendorHash = "sha256-U0GaArt1R95VIItpfB782SYF7XVIm4BJVVlMZm/zo/g=";

  excludedPackages = [ "website" ];

--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildGoModule
 , fetchFromGitHub
 , installShellFiles
@ -7,16 +6,16 @@

 buildGoModule rec {
  pname = "packer";
-  version = "1.9.2";
+  version = "1.9.3";

  src = fetchFromGitHub {
    owner = "hashicorp";
    repo = "packer";
    rev = "v${version}";
-    sha256 = "sha256-ptWy54UCPXPm2vxiysZSRFn4DMQOBORaajipFC+npRw=";
+    hash = "sha256-aRzTx3XFkC3brbKBntQ82xFeafZhFEV52pjByonOfug=";
  };

-  vendorHash = "sha256-svoXUaiQprik/aZfpEmIuBZdOGMcdY0nG59fMYt9c3c=";
+  vendorHash = "sha256-vHVx9vFPvctWNzibfZlN7mEYngYd6q7s9gMIM0FX0Ao=";

  subPackages = [ "." ];

--- a/pkgs/development/tools/rust/cargo-workspaces/default.nix
+++ b/pkgs/development/tools/rust/cargo-workspaces/default.nix
@ -1,39 +1,42 @@
-{ fetchCrate
-, lib
+{ lib
 , rustPlatform
+, fetchCrate
 , pkg-config
+, libgit2_1_6
+, libssh2
 , openssl
 , zlib
 , stdenv
-, libssh2
-, libgit2
-, IOKit
-, Security
-, CoreFoundation
-, AppKit
-, System
+, darwin
 }:

 rustPlatform.buildRustPackage rec {
  pname = "cargo-workspaces";
-  version = "0.2.43";
+  version = "0.2.44";

  src = fetchCrate {
    inherit pname version;
-    sha256 = "sha256-xLwDCXJ/Ab4H1U4M9z3Xx7WWCr0Po2mvbL6jWtU/4K4=";
+    hash = "sha256-5r5XRb/RWHv0Am58VPOxe+QSKn2QT4JZYp5LjTh20KM=";
  };

-  cargoHash = "sha256-jia2n+rKIDewDLPZPvJ+7jdF9uT/afwDhu6aEgpX9Kc=";
+  cargoHash = "sha256-p+7CWvspYk1LRO2s8Sstlven/2edNe+JYFQHaDFlGkM=";

-  # needed to get libssh2/libgit2 to link properly
-  LIBGIT2_SYS_USE_PKG_CONFIG = true;
-  LIBSSH2_SYS_USE_PKG_CONFIG = true;
+  nativeBuildInputs = [
+    pkg-config
+  ];

-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ openssl zlib libssh2 libgit2 ] ++ (
-    lib.optionals stdenv.isDarwin ([ IOKit Security CoreFoundation AppKit ]
-      ++ (lib.optionals stdenv.isAarch64 [ System ]))
-  );
+  buildInputs = [
+    libgit2_1_6
+    libssh2
+    openssl
+    zlib
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Security
+  ];
+
+  env = {
+    LIBSSH2_SYS_USE_PKG_CONFIG = true;
+  };

  meta = with lib; {
    description = "A tool for managing cargo workspaces and their crates, inspired by lerna";
@ -43,7 +46,9 @@ rustPlatform.buildRustPackage rec {
      commands and more.
    '';
    homepage = "https://github.com/pksunkara/cargo-workspaces";
+    changelog = "https://github.com/pksunkara/cargo-workspaces/blob/v${version}/CHANGELOG.md";
    license = licenses.mit;
-    maintainers = with maintainers; [ macalinao matthiasbeyer ];
+    maintainers = with maintainers; [ figsoda macalinao matthiasbeyer ];
+    mainProgram = "cargo-workspaces";
  };
 }
--- a/pkgs/development/tools/tailwindcss/default.nix
+++ b/pkgs/development/tools/tailwindcss/default.nix
@ -56,6 +56,7 @@ stdenv.mkDerivation rec {
    license = licenses.mit;
    sourceProvenance = [ sourceTypes.binaryNativeCode ];
    maintainers = [ maintainers.adamcstephens ];
+    mainProgram = "tailwindcss";
    platforms = platforms.darwin ++ platforms.linux;
  };
 }
--- a/pkgs/misc/wiki-tui/default.nix
+++ b/pkgs/misc/wiki-tui/default.nix
@ -10,13 +10,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "wiki-tui";
-  version = "0.8.0";
+  version = "0.8.2";

  src = fetchFromGitHub {
    owner = "Builditluc";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-WEB6tzHeP7fX+KyNOqAADKHT6IE1t8af889XcHH/48Q=";
+    hash = "sha256-euyg4wYWYerYT3hKdOCjokx8lJldGN7E3PHimDgQy3U=";
  };

  nativeBuildInputs = [
@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
    Security
  ];

-  cargoHash = "sha256-pLAUwkn4w/vwg/znBtjxc+og2yJn5uABY3Au9AYkpM4=";
+  cargoHash = "sha256-rKTR7vKt8woWAn7XgNYFiWu4KSiZYhaH+PLEIOfbNIY=";

  meta = with lib; {
    description = "A simple and easy to use Wikipedia Text User Interface";
--- a/pkgs/os-specific/darwin/raycast/default.nix
+++ b/pkgs/os-specific/darwin/raycast/default.nix
@ -6,12 +6,12 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "raycast";
-  version = "1.55.2";
+  version = "1.57.1";

  src = fetchurl {
    name = "Raycast.dmg";
    url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal";
-    hash = "sha256-O+9dSXmkNxeY0Rvjn7dcStk/cqmM4y+lrXa5MymYUcY=";
+    hash = "sha256-ePHaNujW39LjMc+R2TZ1favJXeroHpbeuRNwmv8HgXc=";
  };

  dontPatch = true;
--- a/pkgs/tools/misc/a4term/default.nix
+++ b/pkgs/tools/misc/a4term/default.nix
@ -7,13 +7,13 @@

 stdenv.mkDerivation rec {
  pname = "a4term";
-  version = "0.2.2";
+  version = "0.2.3";

  src = fetchFromGitHub {
    owner = "rpmohn";
    repo = "a4";
    rev = "v${version}";
-    hash = "sha256-hsAEiPOZBqjvmSZEmZwfDqHZV/8ym62RZPxl3DG4ntQ=";
+    hash = "sha256-AX5psz9+bLdFFeDR55TIrAWDAkhDygw6289OgIfOJTg=";
  };

  buildInputs = [
--- a/pkgs/tools/misc/ddcutil/default.nix
+++ b/pkgs/tools/misc/ddcutil/default.nix
@ -1,6 +1,6 @@
 { lib
 , stdenv
-, fetchFromGitHub
+, fetchurl
 , autoreconfHook
 , pkg-config
 , glib
@ -15,13 +15,11 @@

 stdenv.mkDerivation rec {
  pname = "ddcutil";
-  version = "1.4.1";
+  version = "1.4.2";

-  src = fetchFromGitHub {
-    owner = "rockowitz";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-y3mubdInYa4gpxhdw2JcRhnhd12O7jNq/oF3qoP82LU=";
+  src = fetchurl {
+    url = "https://www.ddcutil.com/tarballs/ddcutil-${version}.tar.gz";
+    hash = "sha256-wGwTZheRHi5pGf6WB9hGd8m/pLOmnlYYrS5dd+QItAQ=";
  };

  nativeBuildInputs = [ autoreconfHook pkg-config ];
--- a/pkgs/tools/networking/libreswan/default.nix
+++ b/pkgs/tools/networking/libreswan/default.nix
@ -45,11 +45,11 @@ in

 stdenv.mkDerivation rec {
  pname = "libreswan";
-  version = "4.11";
+  version = "4.12";

  src = fetchurl {
    url = "https://download.libreswan.org/${pname}-${version}.tar.gz";
-    sha256 = "sha256-QpqRf+SlUmDxUs+zGIpYflsS6UoU4kCsElMZ/xS4yD0=";
+    hash = "sha256-roWr5BX3vs9LaiuYl+FxLyflqsnDXfvd28zgrX39mfc=";
  };

  strictDeps = true;
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@ -1836,6 +1836,7 @@ mapAliases ({
  wineUnstable = throw "'wineUnstable' has been renamed to/replaced by 'winePackages.unstable'"; # Converted to throw 2022-02-22
  wineWayland = wine-wayland;
  win-qemu = throw "'win-qemu' has been replaced by 'win-virtio'"; # Added 2023-08-16
+  win-signed-gplpv-drivers = throw "win-signed-gplpv-drivers has been removed from nixpkgs, as it's unmaintained: https://help.univention.com/t/installing-signed-gplpv-drivers/21828"; # Added 2023-08-17
  winpdb = throw "winpdb has been removed: abandoned by upstream"; # Added 2022-04-22
  winusb = throw "'winusb' has been renamed to/replaced by 'woeusb'"; # Converted to throw 2022-02-22
  wireguard = throw "'wireguard' has been renamed to/replaced by 'wireguard-tools'"; # Converted to throw 2022-02-22
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -17157,9 +17157,7 @@ with pkgs;
    inherit (darwin.apple_sdk_11_0.frameworks) Cocoa CoreServices Foundation;
  };
  cargo-wipe = callPackage ../development/tools/rust/cargo-wipe { };
-  cargo-workspaces = callPackage ../development/tools/rust/cargo-workspaces {
-    inherit (darwin.apple_sdk.frameworks) IOKit Security CoreFoundation AppKit System;
-  };
+  cargo-workspaces = callPackage ../development/tools/rust/cargo-workspaces { };
  cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { };
  cargo-generate = callPackage ../development/tools/rust/cargo-generate { };
  cargo-bootimage = callPackage ../development/tools/rust/bootimage { };
@ -17625,6 +17623,8 @@ with pkgs;
    fetchHex beamPackages
    lfe lfe_2_1;

+  expr = callPackage ../development/interpreters/expr { };
+
  gnudatalanguage = callPackage ../development/interpreters/gnudatalanguage {
    inherit (llvmPackages) openmp;
    inherit (darwin.apple_sdk.frameworks) Cocoa;
@ -36527,7 +36527,6 @@ with pkgs;
  win-spice = callPackage ../applications/virtualization/driver/win-spice { };
  win-virtio = callPackage ../applications/virtualization/driver/win-virtio { };
  win-pvdrivers = callPackage ../applications/virtualization/driver/win-pvdrivers { };
-  win-signed-gplpv-drivers = callPackage ../applications/virtualization/driver/win-signed-gplpv-drivers { };

  xfig = callPackage ../applications/graphics/xfig { };

--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -5044,6 +5044,8 @@ self: super: with self; {

  imagecorruptions = callPackage ../development/python-modules/imagecorruptions { };

+  imagededup = callPackage ../development/python-modules/imagededup { };
+
  imagehash = callPackage ../development/python-modules/imagehash { };

  imageio = callPackage ../development/python-modules/imageio { };