diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index aac03b0c9946..5b7226d344df 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1803,6 +1803,12 @@ matrix = "@andrewzah:matrix.abare.party"; keys = [ { fingerprint = "D87B D9DC F11B ACD6 CDB4 0CB2 1373 2FB1 3E61 E0BE"; } ]; }; + andrinoff = { + name = "Drew Smirnoff"; + email = "me@andrinoff.com"; + github = "andrinoff"; + githubId = 175145001; + }; Andy3153 = { name = "Andrei Dobrete"; email = "andy3153@protonmail.com"; @@ -9510,6 +9516,11 @@ name = "Faye Chun"; keys = [ { fingerprint = "ACB8 DB1F E88D A908 6332 BDB1 5A71 B010 2FD7 3FC0"; } ]; }; + fxai = { + github = "fxai"; + githubId = 44463990; + name = "fxai"; + }; fxfactorial = { email = "edgar.factorial@gmail.com"; github = "fxfactorial"; @@ -29763,7 +29774,7 @@ wolfram444 = { name = "Xabibulloh To'xtayev"; email = "kamiltox2006@gmail.com"; - github = "woolfram444"; + github = "wolfram444"; githubId = 109225370; }; womeier = { @@ -30052,6 +30063,12 @@ githubId = 5629059; name = "Xavier Lambein"; }; + xmnlz = { + name = "xmnlz"; + github = "xmnlz"; + githubId = 63904972; + email = "lemmeq9+nixos@gmail.com"; + }; xnaveira = { email = "xnaveira@gmail.com"; github = "xnaveira"; diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index 7851368075a0..418d7aeeda9b 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -226,8 +226,29 @@ in enableSystemdStage1 = true; }; - installerBoot = (import ./installer.nix { inherit system; }).separateBootZfs; - installer = (import ./installer.nix { inherit system; }).zfsroot; + installerBoot = + (import ./installer.nix { + inherit system; + systemdStage1 = false; + }).separateBootZfs; + + installer = + (import ./installer.nix { + inherit system; + systemdStage1 = false; + }).zfsroot; + + installerBootWithSystemdStage1 = + (import ./installer.nix { + inherit system; + systemdStage1 = true; + }).separateBootZfs; + + installerWithSystemdStage1 = + (import ./installer.nix { + inherit system; + systemdStage1 = true; + }).zfsroot; expand-partitions = makeTest { name = "multi-disk-zfs"; diff --git a/pkgs/development/interpreters/acl2/0001-path-changes-for-nix.patch b/pkgs/by-name/ac/acl2/0001-path-changes-for-nix.patch similarity index 100% rename from pkgs/development/interpreters/acl2/0001-path-changes-for-nix.patch rename to pkgs/by-name/ac/acl2/0001-path-changes-for-nix.patch diff --git a/pkgs/development/interpreters/acl2/libipasirglucose4/0001-Support-shared-library-build.patch b/pkgs/by-name/ac/acl2/libipasirglucose4/0001-Support-shared-library-build.patch similarity index 100% rename from pkgs/development/interpreters/acl2/libipasirglucose4/0001-Support-shared-library-build.patch rename to pkgs/by-name/ac/acl2/libipasirglucose4/0001-Support-shared-library-build.patch diff --git a/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix b/pkgs/by-name/ac/acl2/libipasirglucose4/default.nix similarity index 100% rename from pkgs/development/interpreters/acl2/libipasirglucose4/default.nix rename to pkgs/by-name/ac/acl2/libipasirglucose4/default.nix diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/by-name/ac/acl2/package.nix similarity index 100% rename from pkgs/development/interpreters/acl2/default.nix rename to pkgs/by-name/ac/acl2/package.nix diff --git a/pkgs/by-name/an/anytype/0003-remove-desktop-entry.patch b/pkgs/by-name/an/anytype/0003-remove-desktop-entry.patch new file mode 100644 index 000000000000..e772bdff71c6 --- /dev/null +++ b/pkgs/by-name/an/anytype/0003-remove-desktop-entry.patch @@ -0,0 +1,15 @@ +diff --git a/electron/js/util.js b/electron/js/util.js +index da18f41ad0..bb07ec9f21 100644 +--- a/electron/js/util.js ++++ b/electron/js/util.js +@@ -314,7 +314,9 @@ class Util { + if (!is.linux) { + return; + }; +- ++ // NixOS: desktop entries are managed by the package, avoid ++ // writing user-local anytype.desktop which goes stale on updates ++ return; + const { execFile } = require('child_process'); + const home = process.env.HOME || ''; + const dataHome = process.env.XDG_DATA_HOME || path.join(home, '.local', 'share'); diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index 140f6f504ae9..12391fb12824 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -57,6 +57,7 @@ buildNpmPackage (finalAttrs: { patches = [ ./0001-feat-update-Disable-auto-checking-for-updates-and-updating-manually.patch ./0002-remove-grpc-devtools.patch + ./0003-remove-desktop-entry.patch ]; buildPhase = '' @@ -137,6 +138,7 @@ buildNpmPackage (finalAttrs: { autrimpo adda kira-bruneau + xmnlz ]; platforms = [ "x86_64-linux" diff --git a/pkgs/by-name/bl/bleur/package.nix b/pkgs/by-name/bl/bleur/package.nix new file mode 100644 index 000000000000..17d5345493a0 --- /dev/null +++ b/pkgs/by-name/bl/bleur/package.nix @@ -0,0 +1,40 @@ +{ + lib, + pkg-config, + openssl, + rustPlatform, + fetchgit, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "bleur"; + version = "0.0.7"; + __structuredAttrs = true; + + src = fetchgit { + url = "https://git.oss.uzinfocom.uz/bleur/bleur.git"; + rev = "v${finalAttrs.version}"; + hash = "sha256-bFpOvnC2MILr3b+KdVOAvDGmEZM8LDlwGd04csk2l18="; + }; + + cargoHash = "sha256-edeegm0QeXqj0E46+BHcmJMU1Ewn6p9hi3WArDtyVnI="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + strictDeps = true; + + meta = { + description = "Template manager & buddy for bleur templates by Orzklv"; + platforms = with lib.platforms; linux ++ darwin; + mainProgram = "bleur"; + homepage = "https://bleur.uz/"; + license = with lib.licenses; [ + mit + asl20 + ]; + maintainers = with lib.maintainers; [ + orzklv + bahrom04 + wolfram444 + ]; + }; +}) diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index ace41055c5f9..e7b6b4190de9 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -9,6 +9,7 @@ installShellFiles, makeBinaryWrapper, autoPatchelfHook, + alsa-lib, procps, ripgrep, bubblewrap, @@ -56,7 +57,9 @@ stdenv.mkDerivation (finalAttrs: { --set-default FORCE_AUTOUPDATE_PLUGINS 1 \ --set DISABLE_INSTALLATION_CHECKS 1 \ --set USE_BUILTIN_RIPGREP 0 \ - --prefix PATH : ${ + ${lib.optionalString stdenv.hostPlatform.isLinux '' + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ alsa-lib ]} \ + ''}--prefix PATH : ${ lib.makeBinPath ( [ # claude-code uses [node-tree-kill](https://github.com/pkrumins/node-tree-kill) which requires procps's pgrep(darwin) or ps(linux) diff --git a/pkgs/by-name/cl/clonehero/package.nix b/pkgs/by-name/cl/clonehero/package.nix index 9dcdf42391d4..b5c40213ce42 100644 --- a/pkgs/by-name/cl/clonehero/package.nix +++ b/pkgs/by-name/cl/clonehero/package.nix @@ -24,18 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "clonehero"; - version = "1.0.0.4080"; + version = "1.1.0.6085"; src = fetchurl { - url = "https://github.com/clonehero-game/releases/releases/download/V${finalAttrs.version}/CloneHero-linux.tar.xz"; - hash = "sha256-YWLV+wgQ9RfKRSSWh/x0PMjB6tFA4YpHb9WtYOOgZZI="; + url = "https://github.com/clonehero-game/releases/releases/download/v${finalAttrs.version}-final/Linux.x86_64-Standalone.tar"; + hash = "sha256-xy7/3SDNgKw67ikA7CtRVK2gNrfjqx4cTDeRUkkSBKo="; }; - outputs = [ - "out" - "doc" - ]; - nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ @@ -73,17 +68,20 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - install -Dm755 clonehero "$out/bin/clonehero" - install -Dm644 UnityPlayer.so "$out/libexec/clonehero/UnityPlayer.so" + install -Dm755 clonehero "$out/libexec/clonehero/clonehero" + install -Dm644 GameAssembly.so "$out/lib/clonehero/GameAssembly.so" + install -Dm644 UnityPlayer.so "$out/lib/clonehero/UnityPlayer.so" - mkdir -p "$out/share/icons/hicolor/128x128/apps" + mkdir -p "$out/share" cp -r clonehero_Data "$out/share/clonehero" - ln -s "$out/share/clonehero" "$out/bin/clonehero_Data" - ln -s "$out/share/clonehero/Resources/UnityPlayer.png" "$out/share/icons/hicolor/128x128/apps/clonehero.png" install -Dm644 "$desktopItem/share/applications/clonehero.desktop" "$out/share/applications/clonehero.desktop" - mkdir -p "$doc/share/doc/clonehero" - cp -r CLONE_HERO_MANUAL.{pdf,txt} Custom EULA.txt THIRDPARTY.txt "$doc/share/doc/clonehero" + mkdir -p "$out/bin" "$out/share/icons/hicolor/128x128/apps" + ln -s "$out/libexec/clonehero/clonehero" "$out/bin/clonehero" + ln -s "$out/lib/clonehero/GameAssembly.so" "$out/libexec/clonehero/GameAssembly.so" + ln -s "$out/lib/clonehero/UnityPlayer.so" "$out/libexec/clonehero/UnityPlayer.so" + ln -s "$out/share/clonehero" "$out/libexec/clonehero/clonehero_Data" + ln -s "$out/share/clonehero/Resources/UnityPlayer.png" "$out/share/icons/hicolor/128x128/apps/clonehero.png" runHook postInstall ''; @@ -114,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { --add-needed libXrandr.so.2 \ --add-needed libXss.so.1 \ --add-needed libXxf86vm.so.1 \ - "$out/libexec/clonehero/UnityPlayer.so" + "$out/lib/clonehero/UnityPlayer.so" ''; meta = { diff --git a/pkgs/by-name/co/comigo/package.nix b/pkgs/by-name/co/comigo/package.nix new file mode 100644 index 000000000000..d9909a213dc6 --- /dev/null +++ b/pkgs/by-name/co/comigo/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule (finalAttrs: { + pname = "comigo"; + version = "1.2.30"; + + src = fetchFromGitHub { + owner = "yumenaka"; + repo = "comigo"; + tag = "v${finalAttrs.version}"; + hash = "sha256-JS+KgXmYEx3V5FnFqcDwFonxRHg5f5n8uH4MtpT0e3g="; + }; + + vendorHash = "sha256-OUmqbev7Eq79co8RdmwOF6fqcOWwwm6Kx4fbvd2DJU4="; + + subPackages = [ "." ]; + + ldflags = [ + "-s" + "-w" + ]; + + __structuredAttrs = true; + + meta = { + description = "Simple and Efficient Comic Reader"; + homepage = "https://github.com/yumenaka/comigo"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ zendo ]; + mainProgram = "comigo"; + }; +}) diff --git a/pkgs/applications/science/physics/crystfel/libccp4-use-hardcoded-syminfo-lib.patch b/pkgs/by-name/cr/crystfel/libccp4-use-hardcoded-syminfo-lib.patch similarity index 100% rename from pkgs/applications/science/physics/crystfel/libccp4-use-hardcoded-syminfo-lib.patch rename to pkgs/by-name/cr/crystfel/libccp4-use-hardcoded-syminfo-lib.patch diff --git a/pkgs/applications/science/physics/crystfel/link-to-argp-standalone-if-needed.patch b/pkgs/by-name/cr/crystfel/link-to-argp-standalone-if-needed.patch similarity index 100% rename from pkgs/applications/science/physics/crystfel/link-to-argp-standalone-if-needed.patch rename to pkgs/by-name/cr/crystfel/link-to-argp-standalone-if-needed.patch diff --git a/pkgs/applications/science/physics/crystfel/default.nix b/pkgs/by-name/cr/crystfel/package.nix similarity index 100% rename from pkgs/applications/science/physics/crystfel/default.nix rename to pkgs/by-name/cr/crystfel/package.nix diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/by-name/gr/graphviz/package.nix similarity index 100% rename from pkgs/tools/graphics/graphviz/default.nix rename to pkgs/by-name/gr/graphviz/package.nix diff --git a/pkgs/development/libraries/ipu6-camera-hal/default.nix b/pkgs/by-name/ip/ipu6-camera-hal/package.nix similarity index 100% rename from pkgs/development/libraries/ipu6-camera-hal/default.nix rename to pkgs/by-name/ip/ipu6-camera-hal/package.nix diff --git a/pkgs/development/libraries/jabcode/default.nix b/pkgs/by-name/ja/jabcode/package.nix similarity index 100% rename from pkgs/development/libraries/jabcode/default.nix rename to pkgs/by-name/ja/jabcode/package.nix diff --git a/pkgs/development/libraries/libint/default.nix b/pkgs/by-name/li/libint/package.nix similarity index 100% rename from pkgs/development/libraries/libint/default.nix rename to pkgs/by-name/li/libint/package.nix diff --git a/pkgs/development/libraries/librealsense/0001-fix-pybind11.patch b/pkgs/by-name/li/librealsense/0001-fix-pybind11.patch similarity index 100% rename from pkgs/development/libraries/librealsense/0001-fix-pybind11.patch rename to pkgs/by-name/li/librealsense/0001-fix-pybind11.patch diff --git a/pkgs/development/libraries/librealsense/install-presets.patch b/pkgs/by-name/li/librealsense/install-presets.patch similarity index 100% rename from pkgs/development/libraries/librealsense/install-presets.patch rename to pkgs/by-name/li/librealsense/install-presets.patch diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/by-name/li/librealsense/package.nix similarity index 100% rename from pkgs/development/libraries/librealsense/default.nix rename to pkgs/by-name/li/librealsense/package.nix diff --git a/pkgs/development/libraries/librealsense/py_pybind11_no_external_download.patch b/pkgs/by-name/li/librealsense/py_pybind11_no_external_download.patch similarity index 100% rename from pkgs/development/libraries/librealsense/py_pybind11_no_external_download.patch rename to pkgs/by-name/li/librealsense/py_pybind11_no_external_download.patch diff --git a/pkgs/by-name/ma/matcha/package.nix b/pkgs/by-name/ma/matcha/package.nix new file mode 100644 index 000000000000..061b117603d4 --- /dev/null +++ b/pkgs/by-name/ma/matcha/package.nix @@ -0,0 +1,63 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + pkg-config, + pcsclite, + stdenv, + apple-sdk_15, + nix-update-script, + versionCheckHook, +}: + +buildGoModule (finalAttrs: { + __structuredAttrs = true; + + pname = "matcha"; + version = "0.37.0"; + + src = fetchFromGitHub { + owner = "floatpane"; + repo = "matcha"; + tag = "v${finalAttrs.version}"; + hash = "sha256-bvy7og6om+Mqn4J0GrtIx8VQQXUiy8Y7Kueyfj5FWWQ="; + }; + + vendorHash = "sha256-SH7zP5+3R82mMx9vHY8QbPUkLr29pwbIbiV55UUQu+M="; + proxyVendor = true; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + pkg-config + ]; + + buildInputs = + lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ]; + + subPackages = [ "." ]; + + env.CGO_ENABLED = 1; + + ldflags = [ + "-s" + "-w" + "-X main.version=${finalAttrs.version}" + "-X main.date=1970-01-01T00:00:00Z" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Beautiful and functional email client for the terminal"; + homepage = "https://matcha.email"; + changelog = "https://github.com/floatpane/matcha/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + mainProgram = "matcha"; + maintainers = with lib.maintainers; [ andrinoff ]; + platforms = lib.platforms.darwin ++ lib.platforms.linux; + }; +}) diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/by-name/mi/miniupnpd/package.nix similarity index 100% rename from pkgs/tools/networking/miniupnpd/default.nix rename to pkgs/by-name/mi/miniupnpd/package.nix diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix index ee6f8d238a0e..6bd63425dcad 100644 --- a/pkgs/by-name/mo/mongodb-compass/package.nix +++ b/pkgs/by-name/mo/mongodb-compass/package.nix @@ -52,7 +52,7 @@ let pname = "mongodb-compass"; - version = "1.49.5"; + version = "1.49.7"; selectSystem = attrs: @@ -67,9 +67,9 @@ let } }"; hash = selectSystem { - x86_64-linux = "sha256-CuNY+hzTF2jxZEMSOZkiexGw+1QSGmZ8HDPbD4CGnqU="; - x86_64-darwin = "sha256-qbNnu6HK7ajKaXak3raOj1xAlE2bUqN9SsGcs+YbjE8="; - aarch64-darwin = "sha256-+ECujuOErLrwJ3j/7SbjgCHTh9QxmDFj8G52IhWOR3E="; + x86_64-linux = "sha256-qd05VAGDDmB/CMea+/NSPpmdHnTNms1LttwaA1bhgaU="; + x86_64-darwin = "sha256-9gIqtPE1qAKHSGE49FxrpbvYGchJNBqPMiq/0hUNkjE="; + aarch64-darwin = "sha256-zlbXep67u9F+BSynYp4+czDbkW7/VCPV/JafghLf3Xs="; }; }; diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/by-name/mt/mtr/package.nix similarity index 100% rename from pkgs/tools/networking/mtr/default.nix rename to pkgs/by-name/mt/mtr/package.nix diff --git a/pkgs/applications/graphics/nufraw/nufraw.thumbnailer b/pkgs/by-name/nu/nufraw/nufraw.thumbnailer similarity index 100% rename from pkgs/applications/graphics/nufraw/nufraw.thumbnailer rename to pkgs/by-name/nu/nufraw/nufraw.thumbnailer diff --git a/pkgs/applications/graphics/nufraw/default.nix b/pkgs/by-name/nu/nufraw/package.nix similarity index 100% rename from pkgs/applications/graphics/nufraw/default.nix rename to pkgs/by-name/nu/nufraw/package.nix diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/by-name/nw/nwjs/package.nix similarity index 100% rename from pkgs/development/tools/nwjs/default.nix rename to pkgs/by-name/nw/nwjs/package.nix diff --git a/pkgs/by-name/op/openzwave/package.nix b/pkgs/by-name/op/openzwave/package.nix deleted file mode 100644 index a593b6c93ed4..000000000000 --- a/pkgs/by-name/op/openzwave/package.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - doxygen, - fontconfig, - graphviz-nox, - libxml2, - pkg-config, - which, - systemd, -}: - -stdenv.mkDerivation { - pname = "openzwave"; - version = "1.6-unstable-2022-11-17"; - - src = fetchFromGitHub { - owner = "OpenZWave"; - repo = "open-zwave"; - rev = "3fff11d246a0d558d26110e1db6bd634a1b347c0"; - hash = "sha256-CLK2MeoTmZ8GMKb1OAZFNLyc4C+k+REK2w+WQxZv0/E="; - }; - - outputs = [ - "out" - "doc" - ]; - - nativeBuildInputs = [ - doxygen - fontconfig - graphviz-nox - libxml2 - pkg-config - which - ]; - - buildInputs = [ systemd ]; - - hardeningDisable = [ "format" ]; - - enableParallelBuilding = true; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; - - env = { - FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; - FONTCONFIG_PATH = "${fontconfig.out}/etc/fonts/"; - }; - - postPatch = '' - substituteInPlace cpp/src/Options.cpp \ - --replace /etc/openzwave $out/etc/openzwave - substituteInPlace cpp/build/Makefile \ - --replace "-Werror" "-Werror -Wno-format" - ''; - - meta = { - description = "C++ library to control Z-Wave Networks via a USB Z-Wave Controller"; - homepage = "http://www.openzwave.net/"; - license = lib.licenses.gpl3; - maintainers = [ ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/by-name/or/orbstack/package.nix b/pkgs/by-name/or/orbstack/package.nix index eb4049caceec..dbef9737c3c7 100644 --- a/pkgs/by-name/or/orbstack/package.nix +++ b/pkgs/by-name/or/orbstack/package.nix @@ -6,15 +6,15 @@ }: let inherit (stdenvNoCC.hostPlatform) system; - version = "2.1.1-20026"; + version = "2.1.3-20115"; sourceData = { aarch64-darwin = { arch = "arm64"; - hash = "sha256-GKQfdZlY4foJUWlrggtUeNPtc1P4ykhv6dAmoafZcgc="; + hash = "sha256-9JTbgE/Ehu8viOq5A9GGpph8eG3jmGj/iDQWpeuacxc="; }; x86_64-darwin = { arch = "amd64"; - hash = "sha256-x+748PKaqsnQqeqWIgihNipjztCSZkWluomDXlJgUTw="; + hash = "sha256-Wi76W+z5Xs66gjtyxUZIo+K3ziHb3GAn83k7k5Xopjk="; }; }; sources = lib.mapAttrs ( diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/by-name/pa/pantalaimon/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/pantalaimon/default.nix rename to pkgs/by-name/pa/pantalaimon/package.nix diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/by-name/pc/pcre/package.nix similarity index 100% rename from pkgs/development/libraries/pcre/default.nix rename to pkgs/by-name/pc/pcre/package.nix diff --git a/pkgs/development/libraries/pcre/stacksize-detection.patch b/pkgs/by-name/pc/pcre/stacksize-detection.patch similarity index 100% rename from pkgs/development/libraries/pcre/stacksize-detection.patch rename to pkgs/by-name/pc/pcre/stacksize-detection.patch diff --git a/pkgs/applications/editors/pinegrow/default.nix b/pkgs/by-name/pi/pinegrow/package.nix similarity index 100% rename from pkgs/applications/editors/pinegrow/default.nix rename to pkgs/by-name/pi/pinegrow/package.nix diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/by-name/qu/quarto/package.nix similarity index 100% rename from pkgs/development/libraries/quarto/default.nix rename to pkgs/by-name/qu/quarto/package.nix diff --git a/pkgs/by-name/st/still/package.nix b/pkgs/by-name/st/still/package.nix new file mode 100644 index 000000000000..f0459249b1d0 --- /dev/null +++ b/pkgs/by-name/st/still/package.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + meson, + ninja, + pkg-config, + scdoc, + wayland, + wayland-protocols, + pixman, + wayland-scanner, + nix-update-script, + fetchFromGitHub, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "still"; + version = "0.0.9"; + + src = fetchFromGitHub { + owner = "faergeek"; + repo = "still"; + tag = "v${finalAttrs.version}"; + hash = "sha256-bZo4SvBB5pSdvwxuE3+A2iz1um1kSZQ62chR0lOjpj8="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + scdoc + wayland-scanner + ]; + + buildInputs = [ + pixman + wayland + wayland-protocols + ]; + + strictDeps = true; + __structuredAttrs = true; + + postInstall = '' + install -Dm644 $src/LICENSE $out/share/licenses/still/LICENSE + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Freeze the screen of a Wayland compositor until a provided command exits"; + homepage = "https://github.com/faergeek/still"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + mainProgram = "still"; + maintainers = [ lib.maintainers.fazzi ]; + }; +}) diff --git a/pkgs/by-name/su/subjack/package.nix b/pkgs/by-name/su/subjack/package.nix new file mode 100644 index 000000000000..8349159a72a0 --- /dev/null +++ b/pkgs/by-name/su/subjack/package.nix @@ -0,0 +1,30 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule (finalAttrs: { + pname = "subjack"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "haccer"; + repo = "subjack"; + tag = "v${finalAttrs.version}"; + hash = "sha256-AHzBPtMpXy8ZG+lh7PpcvkJkdUal3ONhEQIhMVFSx+A="; + }; + + vendorHash = "sha256-Ma4kAcMfYm1ltOaAX39j78lxaAnWq03FYyB6rnKv9y8="; + + __structuredAttrs = true; + + meta = { + description = "DNS Takeover Scanner written in Go"; + mainProgram = "subjack"; + homepage = "https://github.com/haccer/subjack"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ fxai ]; + }; +}) diff --git a/pkgs/applications/video/tartube/default.nix b/pkgs/by-name/ta/tartube/package.nix similarity index 100% rename from pkgs/applications/video/tartube/default.nix rename to pkgs/by-name/ta/tartube/package.nix diff --git a/pkgs/development/python-modules/python-openzwave/cython.patch b/pkgs/development/python-modules/python-openzwave/cython.patch deleted file mode 100644 index e01ffdbdc0d0..000000000000 --- a/pkgs/development/python-modules/python-openzwave/cython.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/pyozw_setup.py b/pyozw_setup.py -index b201840..37bf2a8 100644 ---- a/pyozw_setup.py -+++ b/pyozw_setup.py -@@ -257,13 +257,13 @@ class Template(object): - if sys.platform.startswith("win"): - return ['Cython'] - else: -- return ['Cython==0.28.6'] -+ return ['Cython>=0.28.6'] - - def build_requires(self): - if sys.platform.startswith("win"): - return ['Cython'] - else: -- return ['Cython==0.28.6'] -+ return ['Cython>=0.28.6'] - - def build(self): - if len(self.ctx['extra_objects']) == 1 and os.path.isfile(self.ctx['extra_objects'][0]): diff --git a/pkgs/development/python-modules/python-openzwave/default.nix b/pkgs/development/python-modules/python-openzwave/default.nix deleted file mode 100644 index 162fc0fb4c3f..000000000000 --- a/pkgs/development/python-modules/python-openzwave/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - isPy3k, - pkg-config, - libyaml, - openzwave, - cython, - pyserial, - six, - pydispatcher, - urwid, -}: - -buildPythonPackage rec { - pname = "python-openzwave"; - version = "0.4.19"; - format = "setuptools"; - - disabled = !isPy3k; - - src = fetchPypi { - pname = "python_openzwave"; - inherit version; - sha256 = "6b40c7711383eeb3535cf5504f1cf47cc1ac7018eb820f299642a5a2795aef84"; - extension = "zip"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libyaml - openzwave - cython - ]; - propagatedBuildInputs = [ - six - urwid - pydispatcher - pyserial - ]; - - # primary location for the .xml files is in /etc/openzwave so we override the - # /usr/local/etc lookup instead as that allows us to dump new .xml files into - # /etc/openzwave if needed - postPatch = '' - substituteInPlace src-lib/libopenzwave/libopenzwave.pyx \ - --replace /usr/local/etc/openzwave ${openzwave}/etc/openzwave - ''; - - patches = [ ./cython.patch ]; - - # no tests available - doCheck = false; - - meta = { - description = "Python wrapper for the OpenZWave C++ library"; - homepage = "https://github.com/OpenZWave/python-openzwave"; - license = lib.licenses.gpl3Plus; - maintainers = [ ]; - inherit (openzwave.meta) platforms; - }; -} diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index d8daca0434ec..aac63e40f1de 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -69,14 +69,14 @@ buildPythonPackage (finalAttrs: { pname = "sentry-sdk"; - version = "2.59.0"; + version = "2.60.0"; pyproject = true; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-python"; tag = finalAttrs.version; - hash = "sha256-CNGo0jVVRvHm7mLKT8ciw6oIlY600BBwCAVOCR12F74="; + hash = "sha256-ny1MDl0J/TeYtlzpIuNUy9FR/+pEDF0+AOZNU4nJey4="; }; postPatch = '' @@ -220,6 +220,8 @@ buildPythonPackage (finalAttrs: { # KeyError: 'sentry.release' "test_logs_attributes" "test_logger_with_all_attributes" + "test_span_templates_ai_dicts" + "test_span_templates_ai_objects" ] ++ lib.optionals (pythonAtLeast "3.14" && stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin) diff --git a/pkgs/os-specific/linux/zfs/2_3.nix b/pkgs/os-specific/linux/zfs/2_3.nix index b28159b0c1ac..bf6701cc0ff8 100644 --- a/pkgs/os-specific/linux/zfs/2_3.nix +++ b/pkgs/os-specific/linux/zfs/2_3.nix @@ -13,10 +13,10 @@ callPackage ./generic.nix args { kernelModuleAttribute = "zfs_2_3"; kernelMinSupportedMajorMinor = "4.18"; - kernelMaxSupportedMajorMinor = "6.19"; + kernelMaxSupportedMajorMinor = "7.0"; # this package should point to the latest release. - version = "2.3.6"; + version = "2.3.7"; tests = { inherit (nixosTests.zfs) series_2_3; @@ -30,5 +30,5 @@ callPackage ./generic.nix args { amarshall ]; - hash = "sha256-5p9UbOQ0WY+XeAO+btDyJ04nRnOQuEuwszduEV7cbso="; + hash = "sha256-67Yo5bAJP3dXC94xybrC4xhwz7pGtrp0MUT9P6OInog="; } diff --git a/pkgs/os-specific/linux/zfs/2_4.nix b/pkgs/os-specific/linux/zfs/2_4.nix index e63787fd7a4b..5752d198e755 100644 --- a/pkgs/os-specific/linux/zfs/2_4.nix +++ b/pkgs/os-specific/linux/zfs/2_4.nix @@ -13,10 +13,10 @@ callPackage ./generic.nix args { kernelModuleAttribute = "zfs_2_4"; kernelMinSupportedMajorMinor = "4.18"; - kernelMaxSupportedMajorMinor = "6.19"; + kernelMaxSupportedMajorMinor = "7.0"; # this package should point to the latest release. - version = "2.4.1"; + version = "2.4.2"; tests = { inherit (nixosTests.zfs) series_2_4; @@ -30,5 +30,5 @@ callPackage ./generic.nix args { amarshall ]; - hash = "sha256-gapM2PNVOjhwGw6TAZF6QDxLza7oqOf1tpj7q0EN9Vg="; + hash = "sha256-OqsKHzyFjjyX8CoajDGydY4TbuQqMA37PIaEOL+vDug="; } diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index ea017985f78e..1dc98829da38 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -4,6 +4,7 @@ let lib, stdenv, fetchFromGitHub, + fetchpatch2, autoreconfHook269, util-linux, nukeReferences, @@ -99,7 +100,12 @@ let inherit rev hash; }; - patches = extraPatches; + patches = + extraPatches + ++ lib.optional (kernel != null && lib.versionOlder kernel.version "5.14") (fetchpatch2 { + url = "https://github.com/openzfs/zfs/commit/58c8dc5f6926eb96903a3f38b141e8998ef9261b.patch?full_index=1"; + hash = "sha256-eYkMhHsHBA9MKXnB/GuHpuv44g1SCGV5Or0InPBeNkU="; + }); postPatch = optionalString buildKernel '' diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index 698c3ba41646..f72e792a16c0 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -10,20 +10,20 @@ callPackage ./generic.nix args { kernelModuleAttribute = "zfs_unstable"; kernelMinSupportedMajorMinor = "4.18"; - kernelMaxSupportedMajorMinor = "6.19"; + kernelMaxSupportedMajorMinor = "7.0"; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the # zfs--staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.4.1"; + version = "2.4.2"; # rev = ""; tests = { inherit (nixosTests.zfs) unstable; }; - hash = "sha256-gapM2PNVOjhwGw6TAZF6QDxLza7oqOf1tpj7q0EN9Vg="; + hash = "sha256-OqsKHzyFjjyX8CoajDGydY4TbuQqMA37PIaEOL+vDug="; extraLongDescription = '' This is "unstable" ZFS, and will usually be a pre-release version of ZFS. diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/package.nix index 7664dfc4f47a..1c4aed328a8d 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/package.nix @@ -48,6 +48,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.entrypoint = "lovelace-horizon-card.js"; + meta = { description = "Sun Card successor: Visualize the position of the Sun over the horizon"; homepage = "https://github.com/rejuvenate/lovelace-horizon-card"; diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index cffe00f39527..983b003d2748 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -309,7 +309,7 @@ stdenv.mkDerivation { { description = "Reverse proxy and lightweight webserver"; mainProgram = "nginx"; - homepage = "http://nginx.org"; + homepage = "https://nginx.org"; license = [ lib.licenses.bsd2 ] ++ lib.concatMap (m: m.meta.license) modules; broken = lib.any (m: m.meta.broken or false) modules; platforms = lib.platforms.all; diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 5d33385c2bf1..5577ca7a583f 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.29.7"; - hash = "sha256-Zz+PuMCWHET72UENYWGDFFNgm0QGPT8pSCU/wrVpITk="; + version = "1.31.0"; + hash = "sha256-bVsA1FOTry5OfFKkQtKhmPDMvHZ47QYqRvQD7dgz66o="; } diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix index 8e9facc7fc1f..7d01bc4c7942 100644 --- a/pkgs/servers/http/nginx/stable.nix +++ b/pkgs/servers/http/nginx/stable.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.30.0"; - hash = "sha256-BYGIxkvyK67KpyuAmmMYpPm6YjiJxVT+qwP3y4U6sxs="; + version = "1.30.1"; + hash = "sha256-mXZQANl0iWsxyliC2MJ5zj/n729cb58Kln7X/TQH+cw="; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 910264e006f8..e10b345d4c8b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1608,6 +1608,7 @@ mapAliases { opensyclWithRocm = throw "'opensyclWithRocm' has been renamed to/replaced by 'adaptivecppWithRocm'"; # Converted to throw 2025-10-27 opentofu-ls = warnAlias "'opentofu-ls' has been renamed to 'tofu-ls'" tofu-ls; # Added 2025-06-10 opentracing-cpp = throw "'opentracingc-cpp' has been removed as it was archived upstream in 2024"; # Added 2025-10-19 + openzwave = throw "openzwave was removed because upstream is no longer maintained. Consider using zwave-js-server"; # Added 2026-05-14 opera = throw "'opera' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-05-19 opusTools = warnAlias "'opusTools' has been renamed to 'opus-tools'" opus-tools; # Added 2026-02-12 orogene = throw "'orogene' uses a wasm-specific fork of async-tar that is vulnerable to CVE-2025-62518, which is not supported by its upstream"; # Added 2025-10-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a80deda17844..28b84eabe323 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1426,9 +1426,7 @@ with pkgs; else throw "freshBootstrapTools: unknown hostPlatform ${stdenv.hostPlatform.config}"; - crystfel = callPackage ../applications/science/physics/crystfel { }; - - crystfel-headless = callPackage ../applications/science/physics/crystfel { withGui = false; }; + crystfel-headless = crystfel.override { withGui = false; }; amule-daemon = amule.override { monolithic = false; @@ -1519,12 +1517,12 @@ with pkgs; pass = callPackage ../tools/security/pass { }; - pass-nodmenu = callPackage ../tools/security/pass { + pass-nodmenu = pass.override { dmenuSupport = false; pass = pass-nodmenu; }; - pass-wayland = callPackage ../tools/security/pass { + pass-wayland = pass.override { waylandSupport = true; pass = pass-wayland; }; @@ -2438,9 +2436,7 @@ with pkgs; callPackage ../tools/misc/graylog/plugins.nix { graylogPackage = graylog-6_0; } ); - graphviz = callPackage ../tools/graphics/graphviz { }; - - graphviz-nox = callPackage ../tools/graphics/graphviz { + graphviz-nox = graphviz.override { withXorg = false; }; @@ -2744,8 +2740,7 @@ with pkgs; ; lerna = lerna_8; - libint = callPackage ../development/libraries/libint { }; - libintPsi4 = callPackage ../development/libraries/libint { + libintPsi4 = libint.override { enableFortran = false; enableSSE = false; maxAm = 6; @@ -2817,9 +2812,7 @@ with pkgs; mcstatus = with python3Packages; toPythonApplication mcstatus; - miniupnpd = callPackage ../tools/networking/miniupnpd { }; - - miniupnpd-nftables = callPackage ../tools/networking/miniupnpd { firewall = "nftables"; }; + miniupnpd-nftables = miniupnpd.override { firewall = "nftables"; }; mir-qualia = callPackage ../tools/text/mir-qualia { pythonPackages = python3Packages; @@ -2841,9 +2834,7 @@ with pkgs; metasploit = callPackage ../tools/security/metasploit { }; - mtr = callPackage ../tools/networking/mtr { }; - - mtr-gui = callPackage ../tools/networking/mtr { withGtk = true; }; + mtr-gui = mtr.override { withGtk = true; }; multitran = recurseIntoAttrs ( let @@ -3330,9 +3321,7 @@ with pkgs; w3m = w3m-batch; }; - tartube = callPackage ../applications/video/tartube { }; - - tartube-yt-dlp = callPackage ../applications/video/tartube { + tartube-yt-dlp = tartube.override { youtube-dl = yt-dlp; }; @@ -4702,8 +4691,7 @@ with pkgs; ### DEVELOPMENT / INTERPRETERS - acl2 = callPackage ../development/interpreters/acl2 { }; - acl2-minimal = callPackage ../development/interpreters/acl2 { certifyBooks = false; }; + acl2-minimal = acl2.override { certifyBooks = false; }; uiua-unstable = callPackage ../by-name/ui/uiua/package.nix { uiua_versionType = "unstable"; }; @@ -5713,9 +5701,7 @@ with pkgs; _7zz = _7zz-rar; }; - nwjs = callPackage ../development/tools/nwjs { }; - - nwjs-sdk = callPackage ../development/tools/nwjs { + nwjs-sdk = nwjs.override { sdk = true; }; @@ -6652,11 +6638,11 @@ with pkgs; libtorrent-rasterbar = libtorrent-rasterbar-2_0_x; - libubox-nossl = callPackage ../development/libraries/libubox { }; + libubox-nossl = libubox.override { with_ustream_ssl = false; }; libubox = callPackage ../development/libraries/libubox { with_ustream_ssl = true; }; - libubox-mbedtls = callPackage ../development/libraries/libubox { + libubox-mbedtls = libubox.override { with_ustream_ssl = true; ustream-ssl = ustream-ssl-mbedtls; }; @@ -7005,9 +6991,8 @@ with pkgs; openssl_4_0 ; - pcre = callPackage ../development/libraries/pcre { }; # pcre32 seems unused - pcre-cpp = res.pcre.override { variant = "cpp"; }; + pcre-cpp = pcre.override { variant = "cpp"; }; pcre2 = callPackage ../development/libraries/pcre2 { }; @@ -7088,9 +7073,7 @@ with pkgs; qdjango = libsForQt5.callPackage ../development/libraries/qdjango { }; - quarto = callPackage ../development/libraries/quarto { }; - - quartoMinimal = callPackage ../development/libraries/quarto { + quartoMinimal = quarto.override { rWrapper = null; python3 = null; }; @@ -8355,13 +8338,11 @@ with pkgs; i7z = qt5.callPackage ../os-specific/linux/i7z { }; - ipu6-camera-hal = callPackage ../development/libraries/ipu6-camera-hal { }; - - ipu6ep-camera-hal = callPackage ../development/libraries/ipu6-camera-hal { + ipu6ep-camera-hal = ipu6-camera-hal.override { ipuVersion = "ipu6ep"; }; - ipu6epmtl-camera-hal = callPackage ../development/libraries/ipu6-camera-hal { + ipu6epmtl-camera-hal = ipu6-camera-hal.override { ipuVersion = "ipu6epmtl"; }; @@ -8442,17 +8423,15 @@ with pkgs; cryptodev = linuxPackages.cryptodev; - librealsense = callPackage ../development/libraries/librealsense { }; - - librealsenseWithCuda = callPackage ../development/libraries/librealsense { + librealsenseWithCuda = librealsense.override { cudaSupport = true; }; - librealsenseWithoutCuda = callPackage ../development/libraries/librealsense { + librealsenseWithoutCuda = librealsense.override { cudaSupport = false; }; - librealsense-gui = callPackage ../development/libraries/librealsense { + librealsense-gui = librealsense.override { enableGUI = true; }; @@ -9544,13 +9523,11 @@ with pkgs; callPackages ../applications/graphics/inkscape/extensions.nix { } ); - jabcode = callPackage ../development/libraries/jabcode { }; - - jabcode-writer = callPackage ../development/libraries/jabcode { + jabcode-writer = jabcode.override { subproject = "writer"; }; - jabcode-reader = callPackage ../development/libraries/jabcode { + jabcode-reader = jabcode.override { subproject = "reader"; }; @@ -9811,9 +9788,7 @@ with pkgs; pijuice = with python3Packages; toPythonApplication pijuice; - pinegrow6 = callPackage ../applications/editors/pinegrow { pinegrowVersion = "6"; }; - - pinegrow = callPackage ../applications/editors/pinegrow { }; + pinegrow6 = pinegrow.override { pinegrowVersion = "6"; }; pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { }; @@ -9871,9 +9846,7 @@ with pkgs; muchsync = callPackage ../applications/networking/mailreaders/notmuch/muchsync.nix { }; - nufraw = callPackage ../applications/graphics/nufraw { }; - - nufraw-thumbnailer = callPackage ../applications/graphics/nufraw { + nufraw-thumbnailer = nufraw.override { addThumbnailer = true; }; @@ -9919,9 +9892,7 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; - pantalaimon = callPackage ../applications/networking/instant-messengers/pantalaimon { }; - - pantalaimon-headless = callPackage ../applications/networking/instant-messengers/pantalaimon { + pantalaimon-headless = pantalaimon.override { enableDbusUi = false; }; @@ -10080,7 +10051,7 @@ with pkgs; rke2 = rke2_stable; rofi-pass = callPackage ../tools/security/pass/rofi-pass.nix { }; - rofi-pass-wayland = callPackage ../tools/security/pass/rofi-pass.nix { + rofi-pass-wayland = rofi-pass.override { backend = "wayland"; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index bf06b3138e97..517adf568d47 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -480,6 +480,7 @@ mapAliases { python-Levenshtein = throw "'python-Levenshtein' has been renamed to/replaced by 'levenshtein'"; # Converted to throw 2025-10-29 python-lz4 = throw "'python-lz4' has been renamed to/replaced by 'lz4'"; # Converted to throw 2025-10-29 python-mbedtls = throw "'python-mbedtls' has been removed as it is unmaintained"; + python-openzwave = throw "python-openzwave was removed because openzwave is no longer maintained upstream. Consider using python3Packages.zwave-js-server-python"; # Added 2026-05-14 python-qt = throw "python-qt has been removed, because hard to maintain and not required by anything"; # Added 2025-01-14 python-simple-hipchat = throw "'python-simple-hipchat' has been removed because it was broken and unmaintained"; # added 2025-08-26 python-subunit = throw "'python-subunit' has been renamed to/replaced by 'subunit'"; # Converted to throw 2025-10-29 @@ -489,7 +490,7 @@ mapAliases { python_fedora = throw "'python_fedora' has been renamed to/replaced by 'python-fedora'"; # Converted to throw 2025-10-29 python_magic = throw "'python_magic' has been renamed to/replaced by 'python-magic'"; # Converted to throw 2025-10-29 python_mimeparse = throw "'python_mimeparse' has been renamed to/replaced by 'python-mimeparse'"; # Converted to throw 2025-10-29 - python_openzwave = throw "'python_openzwave' has been renamed to/replaced by 'python-openzwave'"; # Converted to throw 2025-10-29 + python_openzwave = throw "python-openzwave was removed because openzwave is no longer maintained upstream. Consider using python3Packages.zwave-js-server-python"; # Converted to throw 2025-10-29 python_simple_hipchat = throw "'python_simple_hipchat' has been renamed to/replaced by 'python-simple-hipchat'"; # Converted to throw 2025-10-29 pythonix = throw "pythonix was removed as it was unmaintained since 2022"; # added 2025-07-24 pytorch = throw "'pytorch' has been renamed to/replaced by 'torch'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aa03054ad044..e424f639803b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16021,8 +16021,6 @@ self: super: with self; { python-openstackclient = callPackage ../development/python-modules/python-openstackclient { }; - python-openzwave = callPackage ../development/python-modules/python-openzwave { }; - python-osc = callPackage ../development/python-modules/python-osc { }; python-otbr-api = callPackage ../development/python-modules/python-otbr-api { };