diff --git a/nixos/lib/systemd-unit-options.nix b/nixos/lib/systemd-unit-options.nix index 8538c8519c53..86bb255a84c3 100644 --- a/nixos/lib/systemd-unit-options.nix +++ b/nixos/lib/systemd-unit-options.nix @@ -625,7 +625,7 @@ rec { listenStreams = mkOption { default = [ ]; - type = types.listOf types.str; + type = types.listOf (types.coercedTo types.port toString types.str); example = [ "0.0.0.0:993" "/run/my-socket" diff --git a/nixos/modules/services/network-filesystems/rsyncd.nix b/nixos/modules/services/network-filesystems/rsyncd.nix index c3d81cb15302..8bae90b6cfda 100644 --- a/nixos/modules/services/network-filesystems/rsyncd.nix +++ b/nixos/modules/services/network-filesystems/rsyncd.nix @@ -132,7 +132,7 @@ in description = "socket for fast remote file copy program daemon"; conflicts = [ "rsync.service" ]; - listenStreams = [ (toString cfg.port) ]; + listenStreams = [ cfg.port ]; socketConfig.Accept = true; wantedBy = [ "sockets.target" ]; diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index d6ec21f82226..219f386f3789 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -201,7 +201,7 @@ rec { (onFullSupported "nixos.tests.printing-socket") (onFullSupported "nixos.tests.proxy") (onFullSupported "nixos.tests.sddm.default") - (onFullSupported "nixos.tests.shadow") + (onFullSupported "nixos.tests.shadow.login") (onFullSupported "nixos.tests.simple-container") (onFullSupported "nixos.tests.simple-vm") (onFullSupported "nixos.tests.sway") diff --git a/pkgs/by-name/dm/dms-shell/package.nix b/pkgs/by-name/dm/dms-shell/package.nix index ec2a19d1fb22..d1df7ebadd33 100644 --- a/pkgs/by-name/dm/dms-shell/package.nix +++ b/pkgs/by-name/dm/dms-shell/package.nix @@ -28,13 +28,13 @@ buildGoModule ( in { pname = "dms-shell"; - version = "1.5.0"; + version = "1.5.2"; src = fetchFromGitHub { owner = "AvengeMedia"; repo = "DankMaterialShell"; tag = "v${finalAttrs.version}"; - hash = "sha256-zdHsPGPE5MVi/y+uIt548XScTfZjQzdF21dME7ISEJM="; + hash = "sha256-7VjoVZu+8PC41ZDQ3umi/EXsU3sCLNyRfxZrfJKHy+E="; }; sourceRoot = "${finalAttrs.src.name}/core"; diff --git a/pkgs/by-name/js/jsonschema-cli/package.nix b/pkgs/by-name/js/jsonschema-cli/package.nix index 2c8a4cbe45a8..00151b83fb15 100644 --- a/pkgs/by-name/js/jsonschema-cli/package.nix +++ b/pkgs/by-name/js/jsonschema-cli/package.nix @@ -9,15 +9,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "jsonschema-cli"; - version = "0.47.0"; + version = "0.48.0"; src = fetchCrate { pname = "jsonschema-cli"; inherit (finalAttrs) version; - hash = "sha256-0U9NBfkpqCZnNQIxQhNjErX/LehI3xOcUvHiYRKwrXo="; + hash = "sha256-nQblUoTzrheAQA6wlT/p/x72eATD3gUUjgBneMu6L2E="; }; - cargoHash = "sha256-q/3Nvl+hND94im0mzHqZRepE8GcB5Fec/0HurPgqOmY="; + cargoHash = "sha256-rm5v5S11mJRoyhUnSFXLKu/znKClnI6hOQY7qDpyb/U="; preCheck = '' export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt diff --git a/pkgs/by-name/mi/minikube/package.nix b/pkgs/by-name/mi/minikube/package.nix index 1594840e771a..791e29f09485 100644 --- a/pkgs/by-name/mi/minikube/package.nix +++ b/pkgs/by-name/mi/minikube/package.nix @@ -9,6 +9,8 @@ libvirt, withQemu ? false, qemu, + withVfkit ? false, + vfkit, makeWrapper, writableTmpDirAsHomeHook, OVMF, @@ -38,14 +40,14 @@ buildGoModule (finalAttrs: { + (lib.optionalString (withQemu && stdenv.hostPlatform.isDarwin) '' substituteInPlace \ pkg/minikube/registry/drvs/qemu2/qemu2.go \ - --replace "/usr/local/opt/qemu/share/qemu" "${qemu}/share/qemu" \ - --replace "/opt/homebrew/opt/qemu/share/qemu" "${qemu}/share/qemu" + --replace-fail "/usr/local/opt/qemu/share/qemu" "${lib.getLib qemu}/share/qemu" \ + --replace-fail "/opt/homebrew/opt/qemu/share/qemu" "${lib.getLib qemu}/share/qemu" '') + (lib.optionalString (withQemu && stdenv.hostPlatform.isLinux) '' substituteInPlace \ pkg/minikube/registry/drvs/qemu2/qemu2.go \ - --replace "/usr/share/OVMF/OVMF_CODE.fd" "${OVMF.firmware}" \ - --replace "/usr/share/AAVMF/AAVMF_CODE.fd" "${OVMF.firmware}" + --replace-fail "/usr/share/OVMF/OVMF_CODE.fd" "${OVMF.firmware}" \ + --replace-fail "/usr/share/AAVMF/AAVMF_CODE.fd" "${OVMF.firmware}" ''); nativeBuildInputs = [ @@ -72,16 +74,22 @@ buildGoModule (finalAttrs: { installBin out/minikube wrapProgram $out/bin/minikube --set MINIKUBE_WANTUPDATENOTIFICATION false \ - --prefix PATH : ${lib.makeBinPath (lib.optionals stdenv.hostPlatform.isLinux [ libvirt ])} \ - --prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath (lib.optionals stdenv.hostPlatform.isLinux [ libvirt ]) - } + --prefix PATH : ${ + lib.makeBinPath ( + lib.optionals withQemu [ qemu ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libvirt ] + ++ lib.optionals (withVfkit && stdenv.hostPlatform.isDarwin) [ vfkit ] + ) + } \ + ${lib.optionalString stdenv.hostPlatform.isLinux "--prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ libvirt ] + }"} ln -sv $out/bin/minikube $out/bin/kubectl - for shell in bash zsh fish; do - $out/bin/minikube completion $shell > minikube.$shell - installShellCompletion minikube.$shell - done + installShellCompletion --cmd minikube \ + --bash <($out/bin/minikube completion bash) \ + --fish <($out/bin/minikube completion fish) \ + --zsh <($out/bin/minikube completion zsh) runHook postInstall ''; diff --git a/pkgs/by-name/ms/msedit/package.nix b/pkgs/by-name/ms/msedit/package.nix index 12a301fc8170..e92a75b23d58 100644 --- a/pkgs/by-name/ms/msedit/package.nix +++ b/pkgs/by-name/ms/msedit/package.nix @@ -5,20 +5,20 @@ fetchFromGitHub, versionCheckHook, nix-update-script, - icu, + icu76, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "msedit"; - version = "1.2.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "edit"; tag = "v${finalAttrs.version}"; - hash = "sha256-Sb73awgdajBKKW0QIpmKF6g9mIIS/1f0a6D/jQulnUM="; + hash = "sha256-9HoK5i0IimujfTQxDplBNJRO7qmD/S+SnLLnR95RHiQ="; }; - cargoHash = "sha256-U8U70nzTmpY6r8J661EJ4CGjx6vWrGovu5m25dvz5sY="; + cargoHash = "sha256-r7AR6Mf13UUeooPV5/8gyp7HvmOeSaOJNotWWqU10SQ="; # Requires nightly features env = { @@ -30,17 +30,24 @@ rustPlatform.buildRustPackage (finalAttrs: { "-headerpad_max_install_names" ] ); + } + // lib.optionalAttrs stdenv.hostPlatform.isLinux { + # https://github.com/microsoft/edit/releases/tag/v2.0.0 + # see section 'Additonal notes to Building & Packaging + EDIT_CFG_ICUUC_SONAME = "${lib.getLib icu76}/lib/libicuuc.so.76"; + EDIT_CFG_ICUI18N_SONAME = "${lib.getLib icu76}/lib/libicui18n.so.76"; + EDIT_CFG_ICU_RENAMING_VERSION = 76; }; buildInputs = [ - icu + icu76 ]; # https://github.com/microsoft/edit/blob/f8bea2be191d00baa2a4551817541ea3f8c5b03e/src/icu.rs#L834 # Required for Ctrl+F searching to work postFixup = let - rpathAppend = lib.makeLibraryPath [ icu ]; + rpathAppend = lib.makeLibraryPath [ icu76 ]; in lib.optionalString stdenv.hostPlatform.isElf '' patchelf $out/bin/edit \ diff --git a/pkgs/by-name/nz/nzbhydra2/package.nix b/pkgs/by-name/nz/nzbhydra2/package.nix index 5ec1f65a51d4..6a7c5053ccdc 100644 --- a/pkgs/by-name/nz/nzbhydra2/package.nix +++ b/pkgs/by-name/nz/nzbhydra2/package.nix @@ -35,16 +35,16 @@ let in maven.buildMavenPackage rec { pname = "nzbhydra2"; - version = "8.8.5"; + version = "8.9.0"; src = fetchFromGitHub { owner = "theotherp"; repo = "nzbhydra2"; tag = "v${version}"; - hash = "sha256-TKqqKFcmxGQ/u5XpRQbEQRdnVlILS8WDdVMXNsAz/yQ="; + hash = "sha256-c8rQ53YROPx+YZo/YdaKs/51ZZQpwwbSLk/bMGY0m2c="; }; - mvnHash = "sha256-mPNyJ4zijwQg8l0G+2cJPkwAVRFVbpCRfyFkA5ONBIE="; + mvnHash = "sha256-Z+Y97yd9TQMuTyqtWOOZZ52rgp4KomID/ns0gGG5rvg="; mvnFetchExtraArgs.preBuild = '' mvn -nsu "${timestampParameter}" --projects org.nzbhydra:github-release-plugin "-Dmaven.repo.local=$out/.m2" clean install diff --git a/pkgs/by-name/ru/rustical/package.nix b/pkgs/by-name/ru/rustical/package.nix index 8e58c6e13df2..fa9b1c5e931e 100644 --- a/pkgs/by-name/ru/rustical/package.nix +++ b/pkgs/by-name/ru/rustical/package.nix @@ -10,16 +10,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rustical"; - version = "0.13.1"; + version = "0.14.0"; + __darwinAllowLocalNetworking = true; src = fetchFromGitHub { owner = "lennart-k"; repo = "rustical"; tag = "v${finalAttrs.version}"; - hash = "sha256-DNwxQq2QKPQ6gzIxBJUhdMNbmHNYnt+MSFJ28PLzunQ="; + hash = "sha256-V0gd4qFs3mRhajhBbtVO835HLAwLKswFQDaURENNTOM="; }; - cargoHash = "sha256-bIbDohCkSlV7uBi+lyylLE/gSqjzlp+xwxQRS9zBiio="; + cargoHash = "sha256-HJeN9xv1U6l1ailE+8L+wlZSCKiCZyhfsh7uT+zebE0="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/td/tdlib/package.nix b/pkgs/by-name/td/tdlib/package.nix index 9fb8828d6d60..a65f7254d08d 100644 --- a/pkgs/by-name/td/tdlib/package.nix +++ b/pkgs/by-name/td/tdlib/package.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation { pname = if tde2eOnly then "tde2e" else "tdlib"; - version = "1.8.65"; + version = "1.8.66"; src = fetchFromGitHub { owner = "tdlib"; @@ -47,8 +47,8 @@ stdenv.mkDerivation { # The tdlib authors do not set tags for minor versions, but # external programs depending on tdlib constrain the minor # version, hence we set a specific commit with a known version. - rev = "a8f21f5230172634becc1739050ef23ecd6ea291"; - hash = "sha256-cCNXRyeu6ZMf/0oxipPPUyniGuLzvWFLWCvklPIYvzk="; + rev = "a9966eb3704a3351568c28013fed67d797c17828"; + hash = "sha256-lCfQIehcH5jNQ7rOR6U4Ht+LCcmQRqkRtl0TFuYVdJg="; }; buildInputs = [ diff --git a/pkgs/by-name/ze/zerofs/package.nix b/pkgs/by-name/ze/zerofs/package.nix index 50602d838687..2c559d06ae87 100644 --- a/pkgs/by-name/ze/zerofs/package.nix +++ b/pkgs/by-name/ze/zerofs/package.nix @@ -10,18 +10,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "zerofs"; - version = "2.0.6"; + version = "2.0.10"; src = fetchFromGitHub { owner = "Barre"; repo = "ZeroFS"; tag = "v${finalAttrs.version}"; - hash = "sha256-xQOuMBScZn1I2SgmVKvZpKy95+/82SBI/kvl+zrzlT4="; + hash = "sha256-0F+FSQbW5lKHzODskdaxRwXwe3zdXwZr/d7Iw1R+IUE="; }; sourceRoot = "${finalAttrs.src.name}/zerofs"; - cargoHash = "sha256-ewqv2b1/T1Zl7oLKbCVNbt8jLURlFKyGQVatAl0B9Nc="; + cargoHash = "sha256-BFaOd0yIcqFp9u4sg+SMCEdffz3eFQfRFSahXXeTk6A="; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/interpreters/spidermonkey/115.nix b/pkgs/development/interpreters/spidermonkey/115.nix deleted file mode 100644 index 43e85b3a2235..000000000000 --- a/pkgs/development/interpreters/spidermonkey/115.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./common.nix { - version = "115.28.0"; - hash = "sha512-lnfF4YA/aGV9GKTlsmXsjqiL/J778qbEKQuTW/PG7jsMMcp4ACacAmxRISKvw2MPmCFd7JYzNvJhpXNDK6umnw=="; -} diff --git a/pkgs/development/interpreters/spidermonkey/allow-system-s-nspr-and-icu-on-bootstrapped-sysroot.patch b/pkgs/development/interpreters/spidermonkey/allow-system-s-nspr-and-icu-on-bootstrapped-sysroot.patch deleted file mode 100644 index 29966d90864d..000000000000 --- a/pkgs/development/interpreters/spidermonkey/allow-system-s-nspr-and-icu-on-bootstrapped-sysroot.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a26bb162d9403138d64b84e8fa4f0471084c45b2 Mon Sep 17 00:00:00 2001 -From: "Kirill A. Korinsky" -Date: Fri, 8 Jul 2022 21:21:25 +0200 -Subject: [PATCH] Allow system's nspr and icu on bootstrapped sysroot - -This patch partially reverts https://github.com/mozilla/gecko-dev/commit/9aa3587bbf0416dd2eb5b614f7b301c71c64286b ---- - build/moz.configure/nspr.configure | 2 +- - js/moz.configure | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/build/moz.configure/nspr.configure b/build/moz.configure/nspr.configure -index 06f03d9bc72d..9687c84a7290 100644 ---- a/build/moz.configure/nspr.configure -+++ b/build/moz.configure/nspr.configure -@@ -19,7 +19,7 @@ def enable_nspr_build(enable): - return enable - - --system_lib_option("--with-system-nspr", help="Use system NSPR") -+option("--with-system-nspr", help="Use system NSPR") - - - @depends(enable_nspr_build, "--with-system-nspr", js_standalone) -diff --git a/js/moz.configure b/js/moz.configure -index b7ba9790425d..5ff5cb2da266 100644 ---- a/js/moz.configure -+++ b/js/moz.configure -@@ -1129,7 +1129,7 @@ set_define( - - # ECMAScript Internationalization API Support (uses ICU) - # ====================================================== --system_lib_option("--with-system-icu", help="Use system ICU") -+option("--with-system-icu", help="Use system ICU") - - system_icu = pkg_check_modules("MOZ_ICU", "icu-i18n >= 71.1", when="--with-system-icu") - --- -2.37.0 - diff --git a/pkgs/development/interpreters/spidermonkey/always-check-for-pkg-config.patch b/pkgs/development/interpreters/spidermonkey/always-check-for-pkg-config.patch deleted file mode 100644 index c6e43b60aa59..000000000000 --- a/pkgs/development/interpreters/spidermonkey/always-check-for-pkg-config.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 9d3f6e9ff5e66af90a5d187d902f7893fb91c24b Mon Sep 17 00:00:00 2001 -From: "Kirill A. Korinsky" -Date: Fri, 1 Jul 2022 12:23:37 +0200 -Subject: [PATCH] Always check for pkg-config - ---- - build/moz.configure/pkg.configure | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/build/moz.configure/pkg.configure b/build/moz.configure/pkg.configure -index 6b460ae174eed..0056ecd7ae2d8 100644 ---- a/build/moz.configure/pkg.configure -+++ b/build/moz.configure/pkg.configure -@@ -15,8 +15,7 @@ pkg_config = check_prog( - pkg_config, - bootstrap=depends(when=target_sysroot.bootstrapped)(lambda: "pkgconf"), - allow_missing=True, -- when=compile_environment -- & depends(target.os)(lambda os: os not in ("WINNT", "OSX", "Android")), -+ when=compile_environment, - ) - - diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix index 29b381e77476..d6ca5d564778 100644 --- a/pkgs/development/interpreters/spidermonkey/common.nix +++ b/pkgs/development/interpreters/spidermonkey/common.nix @@ -48,32 +48,26 @@ stdenv.mkDerivation (finalAttrs: { inherit hash; }; - patches = - lib.optionals (lib.versionOlder version "128") [ - # use pkg-config at all systems - ./always-check-for-pkg-config.patch - ./allow-system-s-nspr-and-icu-on-bootstrapped-sysroot.patch - ] - ++ lib.optionals (lib.versionAtLeast version "128") [ - # rebased version of the above 2 patches - ./always-check-for-pkg-config-128.patch - ./allow-system-s-nspr-and-icu-on-bootstrapped-sysroot-128.patch - ] - ++ lib.optionals (stdenv.hostPlatform.system == "i686-linux") [ - # Fixes i686 build, https://bugzilla.mozilla.org/show_bug.cgi?id=1729459 - ./fix-float-i686.patch - ] - ++ lib.optionals (lib.versionAtLeast version "140") [ - # mozjs-140.pc does not contain -DXP_UNIX on Linux - # https://bugzilla.mozilla.org/show_bug.cgi?id=1973994 - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/mozjs140/raw/49492baa47bc1d7b7d5bc738c4c81b4661302f27/f/9aa8b4b051dd539e0fbd5e08040870b3c712a846.patch"; - hash = "sha256-SsyO5g7wlrxE7y2+VTHfmUDamofeZVqge8fv2y0ZhuU="; - }) - ] - ++ lib.optionals (lib.versionAtLeast version "140" && stdenv.hostPlatform.is32bit) [ - ./fix-32bit-build.patch - ]; + patches = [ + # use pkg-config for all systems + ./always-check-for-pkg-config-128.patch + ./allow-system-s-nspr-and-icu-on-bootstrapped-sysroot-128.patch + ] + ++ lib.optionals (stdenv.hostPlatform.system == "i686-linux") [ + # Fixes i686 build, https://bugzilla.mozilla.org/show_bug.cgi?id=1729459 + ./fix-float-i686.patch + ] + ++ lib.optionals (lib.versionAtLeast version "140") [ + # mozjs-140.pc does not contain -DXP_UNIX on Linux + # https://bugzilla.mozilla.org/show_bug.cgi?id=1973994 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/mozjs140/raw/49492baa47bc1d7b7d5bc738c4c81b4661302f27/f/9aa8b4b051dd539e0fbd5e08040870b3c712a846.patch"; + hash = "sha256-SsyO5g7wlrxE7y2+VTHfmUDamofeZVqge8fv2y0ZhuU="; + }) + ] + ++ lib.optionals (lib.versionAtLeast version "140" && stdenv.hostPlatform.is32bit) [ + ./fix-32bit-build.patch + ]; nativeBuildInputs = [ cargo @@ -85,8 +79,6 @@ stdenv.mkDerivation (finalAttrs: { rustc.llvmPackages.llvm # for llvm-objdump which zip - ] - ++ lib.optionals (lib.versionAtLeast version "128") [ rust-cbindgen rustPlatform.bindgenHook ]; @@ -147,23 +139,20 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - preConfigure = - lib.optionalString (lib.versionAtLeast version "128") '' - export MOZBUILD_STATE_PATH=$TMPDIR/mozbuild - '' - + '' - export LIBXUL_DIST=$out - export PYTHON="${buildPackages.python3.interpreter}" - export M4=m4 - export AWK=awk - export AS=$CC - export AC_MACRODIR=$PWD/build/autoconf/ - patchShebangs build/cargo-linker - # We can't build in js/src/, so create a build dir - mkdir obj - cd obj/ - configureScript=../js/src/configure - ''; + preConfigure = '' + export MOZBUILD_STATE_PATH=$TMPDIR/mozbuild + export LIBXUL_DIST=$out + export PYTHON="${buildPackages.python3.interpreter}" + export M4=m4 + export AWK=awk + export AS=$CC + export AC_MACRODIR=$PWD/build/autoconf/ + patchShebangs build/cargo-linker + # We can't build in js/src/, so create a build dir + mkdir obj + cd obj/ + configureScript=../js/src/configure + ''; env = lib.optionalAttrs (lib.versionAtLeast version "140") { # '-Wformat-security' ignored without '-Wformat' @@ -189,8 +178,6 @@ stdenv.mkDerivation (finalAttrs: { catap bobby285271 ]; - # ERROR: Failed to find an adequate linker - broken = lib.versionOlder version "128" && stdenv.hostPlatform.isDarwin; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index 4bf65e966a45..b247114d37b3 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "aws-adfs"; - version = "2.12.1"; + version = "2.13.0"; pyproject = true; src = fetchFromGitHub { owner = "venth"; repo = "aws-adfs"; tag = "v${version}"; - hash = "sha256-U1ptI/VynHArJ1SwX4LanHB0f4U38YZO9XDCXcLBu+s="; + hash = "sha256-FqE4v6Ao8Gc0S1w4GN9rytXqIt2CMQOlO81mXe8xZtM="; }; build-system = [ diff --git a/pkgs/kde/misc/kirigami-addons/default.nix b/pkgs/kde/misc/kirigami-addons/default.nix index 686496394966..4022ffab289f 100644 --- a/pkgs/kde/misc/kirigami-addons/default.nix +++ b/pkgs/kde/misc/kirigami-addons/default.nix @@ -10,11 +10,11 @@ }: mkKdeDerivation rec { pname = "kirigami-addons"; - version = "1.12.1"; + version = "1.13.0"; src = fetchurl { url = "mirror://kde/stable/kirigami-addons/kirigami-addons-${version}.tar.xz"; - hash = "sha256-xUOkk85YdfQF+xyf9tUxBg7QgsxtcQ5W1GrELRZCB7s="; + hash = "sha256-C56D1TP77SrDcjP+CBeOBnHbQnIyBUi5CRbX0GhaqNQ="; }; extraNativeBuildInputs = [ qttools ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c2f58bbf9dbd..ca4aef310f52 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2140,6 +2140,7 @@ mapAliases { spectrojack = throw "'spectrojack' was remove due to lack of upstream maintenance and relying on gtk2"; # Added 2025-12-02 speed_dreams = speed-dreams; # Added 2026-01-19 spidermonkey_91 = throw "'spidermonkey_91 is EOL since 2022/09"; # Added 2025-08-26 + spidermonkey_115 = throw "'spidermonkey_115 is EOL since 2024/09"; # Added 2026-07-06 spoof = throw "'spoof' has been removed, as it is broken with the latest MacOS versions and is unmaintained upstream"; # Added 2025-11-14 spotify-unwrapped = throw "'spotify-unwrapped' has been renamed to/replaced by 'spotify'"; # Converted to throw 2025-10-27 spring = throw "spring has been removed, as it had been broken since 2023 (it was a game; maybe you’re thinking of spring-boot-cli?)"; # Added 2025-09-16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6194dabf551d..a8122d6b626b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4678,11 +4678,9 @@ with pkgs; inherit ({ - spidermonkey_115 = callPackage ../development/interpreters/spidermonkey/115.nix { }; spidermonkey_128 = callPackage ../development/interpreters/spidermonkey/128.nix { }; spidermonkey_140 = callPackage ../development/interpreters/spidermonkey/140.nix { }; }) - spidermonkey_115 spidermonkey_128 spidermonkey_140 ;