diff options
Diffstat (limited to 'nixpkgs/pkgs/top-level')
| -rw-r--r-- | nixpkgs/pkgs/top-level/aliases.nix | 5 | ||||
| -rw-r--r-- | nixpkgs/pkgs/top-level/all-packages.nix | 204 | ||||
| -rw-r--r-- | nixpkgs/pkgs/top-level/coq-packages.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/pkgs/top-level/dotnet-packages.nix | 51 | ||||
| -rw-r--r-- | nixpkgs/pkgs/top-level/linux-kernels.nix | 35 | ||||
| -rw-r--r-- | nixpkgs/pkgs/top-level/ocaml-packages.nix | 6 | ||||
| -rw-r--r-- | nixpkgs/pkgs/top-level/perl-packages.nix | 32 | ||||
| -rw-r--r-- | nixpkgs/pkgs/top-level/pkg-config/pkg-config-data.json | 2 | ||||
| -rw-r--r-- | nixpkgs/pkgs/top-level/python-packages.nix | 67 | ||||
| -rw-r--r-- | nixpkgs/pkgs/top-level/qt5-packages.nix | 3 |
10 files changed, 225 insertions, 182 deletions
diff --git a/nixpkgs/pkgs/top-level/aliases.nix b/nixpkgs/pkgs/top-level/aliases.nix index 2ca34f27060a..dd0610eee074 100644 --- a/nixpkgs/pkgs/top-level/aliases.nix +++ b/nixpkgs/pkgs/top-level/aliases.nix @@ -617,6 +617,7 @@ mapAliases ({ gitin = throw "gitin has been remove because it was unmaintained and depended on an insecure version of libgit2"; # Added 2021-12-07 gitinspector = throw "gitinspector has been removed because it doesn't work with python3"; # Added 2022-01-12 + gitter = throw "gitter has been removed since the client has been abandoned by upstream with the backend migration to Matrix"; # Added 2023-09-18 gksu = throw "gksu has been removed"; # Added 2022-01-16 glib_networking = throw "'glib_networking' has been renamed to/replaced by 'glib-networking'"; # Converted to throw 2022-02-22 glimpse = throw "glimpse was removed, as the project was discontinued. You can use gimp instead."; # Added 2022-07-11 @@ -681,6 +682,7 @@ mapAliases ({ go-mk = throw "go-mk has been dropped due to the lack of maintenance from upstream since 2015"; # Added 2022-06-02 go-pup = throw "'go-pup' has been renamed to/replaced by 'pup'"; # Converted to throw 2022-02-22 go-repo-root = throw "go-repo-root has been dropped due to the lack of maintenance from upstream since 2014"; # Added 2022-06-02 + go-thumbnailer = thud; # Added 2023-09-21 gometer = throw "gometer has been removed from nixpkgs because goLance stopped offering Linux support"; # Added 2023-02-10 gpgstats = throw "gpgstats has been removed: upstream is gone"; # Added 2022-02-06 gpshell = throw "gpshell has been removed, because it was unmaintained in nixpkgs"; # added 2021-12-17 @@ -786,6 +788,7 @@ mapAliases ({ interfacer = throw "interfacer is deprecated and archived by upstream"; # Added 2022-04-05 inter-ui = inter; # Added 2021-03-27 iops = throw "iops was removed: upstream is gone"; # Added 2022-02-06 + iouyap = throw "'iouyap' is deprecated and archived by upstream, use 'ubridge' instead"; # Added 2023-09-21 ipfs = kubo; # Added 2022-09-27 ipfs-migrator-all-fs-repo-migrations = kubo-migrator-all-fs-repo-migrations; # Added 2022-09-27 ipfs-migrator-unwrapped = kubo-migrator-unwrapped; # Added 2022-09-27 @@ -1101,7 +1104,6 @@ mapAliases ({ mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # Added 2020-05-23 mcomix3 = mcomix; # Added 2022-06-05 mediatomb = throw "mediatomb is no longer maintained upstream, use gerbera instead"; # added 2022-01-04 - meli = throw "'meli' has been removed as it requires an outdated version of openssl"; # added 2023-05-12 meme = meme-image-generator; # Added 2021-04-21 memtest86 = throw "'memtest86' has been renamed to/replaced by 'memtest86plus'"; # Converted to throw 2022-02-22 mercurial_4 = throw "mercurial_4 has been removed as it's unmaintained"; # Added 2021-10-18 @@ -1301,6 +1303,7 @@ mapAliases ({ parity-ui = throw "parity-ui was removed because it was broken and unmaintained by upstream"; # Added 2022-01-10 parquet-cpp = throw "'parquet-cpp' has been renamed to/replaced by 'arrow-cpp'"; # Converted to throw 2022-02-22 patchmatrix = throw "'patchmatrix' has been renamed to/replaced by 'open-music-kontrollers.patchmatrix'"; # Added 2022-03-09 + pash = throw "'pash' has been removed: abandoned by upstream. Use 'powershell' instead"; # Added 2023-09-16 pass-otp = throw "'pass-otp' has been renamed to/replaced by 'pass.withExtensions'"; # Converted to throw 2022-02-22 pbis-open = throw "pbis-open has been removed, because it is no longer maintained upstream"; # added 2021-12-15 pdf-redact-tools = throw "pdf-redact-tools has been removed from nixpkgs because the upstream has abandoned the project"; # Added 2022-01-01 diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index b24a8597681c..5617bb44bc7f 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -1291,6 +1291,8 @@ with pkgs; mokutil = callPackage ../tools/security/mokutil { }; + mpsolve = libsForQt5.callPackage ../applications/science/math/mpsolve { }; + nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit lib writeText; inherit (emacs.pkgs) inherit-local; }; nix-gitignore = callPackage ../build-support/nix-gitignore { }; @@ -1697,6 +1699,8 @@ with pkgs; cf-vault = callPackage ../tools/admin/cf-vault { }; + cfspeedtest = callPackage ../tools/networking/cfspeedtest { }; + cfonts = callPackage ../tools/misc/cfonts { }; bikeshed = python3Packages.callPackage ../applications/misc/bikeshed { }; @@ -1947,6 +1951,8 @@ with pkgs; polygon-cli = callPackage ../tools/networking/polygon-cli { }; + pricehist = python3Packages.callPackage ../tools/misc/pricehist { }; + proycon-wayout = callPackage ../tools/wayland/proycon-wayout { }; q = callPackage ../tools/networking/q { }; @@ -2622,8 +2628,6 @@ with pkgs; flix = callPackage ../development/compilers/flix { }; - fleng = callPackage ../development/compilers/fleng { }; - fsrx = callPackage ../tools/misc/fsrx { }; fsuae = callPackage ../applications/emulators/fs-uae { }; @@ -2778,8 +2782,6 @@ with pkgs; uae = callPackage ../applications/emulators/uae { }; - uxn = callPackage ../applications/emulators/uxn { }; - vbam = callPackage ../applications/emulators/vbam { }; vice = callPackage ../applications/emulators/vice { }; @@ -3002,7 +3004,7 @@ with pkgs; kermit-terminal = callPackage ../applications/terminal-emulators/kermit-terminal { }; kitty = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/kitty { - go = go_1_20; + go = go_1_21; harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; inherit (darwin.apple_sdk_11_0) Libsystem; inherit (darwin.apple_sdk_11_0.frameworks) @@ -3329,6 +3331,8 @@ with pkgs; aliyun-cli = callPackage ../tools/admin/aliyun-cli { }; + aws-encryption-sdk-cli = callPackage ../tools/admin/aws-encryption-sdk-cli { }; + aws-iam-authenticator = callPackage ../tools/security/aws-iam-authenticator { }; awscli = callPackage ../tools/admin/awscli { }; @@ -3751,8 +3755,6 @@ with pkgs; sedutil = callPackage ../tools/security/sedutil { }; - elvish = callPackage ../shells/elvish { }; - emplace = callPackage ../tools/package-management/emplace { }; enchive = callPackage ../tools/security/enchive { }; @@ -3833,8 +3835,6 @@ with pkgs; gistyc = with python3Packages; toPythonApplication gistyc; - gitter = callPackage ../applications/networking/instant-messengers/gitter { }; - gjs = callPackage ../development/libraries/gjs { }; gjo = callPackage ../tools/text/gjo { }; @@ -4014,10 +4014,6 @@ with pkgs; pbpctrl = callPackage ../applications/audio/pbpctrl { }; - pdepend = callPackage ../development/php-packages/pdepend { }; - - platformsh = callPackage ../misc/platformsh { }; - inherd-quake = callPackage ../applications/misc/inherd-quake { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; @@ -4412,8 +4408,6 @@ with pkgs; bmon = callPackage ../tools/misc/bmon { }; - bmake = callPackage ../development/tools/build-managers/bmake { }; - boca = callPackage ../development/libraries/boca { }; bubblewrap = callPackage ../tools/admin/bubblewrap { }; @@ -4507,7 +4501,7 @@ with pkgs; bsh = fetchurl { url = "http://www.beanshell.org/bsh-2.0b5.jar"; - sha256 = "0p2sxrpzd0vsk11zf3kb5h12yl1nq4yypb5mpjrm8ww0cfaijck2"; + hash = "sha256-YjIZlWOAc1SzvLWs6z3BNlAvAixrDvdDmHqD9m/uWlw="; }; btfs = callPackage ../os-specific/linux/btfs { }; @@ -5507,8 +5501,6 @@ with pkgs; go-neb = callPackage ../applications/networking/instant-messengers/go-neb { }; - go-thumbnailer = callPackage ../applications/misc/go-thumbnailer { }; - google-cursor = callPackage ../data/icons/google-cursor { }; geckodriver = callPackage ../development/tools/geckodriver { @@ -6101,6 +6093,8 @@ with pkgs; nltk-data = callPackage ../tools/text/nltk_data { }; + seaborn-data = callPackage ../tools/misc/seaborn-data { }; + nodepy-runtime = with python3.pkgs; toPythonApplication nodepy-runtime; nixpkgs-pytools = with python3.pkgs; toPythonApplication nixpkgs-pytools; @@ -6184,6 +6178,8 @@ with pkgs; ondir = callPackage ../tools/misc/ondir { }; + opam-publish = callPackage ../development/tools/ocaml/opam-publish { }; + opencomposite = callPackage ../development/libraries/opencomposite { }; opencomposite-helper = callPackage ../development/libraries/opencomposite/helper.nix { }; @@ -7358,8 +7354,6 @@ with pkgs; dcfldd = callPackage ../tools/system/dcfldd { }; - debianutils = callPackage ../tools/misc/debianutils { }; - debian-devscripts = callPackage ../tools/misc/debian-devscripts { }; debian-goodies = callPackage ../applications/misc/debian-goodies { }; @@ -7407,6 +7401,8 @@ with pkgs; deluge-2_x = deluge; + der-ascii = callPackage ../tools/security/der-ascii { }; + desktop-file-utils = callPackage ../tools/misc/desktop-file-utils { }; dfc = callPackage ../tools/system/dfc { }; @@ -7643,8 +7639,6 @@ with pkgs; a4term = callPackage ../tools/misc/a4term { }; - ecmtools = callPackage ../tools/cd-dvd/ecm-tools { }; - erofs-utils = callPackage ../tools/filesystems/erofs-utils { }; e2tools = callPackage ../tools/filesystems/e2tools { }; @@ -8940,7 +8934,9 @@ with pkgs; gssdp-tools = callPackage ../development/libraries/gssdp/tools.nix { }; - grype = callPackage ../tools/security/grype { }; + grype = callPackage ../tools/security/grype { + buildGoModule = buildGo121Module; + }; gt5 = callPackage ../tools/system/gt5 { }; @@ -9423,8 +9419,6 @@ with pkgs; ior = callPackage ../tools/system/ior { }; - iouyap = callPackage ../tools/networking/iouyap { }; - ioztat = callPackage ../tools/filesystems/ioztat { }; ip2location = callPackage ../tools/networking/ip2location { }; @@ -9716,8 +9710,6 @@ with pkgs; katana = callPackage ../tools/security/katana { }; - katriawm = callPackage ../applications/window-managers/katriawm { }; - kbdd = callPackage ../applications/window-managers/kbdd { }; kbs2 = callPackage ../tools/security/kbs2 { @@ -9885,8 +9877,6 @@ with pkgs; leocad = libsForQt5.callPackage ../applications/graphics/leocad { }; - less = callPackage ../tools/misc/less { }; - lha = callPackage ../tools/archivers/lha { }; lhasa = callPackage ../tools/compression/lhasa { }; @@ -10248,31 +10238,30 @@ with pkgs; nodenv = callPackage ../development/tools/nodenv { }; nodejs = hiPrio nodejs_18; - nodejs-slim = nodejs-slim_18; + corepack = hiPrio corepack_18; - nodejs_14 = callPackage ../development/web/nodejs/v14.nix { - openssl = openssl_1_1; - }; + nodejs_14 = callPackage ../development/web/nodejs/v14.nix { openssl = openssl_1_1; }; nodejs-slim_14 = callPackage ../development/web/nodejs/v14.nix { openssl = openssl_1_1; enableNpm = false; }; + nodejs_16 = callPackage ../development/web/nodejs/v16.nix { }; - nodejs-slim_16 = callPackage ../development/web/nodejs/v16.nix { - enableNpm = false; - }; + nodejs-slim_16 = callPackage ../development/web/nodejs/v16.nix { enableNpm = false; }; + nodejs_18 = callPackage ../development/web/nodejs/v18.nix { }; - nodejs-slim_18 = callPackage ../development/web/nodejs/v18.nix { - enableNpm = false; - }; + nodejs-slim_18 = callPackage ../development/web/nodejs/v18.nix { enableNpm = false; }; + corepack_18 = hiPrio (callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_18; }); + nodejs_20 = callPackage ../development/web/nodejs/v20.nix { }; - nodejs-slim_20 = callPackage ../development/web/nodejs/v20.nix { - enableNpm = false; - }; + nodejs-slim_20 = callPackage ../development/web/nodejs/v20.nix { enableNpm = false; }; + corepack_20 = hiPrio (callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_20; }); + # Update this when adding the newest nodejs major version! nodejs_latest = nodejs_20; nodejs-slim_latest = nodejs-slim_20; + corepack_latest = hiPrio corepack_20; buildNpmPackage = callPackage ../build-support/node/build-npm-package { }; @@ -10806,8 +10795,6 @@ with pkgs; mfoc = callPackage ../tools/security/mfoc { }; - mfoc-hardnested = callPackage ../tools/security/mfoc-hardnested { }; - microbin = callPackage ../servers/microbin { }; microdnf = callPackage ../tools/package-management/microdnf { }; @@ -10918,9 +10905,7 @@ with pkgs; electron = electron_22; }; - mosh = callPackage ../tools/networking/mosh { - protobuf = protobuf3_21; - }; + mosh = callPackage ../tools/networking/mosh { }; motrix = callPackage ../tools/networking/motrix { }; @@ -11028,8 +11013,6 @@ with pkgs; navilu-font = callPackage ../data/fonts/navilu { stdenv = stdenvNoCC; }; - nawk = callPackage ../tools/text/nawk { }; - nbd = callPackage ../tools/networking/nbd { }; xnbd = callPackage ../tools/networking/xnbd { }; @@ -11697,9 +11680,7 @@ with pkgs; optifine = optifinePackages.optifine-latest; - optipng = callPackage ../tools/graphics/optipng { - libpng = libpng12; - }; + optipng = callPackage ../tools/graphics/optipng { }; olsrd = callPackage ../tools/networking/olsrd { }; @@ -11796,6 +11777,8 @@ with pkgs; PageEdit = libsForQt5.callPackage ../applications/office/PageEdit { }; + pagefind = libsForQt5.callPackage ../applications/misc/pagefind { }; + paging-calculator = callPackage ../development/tools/paging-calculator { }; pagmo2 = callPackage ../development/libraries/pagmo2 { }; @@ -12573,8 +12556,6 @@ with pkgs; ratt = callPackage ../applications/misc/ratt { }; - rc = callPackage ../shells/rc { }; - rc-9front = callPackage ../shells/rc-9front { }; rcon = callPackage ../tools/networking/rcon { }; @@ -12676,7 +12657,7 @@ with pkgs; recoll = libsForQt5.callPackage ../applications/search/recoll { }; - redoc-cli = nodePackages.redoc-cli; + redoc-cli = callPackage ../development/tools/redoc-cli { }; reflex = callPackage ../development/tools/reflex { }; @@ -13430,8 +13411,6 @@ with pkgs; sunwait = callPackage ../applications/misc/sunwait { }; - sunpaper = callPackage ../tools/X11/sunpaper { }; - surface-control = callPackage ../applications/misc/surface-control { }; syntex = callPackage ../tools/graphics/syntex { }; @@ -14308,6 +14287,8 @@ with pkgs; urdfdom-headers = callPackage ../development/libraries/urdfdom-headers { }; + urlencode = callPackage ../tools/misc/urlencode {}; + uriparser = callPackage ../development/libraries/uriparser { }; urlscan = callPackage ../applications/misc/urlscan { }; @@ -14922,7 +14903,7 @@ with pkgs; src = fetchgit { url = "https://git.savannah.gnu.org/r/gnulib.git"; rev = "0b38e1d69f03d3977d7ae7926c1efeb461a8a971"; - sha256 = "06bj9y8wcfh35h653yk8j044k7h5g82d2j3z3ib69rg0gy1xagzp"; + hash = "sha256-9z/Vg3/g5WRWHH9I0QR6BZ5JCJBo+lEMLAM6xpFPchk="; }; }; }; @@ -15066,8 +15047,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - xorriso = callPackage ../tools/cd-dvd/xorriso { }; - xprite-editor = callPackage ../tools/misc/xprite-editor { inherit (darwin.apple_sdk.frameworks) AppKit; }; @@ -15412,8 +15391,6 @@ with pkgs; liquidprompt = callPackage ../shells/liquidprompt { }; - mksh = callPackage ../shells/mksh { }; - murex = callPackage ../shells/murex { }; oh = callPackage ../shells/oh { }; @@ -15424,8 +15401,6 @@ with pkgs; loksh = callPackage ../shells/loksh { }; - pash = callPackage ../shells/pash { }; - scponly = callPackage ../shells/scponly { }; rush = callPackage ../shells/rush { }; @@ -15518,8 +15493,6 @@ with pkgs; alarm-clock-applet = callPackage ../tools/misc/alarm-clock-applet { }; - algol68g = callPackage ../development/compilers/algol68g { }; - ante = callPackage ../development/compilers/ante { }; armips = callPackage ../development/compilers/armips { @@ -15724,7 +15697,7 @@ with pkgs; comby = callPackage ../development/tools/comby { }; - inherit (coqPackages) compcert; + inherit (coqPackages_8_17) compcert; computecpp-unwrapped = callPackage ../development/compilers/computecpp { }; computecpp = wrapCCWith rec { @@ -17185,6 +17158,22 @@ with pkgs; inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform; + # https://github.com/NixOS/nixpkgs/issues/89426 + rustc-wasm32 = (rustc.override { + stdenv = stdenv.override { + targetPlatform = stdenv.targetPlatform // { + parsed = { + cpu.name = "wasm32"; + vendor.name = "unknown"; + kernel.name = "unknown"; + abi.name = "unknown"; + }; + }; + }; + }).overrideAttrs (old: { + configureFlags = old.configureFlags ++ ["--set=build.docs=false"]; + }); + makeRustPlatform = callPackage ../development/compilers/rust/make-rust-platform.nix { }; buildRustCrate = callPackage ../build-support/rust/build-rust-crate { }; @@ -17996,14 +17985,10 @@ with pkgs; obb = callPackage ../development/interpreters/clojure/obb.nix { }; - octave = callPackage ../development/interpreters/octave { - python = python3; - mkDerivation = stdenv.mkDerivation; - }; - octaveFull = libsForQt5.callPackage ../development/interpreters/octave { - python = python3; + octave = callPackage ../development/interpreters/octave { }; + + octaveFull = octave.override { enableQt = true; - overridePlatforms = ["x86_64-linux" "x86_64-darwin"]; }; octave-kernel = callPackage ../applications/editors/jupyter-kernels/octave { }; @@ -21712,7 +21697,7 @@ with pkgs; owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "sha256-7atNkOBzX+nU1gtFQEaE+EF1L+eex+Ajhq2ocoJY920="; + hash = "sha256-7atNkOBzX+nU1gtFQEaE+EF1L+eex+Ajhq2ocoJY920="; }; patches = []; }; @@ -22676,8 +22661,6 @@ with pkgs; libbson = callPackage ../development/libraries/libbson { }; - libburn = callPackage ../development/libraries/libburn { }; - libbytesize = callPackage ../development/libraries/libbytesize { }; libcaca = callPackage ../development/libraries/libcaca { }; @@ -23369,10 +23352,6 @@ with pkgs; libinstpatch = callPackage ../development/libraries/audio/libinstpatch { }; - libisofs = callPackage ../development/libraries/libisofs { }; - - libisoburn = callPackage ../development/libraries/libisoburn { }; - libipt = callPackage ../development/libraries/libipt { }; libiptcdata = callPackage ../development/libraries/libiptcdata { }; @@ -24998,7 +24977,7 @@ with pkgs; owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "sha256-U2ReSrJwjAXUdRmwixC0DQXht/h/6rV8SOf5e2NozIs="; + hash = "sha256-U2ReSrJwjAXUdRmwixC0DQXht/h/6rV8SOf5e2NozIs="; }; }; @@ -25009,7 +24988,7 @@ with pkgs; owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SsDqhjdCdtIGNlsMj5kfiuS3zSGwcxi4KV71d95h7yk="; + hash = "sha256-SsDqhjdCdtIGNlsMj5kfiuS3zSGwcxi4KV71d95h7yk="; }; }; @@ -25720,6 +25699,8 @@ with pkgs; vulkan-cts = callPackage ../tools/graphics/vulkan-cts { }; + vulkan-helper = callPackage ../tools/graphics/vulkan-helper { }; + vulkan-extension-layer = callPackage ../tools/graphics/vulkan-extension-layer { }; vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; vulkan-loader = callPackage ../development/libraries/vulkan-loader { inherit (darwin) moltenvk; }; @@ -25776,12 +25757,7 @@ with pkgs; wfa2-lib = callPackage ../development/libraries/wfa2-lib { }; - webrtc-audio-processing_1 = callPackage ../development/libraries/webrtc-audio-processing { - stdenv = gcc10StdenvCompat; - abseil-cpp = abseil-cpp.override { - cxxStandard = "14"; - }; - }; + webrtc-audio-processing_1 = callPackage ../development/libraries/webrtc-audio-processing { }; webrtc-audio-processing_0_3 = callPackage ../development/libraries/webrtc-audio-processing/0.3.nix { }; # bump when majoring of packages have updated webrtc-audio-processing = webrtc-audio-processing_0_3; @@ -27306,12 +27282,14 @@ with pkgs; postgresql_13 postgresql_14 postgresql_15 + postgresql_16 postgresql_11_jit postgresql_12_jit postgresql_13_jit postgresql_14_jit postgresql_15_jit + postgresql_16_jit ; postgresql = postgresql_14.override { this = postgresql; }; postgresql_jit = postgresql_14_jit.override { this = postgresql_jit; }; @@ -27321,11 +27299,13 @@ with pkgs; postgresql12Packages = recurseIntoAttrs postgresql_12.pkgs; postgresql13Packages = recurseIntoAttrs postgresql_13.pkgs; postgresql15Packages = recurseIntoAttrs postgresql_15.pkgs; + postgresql16Packages = recurseIntoAttrs postgresql_16.pkgs; postgresql11JitPackages = recurseIntoAttrs postgresql_11_jit.pkgs; postgresql12JitPackages = recurseIntoAttrs postgresql_12_jit.pkgs; postgresql13JitPackages = recurseIntoAttrs postgresql_13_jit.pkgs; postgresql14JitPackages = recurseIntoAttrs postgresql_14_jit.pkgs; postgresql15JitPackages = recurseIntoAttrs postgresql_15_jit.pkgs; + postgresql16JitPackages = recurseIntoAttrs postgresql_16_jit.pkgs; postgresql14Packages = postgresqlPackages; postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; @@ -28312,7 +28292,7 @@ with pkgs; version = "5.19.16"; src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "13g0c6ljxk3sd0ja39ndih5vrzp2ssj78qxaf8nswn8hgrkazsx1"; + hash = "sha256-oeuvZn4QWa4tcqpjdKTW4v68C4zNpqEkaHrMLqlh4I0="; }; }; @@ -28382,6 +28362,8 @@ with pkgs; linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened; linuxPackages_6_4_hardened = linuxKernel.packages.linux_6_4_hardened; linux_6_4_hardened = linuxKernel.kernels.linux_6_4_hardened; + linuxPackages_6_5_hardened = linuxKernel.packages.linux_6_5_hardened; + linux_6_5_hardened = linuxKernel.kernels.linux_6_5_hardened; # Hardkernel (Odroid) kernels. linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest; @@ -28990,6 +28972,7 @@ with pkgs; withCompression = false; withCoredump = false; withCryptsetup = false; + withRepart = false; withDocumentation = false; withEfi = false; withFido2 = false; @@ -29012,11 +28995,13 @@ with pkgs; withRemote = false; withResolved = false; withShellCompletions = false; + withSysupdate = false; withTimedated = false; withTimesyncd = false; withTpm2Tss = false; withUserDb = false; withUkify = false; + withBootloader = false; }; systemdStage1 = systemdMinimal.override { pname = "systemd-stage-1"; @@ -29025,6 +29010,7 @@ with pkgs; withFido2 = true; withKmod = true; withTpm2Tss = true; + withRepart = true; }; systemdStage1Network = systemdStage1.override { pname = "systemd-stage-1-network"; @@ -30223,6 +30209,7 @@ with pkgs; inherit (callPackages ../data/fonts/pretendard { }) pretendard + pretendard-gov pretendard-jp pretendard-std; @@ -31678,7 +31665,10 @@ with pkgs; gpg-mdp = callPackage ../applications/misc/gpg-mdp { }; greenfoot = callPackage ../applications/editors/greenfoot { - jdk = jetbrains.jdk; + openjdk = openjdk17.override { + enableJavaFX = true; + openjfx = openjfx17.override { withWebKit = true; }; + }; }; gspeech = callPackage ../applications/audio/gspeech { }; @@ -32497,8 +32487,6 @@ with pkgs; gnomecast = callPackage ../applications/video/gnomecast { }; - celluloid = callPackage ../applications/video/celluloid { }; - gnome-recipes = callPackage ../applications/misc/gnome-recipes { inherit (gnome) gnome-autoar; }; @@ -33875,6 +33863,8 @@ with pkgs; meld = callPackage ../applications/version-management/meld { }; + meli = callPackage ../applications/networking/mailreaders/meli { }; + melmatcheq.lv2 = callPackage ../applications/audio/melmatcheq.lv2 { }; melody = callPackage ../tools/misc/melody { }; @@ -34636,6 +34626,8 @@ with pkgs; nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { }; + normcap = callPackage ../applications/graphics/normcap { }; + notepad-next = libsForQt5.callPackage ../applications/editors/notepad-next { }; notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { }; @@ -36601,7 +36593,9 @@ with pkgs; waon = callPackage ../applications/audio/waon { }; - warp = callPackage ../applications/networking/warp { }; + warp = callPackage ../applications/networking/warp { + inherit (darwin.apple_sdk.frameworks) Security Foundation; + }; warpd = callPackage ../applications/misc/warpd { }; @@ -37322,7 +37316,7 @@ with pkgs; owner = "ElementsProject"; repo = "elements"; rev = "ea318a45094ab3d31dd017d7781a6f28f1ffaa33"; # simplicity branch latest - sha256 = "ooe+If3HWaJWpr2ux7DpiCTqB9Hv+aXjquEjplDjvhM="; + hash = "sha256-ooe+If3HWaJWpr2ux7DpiCTqB9Hv+aXjquEjplDjvhM="; }; }; @@ -39349,6 +39343,14 @@ with pkgs; trimal = callPackage ../applications/science/biology/trimal { }; + trimmomatic = callPackage ../applications/science/biology/trimmomatic { + # Reduce closure size + jre = pkgs.jre_minimal.override { + modules = [ "java.base" "java.logging" ]; + jdk = pkgs.jdk11_headless; + }; + }; + truvari = callPackage ../applications/science/biology/truvari { }; varscan = callPackage ../applications/science/biology/varscan { }; @@ -39699,8 +39701,6 @@ with pkgs; beluga = callPackage ../applications/science/logic/beluga { }; - boogie = dotnetPackages.Boogie; - cbmc = callPackage ../applications/science/logic/cbmc { }; cadical = callPackage ../applications/science/logic/cadical { }; @@ -39801,7 +39801,7 @@ with pkgs; owner = "polyml"; repo = "polyml"; rev = "bafe319bc3a65bf63bd98a4721a6f4dd9e0eabd6"; - sha256 = "1ygs09zzq8icq1gc8qf4sb24lxx7sbcyd5hw3vw67a3ryaki0qw2"; + hash = "sha256-gmMQp/J5qGP4HhyW5tnSp3dKxNLEYcRewCwi/H8C+vk="; }; }; @@ -40539,6 +40539,8 @@ with pkgs; faustPhysicalModeling = callPackage ../applications/audio/faustPhysicalModeling { }; + flashprint = libsForQt5.callPackage ../applications/misc/flashprint { }; + flockit = callPackage ../tools/backup/flockit { }; fahclient = callPackage ../applications/science/misc/foldingathome/client.nix { }; @@ -40671,6 +40673,8 @@ with pkgs; infnoise = callPackage ../misc/drivers/infnoise { }; + itamae = callPackage ../tools/admin/itamae { }; + # using the new configuration style proposal which is unstable jack1 = callPackage ../misc/jackaudio/jack1.nix { }; @@ -41673,7 +41677,7 @@ with pkgs; wmutils-opt = callPackage ../tools/X11/wmutils-opt { }; inherit (callPackage ../servers/web-apps/wordpress {}) - wordpress wordpress6_1 wordpress6_2; + wordpress wordpress6_1 wordpress6_2 wordpress6_3; wordpressPackages = ( callPackage ../servers/web-apps/wordpress/packages { plugins = lib.importJSON ../servers/web-apps/wordpress/packages/plugins.json; @@ -41979,7 +41983,7 @@ with pkgs; version = "1.7.9"; src = fetchurl { url = "http://www.openfst.org/twiki/pub/FST/FstDownload/openfst-${version}.tar.gz"; - sha256 = "1pmx1yhn2gknj0an0zwqmzgwjaycapi896244np50a8y3nrsw6ck"; + hash = "sha256-kxmusx0eKVCuJUSYhOJVzCvJ36+Yf2AVkHY+YaEPvd4="; }; }; }; diff --git a/nixpkgs/pkgs/top-level/coq-packages.nix b/nixpkgs/pkgs/top-level/coq-packages.nix index 8280942d8b78..fe3eb9ebe85d 100644 --- a/nixpkgs/pkgs/top-level/coq-packages.nix +++ b/nixpkgs/pkgs/top-level/coq-packages.nix @@ -197,7 +197,7 @@ in rec { coqPackages_8_16 = mkCoqPackages coq_8_16; coqPackages_8_17 = mkCoqPackages coq_8_17; coqPackages_8_18 = mkCoqPackages coq_8_18; - coqPackages = recurseIntoAttrs coqPackages_8_17; + coqPackages = recurseIntoAttrs coqPackages_8_18; coq = coqPackages.coq; } diff --git a/nixpkgs/pkgs/top-level/dotnet-packages.nix b/nixpkgs/pkgs/top-level/dotnet-packages.nix index 5445b9cbcb49..661603b2ba1f 100644 --- a/nixpkgs/pkgs/top-level/dotnet-packages.nix +++ b/nixpkgs/pkgs/top-level/dotnet-packages.nix @@ -9,9 +9,13 @@ , glib , mono , overrides ? {} +, boogie }: let self = dotnetPackages // overrides; dotnetPackages = with self; { + # ALIASES FOR MOVED PACKAGES + + Boogie = boogie; # BINARY PACKAGES @@ -125,53 +129,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { # SOURCE PACKAGES - Boogie = buildDotnetModule rec { - pname = "Boogie"; - version = "2.15.7"; - - src = fetchFromGitHub { - owner = "boogie-org"; - repo = "boogie"; - rev = "v${version}"; - sha256 = "16kdvkbx2zwj7m43cra12vhczbpj23wyrdnj0ygxf7np7c2aassp"; - }; - - projectFile = [ "Source/Boogie.sln" ]; - nugetDeps = ../development/dotnet-modules/boogie-deps.nix; - - postInstall = '' - mkdir -pv "$out/lib/dotnet/${pname}" - ln -sv "${pkgs.z3}/bin/z3" "$out/lib/dotnet/${pname}/z3.exe" - - # so that this derivation can be used as a vim plugin to install syntax highlighting - vimdir=$out/share/vim-plugins/boogie - install -Dt $vimdir/syntax/ Util/vim/syntax/boogie.vim - mkdir $vimdir/ftdetect - echo 'au BufRead,BufNewFile *.bpl set filetype=boogie' > $vimdir/ftdetect/bpl.vim - mkdir -p $out/share/nvim - ln -s $out/share/vim-plugins/boogie $out/share/nvim/site - ''; - - postFixup = '' - ln -s "$out/bin/BoogieDriver" "$out/bin/boogie" - rm -f $out/bin/{Microsoft,NUnit3,System}.* "$out/bin"/*Tests - ''; - - meta = with lib; { - description = "An intermediate verification language"; - homepage = "https://github.com/boogie-org/boogie"; - longDescription = '' - Boogie is an intermediate verification language (IVL), intended as a - layer on which to build program verifiers for other languages. - - This derivation may be used as a vim plugin to provide syntax highlighting. - ''; - license = licenses.mspl; - maintainers = [ maintainers.taktoa ]; - platforms = with platforms; (linux ++ darwin); - }; - }; - MonoAddins = buildDotnetPackage rec { pname = "Mono.Addins"; version = "1.2"; diff --git a/nixpkgs/pkgs/top-level/linux-kernels.nix b/nixpkgs/pkgs/top-level/linux-kernels.nix index 07429cee853a..7b746286f055 100644 --- a/nixpkgs/pkgs/top-level/linux-kernels.nix +++ b/nixpkgs/pkgs/top-level/linux-kernels.nix @@ -96,7 +96,8 @@ in { rpiVersion = 4; }; - linux_4_14 = callPackage ../os-specific/linux/kernel/linux-4.14.nix { + linux_4_14 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "4.14"; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper @@ -107,7 +108,8 @@ in { ]; }; - linux_4_19 = callPackage ../os-specific/linux/kernel/linux-4.19.nix { + linux_4_19 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "4.19"; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper @@ -115,7 +117,8 @@ in { ]; }; - linux_5_4 = callPackage ../os-specific/linux/kernel/linux-5.4.nix { + linux_5_4 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "5.4"; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper @@ -130,7 +133,8 @@ in { ]; }; - linux_5_10 = callPackage ../os-specific/linux/kernel/linux-5.10.nix { + linux_5_10 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "5.10"; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper @@ -145,7 +149,8 @@ in { ]; }; - linux_5_15 = callPackage ../os-specific/linux/kernel/linux-5.15.nix { + linux_5_15 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "5.15"; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper @@ -160,10 +165,12 @@ in { ]; }; - linux_6_1 = callPackage ../os-specific/linux/kernel/linux-6.1.nix { + linux_6_1 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "6.1"; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.dell_xps_regression ]; }; @@ -172,25 +179,33 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.export-rt-sched-migrate + kernelPatches.dell_xps_regression ]; }; - linux_6_4 = callPackage ../os-specific/linux/kernel/linux-6.4.nix { + linux_6_4 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "6.4"; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.dell_xps_regression ]; }; - linux_6_5 = callPackage ../os-specific/linux/kernel/linux-6.5.nix { + linux_6_5 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "6.5"; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.dell_xps_regression ]; }; linux_testing = let - testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { + testing = callPackage ../os-specific/linux/kernel/mainline.nix { + # A special branch that tracks the kernel under the release process + # i.e. which has at least a public rc1 and is not released yet. + branch = "testing"; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper @@ -267,6 +282,7 @@ in { linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { }; linux_6_4_hardened = hardenedKernelFor kernels.linux_6_4 { }; + linux_6_5_hardened = hardenedKernelFor kernels.linux_6_5 { }; } // lib.optionalAttrs config.allowAliases { linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; @@ -626,6 +642,7 @@ in { linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened); linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened); linux_6_4_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_4_hardened); + linux_6_5_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_5_hardened); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); diff --git a/nixpkgs/pkgs/top-level/ocaml-packages.nix b/nixpkgs/pkgs/top-level/ocaml-packages.nix index 4bd589ec7826..cffb020d4684 100644 --- a/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -337,6 +337,10 @@ let dolmen = callPackage ../development/ocaml-modules/dolmen { }; + dolmen_loop = callPackage ../development/ocaml-modules/dolmen/loop.nix { }; + + dolmen_type = callPackage ../development/ocaml-modules/dolmen/type.nix { }; + dolog = callPackage ../development/ocaml-modules/dolog { }; domain-local-await = callPackage ../development/ocaml-modules/domain-local-await { }; @@ -1935,7 +1939,7 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_5_1 = mkOcamlPackages (callPackage ../development/compilers/ocaml/5.1.nix { }); - ocamlPackages_latest = ocamlPackages_5_0; + ocamlPackages_latest = ocamlPackages_5_1; ocamlPackages = ocamlPackages_4_14; diff --git a/nixpkgs/pkgs/top-level/perl-packages.nix b/nixpkgs/pkgs/top-level/perl-packages.nix index 6d5fe5d35465..6c904a122339 100644 --- a/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/nixpkgs/pkgs/top-level/perl-packages.nix @@ -9189,19 +9189,15 @@ with self; { }; }; - FileBaseDir = buildPerlModule { - version = "0.08"; + FileBaseDir = buildPerlPackage { + version = "0.09"; pname = "File-BaseDir"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KI/KIMRYAN/File-BaseDir-0.08.tar.gz"; - hash = "sha256-wGX80+LyKudpk3vMlxuR+AKU1QCfrBQL+6g799NTBeM="; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/File-BaseDir-0.09.tar.gz"; + hash = "sha256-bab3KBVirI8R7xo69q7bUcQRgrYPHxIs7QB579kpZ9k="; }; - configurePhase = '' - runHook preConfigure - perl Build.PL PREFIX="$out" prefix="$out" - ''; propagatedBuildInputs = [ IPCSystemSimple ]; - buildInputs = [ FileWhich ]; + nativeCheckInputs = [ FileWhich ]; meta = { description = "Use the Freedesktop.org base directory specification"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -14674,6 +14670,7 @@ with self; { meta = { description = "Parse and evaluate mathematical expressions"; homepage = "https://github.com/Grinnz/Math-Calc-Parser"; + broken = true; license = with lib.licenses; [ artistic2 ]; maintainers = with maintainers; [ sgo ]; }; @@ -16063,10 +16060,10 @@ with self; { Mojolicious = buildPerlPackage { pname = "Mojolicious"; - version = "9.26"; + version = "9.34"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-9.26.tar.gz"; - hash = "sha256-nkKMVRJpjwXhUTONj6Eq7eKHqzpeQp7D04yApKgsjYg="; + url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-9.34.tar.gz"; + hash = "sha256-UGnWjk4titZj21iFm0/sDOeasTTZ5YBVqq8/DzpzosY="; }; meta = { description = "Real-time web framework"; @@ -21501,6 +21498,10 @@ with self; { url = "mirror://cpan/authors/id/F/FR/FROGGS/SDL-2.548.tar.gz"; hash = "sha256-JSoZK/qcIHCkiDcH0TnDpF2cRRjM1moeaZtbeVm9T7U="; }; + patches = [ + # https://github.com/PerlGameDev/SDL/pull/304 + ../development/perl-modules/sdl-modern-perl.patch + ]; perlPreHook = "export LD=$CC"; preCheck = "rm t/core_audiospec.t"; buildInputs = [ pkgs.SDL pkgs.SDL_gfx pkgs.SDL_mixer pkgs.SDL_image pkgs.SDL_ttf pkgs.SDL_Pango pkgs.SDL_net AlienSDL CaptureTiny TestDeep TestDifferences TestException TestMost TestWarn ]; @@ -24142,12 +24143,11 @@ with self; { TestFile = buildPerlPackage { pname = "Test-File"; - version = "1.443"; + version = "1.993"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/Test-File-1.443.tar.gz"; - hash = "sha256-YbSmq49hfIx7WXUWTPYZRo3DBLa6quo1J4KShvpYvNU="; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Test-File-1.993.tar.gz"; + hash = "sha256-7y/+Gq7HtC2HStQR7GR1R7m5vC9fuT5J4zmUiEVq/Ho="; }; - buildInputs = [ Testutf8 ]; meta = { description = "Test file attributes"; homepage = "https://github.com/briandfoy/test-file"; diff --git a/nixpkgs/pkgs/top-level/pkg-config/pkg-config-data.json b/nixpkgs/pkgs/top-level/pkg-config/pkg-config-data.json index 758986390b22..4578b0f92b25 100644 --- a/nixpkgs/pkgs/top-level/pkg-config/pkg-config-data.json +++ b/nixpkgs/pkgs/top-level/pkg-config/pkg-config-data.json @@ -670,7 +670,7 @@ }, "netsnmp": { "attrPath": [ - "net_snmp" + "net-snmp" ] }, "nix-cmd": { diff --git a/nixpkgs/pkgs/top-level/python-packages.nix b/nixpkgs/pkgs/top-level/python-packages.nix index 01cf514cba7c..f89cd0192fbd 100644 --- a/nixpkgs/pkgs/top-level/python-packages.nix +++ b/nixpkgs/pkgs/top-level/python-packages.nix @@ -312,6 +312,8 @@ self: super: with self; { aiooss2 = callPackage ../development/python-modules/aiooss2 { }; + aiopegelonline = callPackage ../development/python-modules/aiopegelonline { }; + aiopg = callPackage ../development/python-modules/aiopg { }; aioprocessing = callPackage ../development/python-modules/aioprocessing { }; @@ -949,6 +951,8 @@ self: super: with self; { aws-adfs = callPackage ../development/python-modules/aws-adfs { }; + aws-encryption-sdk = callPackage ../development/python-modules/aws-encryption-sdk { }; + aws-lambda-builders = callPackage ../development/python-modules/aws-lambda-builders { }; aws-sam-translator = callPackage ../development/python-modules/aws-sam-translator { }; @@ -1289,6 +1293,8 @@ self: super: with self; { base58check = callPackage ../development/python-modules/base58check { }; + base64io = callPackage ../development/python-modules/base64io { }; + baseline = callPackage ../development/python-modules/baseline { }; baselines = callPackage ../development/python-modules/baselines { }; @@ -2390,6 +2396,8 @@ self: super: with self; { curio = callPackage ../development/python-modules/curio { }; + curlify = callPackage ../development/python-modules/curlify { }; + curtsies = callPackage ../development/python-modules/curtsies { }; curve25519-donna = callPackage ../development/python-modules/curve25519-donna { }; @@ -2964,6 +2972,8 @@ self: super: with self; { django-mysql = callPackage ../development/python-modules/django-mysql { }; + django-ninja = callPackage ../development/python-modules/django-ninja { }; + django-nose = callPackage ../development/python-modules/django-nose { }; django-oauth-toolkit = callPackage ../development/python-modules/django-oauth-toolkit { }; @@ -3070,6 +3080,8 @@ self: super: with self; { django-two-factor-auth = callPackage ../development/python-modules/django-two-factor-auth { }; + django-types = callPackage ../development/python-modules/django-types { }; + django-versatileimagefield = callPackage ../development/python-modules/django-versatileimagefield { }; django-vite = callPackage ../development/python-modules/django-vite { }; @@ -4120,6 +4132,8 @@ self: super: with self; { fs-s3fs = callPackage ../development/python-modules/fs-s3fs { }; + fschat = callPackage ../development/python-modules/fschat { }; + fsspec = callPackage ../development/python-modules/fsspec { }; fst-pso = callPackage ../development/python-modules/fst-pso { }; @@ -4189,6 +4203,8 @@ self: super: with self; { garminconnect = callPackage ../development/python-modules/garminconnect { }; + garth = callPackage ../development/python-modules/garth { }; + gassist-text = callPackage ../development/python-modules/gassist-text { }; gast = callPackage ../development/python-modules/gast { }; @@ -5850,6 +5866,8 @@ self: super: with self; { konnected = callPackage ../development/python-modules/konnected { }; + kotsu = callPackage ../development/python-modules/kotsu { }; + korean-lunar-calendar = callPackage ../development/python-modules/korean-lunar-calendar { }; kornia = callPackage ../development/python-modules/kornia { }; @@ -5876,6 +5894,8 @@ self: super: with self; { langdetect = callPackage ../development/python-modules/langdetect { }; + langid = callPackage ../development/python-modules/langid { }; + langsmith = callPackage ../development/python-modules/langsmith { }; language-data = callPackage ../development/python-modules/language-data { }; @@ -6045,6 +6065,10 @@ self: super: with self; { inherit (pkgs) libsodium; }; + libpcap = callPackage ../development/python-modules/libpcap { + pkgsLibpcap = pkgs.libpcap; # Needs the C library + }; + libpurecool = callPackage ../development/python-modules/libpurecool { }; libpyfoscam = callPackage ../development/python-modules/libpyfoscam { }; @@ -6411,6 +6435,8 @@ self: super: with self; { manuel = callPackage ../development/python-modules/manuel { }; + manuf = callPackage ../development/python-modules/manuf { }; + mapbox = callPackage ../development/python-modules/mapbox { }; mapbox-earcut = callPackage ../development/python-modules/mapbox-earcut { }; @@ -6891,6 +6917,8 @@ self: super: with self; { mrjob = callPackage ../development/python-modules/mrjob { }; + mrsqm = callPackage ../development/python-modules/mrsqm { }; + ms-active-directory = callPackage ../development/python-modules/ms-active-directory { }; ms-cv = callPackage ../development/python-modules/ms-cv { }; @@ -7510,7 +7538,12 @@ self: super: with self; { onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { }; onnx = callPackage ../development/python-modules/onnx { - protobuf = protobuf3; + # in linux c++ defaults to 17 + # on darwin clang is on an old version so c++ defaults to 11 + abseil-cpp = if stdenv.isLinux then + pkgs.abseil-cpp_202301 + else + pkgs.abseil-cpp_202301.override { cxxStandard = "14"; }; }; onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common { @@ -7930,7 +7963,9 @@ self: super: with self; { pc-ble-driver-py = toPythonModule (callPackage ../development/python-modules/pc-ble-driver-py { }); - pcapy-ng = callPackage ../development/python-modules/pcapy-ng { }; + pcapy-ng = callPackage ../development/python-modules/pcapy-ng { + inherit (pkgs) libpcap; # Avoid confusion with python package of the same name + }; pcodedmp = callPackage ../development/python-modules/pcodedmp { }; @@ -8310,6 +8345,8 @@ self: super: with self; { pyre-extensions = callPackage ../development/python-modules/pyre-extensions { }; + pyrender = callPackage ../development/python-modules/pyrender { }; + pyrevolve = callPackage ../development/python-modules/pyrevolve { }; pyrfxtrx = callPackage ../development/python-modules/pyrfxtrx { }; @@ -8490,6 +8527,8 @@ self: super: with self; { pmw = callPackage ../development/python-modules/pmw { }; + pmdarima = callPackage ../development/python-modules/pmdarima { }; + pmdsky-debug-py = callPackage ../development/python-modules/pmdsky-debug-py { }; pnglatex = callPackage ../development/python-modules/pnglatex { }; @@ -9022,6 +9061,8 @@ self: super: with self; { pydata-sphinx-theme = callPackage ../development/python-modules/pydata-sphinx-theme { }; + pydateinfer = callPackage ../development/python-modules/pydateinfer { }; + pydbus = callPackage ../development/python-modules/pydbus { }; pydeck = callPackage ../development/python-modules/pydeck { }; @@ -9038,7 +9079,9 @@ self: super: with self; { pydes = callPackage ../development/python-modules/pydes { }; - py-desmume = callPackage ../development/python-modules/py-desmume { }; + py-desmume = callPackage ../development/python-modules/py-desmume { + inherit (pkgs) libpcap; # Avoid confusion with python package of the same name + }; pydevccu = callPackage ../development/python-modules/pydevccu { }; @@ -9697,7 +9740,9 @@ self: super: with self; { pypca = callPackage ../development/python-modules/pypca { }; - pypcap = callPackage ../development/python-modules/pypcap { }; + pypcap = callPackage ../development/python-modules/pypcap { + inherit (pkgs) libpcap; # Avoid confusion with python package of the same name + }; pypck = callPackage ../development/python-modules/pypck { }; @@ -10300,6 +10345,8 @@ self: super: with self; { pytest-randomly = callPackage ../development/python-modules/pytest-randomly { }; + pytest-reverse = callPackage ../development/python-modules/pytest-reverse { }; + pytest-random-order = callPackage ../development/python-modules/pytest-random-order { }; pytest-recording = callPackage ../development/python-modules/pytest-recording { }; @@ -11568,7 +11615,9 @@ self: super: with self; { scancode-toolkit = callPackage ../development/python-modules/scancode-toolkit { }; - scapy = callPackage ../development/python-modules/scapy { }; + scapy = callPackage ../development/python-modules/scapy { + inherit (pkgs) libpcap; # Avoid confusion with python package of the same name + }; schedule = callPackage ../development/python-modules/schedule { }; @@ -11608,6 +11657,8 @@ self: super: with self; { scikit-optimize = callPackage ../development/python-modules/scikit-optimize { }; + scikit-posthocs = callPackage ../development/python-modules/scikit-posthocs { }; + scikit-rf = callPackage ../development/python-modules/scikit-rf { }; scikits-odes = callPackage ../development/python-modules/scikits-odes { }; @@ -11886,6 +11937,8 @@ self: super: with self; { simple-salesforce = callPackage ../development/python-modules/simple-salesforce { }; + simple-websocket = callPackage ../development/python-modules/simple-websocket { }; + simple-websocket-server = callPackage ../development/python-modules/simple-websocket-server { }; simplisafe-python = callPackage ../development/python-modules/simplisafe-python { }; @@ -12546,6 +12599,8 @@ self: super: with self; { svg-path = callPackage ../development/python-modules/svg-path { }; + svgelements = callPackage ../development/python-modules/svgelements { }; + svgwrite = callPackage ../development/python-modules/svgwrite { }; sv-ttk = callPackage ../development/python-modules/sv-ttk { }; @@ -13266,6 +13321,8 @@ self: super: with self; { typer = callPackage ../development/python-modules/typer { }; + type-infer = callPackage ../development/python-modules/type-infer { }; + types-appdirs = callPackage ../development/python-modules/types-appdirs { }; types-awscrt = callPackage ../development/python-modules/types-awscrt { }; diff --git a/nixpkgs/pkgs/top-level/qt5-packages.nix b/nixpkgs/pkgs/top-level/qt5-packages.nix index 58c2e2001839..93cb2c9a1372 100644 --- a/nixpkgs/pkgs/top-level/qt5-packages.nix +++ b/nixpkgs/pkgs/top-level/qt5-packages.nix @@ -207,7 +207,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea qtinstaller = callPackage ../development/libraries/qtinstaller { }; qtkeychain = callPackage ../development/libraries/qtkeychain { - inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security; + stdenv = if pkgs.stdenv.isDarwin then pkgs.darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; + inherit (pkgs.darwin.apple_sdk_11_0.frameworks) CoreFoundation Security; }; qtmpris = callPackage ../development/libraries/qtmpris { }; |