diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 32 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 232 | ||||
-rw-r--r-- | pkgs/top-level/darwin-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 28 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 23 | ||||
-rw-r--r-- | pkgs/top-level/qt5-packages.nix | 4 |
6 files changed, 209 insertions, 112 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4f00b0e30c906..2d2fb1580b7aa 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -782,7 +782,7 @@ mapAliases ({ keepnote = throw "keepnote has been removed from nixpkgs, as it is stuck on python2"; # Added 2022-01-01 kerberos = libkrb5; # moved from top-level 2021-03-14 kexectools = kexec-tools; # Added 2021-09-03 - kexpand = "kexpand awless has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-01 + kexpand = throw "kexpand awless has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-01 keybase-go = throw "'keybase-go' has been renamed to/replaced by 'keybase'"; # Converted to throw 2022-02-22 keysmith = libsForQt5.kdeGear.keysmith; # Added 2021-07-14 kgx = gnome-console; # Added 2022-02-19 @@ -814,9 +814,9 @@ mapAliases ({ letsencrypt = throw "'letsencrypt' has been renamed to/replaced by 'certbot'"; # Converted to throw 2022-02-22 libGL_driver = throw "'libGL_driver' has been renamed to/replaced by 'mesa.drivers'"; # Converted to throw 2022-02-22 libaudit = throw "'libaudit' has been renamed to/replaced by 'audit'"; # Converted to throw 2022-02-22 - libayatana-indicator-gtk2 = "'libayatana-indicator-gtk2' has been removed from nixpkgs, as gtk2 is deprecated"; # Added 2022-10-18 + libayatana-indicator-gtk2 = throw "'libayatana-indicator-gtk2' has been removed from nixpkgs, as gtk2 is deprecated"; # Added 2022-10-18 libayatana-indicator-gtk3 = libayatana-indicator; # Added 2022-10-18 - libayatana-appindicator-gtk2 = "'libayatana-appindicator-gtk2' has been removed from nixpkgs, as gtk2 is deprecated"; # Added 2022-10-18 + libayatana-appindicator-gtk2 = throw "'libayatana-appindicator-gtk2' has been removed from nixpkgs, as gtk2 is deprecated"; # Added 2022-10-18 libayatana-appindicator-gtk3 = libayatana-appindicator; # Added 2022-10-18 libbencodetools = bencodetools; # Added 2022-07-30 libbluedevil = throw "'libbluedevil' (Qt4) is unmaintained and unused since 'kde4.bluedevil's removal in 2017"; # Added 2022-06-14 @@ -1121,9 +1121,19 @@ mapAliases ({ nmap-unfree = nmap; # Added 2021-04-06 nmap-graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Added 2022-04-26 nmap_graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Modified 2022-04-26 - nodejs-10_x = throw "nodejs-10_x has been removed. Use a newer version instead."; # Added 2022-05-31 - nodejs-12_x = throw "nodejs-12_x has been removed. Use a newer version instead."; # Added 2022-07-04 + nodejs_10 = throw "nodejs-10_x has been removed. Use a newer version instead."; # Added 2022-05-31 + nodejs-10_x = nodejs_10; # Added 2022-11-06 + nodejs_12 = throw "nodejs-12_x has been removed. Use a newer version instead."; # Added 2022-07-04 + nodejs-12_x = nodejs_12; # Added 2022-11-06 + nodejs-14_x = nodejs_14; # Added 2022-11-06 + nodejs-slim-14_x = nodejs-slim_14; # Added 2022-11-06 + nodejs-16_x = nodejs_16; # Added 2022-11-06 nodejs-16_x-openssl_1_1 = throw "nodejs-16_x-openssl_1_1 has been removed."; # Added 2023-02-04 + nodejs-slim-16_x = nodejs-slim_16; # Added 2022-11-06 + nodejs-18_x = nodejs_18; # Added 2022-11-06 + nodejs-slim-18_x = nodejs-slim_18; # Added 2022-11-06 + nodejs-19_x = nodejs_19; # Added 2022-11-06 + nodejs-slim-19_x = nodejs-slim_19; # Added 2022-11-06 nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22 nomad_1_1 = throw "nomad_1_1 has been removed because it's outdated. Use a a newer version instead"; # Added 2022-05-22 nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27 @@ -1628,7 +1638,7 @@ mapAliases ({ torchPackages = throw "torchPackages has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 trang = throw "'trang' has been renamed to/replaced by 'jing-trang'"; # Converted to throw 2022-02-22 transfig = fig2dev; # Added 2022-02-15 - transmission-remote-cli = "transmission-remote-cli has been removed, as the upstream project has been abandoned. Please use tremc instead"; # Added 2020-10-14 + transmission-remote-cli = throw "transmission-remote-cli has been removed, as the upstream project has been abandoned. Please use tremc instead"; # Added 2020-10-14 transmission_gtk = throw "'transmission_gtk' has been renamed to/replaced by 'transmission-gtk'"; # Converted to throw 2022-02-22 transmission_remote_gtk = throw "'transmission_remote_gtk' has been renamed to/replaced by 'transmission-remote-gtk'"; # Converted to throw 2022-02-22 transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned"; @@ -1711,6 +1721,7 @@ mapAliases ({ weechat-matrix-bridge = throw "'weechat-matrix-bridge' has been renamed to/replaced by 'weechatScripts.weechat-matrix-bridge'"; # Converted to throw 2022-02-22 weighttp = throw "weighttp has been removed: abandoned by upstream"; # Added 2022-04-20 whirlpool-gui = throw "whirlpool-gui has been removed as it depended on an insecure version of Electron"; # added 2022-02-08 + wio = throw "wio has been removed from nixpkgs, it was unmaintained and required wlroots_0_14 at the time of removal"; # Added 2023-04-28 wicd = throw "wicd has been removed as it is abandoned"; # Added 2021-09-11 wineFull = throw "'wineFull' has been renamed to/replaced by 'winePackages.full'"; # Converted to throw 2022-02-22 wineMinimal = throw "'wineMinimal' has been renamed to/replaced by 'winePackages.minimal'"; # Converted to throw 2022-02-22 @@ -1823,10 +1834,6 @@ mapAliases ({ zeromq3 = throw "zeromq3 has been deprecated by zeromq4"; jzmq = throw "jzmq has been removed from nixpkgs, as it was unmaintained"; - avian = throw '' - The package doesn't compile anymore on NixOS and both development & - maintenance is abandoned by upstream. - ''; # Cleanup before 21.11, Added 2021-05-07 ant-dracula-theme = throw "ant-dracula-theme is now dracula-theme, and theme name is Dracula instead of Ant-Dracula"; dina-font-pcf = dina-font; # Added 2020-02-09 dnscrypt-proxy = throw "dnscrypt-proxy has been removed. Please use dnscrypt-proxy2"; # Added 2020-02-02 @@ -1860,12 +1867,7 @@ mapAliases ({ Its new location is obs-studio-plugins.wlrobs. ''; # Added 2021-06-01 - oraclejdk8psu = throw "The *psu versions of oraclejdk are no longer provided by upstream"; # Cleanup before 20.09 - oraclejre8psu = oraclejdk8psu; # Cleanup before 20.09 - oraclejdk8psu_distro = oraclejdk8psu; # Cleanup before 20.09 posix_man_pages = man-pages-posix; # Added 2021-04-15 - riot-desktop = throw "riot-desktop is now element-desktop!"; # Cleanup before 21.05 - riot-web = throw "riot-web is now element-web"; # Cleanup before 21.05 sqldeveloper_18 = throw "sqldeveloper_18 is not maintained anymore!"; # Added 2020-02-04 todolist = throw "todolist is now ultralist"; # Added 2020-12-27 tor-browser-bundle = throw "tor-browser-bundle was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead"; # Added 2020-01-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20f1e7b4aaaef..c2397c4ce5dbe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -543,6 +543,8 @@ with pkgs; expressvpn = callPackage ../applications/networking/expressvpn { }; + figma-agent = callPackage ../applications/graphics/figma-agent { }; + figma-linux = callPackage ../applications/graphics/figma-linux { }; firefly-desktop = callPackage ../applications/misc/firefly-desktop { }; @@ -1544,6 +1546,8 @@ with pkgs; godspeed = callPackage ../tools/networking/godspeed { }; + gp-saml-gui = python3Packages.callPackage ../tools/networking/gp-saml-gui { }; + guestfs-tools = callPackage ../tools/virtualization/guestfs-tools { }; fabs = callPackage ../tools/backup/fabs { }; @@ -1574,6 +1578,8 @@ with pkgs; kubevirt = callPackage ../tools/virtualization/kubevirt { }; + license-cli = callPackage ../tools/misc/license-cli { }; + license-generator = callPackage ../tools/misc/license-generator { }; linux-router = callPackage ../tools/networking/linux-router { }; @@ -1634,6 +1640,8 @@ with pkgs; sorted-grep = callPackage ../tools/text/sorted-grep { }; + smbmap = callPackage ../tools/security/smbmap { }; + smbscan = callPackage ../tools/security/smbscan { }; spectre-cli = callPackage ../tools/security/spectre-cli { }; @@ -2525,6 +2533,8 @@ with pkgs; fox = fox_1_6; }; + xplr = callPackage ../applications/file-managers/xplr { }; + ytree = callPackage ../applications/file-managers/ytree { }; ### APPLICATIONS/TERMINAL-EMULATORS @@ -3586,7 +3596,7 @@ with pkgs; play-with-mpv = callPackage ../tools/video/play-with-mpv { }; - plausible = callPackage ../servers/web-apps/plausible { nodejs = nodejs-16_x; }; + plausible = callPackage ../servers/web-apps/plausible { nodejs = nodejs_16; }; pam-reattach = callPackage ../os-specific/darwin/pam-reattach { }; @@ -5564,6 +5574,8 @@ with pkgs; electron = electron_22; }; + portal = callPackage ../tools/misc/portal { }; + pouf = callPackage ../tools/misc/pouf { }; poweralertd = callPackage ../tools/misc/poweralertd { }; @@ -5617,7 +5629,7 @@ with pkgs; river = callPackage ../applications/window-managers/river { }; rivercarro = callPackage ../applications/misc/rivercarro { - zig = zig_0_9; + zig = buildPackages.zig_0_9; }; river-luatile = callPackage ../applications/misc/river-luatile{ }; @@ -5876,13 +5888,7 @@ with pkgs; enableExtraPlugins = true; }; - asciidoctor = callPackage ../tools/typesetting/asciidoctor { - bundlerApp = bundlerApp.override { - # asciidoc supports both ruby 2 and 3, - # but we don't want to be stuck on it: - ruby = ruby_3_1; - }; - }; + asciidoctor = callPackage ../tools/typesetting/asciidoctor { }; asciidoctor-with-extensions = callPackage ../tools/typesetting/asciidoctor-with-extensions { }; @@ -6170,9 +6176,9 @@ with pkgs; hedgedoc = callPackage ../servers/web-apps/hedgedoc { inherit (callPackage ../development/tools/yarn2nix-moretea/yarn2nix { - nodejs = nodejs-16_x; + nodejs = nodejs_16; }) mkYarnPackage; - nodejs = nodejs-16_x; + nodejs = nodejs_16; }; colord = callPackage ../tools/misc/colord { }; @@ -7440,7 +7446,7 @@ with pkgs; findutils = callPackage ../tools/misc/findutils { }; findup = callPackage ../tools/misc/findup { - zig = zig_0_9; + zig = buildPackages.zig_0_9; }; fingerprintx = callPackage ../tools/security/fingerprintx { }; @@ -7458,6 +7464,8 @@ with pkgs; flashrom = callPackage ../tools/misc/flashrom { }; + flashrom-stable = callPackage ../tools/misc/flashrom-stable { }; + flent = python3Packages.callPackage ../applications/networking/flent { }; flexoptix-app = callPackage ../tools/misc/flexoptix-app { }; @@ -7644,6 +7652,7 @@ with pkgs; foundationdb52 foundationdb60 foundationdb61 + foundationdb71 ; foundationdb = foundationdb61; @@ -7911,8 +7920,13 @@ with pkgs; gnupg1orig = callPackage ../tools/security/gnupg/1.nix { }; gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { }; gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1 + + gnupg22 = callPackage ../tools/security/gnupg/22.nix { + pinentry = if stdenv.isDarwin then pinentry_mac else pinentry-gtk2; + libgcrypt = libgcrypt_1_8; + }; + gnupg24 = callPackage ../tools/security/gnupg/24.nix { - guiSupport = stdenv.isDarwin; pinentry = if stdenv.isDarwin then pinentry_mac else pinentry-gtk2; }; gnupg = gnupg24; @@ -8437,6 +8451,8 @@ with pkgs; hostname-debian = callPackage ../tools/networking/hostname-debian { }; + hotdoc = python3Packages.callPackage ../development/tools/hotdoc { }; + hotpatch = callPackage ../development/libraries/hotpatch { }; hotspot = libsForQt5.callPackage ../development/tools/analysis/hotspot { }; @@ -9394,27 +9410,27 @@ with pkgs; nodenv = callPackage ../development/tools/nodenv { }; - nodejs = hiPrio nodejs-18_x; + nodejs = hiPrio nodejs_18; - nodejs-slim = nodejs-slim-18_x; + nodejs-slim = nodejs-slim_18; - nodejs-14_x = callPackage ../development/web/nodejs/v14.nix { + nodejs_14 = callPackage ../development/web/nodejs/v14.nix { openssl = openssl_1_1; }; - nodejs-slim-14_x = callPackage ../development/web/nodejs/v14.nix { + nodejs-slim_14 = callPackage ../development/web/nodejs/v14.nix { openssl = openssl_1_1; enableNpm = false; }; - nodejs-16_x = callPackage ../development/web/nodejs/v16.nix { }; - nodejs-slim-16_x = callPackage ../development/web/nodejs/v16.nix { + nodejs_16 = callPackage ../development/web/nodejs/v16.nix { }; + nodejs-slim_16 = callPackage ../development/web/nodejs/v16.nix { enableNpm = false; }; - nodejs-18_x = callPackage ../development/web/nodejs/v18.nix { }; - nodejs-slim-18_x = callPackage ../development/web/nodejs/v18.nix { + nodejs_18 = callPackage ../development/web/nodejs/v18.nix { }; + nodejs-slim_18 = callPackage ../development/web/nodejs/v18.nix { enableNpm = false; }; - nodejs-19_x = callPackage ../development/web/nodejs/v19.nix { }; - nodejs-slim-19_x = callPackage ../development/web/nodejs/v19.nix { + nodejs_19 = callPackage ../development/web/nodejs/v19.nix { }; + nodejs-slim_19 = callPackage ../development/web/nodejs/v19.nix { enableNpm = false; }; nodejs_20 = callPackage ../development/web/nodejs/v20.nix { }; @@ -9981,10 +9997,10 @@ with pkgs; }; mirakurun = callPackage ../applications/video/mirakurun { - yarn = yarn.override { nodejs = nodejs-16_x; }; + yarn = yarn.override { nodejs = nodejs_16; }; inherit (callPackage ../development/tools/yarn2nix-moretea/yarn2nix { - nodejs = nodejs-16_x; - yarn = yarn.override { nodejs = nodejs-16_x; }; + nodejs = nodejs_16; + yarn = yarn.override { nodejs = nodejs_16; }; }) mkYarnPackage; }; @@ -11472,7 +11488,7 @@ with pkgs; rocket = libsForQt5.callPackage ../tools/graphics/rocket { }; rtabmap = libsForQt5.callPackage ../applications/video/rtabmap/default.nix { - pcl = pcl.override { vtk_8 = vtk_8_withQt5; }; + pcl = pcl.override { vtk = vtkWithQt5; }; }; rtaudio = callPackage ../development/libraries/audio/rtaudio { @@ -13484,6 +13500,10 @@ with pkgs; wireguard-tools = callPackage ../tools/networking/wireguard-tools { }; + wireguard-vanity-address = callPackage ../tools/networking/wireguard-vanity-address { + inherit (darwin.apple_sdk.frameworks) Security; + }; + wireproxy = callPackage ../tools/networking/wireproxy { }; wiringpi = callPackage ../os-specific/linux/wiringpi { }; @@ -13530,12 +13550,13 @@ with pkgs; xe = callPackage ../tools/system/xe { }; - xplr = callPackage ../applications/misc/xplr { }; xray = callPackage ../tools/networking/xray { }; xteve = callPackage ../servers/xteve { }; + termbook = callPackage ../tools/text/termbook { }; + testdisk = libsForQt5.callPackage ../tools/system/testdisk { }; testdisk-qt = testdisk.override { enableQt = true; }; @@ -13972,7 +13993,23 @@ with pkgs; xxv = callPackage ../tools/misc/xxv { }; - xvfb-run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; }; + xvfb-run = callPackage ../tools/misc/xvfb-run { + inherit (texFunctions) fontsConf; + + # xvfb-run is used by a bunch of things to run tests + # and doesn't support hardware accelerated rendering + # so remove it from the rebuild heavy path for mesa + xorgserver = xorg.xorgserver.overrideAttrs(old: { + buildInputs = lib.filter (pkg: lib.getName pkg != "mesa") old.buildInputs; + configureFlags = old.configureFlags ++ [ + "--disable-glamor" + "--disable-glx" + "--disable-dri" + "--disable-dri2" + "--disable-dri3" + ]; + }); + }; xvkbd = callPackage ../tools/X11/xvkbd { }; @@ -14646,8 +14683,10 @@ with pkgs; flutterPackages = recurseIntoAttrs (callPackage ../development/compilers/flutter { }); - flutter = flutterPackages.stable; - flutter2 = flutterPackages.v2; + flutter-unwrapped = flutterPackages.stable; + flutter2-unwrapped = flutterPackages.v2; + flutter = flutterPackages.wrapFlutter flutter-unwrapped; + flutter2 = flutterPackages.wrapFlutter flutter2-unwrapped; fnm = callPackage ../development/tools/fnm { inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation Security; @@ -14933,15 +14972,6 @@ with pkgs; profiledCompiler = false; }); - gfortran-tmp-noisystem = wrapCCWith { grossHackForStagingNext = true; cc = (gcc.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - disableBootstrap = false; - }); }; - gfortran48 = wrapCC (gcc48.cc.override { name = "gfortran"; langFortran = true; @@ -15423,12 +15453,8 @@ with pkgs; julia_16-bin = callPackage ../development/compilers/julia/1.6-bin.nix { }; julia_18-bin = callPackage ../development/compilers/julia/1.8-bin.nix { }; - julia_18 = callPackage ../development/compilers/julia/1.8.nix { - gfortran = gfortran-tmp-noisystem; - }; - julia_19 = callPackage ../development/compilers/julia/1.9.nix { - gfortran = gfortran-tmp-noisystem; - }; + julia_18 = callPackage ../development/compilers/julia/1.8.nix { }; + julia_19 = callPackage ../development/compilers/julia/1.9.nix { }; julia-lts-bin = julia_16-bin; julia-stable-bin = julia_18-bin; @@ -15628,9 +15654,6 @@ with pkgs; llvmPackages_rocm = recurseIntoAttrs (callPackage ../development/compilers/llvm/rocm { }); - # temporary hack; see PR #225846 - stdenv-tmpDropB = overrideCC stdenv (wrapCCWith { tmpDropB = true; inherit (stdenv.cc) cc; }); - lorri = callPackage ../tools/misc/lorri { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; @@ -16035,7 +16058,6 @@ with pkgs; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { - stdenv = gcc10StdenvCompat; openssl = openssl_1_1; }; @@ -16222,6 +16244,7 @@ with pkgs; cargo-unused-features = callPackage ../development/tools/rust/cargo-unused-features { }; cargo-tauri = callPackage ../development/tools/rust/cargo-tauri { }; + tauri-mobile = callPackage ../development/tools/rust/tauri-mobile { }; cargo-valgrind = callPackage ../development/tools/rust/cargo-valgrind { }; cargo-vet = callPackage ../development/tools/rust/cargo-vet { @@ -16266,6 +16289,7 @@ with pkgs; ograc = callPackage ../development/tools/rust/ograc { }; + ravedude = callPackage ../development/tools/rust/ravedude { }; rhack = callPackage ../development/tools/rust/rhack { }; roogle = callPackage ../development/tools/rust/roogle { }; rustfmt = rustPackages.rustfmt; @@ -17066,8 +17090,8 @@ with pkgs; ruby_3_1 ruby_3_2; - ruby = ruby_2_7; - rubyPackages = rubyPackages_2_7; + ruby = ruby_3_1; + rubyPackages = rubyPackages_3_1; rubyPackages_2_7 = recurseIntoAttrs ruby_2_7.gems; rubyPackages_3_0 = recurseIntoAttrs ruby_3_0.gems; @@ -17388,7 +17412,7 @@ with pkgs; verible = callPackage ../development/tools/language-servers/verible { }; zls = callPackage ../development/tools/language-servers/zls { - zig = zig_0_10; + zig = buildPackages.zig_0_10; }; ansible-later = with python3.pkgs; toPythonApplication ansible-later; @@ -19504,11 +19528,12 @@ with pkgs; boost179 boost180 boost181 + boost182 ; boost16x = boost169; boost17x = boost179; - boost18x = boost181; + boost18x = boost182; boost = boost17x; boost_process = callPackage ../development/libraries/boost-process { }; @@ -19544,7 +19569,7 @@ with pkgs; c-blosc = callPackage ../development/libraries/c-blosc { }; # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990 - cachix = haskell.lib.justStaticExecutables haskellPackages.cachix; + cachix = haskell.lib.justStaticExecutables haskellPackages.cachix_1_3_3; calcium = callPackage ../development/libraries/calcium { }; @@ -20953,7 +20978,7 @@ with pkgs; }; isso = callPackage ../servers/isso { - nodejs = nodejs-14_x; + nodejs = nodejs_14; }; itk_5_2 = callPackage ../development/libraries/itk/5.2.x.nix { @@ -21618,7 +21643,7 @@ with pkgs; libgcrypt = callPackage ../development/libraries/libgcrypt { }; - libgcrypt_1_5 = callPackage ../development/libraries/libgcrypt/1.5.nix { }; + libgcrypt_1_8 = callPackage ../development/libraries/libgcrypt/1.8.nix { }; libgdiplus = callPackage ../development/libraries/libgdiplus { inherit (darwin.apple_sdk.frameworks) Carbon; @@ -22646,27 +22671,17 @@ with pkgs; # Default libGLU libGLU = mesa_glu; - # When a new patch is out, add a new mesa attribute with the exact patch version - # Remove old mesa attributes when they're unused. - # Try to keep the previous version around for a bit in case there are new bugs. - mesa_22_3_7 = darwin.apple_sdk_11_0.callPackage ../development/libraries/mesa/22.3.7.nix { + # Keep Mesa 22.3 for now because 23.0 does not build on Darwin. + # FIXME: remove, also investigate why we even need Mesa on Darwin. + mesa_22_3 = darwin.apple_sdk_11_0.callPackage ../development/libraries/mesa/22.3.nix { inherit (darwin.apple_sdk_11_0.frameworks) OpenGL; inherit (darwin.apple_sdk_11_0.libs) Xplugin; }; - mesa_23_0_1 = darwin.apple_sdk_11_0.callPackage ../development/libraries/mesa/23.0.1.nix { + mesa_23_0 = darwin.apple_sdk_11_0.callPackage ../development/libraries/mesa/23.0.nix { inherit (darwin.apple_sdk_11_0.frameworks) OpenGL; inherit (darwin.apple_sdk_11_0.libs) Xplugin; }; - # Bump this immediately on patches; wait a bit for minor versions - mesa_22 = mesa_22_3_7; - mesa_23 = mesa_23_0_1; - # Bump on staging only, tonnes of packages depend on it. - # See https://github.com/NixOS/nixpkgs/issues/218232 - # Major versions should be bumped when they have proven to be reasonably stable - # FIXME: split up libgbm properly - # darwin: deferred until stabilized; e.g. see around: - # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21859 - mesa = if stdenv.isDarwin then mesa_22_3_7 else mesa_23_0_1; + mesa = if stdenv.isDarwin then mesa_22_3 else mesa_23_0; mesa_glu = callPackage ../development/libraries/mesa-glu { inherit (darwin.apple_sdk.frameworks) ApplicationServices; @@ -22960,6 +22975,8 @@ with pkgs; ookla-speedtest = callPackage ../tools/networking/ookla-speedtest { }; + open62541 = callPackage ../development/libraries/open62541 { }; + openalSoft = callPackage ../development/libraries/openal-soft { inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; }; @@ -23053,7 +23070,7 @@ with pkgs; opensaml-cpp = callPackage ../development/libraries/opensaml-cpp { }; openscenegraph = callPackage ../development/libraries/openscenegraph { - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Foundation; + inherit (darwin.apple_sdk.frameworks) AGL Accelerate Carbon Cocoa Foundation; }; openslide = callPackage ../development/libraries/openslide { }; @@ -24698,7 +24715,11 @@ with pkgs; pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.0"; }; faslExt = "fasl"; }; - sbcl = sbcl_2_3_0; + sbcl_2_3_2 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.2"; }; + faslExt = "fasl"; + }; + sbcl = sbcl_2_3_2; sbclPackages = recurseIntoAttrs sbcl.pkgs; @@ -25163,6 +25184,8 @@ with pkgs; theme-spring = callPackage ../servers/icingaweb2/theme-spring { }; }; + irrd = callPackage ../servers/irrd { }; + inspircd = callPackage ../servers/irc/inspircd { }; inspircdMinimal = inspircd.override { extraModules = []; }; @@ -25217,7 +25240,7 @@ with pkgs; }; lemmy-ui = callPackage ../servers/web-apps/lemmy/ui.nix { - nodejs = nodejs-14_x; + nodejs = nodejs_14; }; lightgbm = callPackage ../development/libraries/lightgbm { }; @@ -25415,7 +25438,7 @@ with pkgs; outline = callPackage ../servers/web-apps/outline (lib.fix (super: { yarn2nix-moretea = yarn2nix-moretea.override { inherit (super) nodejs yarn; }; yarn = yarn.override { inherit (super) nodejs; }; - nodejs = nodejs-16_x; + nodejs = nodejs_16; })); openbgpd = callPackage ../servers/openbgpd { }; @@ -26298,7 +26321,7 @@ with pkgs; busybox = callPackage ../os-specific/linux/busybox { }; busybox-sandbox-shell = callPackage ../os-specific/linux/busybox/sandbox-shell.nix { # musl roadmap has RISC-V support projected for 1.1.20 - busybox = if !stdenv.hostPlatform.isRiscV && stdenv.hostPlatform.libc != "bionic" + busybox = if !stdenv.hostPlatform.isRiscV && !stdenv.hostPlatform.isLoongArch64 && stdenv.hostPlatform.libc != "bionic" then pkgsStatic.busybox else busybox; }; @@ -27337,7 +27360,6 @@ with pkgs; withHomed = false; withHwdb = false; withImportd = false; - withKmod = false; withLibBPF = false; withLibidn2 = false; withLocaled = false; @@ -29868,7 +29890,7 @@ with pkgs; epeg = callPackage ../applications/graphics/epeg { }; epgstation = callPackage ../applications/video/epgstation { - nodejs = nodejs-16_x; + nodejs = nodejs_16; }; inherit (gnome) epiphany; @@ -29915,6 +29937,8 @@ with pkgs; expenses = callPackage ../applications/misc/expenses { }; + flowtime = callPackage ../applications/misc/flowtime { }; + fnott = callPackage ../applications/misc/fnott { }; furnace = callPackage ../applications/audio/furnace { @@ -30053,7 +30077,7 @@ with pkgs; flwrap = callPackage ../applications/radio/flwrap { stdenv = gcc10StdenvCompat; }; fluidsynth = callPackage ../applications/audio/fluidsynth { - inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices; + inherit (darwin.apple_sdk.frameworks) AppKit AudioUnit CoreAudio CoreMIDI CoreServices; }; fmit = libsForQt5.callPackage ../applications/audio/fmit { }; @@ -30479,6 +30503,19 @@ with pkgs; freenet = callPackage ../applications/networking/p2p/freenet { gradle = gradle_7; + jdk = jdk_headless; + # Reduce closure size + jre = pkgs.jre_minimal.override { + modules = [ + "java.base" + "java.logging" + "java.naming" + "java.sql" + "java.desktop" + "java.management" + ]; + jdk = jdk_headless; + }; }; freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix { }; @@ -31084,7 +31121,7 @@ with pkgs; waybar = callPackage ../applications/misc/waybar { }; waylock = callPackage ../applications/misc/waylock { - zig = zig_0_10; + zig = buildPackages.zig_0_10; }; wayshot = callPackage ../tools/misc/wayshot { }; @@ -31587,6 +31624,8 @@ with pkgs; k9s = callPackage ../applications/networking/cluster/k9s { }; + kubecm = callPackage ../applications/networking/cluster/kubecm { }; + ktunnel = callPackage ../applications/networking/cluster/ktunnel { }; ktop = callPackage ../applications/networking/cluster/ktop { }; @@ -32030,7 +32069,7 @@ with pkgs; merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; mepo = callPackage ../applications/misc/mepo { - zig = zig_0_9; + zig = buildPackages.zig_0_9; }; meshcentral = callPackage ../tools/admin/meshcentral { }; @@ -32695,7 +32734,7 @@ with pkgs; netcoredbg = callPackage ../development/tools/misc/netcoredbg { }; ncdu = callPackage ../tools/misc/ncdu { - zig = zig_0_10; + zig = buildPackages.zig_0_10; }; ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { }; @@ -32817,9 +32856,7 @@ with pkgs; boost = boost175; }; - openimageio = darwin.apple_sdk_11_0.callPackage ../development/libraries/openimageio { - fmt = fmt_8; - }; + openimageio = darwin.apple_sdk_11_0.callPackage ../development/libraries/openimageio { }; openjump = callPackage ../applications/misc/openjump { }; @@ -32993,7 +33030,7 @@ with pkgs; peek = callPackage ../applications/video/peek { }; peertube = callPackage ../servers/peertube { - nodejs = nodejs-16_x; + nodejs = nodejs_16; }; peroxide = callPackage ../applications/networking/peroxide { }; @@ -33569,6 +33606,8 @@ with pkgs; sacc = callPackage ../applications/networking/gopher/sacc { }; + savvycan = libsForQt5.callPackage ../applications/networking/sniffers/savvycan {}; + sayonara = libsForQt5.callPackage ../applications/audio/sayonara { }; sbagen = callPackage ../applications/misc/sbagen { }; @@ -34796,10 +34835,6 @@ with pkgs; electron = electron_19; }; - wio = callPackage ../applications/window-managers/wio { - wlroots = wlroots_0_14; - }; - windowlab = callPackage ../applications/window-managers/windowlab { }; windowmaker = callPackage ../applications/window-managers/windowmaker { }; @@ -35393,6 +35428,15 @@ with pkgs; boost = boost175; inherit (darwin) autoSignDarwinBinariesHook; }; + elementsd-simplicity = elementsd.overrideAttrs (_: rec { + version = "unstable-2023-04-18"; + src = fetchFromGitHub { + owner = "ElementsProject"; + repo = "elements"; + rev = "ea318a45094ab3d31dd017d7781a6f28f1ffaa33"; # simplicity branch latest + sha256 = "ooe+If3HWaJWpr2ux7DpiCTqB9Hv+aXjquEjplDjvhM="; + }; + }); ergo = callPackage ../applications/blockchains/ergo { }; @@ -35791,7 +35835,7 @@ with pkgs; }; blackshades = callPackage ../games/blackshades { - zig = zig_0_9; + zig = buildPackages.zig_0_9; }; blobby = callPackage ../games/blobby { }; @@ -38279,6 +38323,8 @@ with pkgs; atmos = callPackage ../applications/networking/cluster/atmos { }; + aiac = callPackage ../applications/networking/cluster/aiac { }; + fn-cli = callPackage ../applications/networking/cluster/fn-cli { }; areca = callPackage ../applications/backup/areca { @@ -38851,6 +38897,8 @@ with pkgs; nix-linter = haskell.lib.compose.justStaticExecutables (haskellPackages.nix-linter); + nix-melt = callPackage ../tools/nix/nix-melt { }; + nixos-option = callPackage ../tools/nix/nixos-option { nix = nixVersions.nix_2_3; }; nix-pin = callPackage ../tools/package-management/nix-pin { }; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 68b50fa9ab08f..732b0404040eb 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -216,8 +216,6 @@ impure-cmds // appleSourcePackages // chooseLibs // { # As the name says, this is broken, but I don't want to lose it since it's a direction we want to go in # libdispatch-broken = callPackage ../os-specific/darwin/swift-corelibs/libdispatch.nix { }; - darling = callPackage ../os-specific/darwin/darling/default.nix { }; - libtapi = callPackage ../os-specific/darwin/libtapi {}; ios-deploy = callPackage ../os-specific/darwin/ios-deploy {}; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 29673bd90f50d..64ec8c6f4671b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1623,6 +1623,34 @@ with self; { BioExtAlign = callPackage ../development/perl-modules/Bio-Ext-Align { }; + BioDBHTS = buildPerlModule { + pname = "Bio-DB-HTS"; + version = "3.01"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AV/AVULLO/Bio-DB-HTS-3.01.tar.gz"; + sha256 = "12a6bc1f579513cac8b9167cce4e363655cc8eba26b7d9fe1170dfe95e044f42"; + }; + + buildInputs = [ pkgs.htslib pkgs.zlib ]; + + propagatedBuildInputs = [ BioPerl ]; + htslibStore = toString pkgs.htslib; + + postPatch = '' + # -Wl,-rpath not recognized : replaced by -rpath= + sed -i 's/Wl,-rpath,/rpath=/' Build.PL + ''; + + preBuild = '' + export HTSLIB_DIR=${pkgs.htslib} + ''; + + meta = { + description = "Perl interface to HTS library for DNA sequencing"; + license = lib.licenses.asl20; + }; + }; + BioPerl = buildPerlPackage { pname = "BioPerl"; version = "1.7.8"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8f0a7c604da12..51fc8c39e4b31 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22,6 +22,8 @@ self: super: with self; { accessible-pygments = callPackage ../development/python-modules/accessible-pygments { }; + accelerate = callPackage ../development/python-modules/accelerate { }; + accuweather = callPackage ../development/python-modules/accuweather { }; accupy = callPackage ../development/python-modules/accupy { }; @@ -1284,6 +1286,8 @@ self: super: with self; { bimmer-connected = callPackage ../development/python-modules/bimmer-connected { }; + binary = callPackage ../development/python-modules/binary { }; + binaryornot = callPackage ../development/python-modules/binaryornot { }; bincopy = callPackage ../development/python-modules/bincopy { }; @@ -2326,6 +2330,8 @@ self: super: with self; { dbus-client-gen = callPackage ../development/python-modules/dbus-client-gen { }; + dbus-deviation = callPackage ../development/python-modules/dbus-deviation { }; + dbus-fast = callPackage ../development/python-modules/dbus-fast { }; dbus-next = callPackage ../development/python-modules/dbus-next { }; @@ -2745,6 +2751,8 @@ self: super: with self; { djangorestframework-guardian = callPackage ../development/python-modules/djangorestframework-guardian { }; + djangorestframework-guardian2 = callPackage ../development/python-modules/djangorestframework-guardian2 { }; + djangorestframework-recursive = callPackage ../development/python-modules/djangorestframework-recursive { }; djangorestframework-simplejwt = callPackage ../development/python-modules/djangorestframework-simplejwt { }; @@ -3712,6 +3720,7 @@ self: super: with self; { foundationdb52 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb52; }; foundationdb60 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb60; }; foundationdb61 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb61; }; + foundationdb71 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb71; }; fountains = callPackage ../development/python-modules/fountains { }; @@ -5428,8 +5437,12 @@ self: super: with self; { ledger_agent = callPackage ../development/python-modules/ledger_agent { }; + ledger-bitcoin = callPackage ../development/python-modules/ledger-bitcoin { }; + ledgerblue = callPackage ../development/python-modules/ledgerblue { }; + ledgercomm = callPackage ../development/python-modules/ledgercomm { }; + ledgerwallet = callPackage ../development/python-modules/ledgerwallet { inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; }; @@ -7209,6 +7222,8 @@ self: super: with self; { pefile = callPackage ../development/python-modules/pefile { }; + peft = callPackage ../development/python-modules/peft { }; + pelican = callPackage ../development/python-modules/pelican { inherit (pkgs) glibcLocales git; }; @@ -10503,6 +10518,8 @@ self: super: with self; { rubymarshal = callPackage ../development/python-modules/rubymarshal { }; + ruff-lsp = callPackage ../development/python-modules/ruff-lsp { }; + ruffus = callPackage ../development/python-modules/ruffus { }; runway-python = callPackage ../development/python-modules/runway-python { }; @@ -10539,6 +10556,8 @@ self: super: with self; { safeio = callPackage ../development/python-modules/safeio { }; + safetensors = callPackage ../development/python-modules/safetensors { }; + safety = callPackage ../development/python-modules/safety { }; sagemaker = callPackage ../development/python-modules/sagemaker { }; @@ -11939,6 +11958,8 @@ self: super: with self; { torchmetrics = callPackage ../development/python-modules/torchmetrics { }; + torchio = callPackage ../development/python-modules/torchio { }; + torchinfo = callPackage ../development/python-modules/torchinfo { }; torchlibrosa = callPackage ../development/python-modules/torchlibrosa { }; @@ -12675,6 +12696,8 @@ self: super: with self; { wheel-inspect = callPackage ../development/python-modules/wheel-inspect { }; + wheezy-template = callPackage ../development/python-modules/wheezy-template { }; + whichcraft = callPackage ../development/python-modules/whichcraft { }; whirlpool-sixth-sense = callPackage ../development/python-modules/whirlpool-sixth-sense { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 567795e68f70e..6de840951521d 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -131,7 +131,7 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { }; libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { - inherit (pkgs.darwin.apple_sdk.frameworks) AGL Cocoa Foundation; + inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate AGL Cocoa Foundation; }; libqglviewer = callPackage ../development/libraries/libqglviewer { @@ -192,8 +192,6 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea qoauth = callPackage ../development/libraries/qoauth { }; - qscintilla = callPackage ../development/libraries/qscintilla { }; - qt5ct = callPackage ../tools/misc/qt5ct { }; qtdbusextended = callPackage ../development/libraries/qtdbusextended { }; |