diff options
author | Vladimír Čunát <v@cunat.cz> | 2023-04-12 13:18:37 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2023-04-12 13:18:37 +0200 |
commit | 2a3291834f1a88f4decc18ee4da599b3dea3ef6a (patch) | |
tree | 01fde5ad833ec4a504dc9012e2a047edd9f760ae /pkgs/top-level | |
parent | 930839445bb9a89c392eb73a0498e896c2ddc01b (diff) | |
parent | d0bb9ed674a258ef8bd6a787d8d1ad0f2164cfdd (diff) |
Merge #224806: staging-next 2023-04-05
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 85 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/release-small.nix | 2 |
4 files changed, 63 insertions, 29 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 24b60556bfc18..e6e914c82db61 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1690,6 +1690,7 @@ mapAliases ({ way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # Added 2020-01-13 webbrowser = throw "webbrowser was removed because it's unmaintained upstream and was marked as broken in nixpkgs for over a year"; # Added 2022-03-21 webkit = throw "'webkit' has been renamed to/replaced by 'webkitgtk'"; # Converted to throw 2022-02-22 + webkitgtk_5_0 = throw "'webkitgtk_5_0' has been superseded by 'webkitgtk_6_0'"; # Added 2023-02-25 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45d9fb0a9061b..96a42f49ceed4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2461,6 +2461,8 @@ with pkgs; krusader = libsForQt5.callPackage ../applications/file-managers/krusader { }; + lesscpy = callPackage ../development/compilers/lesscpy { }; + lf = callPackage ../applications/file-managers/lf { }; ctpv = callPackage ../applications/file-managers/lf/ctpv.nix { }; @@ -2848,18 +2850,7 @@ with pkgs; audiowaveform = callPackage ../tools/audio/audiowaveform { }; - authenticator = callPackage ../applications/misc/authenticator rec { - # Remove when GTK is upgraded past 4.8 - # https://github.com/NixOS/nixpkgs/issues/216770 - gtk4 = pkgs.gtk4.overrideAttrs (_: rec { - version = "4.9.4"; - src = fetchurl { - url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "sha256-kaOv1YQB1OXYHjCwjuPxE6R2j/EBQDNqcqMmx3JyvjA="; - }; - }); - wrapGAppsHook4 = wrapGAppsHook.override { gtk3 = gtk4; }; - }; + authenticator = callPackage ../applications/misc/authenticator { }; authelia = callPackage ../servers/authelia { }; @@ -11796,9 +11787,7 @@ with pkgs; rmtrash = callPackage ../tools/misc/rmtrash { }; - roc-toolkit = callPackage ../development/libraries/audio/roc-toolkit { - scons = sconsPackages.scons_4_1_0; - }; + roc-toolkit = callPackage ../development/libraries/audio/roc-toolkit { }; rockbox-utility = libsForQt5.callPackage ../tools/misc/rockbox-utility { }; @@ -14874,6 +14863,15 @@ 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; @@ -15355,8 +15353,12 @@ 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 { }; - julia_19 = callPackage ../development/compilers/julia/1.9.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-lts-bin = julia_16-bin; julia-stable-bin = julia_18-bin; @@ -15556,6 +15558,9 @@ 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; }; @@ -15949,11 +15954,11 @@ with pkgs; inherit (darwin) apple_sdk; }; - rust_1_67 = callPackage ../development/compilers/rust/1_67.nix { + rust_1_68 = callPackage ../development/compilers/rust/1_68.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; llvm_15 = llvmPackages_15.libllvm; }; - rust = rust_1_67; + rust = rust_1_68; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; @@ -15962,8 +15967,8 @@ with pkgs; openssl = openssl_1_1; }; - rustPackages_1_67 = rust_1_67.packages.stable; - rustPackages = rustPackages_1_67; + rustPackages_1_68 = rust_1_68.packages.stable; + rustPackages = rustPackages_1_68; inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform; @@ -20009,6 +20014,16 @@ with pkgs; inherit (darwin) autoSignDarwinBinariesHook; }; + freeipa = callPackage ../os-specific/linux/freeipa { + kerberos = krb5.override { + withVerto = true; + }; + sasl = cyrus_sasl; + samba = samba4.override { + enableLDAP = true; + }; + }; + freetts = callPackage ../development/libraries/freetts { jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; @@ -21265,6 +21280,8 @@ with pkgs; libdecor = callPackage ../development/libraries/libdecor { }; + libdex = callPackage ../development/libraries/libdex { }; + libdigidocpp = callPackage ../development/libraries/libdigidocpp { }; libdiscid = callPackage ../development/libraries/libdiscid { }; @@ -22552,7 +22569,10 @@ with pkgs; # 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 - mesa = mesa_22_3_7; + # 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_glu = callPackage ../development/libraries/mesa-glu { inherit (darwin.apple_sdk.frameworks) ApplicationServices; @@ -22880,12 +22900,13 @@ with pkgs; openct = callPackage ../development/libraries/openct { }; opencv2 = callPackage ../development/libraries/opencv { - inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit; + inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit Accelerate; ffmpeg = ffmpeg_4; }; opencv3 = callPackage ../development/libraries/opencv/3.x.nix { - inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox; + inherit (darwin.apple_sdk.frameworks) + AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate; ffmpeg = ffmpeg_4; }; @@ -22894,7 +22915,8 @@ with pkgs; }; opencv4 = callPackage ../development/libraries/opencv/4.x.nix { - inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox; + inherit (darwin.apple_sdk.frameworks) + AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate; pythonPackages = python3Packages; ffmpeg = ffmpeg_4; }; @@ -24096,7 +24118,7 @@ with pkgs; wavpack = callPackage ../development/libraries/wavpack { }; - wayland = callPackage ../development/libraries/wayland { }; + wayland = darwin.apple_sdk_11_0.callPackage ../development/libraries/wayland { }; wayland-scanner = wayland.bin; wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { }; @@ -24117,7 +24139,7 @@ with pkgs; libsoup = libsoup_3; }; - webkitgtk_5_0 = webkitgtk.override { + webkitgtk_6_0 = webkitgtk.override { libsoup = libsoup_3; gtk3 = gtk4; }; @@ -32123,6 +32145,11 @@ with pkgs; jack = libjack2; }; + libmpg123 = mpg123.override { + libOnly = true; + withConplay = false; + }; + mpg321 = callPackage ../applications/audio/mpg321 { }; mpc-cli = callPackage ../applications/audio/mpc { @@ -32295,7 +32322,7 @@ with pkgs; netmaker-full = callPackage ../applications/networking/netmaker { }; newsflash = callPackage ../applications/networking/feedreaders/newsflash { - webkitgtk = webkitgtk_5_0; + webkitgtk = webkitgtk_6_0; }; nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus { }; @@ -34237,6 +34264,8 @@ with pkgs; testssl = callPackage ../applications/networking/testssl { }; + tests-stdenv-gcc-stageCompare = callPackage ../test/stdenv/gcc-stageCompare.nix { }; + lavalauncher = callPackage ../applications/misc/lavalauncher { }; t-rec = callPackage ../misc/t-rec { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 82374abcafb23..c81bf4d1e7204 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2849,6 +2849,8 @@ self: super: with self; { dogpile-cache = callPackage ../development/python-modules/dogpile-cache { }; + dogtag-pki = callPackage ../development/python-modules/dogtag-pki { }; + dogtail = callPackage ../development/python-modules/dogtail { }; doit = callPackage ../development/python-modules/doit { }; @@ -12924,6 +12926,8 @@ self: super: with self; { ytmusicapi = callPackage ../development/python-modules/ytmusicapi { }; + yubico = callPackage ../development/python-modules/yubico { }; + yubico-client = callPackage ../development/python-modules/yubico-client { }; z3c-checkversions = callPackage ../development/python-modules/z3c-checkversions { }; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 7bf4a234bb657..333e285cef0a0 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -150,5 +150,5 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; xfsprogs = linux; xkeyboard_config = linux; zip = all; - + tests-stdenv-gcc-stageCompare = all; } )) |