diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-23 10:09:14 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:07:03 +0000 |
| commit | 63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f (patch) | |
| tree | d58934cb48f9c953b19a0d0d5cffc0d0c5561471 /nixpkgs/pkgs/top-level | |
| parent | c4eef3dacb2a3d359561f30917d9e3cc4e041be9 (diff) | |
| parent | 91a22f76cd1716f9d0149e8a5c68424bb691de15 (diff) | |
| download | nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.gz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.bz2 nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.lz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.xz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.zst nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
Diffstat (limited to 'nixpkgs/pkgs/top-level')
20 files changed, 1129 insertions, 520 deletions
diff --git a/nixpkgs/pkgs/top-level/agda-packages.nix b/nixpkgs/pkgs/top-level/agda-packages.nix index 948040deecbd..1e0e6e0a2d58 100644 --- a/nixpkgs/pkgs/top-level/agda-packages.nix +++ b/nixpkgs/pkgs/top-level/agda-packages.nix @@ -33,5 +33,7 @@ let generic = callPackage ../development/libraries/agda/generic { }; agdarsec = callPackage ../development/libraries/agda/agdarsec { }; + + _1lab = callPackage ../development/libraries/agda/1lab { }; }; in mkAgdaPackages Agda diff --git a/nixpkgs/pkgs/top-level/aliases.nix b/nixpkgs/pkgs/top-level/aliases.nix index f3b8e5120137..d3ea778c3afb 100644 --- a/nixpkgs/pkgs/top-level/aliases.nix +++ b/nixpkgs/pkgs/top-level/aliases.nix @@ -416,6 +416,7 @@ mapAliases ({ dolphinEmu = dolphin-emu; # Added 2021-11-10 dolphinEmuMaster = dolphin-emu-beta; # Added 2021-11-10 dot-http = throw "'dot-http' has been removed: abandoned by upstream. Use hurl instead."; # Added 2023-01-16 + dotty = scala_3; # Added 2023-08-20 dotnet-netcore = dotnet-runtime; # Added 2021-10-07 double_conversion = throw "'double_conversion' has been renamed to/replaced by 'double-conversion'"; # Converted to throw 2022-02-22 draftsight = throw "draftsight has been removed, no longer available as freeware"; # Added 2020-08-14 @@ -460,6 +461,7 @@ mapAliases ({ emacs28NativeComp = emacs28; # Added 2022-06-08 emacs28Packages = emacs28.pkgs; # Added 2021-10-04 emacs28WithPackages = emacs28.pkgs.withPackages; # Added 2021-10-04 + emacsMacport = emacs-macport; # Added 2023-08-10 emacsNativeComp = emacs28NativeComp; # Added 2022-06-08 emacsPackagesGen = throw "'emacsPackagesGen' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-02-22 emacsPackagesNg = emacs.pkgs; # Added 2019-08-07 @@ -639,6 +641,13 @@ mapAliases ({ gnuvd = throw "gnuvd was removed because the backend service is missing"; # Added 2020-01-14 gobby5 = gobby; # Added 2021-02-01 gobjectIntrospection = throw "'gobjectIntrospection' has been renamed to/replaced by 'gobject-introspection'"; # Converted to throw 2022-02-22 + + #godot + godot = throw "godot has been renamed to godot3 to distinguish from version 4"; # Added 2023-07-16 + godot-export-templates = throw "godot-export-templates has been renamed to godot3-export-templates to distinguish from version 4"; # Added 2023-07-16 + godot-headless = throw "godot-headless has been renamed to godot3-headless to distinguish from version 4"; # Added 2023-07-16 + godot-server = throw "godot-server has been renamed to godot3-server to distinguish from version 4"; # Added 2023-07-16 + gogoclient = throw "gogoclient has been removed, because it was unmaintained"; # Added 2021-12-15 goklp = throw "goklp has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-02 golly-beta = throw "golly-beta has been removed: use golly instead"; # Added 2022-03-21 @@ -878,7 +887,6 @@ mapAliases ({ liberation_ttf_v1_from_source = throw "'liberation_ttf_v1_from_source' has been renamed to/replaced by 'liberation_ttf_v1'"; # Converted to throw 2022-02-22 liberation_ttf_v2_from_source = throw "'liberation_ttf_v2_from_source' has been renamed to/replaced by 'liberation_ttf_v2'"; # Converted to throw 2022-02-22 liberationsansnarrow = throw "'liberationsansnarrow' has been renamed to/replaced by 'liberation-sans-narrow'"; # Converted to throw 2022-02-22 - libgcc = throw "libgcc was removed, use gcc.cc.libgcc if needed"; # added 2023-05-13 libgksu = throw "libgksu has been removed"; # Added 2022-01-16 libgme = game-music-emu; # Added 2022-07-20 libgnome_keyring = throw "'libgnome_keyring' has been renamed to/replaced by 'libgnome-keyring'"; # Converted to throw 2022-02-22 @@ -1362,7 +1370,6 @@ mapAliases ({ pixie = throw "pixie has been removed: abandoned by upstream"; # Added 2022-04-21 pkgconfig = pkg-config; # Added 2018-02-02, moved to aliases.nix 2021-01-18 pkgconfigUpstream = throw "'pkgconfigUpstream' has been renamed to/replaced by 'pkg-configUpstream'"; # Converted to throw 2022-02-22 - planner = throw "planner has been removed from nixpkgs, as it is no longer developed and still uses python2/PyGTK"; # Added 2021-02-02 pleroma-otp = pleroma; # Added 2021-07-10 plexpy = throw "'plexpy' has been renamed to/replaced by 'tautulli'"; # Converted to throw 2022-02-22 pltScheme = racket; # just to be sure @@ -1417,6 +1424,7 @@ mapAliases ({ prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31 prometheus-mesos-exporter = throw "prometheus-mesos-exporter is deprecated and archived by upstream"; # Added 2022-04-05 prometheus-unifi-exporter = throw "prometheus-unifi-exporter is deprecated and archived by upstream, use unifi-poller instead"; # Added 2022-06-03 + prometheus-speedtest-exporter = throw "prometheus-speedtest-exporter was removed as unmaintained"; # Added 2023-07-31 protobuf3_7 = throw "protobuf3_7 does not receive updates anymore and has been removed"; # Added 2022-10-03 protobuf3_11 = throw "protobuf3_11 does not receive updates anymore and has been removed"; # Added 2022-09-28 protobuf3_17 = throw "protobuf3_17 does not receive updates anymore and has been removed"; # Added 2023-05-21 @@ -1481,6 +1489,7 @@ mapAliases ({ quake3game = throw "'quake3game' has been renamed to/replaced by 'ioquake3'"; # Converted to throw 2022-02-22 quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # Added 2020-04-09 quilter = throw "quilter has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-03 + qutebrowser-qt6 = throw "'qutebrowser-qt6' has been replaced by 'qutebrowser', since the the qt5 version has been removed"; # Added 2023-08-19 qvim = throw "qvim has been removed"; # Added 2020-08-31 qweechat = throw "qweechat has been removed because it was broken"; # Added 2021-03-08 qwt6 = throw "'qwt6' has been renamed to/replaced by 'libsForQt5.qwt'"; # Converted to throw 2022-02-22 @@ -1571,9 +1580,11 @@ mapAliases ({ shared_mime_info = throw "'shared_mime_info' has been renamed to/replaced by 'shared-mime-info'"; # Converted to throw 2022-02-22 inherit (libsForQt5.mauiPackages) shelf; # added 2022-05-17 shellinabox = throw "shellinabox has been removed from nixpkgs, as it was unmaintained upstream"; # Added 2021-12-15 + shhgit = throw "shhgit is broken and is no longer maintained. See https://github.com/eth0izzle/shhgit#-shhgit-is-no-longer-maintained-" ; # Added 2023-08-08 shipyard = jumppad; # Added 2023-06-06 sickbeard = throw "sickbeard has been removed from nixpkgs, as it was unmaintained"; # Added 2022-01-01 sickrage = throw "sickbeard has been removed from nixpkgs, as it was unmaintained"; # Added 2022-01-01 + signumone-ks = throw "signumone-ks has been removed from nixpkgs because the developers stopped offering the binaries"; # Added 2023-08-17 sigurlx = throw "sigurlx has been removed (upstream is gone)"; # Added 2022-01-24 skrooge2 = throw "'skrooge2' has been renamed to/replaced by 'skrooge'"; # Converted to throw 2022-02-22 skype = throw "'skype' has been renamed to/replaced by 'skypeforlinux'"; # Converted to throw 2022-02-22 @@ -1627,6 +1638,7 @@ mapAliases ({ speech_tools = throw "'speech_tools' has been renamed to/replaced by 'speech-tools'"; # Converted to throw 2022-02-22 speedometer = throw "speedometer has been removed: abandoned by upstream"; # Added 2022-04-24 speedtest_cli = throw "'speedtest_cli' has been renamed to/replaced by 'speedtest-cli'"; # Converted to throw 2022-02-22 + speedtest-exporter = throw "'speedtest-exporter' has been removed as unmaintained"; # Added 2023-07-31 sphinxbase = throw "sphinxbase has been removed: unmaintained"; # Added 2022-04-24 spice-gtk_libsoup2 = throw "'spice-gtk_libsoup2' has been renamed to/replaced by 'spice-gtk'"; # Added 2023-02-21 spice_gtk = throw "'spice_gtk' has been renamed to/replaced by 'spice-gtk'"; # Converted to throw 2022-02-22 @@ -1833,6 +1845,8 @@ mapAliases ({ wineStaging = throw "'wineStaging' has been renamed to/replaced by 'wine-staging'"; # Converted to throw 2022-02-22 wineUnstable = throw "'wineUnstable' has been renamed to/replaced by 'winePackages.unstable'"; # Converted to throw 2022-02-22 wineWayland = wine-wayland; + win-qemu = throw "'win-qemu' has been replaced by 'win-virtio'"; # Added 2023-08-16 + win-signed-gplpv-drivers = throw "win-signed-gplpv-drivers has been removed from nixpkgs, as it's unmaintained: https://help.univention.com/t/installing-signed-gplpv-drivers/21828"; # Added 2023-08-17 winpdb = throw "winpdb has been removed: abandoned by upstream"; # Added 2022-04-22 winusb = throw "'winusb' has been renamed to/replaced by 'woeusb'"; # Converted to throw 2022-02-22 wireguard = throw "'wireguard' has been renamed to/replaced by 'wireguard-tools'"; # Converted to throw 2022-02-22 diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index 4d95f3cb5751..f5ec81aeb10d 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -276,6 +276,8 @@ with pkgs; astrolog = callPackage ../applications/science/astronomy/astrolog { }; + astronomer = callPackage ../tools/misc/astronomer { }; + atkinson-hyperlegible = callPackage ../data/fonts/atkinson-hyperlegible { }; _0x = callPackage ../tools/misc/0x { }; @@ -509,11 +511,7 @@ with pkgs; colorpicker = callPackage ../tools/misc/colorpicker { }; - colorstorm = callPackage ../applications/misc/colorstorm { - zigHook = zigHook.override { - zig = buildPackages.zig_0_9; - }; - }; + colorstorm = callPackage ../applications/misc/colorstorm { }; comedilib = callPackage ../development/libraries/comedilib { }; @@ -593,13 +591,15 @@ with pkgs; dnf5 = callPackage ../tools/package-management/dnf5 { }; + documenso = callPackage ../applications/office/documenso { }; + dsq = callPackage ../tools/misc/dsq { }; + dt = callPackage ../tools/text/dt { }; + dtv-scan-tables = callPackage ../data/misc/dtv-scan-tables { }; - dufs = callPackage ../servers/http/dufs { - inherit (darwin.apple_sdk.frameworks) Security; - }; + dufs = callPackage ../servers/http/dufs { }; dynein = callPackage ../development/tools/database/dynein { inherit (darwin.apple_sdk.frameworks) Security; @@ -733,7 +733,9 @@ with pkgs; protoc-gen-go-vtproto = callPackage ../development/tools/protoc-gen-go-vtproto { }; - protoc-gen-grpc-web = callPackage ../development/tools/protoc-gen-grpc-web { }; + protoc-gen-grpc-web = callPackage ../development/tools/protoc-gen-grpc-web { + protobuf = protobuf3_21; + }; protoc-gen-connect-go = callPackage ../development/tools/protoc-gen-connect-go { }; @@ -1674,8 +1676,12 @@ with pkgs; colorless = callPackage ../tools/misc/colorless { }; + configurable-http-proxy = callPackage ../tools/networking/configurable-http-proxy { }; + cope = callPackage ../tools/misc/cope { }; + crypto-tracker = callPackage ../tools/misc/crypto-tracker { }; + ejson2env = callPackage ../tools/admin/ejson2env { }; davinci-resolve = callPackage ../applications/video/davinci-resolve { }; @@ -1772,10 +1778,14 @@ with pkgs; gp-saml-gui = python3Packages.callPackage ../tools/networking/gp-saml-gui { }; + grizzly = callPackage ../tools/misc/grizzly { }; + guestfs-tools = callPackage ../tools/virtualization/guestfs-tools { }; fabs = callPackage ../tools/backup/fabs { }; + fm = callPackage ../applications/file-managers/fm { }; + fm-tune = callPackage ../applications/radio/fm-tune { }; fwbuilder = libsForQt5.callPackage ../tools/security/fwbuilder { }; @@ -1790,8 +1800,12 @@ with pkgs; hexdiff = callPackage ../tools/misc/hexdiff { }; + hostmux = callPackage ../tools/misc/hostmux { }; + httm = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/httm { }; + immich-cli = callPackage ../tools/misc/immich-cli { }; + inherit (callPackage ../tools/networking/ivpn/default.nix {}) ivpn ivpn-service; jobber = callPackage ../tools/system/jobber { }; @@ -1842,8 +1856,12 @@ with pkgs; mgmt = callPackage ../applications/system/mgmt { }; + mkosi = python3Packages.callPackage ../tools/virtualization/mkosi { inherit systemd; }; + monica = callPackage ../servers/web-apps/monica { }; + mpremote = python3Packages.callPackage ../tools/misc/mpremote { }; + mprocs = callPackage ../tools/misc/mprocs { }; mpy-utils = python3Packages.callPackage ../tools/misc/mpy-utils { }; @@ -1898,6 +1916,8 @@ with pkgs; shell-genie = callPackage ../applications/misc/shell-genie { }; + sloth = callPackage ../tools/misc/sloth { }; + snagboot = python3.pkgs.callPackage ../applications/misc/snagboot { }; simple-dlna-browser = callPackage ../tools/networking/simple-dlna-browser { }; @@ -1940,7 +1960,9 @@ with pkgs; tere = callPackage ../tools/misc/tere { }; - termusic = callPackage ../applications/audio/termusic { }; + termusic = darwin.apple_sdk_11_0.callPackage ../applications/audio/termusic { + inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreAudio CoreGraphics Foundation IOKit MediaPlayer Security; + }; tfk8s = callPackage ../tools/misc/tfk8s { }; @@ -1958,6 +1980,8 @@ with pkgs; trigger-control = callPackage ../tools/games/trigger-control { }; + trimage = callPackage ../applications/graphics/trimage { inherit (qt5) wrapQtAppsHook; }; + ttchat = callPackage ../tools/misc/ttchat { }; ukmm = callPackage ../tools/games/ukmm { }; @@ -1986,6 +2010,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + vrrtest = callPackage ../tools/video/vrrtest { }; + winbox = callPackage ../tools/admin/winbox { wine = wineWowPackages.staging; }; @@ -2016,6 +2042,8 @@ with pkgs; yarn-lock-converter = callPackage ../tools/package-management/yarn-lock-converter { }; + zsh-history-to-fish = callPackage ../tools/misc/zsh-history-to-fish { }; + archi = callPackage ../tools/misc/archi { }; breitbandmessung = callPackage ../applications/networking/breitbandmessung { }; @@ -2154,6 +2182,8 @@ with pkgs; git-big-picture = callPackage ../applications/version-management/git-big-picture { }; + git-bars = callPackage ../applications/version-management/git-bars { }; + git-branchless = callPackage ../applications/version-management/git-branchless { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; @@ -2391,6 +2421,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) OpenCL; }; + merge-fmt = callPackage ../applications/version-management/merge-fmt { + inherit (ocamlPackages) buildDunePackage cmdliner base stdio; + }; + pass-git-helper = python3Packages.callPackage ../applications/version-management/pass-git-helper { }; qgit = qt5.callPackage ../applications/version-management/qgit { }; @@ -2546,7 +2580,9 @@ with pkgs; gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { }; - goldberg-emu = callPackage ../applications/emulators/goldberg-emu { }; + goldberg-emu = callPackage ../applications/emulators/goldberg-emu { + protobuf = protobuf3_21; + }; gopsuinfo = callPackage ../tools/system/gopsuinfo { }; @@ -2599,6 +2635,8 @@ with pkgs; np2kai = callPackage ../applications/emulators/np2kai { }; + nuked-md = callPackage ../applications/emulators/nuked-md { }; + oberon-risc-emu = callPackage ../applications/emulators/oberon-risc-emu { }; openmsx = callPackage ../applications/emulators/openmsx { }; @@ -3010,6 +3048,8 @@ with pkgs; pikchr = callPackage ../tools/graphics/pikchr { }; + poop = callPackage ../tools/misc/poop { }; + popl = callPackage ../development/libraries/popl { }; popsicle = callPackage ../tools/misc/popsicle { }; @@ -3450,6 +3490,8 @@ with pkgs; boulder = callPackage ../tools/admin/boulder { }; + btrfs-assistant = libsForQt5.callPackage ../tools/misc/btrfs-assistant { }; + btrfs-heatmap = callPackage ../tools/filesystems/btrfs-heatmap { }; bucklespring = bucklespring-x11; @@ -3530,6 +3572,8 @@ with pkgs; codux = callPackage ../applications/editors/codux { }; + conjure = callPackage ../applications/graphics/conjure { }; + coolreader = libsForQt5.callPackage ../applications/misc/coolreader { }; corsair = with python3Packages; toPythonApplication corsair-scan; @@ -3578,6 +3622,8 @@ with pkgs; dcap = callPackage ../tools/networking/dcap { }; + dark-mode-notify = callPackage ../os-specific/darwin/dark-mode-notify { }; + deltachat-cursed = callPackage ../applications/networking/instant-messengers/deltachat-cursed { }; delayarchitect = callPackage ../applications/audio/delayarchitect { }; @@ -4029,7 +4075,9 @@ with pkgs; amoco = callPackage ../tools/security/amoco { }; - anbox = callPackage ../os-specific/linux/anbox { }; + anbox = callPackage ../os-specific/linux/anbox { + protobuf = protobuf3_21; + }; androidenv = callPackage ../development/mobile/androidenv { }; @@ -4353,6 +4401,8 @@ with pkgs; buildpack = callPackage ../development/tools/buildpack { }; + bonk = callPackage ../tools/misc/bonk { }; + bottom-rs = callPackage ../tools/misc/bottom-rs { }; bsp-layout = callPackage ../tools/misc/bsp-layout { }; @@ -4367,6 +4417,8 @@ with pkgs; bwbasic = callPackage ../development/interpreters/bwbasic { }; + bws = callPackage ../tools/security/bws { }; + byobu = callPackage ../tools/misc/byobu { # Choices: [ tmux screen ]; textual-window-manager = tmux; @@ -4495,6 +4547,8 @@ with pkgs; { inherit (haskellPackages) alex happy Agda ghcWithPackages; }; + cel-go = callPackage ../development/interpreters/cel-go { }; + cfdyndns = callPackage ../applications/networking/dyndns/cfdyndns { }; cf-terraforming = callPackage ../tools/misc/cf-terraforming { }; @@ -4577,7 +4631,9 @@ with pkgs; common-licenses = callPackage ../data/misc/common-licenses { }; - compactor = callPackage ../applications/networking/compactor { }; + compactor = callPackage ../applications/networking/compactor { + protobuf = protobuf3_21; + }; consul = callPackage ../servers/consul { }; @@ -4611,6 +4667,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; + chayang = callPackage ../tools/wayland/chayang { }; + cherrytree = callPackage ../applications/misc/cherrytree { }; chntpw = callPackage ../tools/security/chntpw { }; @@ -4830,6 +4888,8 @@ with pkgs; dasher = callPackage ../applications/accessibility/dasher { }; + dataclass-wizard = with python3Packages; toPythonApplication dataclass-wizard; + datafusion-cli = callPackage ../development/misc/datafusion { }; datamash = callPackage ../tools/misc/datamash { }; @@ -5015,9 +5075,9 @@ with pkgs; duperemove = callPackage ../tools/filesystems/duperemove { }; - dvc = callPackage ../applications/version-management/dvc { }; + dvc = with python3.pkgs; toPythonApplication dvc; - dvc-with-remotes = callPackage ../applications/version-management/dvc { + dvc-with-remotes = dvc.override { enableGoogle = true; enableAWS = true; enableAzure = true; @@ -5058,6 +5118,8 @@ with pkgs; egglog = callPackage ../applications/science/logic/egglog { }; + ego = callPackage ../tools/misc/ego { }; + ekam = callPackage ../development/tools/build-managers/ekam { }; eksctl = callPackage ../tools/admin/eksctl { }; @@ -5358,6 +5420,8 @@ with pkgs; go-thumbnailer = callPackage ../applications/misc/go-thumbnailer { }; + google-cursor = callPackage ../data/icons/google-cursor { }; + geckodriver = callPackage ../development/tools/geckodriver { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -5377,8 +5441,9 @@ with pkgs; ghdorker = callPackage ../tools/security/ghdorker { }; - ghidra = if stdenv.isDarwin then darwin.apple_sdk_11_0.callPackage ../tools/security/ghidra/build.nix {} - else callPackage ../tools/security/ghidra/build.nix { }; + ghidra = darwin.apple_sdk_11_0.callPackage ../tools/security/ghidra/build.nix { + protobuf = protobuf3_21; + }; ghidra-bin = callPackage ../tools/security/ghidra { }; @@ -5516,8 +5581,6 @@ with pkgs; hostsblock = callPackage ../tools/misc/hostsblock { }; - hottext = callPackage ../tools/text/hottext { }; - hopper = qt5.callPackage ../development/tools/analysis/hopper { }; hr = callPackage ../applications/misc/hr { }; @@ -5538,6 +5601,8 @@ with pkgs; udis86 = pkgs.callPackage ../applications/window-managers/hyprwm/hyprland/udis86.nix { }; }; + hyprland-autoname-workspaces = callPackage ../applications/misc/hyprland-autoname-workspaces { }; + hyprland-per-window-layout = callPackage ../tools/wayland/hyprland-per-window-layout { }; hyprland-protocols = callPackage ../applications/window-managers/hyprwm/hyprland-protocols { }; @@ -5705,6 +5770,8 @@ with pkgs; libxnd = callPackage ../development/libraries/libxnd { }; + libz = callPackage ../development/libraries/libz { }; + libzbc = callPackage ../os-specific/linux/libzbc { }; libzbd = callPackage ../os-specific/linux/libzbd { }; @@ -5809,18 +5876,23 @@ with pkgs; # example of an error which this fixes # [Errno 8] Exec format error: './gdk3-scan' mesonEmulatorHook = - if (!stdenv.buildPlatform.canExecute stdenv.targetPlatform) then - makeSetupHook - { - name = "mesonEmulatorHook"; - substitutions = { - crossFile = writeText "cross-file.conf" '' + makeSetupHook + { + name = "mesonEmulatorHook"; + substitutions = { + crossFile = writeText "cross-file.conf" '' [binaries] - exe_wrapper = ${lib.escapeShellArg (stdenv.targetPlatform.emulator buildPackages)} + exe_wrapper = ${lib.escapeShellArg (stdenv.targetPlatform.emulator pkgs)} ''; - }; - } ../development/tools/build-managers/meson/emulator-hook.sh - else throw "mesonEmulatorHook has to be in a conditional to check if the target binaries can be executed i.e. (!stdenv.buildPlatform.canExecute stdenv.hostPlatform)"; + }; + } + # The throw is moved into the `makeSetupHook` derivation, so that its + # outer level, but not its outPath can still be evaluated if the condition + # doesn't hold. This ensures that splicing still can work correctly. + (if (!stdenv.hostPlatform.canExecute stdenv.targetPlatform) then + ../development/tools/build-managers/meson/emulator-hook.sh + else + throw "mesonEmulatorHook may only be added to nativeBuildInputs when the target binaries can't be executed; however you are attempting to use it in a situation where ${stdenv.hostPlatform.config} can execute ${stdenv.targetPlatform.config}. Consider only adding mesonEmulatorHook according to a conditional based canExecute in your package expression."); meson-tools = callPackage ../misc/meson-tools { }; @@ -5926,6 +5998,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + nltk-data = callPackage ../tools/text/nltk_data { }; + nodepy-runtime = with python3.pkgs; toPythonApplication nodepy-runtime; nixpkgs-pytools = with python3.pkgs; toPythonApplication nixpkgs-pytools; @@ -6124,11 +6198,7 @@ with pkgs; river = callPackage ../applications/window-managers/river { }; - rivercarro = callPackage ../applications/misc/rivercarro { - zigHook = zigHook.override { - zig = buildPackages.zig_0_9; - }; - }; + rivercarro = callPackage ../applications/misc/rivercarro { }; river-luatile = callPackage ../applications/misc/river-luatile{ }; @@ -6148,6 +6218,8 @@ with pkgs; scour = with python3Packages; toPythonApplication scour; + see = callPackage ../tools/misc/see { }; + s2png = callPackage ../tools/graphics/s2png { }; sfz = callPackage ../tools/misc/sfz { }; @@ -6264,6 +6336,8 @@ with pkgs; tsduck = callPackage ../tools/video/tsduck { }; + turso-cli = callPackage ../development/tools/turso-cli {}; + ripasso-cursive = callPackage ../tools/security/ripasso/cursive.nix { inherit (darwin.apple_sdk.frameworks) AppKit Security; }; @@ -6471,6 +6545,8 @@ with pkgs; biber = callPackage ../tools/typesetting/biber { }; + biber-ms = callPackage ../tools/typesetting/biber-ms { }; + biblatex-check = callPackage ../tools/typesetting/biblatex-check { }; binlore = callPackage ../development/tools/analysis/binlore { }; @@ -6656,6 +6732,7 @@ with pkgs; clementine = libsForQt5.callPackage ../applications/audio/clementine { gst_plugins = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav ]; + protobuf = protobuf3_21; }; mellowplayer = libsForQt5.callPackage ../applications/audio/mellowplayer { }; @@ -6678,6 +6755,8 @@ with pkgs; cmigemo = callPackage ../tools/text/cmigemo { }; + cmospwd = callPackage ../tools/security/cmospwd { }; + cmst = libsForQt5.callPackage ../tools/networking/cmst { }; cmt = callPackage ../applications/audio/cmt { }; @@ -6765,6 +6844,8 @@ with pkgs; keyd = callPackage ../tools/inputmethods/keyd { }; + keymapper = callPackage ../tools/inputmethods/keymapper { }; + twitch-tui = callPackage ../applications/networking/instant-messengers/twitch-tui { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -6833,7 +6914,7 @@ with pkgs; mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { stdenv = clangStdenv; - protobuf = pkgs.protobuf.overrideDerivation (_: { stdenv = clangStdenv; }); + protobuf = pkgs.protobuf3_21.overrideDerivation (_: { stdenv = clangStdenv; }); }; rime = callPackage ../tools/inputmethods/ibus-engines/ibus-rime { }; @@ -6885,6 +6966,8 @@ with pkgs; bbin = callPackage ../development/tools/bbin { }; + blacken-docs = callPackage ../tools/misc/blacken-docs { }; + bore = callPackage ../tools/networking/bore { inherit (darwin) Libsystem; inherit (darwin.apple_sdk.frameworks) SystemConfiguration; @@ -6917,6 +7000,8 @@ with pkgs; code-browser-gtk2 = callPackage ../applications/editors/code-browser { withGtk2 = true; }; code-browser-gtk = callPackage ../applications/editors/code-browser { withGtk3 = true; }; + certdump = callPackage ../tools/security/certdump { }; + certstrap = callPackage ../tools/security/certstrap { }; cfssl = callPackage ../tools/security/cfssl { }; @@ -7037,6 +7122,8 @@ with pkgs; createrepo_c = callPackage ../tools/package-management/createrepo_c { }; + cringify = callPackage ../tools/text/cringify { }; + cromfs = callPackage ../tools/archivers/cromfs { stdenv = gcc10StdenvCompat; }; @@ -7391,13 +7478,13 @@ with pkgs; dropbear = callPackage ../tools/networking/dropbear { }; - dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { }; + dsview = qt6Packages.callPackage ../applications/science/electronics/dsview { }; dtach = callPackage ../tools/misc/dtach { }; dtc = callPackage ../development/compilers/dtc { }; - dt-schema = with python3Packages; toPythonApplication dtschema; + dt-schema = callPackage ../development/tools/dt-schema { }; dub = callPackage ../development/tools/build-managers/dub { }; @@ -7411,6 +7498,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + dumpasn1 = callPackage ../tools/security/dumpasn1 { }; + dumptorrent = callPackage ../tools/misc/dumptorrent { }; duo-unix = callPackage ../tools/security/duo-unix { }; @@ -7684,6 +7773,8 @@ with pkgs; d2 = callPackage ../tools/text/d2 { }; + ddev = callPackage ../applications/virtualization/ddev { }; + easeprobe = callPackage ../tools/misc/easeprobe { }; emscripten = callPackage ../development/compilers/emscripten { @@ -8307,6 +8398,8 @@ with pkgs; ggobi = callPackage ../tools/graphics/ggobi { }; + ggshield = callPackage ../tools/security/ggshield { }; + ghost = callPackage ../tools/security/ghost { }; ghostunnel = callPackage ../tools/networking/ghostunnel { }; @@ -8488,13 +8581,25 @@ with pkgs; godot_4 = callPackage ../development/tools/godot/4 { }; - godot = callPackage ../development/tools/godot/3 { }; + godot3 = callPackage ../development/tools/godot/3 { }; + + godot3-export-templates = callPackage ../development/tools/godot/3/export-templates.nix { }; + + godot3-headless = callPackage ../development/tools/godot/3/headless.nix { }; + + godot3-debug-server = callPackage ../development/tools/godot/3/debug-server.nix { }; - godot-export-templates = callPackage ../development/tools/godot/3/export-templates.nix { }; + godot3-server = callPackage ../development/tools/godot/3/server.nix { }; - godot-headless = callPackage ../development/tools/godot/3/headless.nix { }; + godot3-mono = callPackage ../development/tools/godot/3/mono {}; - godot-server = callPackage ../development/tools/godot/3/server.nix { }; + godot3-mono-export-templates = callPackage ../development/tools/godot/3/mono/export-templates.nix { }; + + godot3-mono-headless = callPackage ../development/tools/godot/3/mono/headless.nix { }; + + godot3-mono-debug-server = callPackage ../development/tools/godot/3/mono/debug-server.nix { }; + + godot3-mono-server = callPackage ../development/tools/godot/3/mono/server.nix { }; goeland = callPackage ../applications/networking/feedreaders/goeland { }; @@ -8612,6 +8717,8 @@ with pkgs; graylog-5_0 = callPackage ../tools/misc/graylog/5.0.nix { }; + graylog-5_1 = callPackage ../tools/misc/graylog/5.1.nix { }; + graylogPlugins = recurseIntoAttrs ( callPackage ../tools/misc/graylog/plugins.nix { } ); @@ -9071,6 +9178,8 @@ with pkgs; ibniz = callPackage ../tools/graphics/ibniz { }; + icebreaker = callPackage ../servers/icebreaker { }; + icecast = callPackage ../servers/icecast { }; icemon = libsForQt5.callPackage ../applications/networking/icemon { }; @@ -9445,8 +9554,6 @@ with pkgs; jove = callPackage ../applications/editors/jove { }; - jucipp = callPackage ../applications/editors/jucipp { }; - jugglinglab = callPackage ../tools/misc/jugglinglab { }; jupp = callPackage ../applications/editors/jupp { }; @@ -9786,11 +9893,10 @@ with pkgs; matrix-sliding-sync = callPackage ../servers/matrix-synapse/sliding-sync { }; - matrix-synapse = callPackage ../servers/matrix-synapse { }; - - matrix-synapse-plugins = recurseIntoAttrs matrix-synapse.plugins; - - matrix-synapse-tools = recurseIntoAttrs matrix-synapse.tools; + matrix-synapse = callPackage ../servers/matrix-synapse/wrapper.nix { }; + matrix-synapse-unwrapped = callPackage ../servers/matrix-synapse/default.nix { }; + matrix-synapse-plugins = recurseIntoAttrs matrix-synapse-unwrapped.plugins; + matrix-synapse-tools = recurseIntoAttrs matrix-synapse-unwrapped.tools; matrix-appservice-irc = callPackage ../servers/matrix-synapse/matrix-appservice-irc { }; @@ -9909,6 +10015,10 @@ with pkgs; ministat = callPackage ../tools/misc/ministat { }; + minizign = callPackage ../tools/security/minizign { }; + + mitm6 = callPackage ../tools/security/mitm6 { }; + mjolnir = callPackage ../servers/mjolnir { matrix-sdk-crypto-nodejs = matrix-sdk-crypto-nodejs-0_1_0-beta_3; }; @@ -9935,6 +10045,8 @@ with pkgs; multitail = callPackage ../tools/misc/multitail { }; + mvebu64boot = callPackage ../tools/misc/mvebu64boot { }; + mx-puppet-discord = callPackage ../servers/mx-puppet-discord { }; mx-takeover = callPackage ../tools/security/mx-takeover { }; @@ -9971,6 +10083,7 @@ with pkgs; netdata = callPackage ../tools/system/netdata { inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; + protobuf = protobuf3_21; }; # Exposed here so the bots can auto-upgrade it netdata-go-plugins = callPackage ../tools/system/netdata/go.d.plugin.nix { }; @@ -10082,6 +10195,8 @@ with pkgs; lcdf-typetools = callPackage ../tools/misc/lcdf-typetools { }; + lcsync = callPackage ../applications/networking/sync/lcsync { }; + ldapdomaindump = with python3Packages; toPythonApplication ldapdomaindump; ldapmonitor = callPackage ../tools/security/ldapmonitor { }; @@ -10104,9 +10219,7 @@ with pkgs; lact = callPackage ../tools/system/lact { }; - ledit = callPackage ../tools/misc/ledit { - inherit (ocaml-ng.ocamlPackages_4_12) ocaml camlp5; - }; + ledit = callPackage ../tools/misc/ledit { }; ledmon = callPackage ../tools/system/ledmon { }; @@ -10319,6 +10432,8 @@ with pkgs; linux-exploit-suggester = callPackage ../tools/security/linux-exploit-suggester { }; + linux-gpib = callPackage ../applications/science/electronics/linux-gpib/user.nix { }; + linuxquota = callPackage ../tools/misc/linuxquota { }; lipl = callPackage ../tools/misc/lipl { }; @@ -10667,7 +10782,9 @@ with pkgs; electron = electron_22; }; - mosh = callPackage ../tools/networking/mosh { }; + mosh = callPackage ../tools/networking/mosh { + protobuf = protobuf3_21; + }; motrix = callPackage ../tools/networking/motrix { }; @@ -10929,7 +11046,7 @@ with pkgs; nifi = callPackage ../servers/web-apps/nifi { }; - nitter = callPackage ../servers/nitter { }; + nitter = nim2Packages.callPackage ../servers/nitter { }; noip = callPackage ../tools/networking/noip { }; @@ -10954,6 +11071,8 @@ with pkgs; nb = callPackage ../tools/misc/nb { }; + nbqa = callPackage ../tools/misc/nbqa { }; + kb = callPackage ../tools/misc/kb { }; notable = callPackage ../applications/misc/notable { }; @@ -10993,6 +11112,13 @@ with pkgs; mtm = callPackage ../tools/misc/mtm { }; + op-geth = callPackage ../applications/blockchains/optimism/geth.nix { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) IOKit; + }; + + optimism = callPackage ../applications/blockchains/optimism { }; + pa_applet = callPackage ../tools/audio/pa-applet { }; pandoc-acro = python3Packages.callPackage ../tools/misc/pandoc-acro { }; @@ -11103,7 +11229,9 @@ with pkgs; nq = callPackage ../tools/system/nq { }; - nsjail = callPackage ../tools/security/nsjail { }; + nsjail = callPackage ../tools/security/nsjail { + protobuf = protobuf3_21; + }; nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd { }; @@ -11235,7 +11363,9 @@ with pkgs; oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { }; - ola = callPackage ../applications/misc/ola { }; + ola = callPackage ../applications/misc/ola { + protobuf = protobuf3_21; + }; olive-editor = qt6Packages.callPackage ../applications/video/olive-editor { inherit (darwin.apple_sdk.frameworks) CoreFoundation; @@ -11506,7 +11636,9 @@ with pkgs; p3x-onenote = callPackage ../applications/office/p3x-onenote { }; - p4c = callPackage ../development/compilers/p4c { }; + p4c = callPackage ../development/compilers/p4c { + protobuf = protobuf3_21; + }; p7zip = callPackage ../tools/archivers/p7zip { }; @@ -11688,6 +11820,8 @@ with pkgs; pdf-quench = callPackage ../applications/misc/pdf-quench { }; + pdf-sign = callPackage ../tools/graphics/pdf-sign { }; + pdfarranger = callPackage ../applications/misc/pdfarranger { }; briss = callPackage ../tools/graphics/briss { }; @@ -12090,7 +12224,7 @@ with pkgs; teapot = callPackage ../applications/office/teapot { }; pyditz = callPackage ../applications/misc/pyditz { - pythonPackages = python27Packages; + pythonPackages = python3Packages; }; py-spy = darwin.apple_sdk_11_0.callPackage ../development/tools/py-spy { }; @@ -12352,6 +12486,8 @@ with pkgs; richgo = callPackage ../development/tools/richgo { }; + risor = callPackage ../development/interpreters/risor { }; + rlci = callPackage ../development/interpreters/rlci { }; rs = callPackage ../tools/text/rs { }; @@ -12377,6 +12513,8 @@ with pkgs; re-isearch = callPackage ../applications/search/re-isearch { }; + reason-shell = callPackage ../applications/science/misc/reason-shell { }; + reaverwps = callPackage ../tools/networking/reaver-wps { }; reaverwps-t6x = callPackage ../tools/networking/reaver-wps-t6x { }; @@ -12617,6 +12755,8 @@ with pkgs; rwc = callPackage ../tools/system/rwc { }; + rwedid = callPackage ../tools/video/rwedid { }; + rxp = callPackage ../tools/text/xml/rxp { }; rzip = callPackage ../tools/compression/rzip { }; @@ -12828,6 +12968,8 @@ with pkgs; schema2ldif = callPackage ../tools/text/schema2ldif { }; + schemacrawler = callPackage ../development/tools/schemacrawler { }; + sharedown = callPackage ../tools/misc/sharedown { }; shen-sbcl = callPackage ../development/interpreters/shen-sbcl { }; @@ -12889,8 +13031,6 @@ with pkgs; # aka., pgp-tools signing-party = callPackage ../tools/security/signing-party { }; - signumone-ks = callPackage ../applications/misc/signumone-ks { }; - sigtop = callPackage ../tools/backup/sigtop { }; silc_client = callPackage ../applications/networking/instant-messengers/silc-client { }; @@ -13458,6 +13598,8 @@ with pkgs; tea = callPackage ../tools/misc/tea { }; + teavpn2 = callPackage ../tools/networking/teavpn2 { }; + inherit (nodePackages) teck-programmer; ted = callPackage ../tools/typesetting/ted { }; @@ -13642,7 +13784,9 @@ with pkgs; tmux-xpanes = callPackage ../tools/misc/tmux-xpanes { }; - tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { }); + tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { + pkgs = pkgs.__splicedPackages; + }); tmsu = callPackage ../tools/filesystems/tmsu { }; @@ -13964,6 +14108,8 @@ with pkgs; uivonim = callPackage ../applications/editors/uivonim { }; + ulid = callPackage ../tools/misc/ulid { }; + umlet = callPackage ../tools/misc/umlet { }; unetbootin = libsForQt5.callPackage ../tools/cd-dvd/unetbootin { }; @@ -14038,7 +14184,7 @@ with pkgs; v2ray-geoip = callPackage ../data/misc/v2ray-geoip { }; - vacuum = callPackage ../applications/networking/instant-messengers/vacuum { }; + vacuum = libsForQt5.callPackage ../applications/networking/instant-messengers/vacuum {}; validator-nu = callPackage ../tools/text/validator-nu { }; @@ -14496,6 +14642,8 @@ with pkgs; xspim = callPackage ../development/tools/misc/xspim { }; + xcrawl3r = callPackage ../tools/security/xcrawl3r { }; + xcruiser = callPackage ../applications/misc/xcruiser { }; xwallpaper = callPackage ../tools/X11/xwallpaper { }; @@ -14596,6 +14744,8 @@ with pkgs; webalizer = callPackage ../tools/networking/webalizer { }; + webmesh = callPackage ../servers/webmesh { }; + wget = callPackage ../tools/networking/wget { }; wget2 = callPackage ../tools/networking/wget2 { @@ -14859,7 +15009,9 @@ with pkgs; zasm = callPackage ../development/compilers/zasm { }; - zbackup = callPackage ../tools/backup/zbackup { }; + zbackup = callPackage ../tools/backup/zbackup { + protobuf = protobuf3_21; + }; zbar = libsForQt5.callPackage ../tools/graphics/zbar { inherit (darwin.apple_sdk.frameworks) Foundation; @@ -14954,6 +15106,8 @@ with pkgs; zsh-clipboard = callPackage ../shells/zsh/zsh-clipboard { }; + zsh-defer = callPackage ../shells/zsh/zsh-defer { }; + zsh-edit = callPackage ../shells/zsh/zsh-edit { }; zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { }; @@ -14988,6 +15142,8 @@ with pkgs; zsh-command-time = callPackage ../shells/zsh/zsh-command-time { }; + zsh-fzf-history-search = callPackage ../shells/zsh/zsh-fzf-history-search { }; + zsh-vi-mode = callPackage ../shells/zsh/zsh-vi-mode { }; zsh-you-should-use = callPackage ../shells/zsh/zsh-you-should-use { }; @@ -15227,6 +15383,8 @@ with pkgs; ats-acc = callPackage ../development/tools/ats-acc { }; + august = callPackage ../development/compilers/august { }; + avra = callPackage ../development/compilers/avra { }; ballerina = callPackage ../development/compilers/ballerina { @@ -15511,18 +15669,17 @@ with pkgs; gerbil = callPackage ../development/compilers/gerbil { }; gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { }; gerbil-support = callPackage ../development/compilers/gerbil/gerbil-support.nix { }; - gerbilPackages-unstable = gerbil-support.gerbilPackages-unstable; # NB: don't recurseIntoAttrs for (unstable!) libraries + gerbilPackages-unstable = pkgs.gerbil-support.gerbilPackages-unstable; # NB: don't recurseIntoAttrs for (unstable!) libraries + glow-lang = pkgs.gerbilPackages-unstable.glow-lang; gbforth = callPackage ../development/compilers/gbforth { }; - inherit (let - num = - if (with stdenv.targetPlatform; isVc4 || libc == "relibc") then 6 - else 12; - numS = toString num; - in { - gcc = pkgs.${"gcc${numS}"}; - gccFun = callPackage (../development/compilers/gcc + "/${numS}"); + default-gcc-version = + if (with stdenv.targetPlatform; isVc4 || libc == "relibc") then 6 + else 12; + inherit ({ + gcc = pkgs.${"gcc${toString default-gcc-version}"}; + gccFun = callPackage ../development/compilers/gcc; }) gcc gccFun; gcc-unwrapped = gcc.cc; @@ -15623,6 +15780,7 @@ with pkgs; cc = gccFun { # copy-pasted inherit noSysDirs; + majorMinorVersion = toString default-gcc-version; reproducibleBuild = true; profiledCompiler = false; @@ -15650,24 +15808,25 @@ with pkgs; # This expression will be pushed into pkgs/development/compilers/gcc/common # once the top-level gcc/${version}/default.nix files are deduplicated. inherit - (lib.listToAttrs (map (version: - let atLeast = lib.versionAtLeast version; - attrName = "gcc${lib.replaceStrings ["."] [""] version}"; - pkg = lowPrio (wrapCC (callPackage (../development/compilers/gcc + "/${version}") ({ + (lib.listToAttrs (map (majorMinorVersion: + let atLeast = lib.versionAtLeast majorMinorVersion; + attrName = "gcc${lib.replaceStrings ["."] [""] majorMinorVersion}"; + pkg = lowPrio (wrapCC (callPackage ../development/compilers/gcc/default.nix ({ inherit noSysDirs; + inherit majorMinorVersion; reproducibleBuild = true; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor version else { }; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor majorMinorVersion else { }; isl = if stdenv.isDarwin then null else if atLeast "9" then isl_0_20 else if atLeast "7" then isl_0_17 else if atLeast "6" then (if stdenv.targetPlatform.isRedox then isl_0_17 else isl_0_14) else if atLeast "4.9" then isl_0_11 else /* "4.8" */ isl_0_14; - } // lib.optionalAttrs (version == "4.8") { + } // lib.optionalAttrs (majorMinorVersion == "4.8") { texinfo = texinfo5; # doesn't validate since 6.1 -> 6.3 bump - } // lib.optionalAttrs (version == "4.9") { + } // lib.optionalAttrs (majorMinorVersion == "4.9") { # Build fails on Darwin with clang stdenv = if stdenv.isDarwin then gccStdenv else stdenv; } // lib.optionalAttrs (!(atLeast "6")) { @@ -15958,8 +16117,8 @@ with pkgs; then haskell.packages.native-bignum.ghc96 # Prefer native-bignum to avoid linking issues with gmp else if stdenv.hostPlatform.isStatic - then haskell.packages.native-bignum.ghc92 - else haskell.packages.ghc92); + then haskell.packages.native-bignum.ghc94 + else haskell.packages.ghc94); # haskellPackages.ghc is build->host (it exposes the compiler used to build the # set, similarly to stdenv.cc), but pkgs.ghc should be host->target to be more @@ -15972,8 +16131,8 @@ with pkgs; ghc = targetPackages.haskellPackages.ghc or # Prefer native-bignum to avoid linking issues with gmp (if stdenv.targetPlatform.isStatic - then haskell.compiler.native-bignum.ghc92 - else haskell.compiler.ghc92); + then haskell.compiler.native-bignum.ghc94 + else haskell.compiler.ghc94); alex = haskell.lib.compose.justStaticExecutables haskellPackages.alex; @@ -16073,6 +16232,8 @@ with pkgs; gox = callPackage ../development/tools/gox { }; + goxlr-utility = callPackage ../tools/audio/goxlr-utility {}; + gprolog = callPackage ../development/compilers/gprolog { }; gwe = callPackage ../tools/misc/gwe { @@ -16089,6 +16250,7 @@ with pkgs; idrisPackages = dontRecurseIntoAttrs (callPackage ../development/idris-modules { idris-no-deps = haskellPackages.idris; + pkgs = pkgs.__splicedPackages; }); idris = idrisPackages.with-packages [ idrisPackages.base ] ; @@ -16519,8 +16681,9 @@ with pkgs; inherit (callPackages ../development/compilers/nim { inherit (darwin) Security; } - ) nim-unwrapped nimble-unwrapped nim; + ) nim-unwrapped nim-unwrapped-2 nimble-unwrapped nim nim2; nimPackages = recurseIntoAttrs nim.pkgs; + nim2Packages = recurseIntoAttrs nim2.pkgs; nrpl = callPackage ../development/tools/nrpl { }; @@ -16841,11 +17004,11 @@ with pkgs; inherit (darwin) apple_sdk; }; - rust_1_70 = callPackage ../development/compilers/rust/1_70.nix { + rust_1_71 = callPackage ../development/compilers/rust/1_71.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; llvm_16 = llvmPackages_16.libllvm; }; - rust = rust_1_70; + rust = rust_1_71; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; @@ -16853,8 +17016,8 @@ with pkgs; openssl = openssl_1_1; }; - rustPackages_1_70 = rust_1_70.packages.stable; - rustPackages = rustPackages_1_70; + rustPackages_1_71 = rust_1_71.packages.stable; + rustPackages = rustPackages_1_71; inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform; @@ -16998,9 +17161,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; cargo-limit = callPackage ../development/tools/rust/cargo-limit { }; - cargo-make = callPackage ../development/tools/rust/cargo-make { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; + cargo-make = callPackage ../development/tools/rust/cargo-make { }; cargo-modules = callPackage ../development/tools/rust/cargo-modules { }; cargo-mommy = callPackage ../development/tools/rust/cargo-mommy { }; cargo-msrv = callPackage ../development/tools/rust/cargo-msrv { @@ -17057,9 +17218,7 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) Cocoa CoreServices Foundation; }; cargo-wipe = callPackage ../development/tools/rust/cargo-wipe { }; - cargo-workspaces = callPackage ../development/tools/rust/cargo-workspaces { - inherit (darwin.apple_sdk.frameworks) IOKit Security CoreFoundation AppKit System; - }; + cargo-workspaces = callPackage ../development/tools/rust/cargo-workspaces { }; cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { }; cargo-generate = callPackage ../development/tools/rust/cargo-generate { }; cargo-bootimage = callPackage ../development/tools/rust/bootimage { }; @@ -17084,6 +17243,8 @@ with pkgs; devspace = callPackage ../development/tools/misc/devspace { }; + leptosfmt = callPackage ../development/tools/rust/leptosfmt { }; + maturin = callPackage ../development/tools/rust/maturin { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -17134,8 +17295,6 @@ with pkgs; scala_2_12 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.12"; }; scala_2_13 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.13"; }; scala_3 = callPackage ../development/compilers/scala { }; - # deprecated - dotty = scala_3; scala = scala_2_13; scala-runners = callPackage ../development/compilers/scala-runners { @@ -17371,6 +17530,8 @@ with pkgs; angelscript = callPackage ../development/interpreters/angelscript { }; + anko = callPackage ../development/interpreters/anko { }; + babashka-unwrapped = callPackage ../development/interpreters/babashka { }; babashka = callPackage ../development/interpreters/babashka/wrapped.nix { }; @@ -17521,6 +17682,8 @@ with pkgs; fetchHex beamPackages lfe lfe_2_1; + expr = callPackage ../development/interpreters/expr { }; + gnudatalanguage = callPackage ../development/interpreters/gnudatalanguage { inherit (llvmPackages) openmp; inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -17528,6 +17691,8 @@ with pkgs; mpi = mpich; }; + gpython = callPackage ../development/interpreters/gpython { }; + graphql-client = callPackage ../development/tools/graphql-client { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -17555,7 +17720,7 @@ with pkgs; stdenv = clangStdenv; }; - jacinda = haskell.lib.compose.justStaticExecutables haskell.packages.ghc92.jacinda; + jacinda = haskell.lib.compose.justStaticExecutables haskellPackages.jacinda; janet = callPackage ../development/interpreters/janet { }; @@ -17908,9 +18073,9 @@ with pkgs; inherit (darwin) libobjc; }; - inherit (callPackage ../development/interpreters/ruby { + inherit (darwin.apple_sdk_11_0.callPackage ../development/interpreters/ruby { inherit (darwin) libobjc libunwind; - inherit (darwin.apple_sdk.frameworks) Foundation; + inherit (darwin.apple_sdk_11_0.frameworks) Foundation; }) mkRubyVersion mkRuby @@ -18011,6 +18176,8 @@ with pkgs; wasm3 = callPackage ../development/interpreters/wasm3 { }; + yaegi = callPackage ../development/interpreters/yaegi { }; + yex-lang = callPackage ../development/interpreters/yex-lang { }; ### DEVELOPMENT / MISC @@ -18235,6 +18402,8 @@ with pkgs; helm-ls = callPackage ../development/tools/language-servers/helm-ls { }; + javascript-typescript-langserver = callPackage ../development/tools/language-servers/javascript-typescript-langserver { }; + jdt-language-server = callPackage ../development/tools/language-servers/jdt-language-server { }; jsonnet-language-server = callPackage ../development/tools/language-servers/jsonnet-language-server { }; @@ -18265,7 +18434,9 @@ with pkgs; pylyzer = callPackage ../development/tools/language-servers/pylyzer { }; - rnix-lsp = callPackage ../development/tools/language-servers/rnix-lsp { }; + rnix-lsp = callPackage ../development/tools/language-servers/rnix-lsp { + nix = nixVersions.nix_2_15; + }; ruff-lsp = python3Packages.callPackage ../development/tools/language-servers/ruff-lsp { }; @@ -18279,11 +18450,7 @@ with pkgs; vscode-langservers-extracted = callPackage ../development/tools/language-servers/vscode-langservers-extracted { }; - zls = callPackage ../development/tools/language-servers/zls { - zigHook = zigHook.override { - zig = buildPackages.zig_0_10; - }; - }; + zls = callPackage ../development/tools/language-servers/zls { }; ansible-later = callPackage ../tools/admin/ansible/later.nix { }; @@ -18630,6 +18797,8 @@ with pkgs; cadre = callPackage ../development/tools/cadre { }; + carto = callPackage ../development/tools/carto { }; + catnip = callPackage ../tools/audio/catnip { }; catnip-gtk4 = callPackage ../tools/audio/catnip-gtk4 { }; @@ -18708,6 +18877,8 @@ with pkgs; cl-launch = callPackage ../development/tools/misc/cl-launch { }; + clean-css-cli = callPackage ../development/tools/clean-css-cli { }; + cloud-nuke = callPackage ../development/tools/cloud-nuke { }; cloudcompare = libsForQt5.callPackage ../applications/graphics/cloudcompare { }; @@ -18832,6 +19003,8 @@ with pkgs; librarian-puppet-go = callPackage ../development/tools/librarian-puppet-go { }; + libgcc = stdenv.cc.cc.libgcc or null; + # This is for e.g. LLVM libraries on linux. gccForLibs = if stdenv.targetPlatform == stdenv.hostPlatform && targetPackages.stdenv.cc.isGNU @@ -18949,6 +19122,8 @@ with pkgs; dwz = callPackage ../development/tools/misc/dwz { }; + eask = callPackage ../development/tools/eask { }; + easypdkprog = callPackage ../development/embedded/easypdkprog { }; eclint = callPackage ../development/tools/eclint { }; @@ -19072,6 +19247,8 @@ with pkgs; funzzy = callPackage ../development/tools/misc/funzzy { }; + fzf-make = callPackage ../development/tools/misc/fzf-make { }; + gede = libsForQt5.callPackage ../development/tools/misc/gede { }; gdbgui = python3Packages.callPackage ../development/tools/misc/gdbgui { }; @@ -19226,6 +19403,8 @@ with pkgs; confluent-cli = callPackage ../development/tools/confluent-cli { }; + htmlhint = callPackage ../development/tools/htmlhint { }; + htmlunit-driver = callPackage ../development/tools/selenium/htmlunit-driver { }; hyenae = callPackage ../tools/networking/hyenae { }; @@ -19434,6 +19613,8 @@ with pkgs; lurk = callPackage ../development/tools/lurk { }; + maizzle = callPackage ../development/tools/maizzle { }; + malt = callPackage ../development/tools/profiling/malt { }; marksman = callPackage ../development/tools/marksman { }; @@ -19480,6 +19661,8 @@ with pkgs; mold = callPackage ../development/tools/mold { }; + mommy = callPackage ../tools/misc/mommy { }; + moon = callPackage ../development/tools/build-managers/moon/default.nix { }; msgpack-tools = callPackage ../development/tools/msgpack-tools { }; @@ -19566,6 +19749,8 @@ with pkgs; openocd = callPackage ../development/embedded/openocd { }; + openocd-rp2040 = callPackage ../development/embedded/openocd-rp2040 { }; + oprofile = callPackage ../development/tools/profiling/oprofile { libiberty_static = libiberty.override { staticBuild = true; }; }; @@ -19713,8 +19898,12 @@ with pkgs; rizin = pkgs.callPackage ../development/tools/analysis/rizin { }; + rizinPlugins = recurseIntoAttrs rizin.plugins; + cutter = libsForQt5.callPackage ../development/tools/analysis/rizin/cutter.nix { }; + cutterPlugins = recurseIntoAttrs cutter.plugins; + ragel = ragelStable; randoop = callPackage ../development/tools/analysis/randoop { }; @@ -19759,6 +19948,8 @@ with pkgs; inherit (callPackage ../development/tools/replay-io { }) replay-io replay-node-cli; + requestly = callPackage ../tools/networking/requestly { }; + reshape = callPackage ../development/tools/reshape { } ; retdec = callPackage ../development/tools/analysis/retdec { @@ -19927,9 +20118,14 @@ with pkgs; flex = flex_2_5_35; }; - spoofer = callPackage ../tools/networking/spoofer { }; + spoofer = callPackage ../tools/networking/spoofer { + protobuf = protobuf3_21; + }; - spoofer-gui = callPackage ../tools/networking/spoofer { withGUI = true; }; + spoofer-gui = callPackage ../tools/networking/spoofer { + withGUI = true; + protobuf = protobuf3_21; + }; spooles = callPackage ../development/libraries/science/math/spooles { }; @@ -19955,6 +20151,8 @@ with pkgs; sqlmap = with python3Packages; toPythonApplication sqlmap; + sqlpage = callPackage ../servers/sqlpage { }; + src-cli = callPackage ../development/tools/misc/src-cli { }; sselp = callPackage ../tools/X11/sselp{ }; @@ -20024,6 +20222,8 @@ with pkgs; tcptrack = callPackage ../development/tools/misc/tcptrack { }; + teensy-cmake-macros = callPackage ../development/embedded/teensy-cmake-macros { }; + teensyduino = arduino-core.override { withGui = true; withTeensyduino = true; }; teensy-loader-cli = callPackage ../development/embedded/teensy-loader-cli { }; @@ -20246,6 +20446,10 @@ with pkgs; tockloader = callPackage ../development/tools/misc/tockloader { }; + zon2nix = callPackage ../tools/nix/zon2nix { }; + + ztags = callPackage ../development/tools/misc/ztags { }; + ### DEVELOPMENT / LIBRARIES a52dec = callPackage ../development/libraries/a52dec { }; @@ -20563,6 +20767,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; + ceedling = callPackage ../development/tools/ceedling { }; + celt = callPackage ../development/libraries/celt { }; celt_0_7 = callPackage ../development/libraries/celt/0.7.nix { }; celt_0_5_1 = callPackage ../development/libraries/celt/0.5.1.nix { }; @@ -20602,6 +20808,8 @@ with pkgs; clanlib = callPackage ../development/libraries/clanlib { }; + clap = callPackage ../development/libraries/clap { }; + classads = callPackage ../development/libraries/classads { }; clfft = callPackage ../development/libraries/clfft { }; @@ -20637,7 +20845,9 @@ with pkgs; cmrt = callPackage ../development/libraries/cmrt { }; - codecserver = callPackage ../applications/audio/codecserver { }; + codecserver = callPackage ../applications/audio/codecserver { + protobuf = protobuf3_21; + }; coeurl = callPackage ../development/libraries/coeurl { }; @@ -21103,6 +21313,8 @@ with pkgs; folks = callPackage ../development/libraries/folks { }; + fortify-headers = callPackage ../development/libraries/fortify-headers { }; + makeFontsConf = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}: callPackage ../development/libraries/fontconfig/make-fonts-conf.nix { inherit fontconfig fontDirectories; @@ -21131,6 +21343,8 @@ with pkgs; fribidi = callPackage ../development/libraries/fribidi { }; + frozen = callPackage ../development/libraries/frozen { }; + funambol = callPackage ../development/libraries/funambol { }; function-runner = callPackage ../development/web/function-runner { }; @@ -21141,7 +21355,9 @@ with pkgs; gallia = callPackage ../tools/security/gallia { }; - gamenetworkingsockets = callPackage ../development/libraries/gamenetworkingsockets { }; + gamenetworkingsockets = callPackage ../development/libraries/gamenetworkingsockets { + protobuf = protobuf3_21; + }; game-music-emu = callPackage ../development/libraries/audio/game-music-emu { }; @@ -21224,6 +21440,10 @@ with pkgs; gdal = callPackage ../development/libraries/gdal { }; + gdalMinimal = callPackage ../development/libraries/gdal { + useMinimalFeatures = true; + }; + gdcm = callPackage ../development/libraries/gdcm { inherit (darwin.apple_sdk.frameworks) ApplicationServices Cocoa; }; @@ -21281,6 +21501,18 @@ with pkgs; rev = "v${version}"; hash = "sha256-KzBMwpqn6wUFhgB3KDclBS0BvZSVcasM5AG/y+L91xM="; }; + patches = []; + }; + + libgit2_1_6 = libgit2.overrideAttrs rec { + version = "1.6.4"; + src = fetchFromGitHub { + owner = "libgit2"; + repo = "libgit2"; + rev = "v${version}"; + hash = "sha256-lW3mokVKsbknVj2xsxEbeZH4IdKZ0aIgGutzenS0Eh0="; + }; + patches = [ ]; }; libgit2-glib = callPackage ../development/libraries/libgit2-glib { }; @@ -21332,6 +21564,11 @@ with pkgs; # Being redundant to avoid cycles on boot. TODO: find a better way glibcCross = callPackage ../development/libraries/glibc { stdenv = gccCrossLibcStdenv; # doesn't compile without gcc + libgcc = callPackage ../development/libraries/gcc/libgcc { + gcc = gccCrossLibcStdenv.cc; + glibc = glibcCross.override { libgcc = null; }; + stdenvNoLibs = gccCrossLibcStdenv; + }; }; muslCross = musl.override { @@ -21496,12 +21733,7 @@ with pkgs; grilo-plugins = callPackage ../development/libraries/grilo-plugins { }; - grpc = callPackage ../development/libraries/grpc { - # grpc builds with c++17 so abseil must also be built that way - abseil-cpp = abseil-cpp_202206.override { - cxxStandard = grpc.cxxStandard; - }; - }; + grpc = callPackage ../development/libraries/grpc { }; gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { }; @@ -21545,7 +21777,7 @@ with pkgs; granted = callPackage ../tools/admin/granted { }; - grantlee = callPackage ../development/libraries/grantlee { }; + grantlee = libsForQt5.callPackage ../development/libraries/grantlee { }; gsasl = callPackage ../development/libraries/gsasl { }; @@ -21714,6 +21946,8 @@ with pkgs; gtk-layer-shell = callPackage ../development/libraries/gtk-layer-shell { }; + gtk4-layer-shell = callPackage ../development/libraries/gtk4-layer-shell { }; + gts = callPackage ../development/libraries/gts { }; gumbo = callPackage ../development/libraries/gumbo { }; @@ -21802,6 +22036,8 @@ with pkgs; hunspellDicts = recurseIntoAttrs (callPackages ../development/libraries/hunspell/dictionaries.nix {}); + hunspellDictsChromium = recurseIntoAttrs (callPackages ../development/libraries/hunspell/dictionaries-chromium.nix {}); + hunspellWithDicts = dicts: callPackage ../development/libraries/hunspell/wrapper.nix { inherit dicts; }; hwloc = callPackage ../development/libraries/hwloc { }; @@ -21871,6 +22107,8 @@ with pkgs; imtui = callPackage ../development/libraries/imtui { }; + immer = callPackage ../development/libraries/immer { }; + imv = callPackage ../applications/graphics/imv { }; iml = callPackage ../development/libraries/iml { }; @@ -22069,6 +22307,8 @@ with pkgs; lcms2 = callPackage ../development/libraries/lcms2 { }; + lcrq = callPackage ../development/libraries/lcrq { }; + ldacbt = callPackage ../development/libraries/ldacbt { }; ldb = callPackage ../development/libraries/ldb { }; @@ -22788,6 +23028,8 @@ with pkgs; libre = callPackage ../development/libraries/libre { }; + librecast = callPackage ../development/libraries/librecast { }; + libredwg = callPackage ../development/libraries/libredwg { }; librem = callPackage ../development/libraries/librem { }; @@ -23130,7 +23372,9 @@ with pkgs; libptytty = callPackage ../development/libraries/libptytty { }; - libpulsar = callPackage ../development/libraries/libpulsar { }; + libpulsar = callPackage ../development/libraries/libpulsar { + protobuf = protobuf3_21; + }; libpwquality = callPackage ../development/libraries/libpwquality { python = python3; @@ -23535,12 +23779,12 @@ with pkgs; lightspark = callPackage ../misc/lightspark { }; - lightstep-tracer-cpp = callPackage ../development/libraries/lightstep-tracer-cpp { }; - - ligolo-ng = callPackage ../tools/networking/ligolo-ng { - buildGoModule = buildGo119Module; # go 1.20 build failure + lightstep-tracer-cpp = callPackage ../development/libraries/lightstep-tracer-cpp { + protobuf = protobuf3_21; }; + ligolo-ng = callPackage ../tools/networking/ligolo-ng { }; + linenoise = callPackage ../development/libraries/linenoise { }; linenoise-ng = callPackage ../development/libraries/linenoise-ng { }; @@ -23874,7 +24118,7 @@ with pkgs; ngtcp2-gnutls = callPackage ../development/libraries/ngtcp2/gnutls.nix { }; nix-plugins = callPackage ../development/libraries/nix-plugins { - nix = nixVersions.nix_2_16; + nix = nixVersions.nix_2_17; }; nika-fonts = callPackage ../data/fonts/nika-fonts { }; @@ -23951,10 +24195,10 @@ with pkgs; nvidia-vaapi-driver = lib.hiPrio (callPackage ../development/libraries/nvidia-vaapi-driver { }); - nvidia-video-sdk = callPackage ../development/libraries/nvidia-video-sdk { }; - nvidia-optical-flow-sdk = callPackage ../development/libraries/nvidia-optical-flow-sdk { }; + nvidia-system-monitor-qt = libsForQt5.callPackage ../tools/system/nvidia-system-monitor-qt { }; + nvitop = callPackage ../tools/system/nvitop { }; nvtop = callPackage ../tools/system/nvtop { }; @@ -24286,8 +24530,9 @@ with pkgs; prospector = callPackage ../development/tools/prospector { }; - protobuf = protobuf3_21; + protobuf = protobuf3_23; + protobuf3_23 = callPackage ../development/libraries/protobuf/3.23.nix { }; protobuf3_21 = callPackage ../development/libraries/protobuf/3.21.nix { abseil-cpp = abseil-cpp_202103; }; @@ -24339,6 +24584,8 @@ with pkgs; qimageblitz = callPackage ../development/libraries/qimageblitz { }; + qoi = callPackage ../development/libraries/qoi { }; + qolibri = libsForQt5.callPackage ../applications/misc/qolibri { }; quarto = callPackage ../development/libraries/quarto { }; @@ -24376,7 +24623,7 @@ with pkgs; qt5 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.15) { inherit (__splicedPackages) - makeScopeWithSplicing generateSplicesForMkScope lib fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper + makeScopeWithSplicing' generateSplicesForMkScope lib fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper bison cups dconf harfbuzz libGL perl gtk3 python3 darwin buildPackages; inherit (__splicedPackages.gst_all_1) gstreamer gst-plugins-base; @@ -24494,7 +24741,9 @@ with pkgs; qm-dsp = callPackage ../development/libraries/audio/qm-dsp { }; - qradiolink = callPackage ../applications/radio/qradiolink { }; + qradiolink = callPackage ../applications/radio/qradiolink { + protobuf = protobuf3_21; + }; qrupdate = callPackage ../development/libraries/qrupdate { }; @@ -24681,8 +24930,6 @@ with pkgs; sfsexp = callPackage ../development/libraries/sfsexp { }; - shhgit = callPackage ../tools/security/shhgit { }; - shhmsg = callPackage ../development/libraries/shhmsg { }; shhopt = callPackage ../development/libraries/shhopt { }; @@ -24862,8 +25109,6 @@ with pkgs; speech-tools = callPackage ../development/libraries/speech-tools { }; - speedtest-exporter = callPackage ../development/libraries/speedtest-exporter { }; - speex = callPackage ../development/libraries/speex { fftw = fftwFloat; }; @@ -24924,6 +25169,8 @@ with pkgs; sv-lang = callPackage ../applications/science/electronics/sv-lang { }; + sqld = callPackage ../servers/sql/sqld { }; + sqlite = lowPrio (callPackage ../development/libraries/sqlite { }); unqlite = lowPrio (callPackage ../development/libraries/unqlite { }); @@ -25325,10 +25572,7 @@ with pkgs; wlr-protocols = callPackage ../development/libraries/wlroots/protocols.nix { }; wt = wt4; - inherit (callPackages ../development/libraries/wt { - boost = boost175; - }) - wt3 + inherit (libsForQt5.callPackage ../development/libraries/wt { }) wt4; wxformbuilder = callPackage ../development/tools/wxformbuilder { }; @@ -25376,6 +25620,8 @@ with pkgs; xdo = callPackage ../tools/misc/xdo { }; + xdiskusage = callPackage ../tools/misc/xdiskusage { }; + xed = callPackage ../development/libraries/xed { }; xedit = callPackage ../applications/editors/xedit { }; @@ -25449,6 +25695,8 @@ with pkgs; yubioath-flutter = callPackage ../applications/misc/yubioath-flutter { }; + yyjson = callPackage ../development/libraries/yyjson { }; + zchunk = callPackage ../development/libraries/zchunk { }; zeitgeist = callPackage ../development/libraries/zeitgeist { }; @@ -25473,7 +25721,7 @@ with pkgs; libzra = callPackage ../development/libraries/libzra { }; # requires a newer Apple SDK - zig_0_9 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.9.1.nix { + zig_0_9 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.9.nix { llvmPackages = llvmPackages_13; }; # requires a newer Apple SDK @@ -25484,9 +25732,9 @@ with pkgs; zig_0_11 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.11.nix { llvmPackages = llvmPackages_16; }; - zig = zig_0_10; + zig = zig_0_11; - zigHook = callPackage ../development/compilers/zig/hook.nix { }; + zig-shell-completions = callPackage ../development/compilers/zig/shell-completions.nix { }; zimlib = callPackage ../development/libraries/zimlib { }; @@ -25496,6 +25744,8 @@ with pkgs; zita-resampler = callPackage ../development/libraries/audio/zita-resampler { }; + zitadel-tools = callPackage ../tools/misc/zitadel-tools { }; + zix = callPackage ../development/libraries/audio/zix { }; zz = callPackage ../development/compilers/zz { }; @@ -25641,6 +25891,17 @@ with pkgs; go = buildPackages.go_1_20; }; + # requires a newer Apple SDK + go_1_21 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.21.nix { + inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security; + }; + buildGo121Module = darwin.apple_sdk_11_0.callPackage ../build-support/go/module.nix { + go = buildPackages.go_1_21; + }; + buildGo121Package = darwin.apple_sdk_11_0.callPackage ../build-support/go/package.nix { + go = buildPackages.go_1_21; + }; + go2nix = callPackage ../development/tools/go2nix { }; leaps = callPackage ../development/tools/leaps { }; @@ -25792,14 +26053,14 @@ with pkgs; ### DEVELOPMENT / PERL MODULES perlInterpreters = import ../development/interpreters/perl { inherit callPackage; }; - inherit (perlInterpreters) perl534 perl536 perldevel; + inherit (perlInterpreters) perl536 perl538 perldevel; - perl534Packages = recurseIntoAttrs perl534.pkgs; perl536Packages = recurseIntoAttrs perl536.pkgs; + perl538Packages = recurseIntoAttrs perl538.pkgs; perldevelPackages = perldevel.pkgs; - perl = perl536; - perlPackages = perl536Packages; + perl = perl538; + perlPackages = perl538Packages; ack = perlPackages.ack; @@ -26308,6 +26569,8 @@ with pkgs; leafnode = callPackage ../servers/news/leafnode { }; + leafnode1 = callPackage ../servers/news/leafnode/1.nix { }; + lemmy-server = callPackage ../servers/web-apps/lemmy/server.nix { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -26699,6 +26962,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; boost = boost177; # Configure checks for specific version. icu = icu69; + protobuf = protobuf3_21; }; mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; @@ -26862,6 +27126,7 @@ with pkgs; prometheus-gitlab-ci-pipelines-exporter = callPackage ../servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix { }; prometheus-graphite-exporter = callPackage ../servers/monitoring/prometheus/graphite-exporter.nix { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; + prometheus-idrac-exporter = callPackage ../servers/monitoring/prometheus/idrac-exporter.nix { }; prometheus-influxdb-exporter = callPackage ../servers/monitoring/prometheus/influxdb-exporter.nix { }; prometheus-ipmi-exporter = callPackage ../servers/monitoring/prometheus/ipmi-exporter.nix { }; prometheus-jitsi-exporter = callPackage ../servers/monitoring/prometheus/jitsi-exporter.nix { }; @@ -26903,7 +27168,6 @@ with pkgs; prometheus-smartctl-exporter = callPackage ../servers/monitoring/prometheus/smartctl-exporter { }; prometheus-smokeping-prober = callPackage ../servers/monitoring/prometheus/smokeping-prober.nix { }; prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; - prometheus-speedtest-exporter = callPackage ../servers/monitoring/prometheus/speedtest-exporter.nix { }; prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { }; prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { }; prometheus-sql-exporter = callPackage ../servers/monitoring/prometheus/sql-exporter.nix { }; @@ -26952,6 +27216,8 @@ with pkgs; radicale = radicale3; + qcal = callPackage ../tools/networking/qcal/default.nix { }; + rake = callPackage ../development/tools/build-managers/rake { }; rakkess = callPackage ../development/tools/rakkess { }; @@ -26976,6 +27242,7 @@ with pkgs; rethinkdb = callPackage ../servers/nosql/rethinkdb { stdenv = clangStdenv; libtool = darwin.cctools; + protobuf = protobuf3_21; }; rippled = callPackage ../servers/rippled { @@ -27210,9 +27477,6 @@ with pkgs; }; xorg = let - keep = _self: { }; - extra = _spliced0: { }; - # Use `lib.callPackageWith __splicedPackages` rather than plain `callPackage` # so as not to have the newly bound xorg items already in scope, which would # have created a cycle. @@ -27227,11 +27491,10 @@ with pkgs; generatedPackages = lib.callPackageWith __splicedPackages ../servers/x11/xorg/default.nix { }; - xorgPackages = makeScopeWithSplicing - (generateSplicesForMkScope "xorg") - keep - extra - (lib.extends overrides generatedPackages); + xorgPackages = makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "xorg"; + f = lib.extends overrides generatedPackages; + }; in recurseIntoAttrs xorgPackages; @@ -27322,7 +27585,8 @@ with pkgs; tinyalsa = callPackage ../os-specific/linux/tinyalsa { }; - inherit (callPackage ../os-specific/linux/alsa-project { }) + alsa-project = callPackage ../os-specific/linux/alsa-project { }; + inherit (alsa-project) alsa-firmware alsa-lib alsa-oss @@ -27333,6 +27597,8 @@ with pkgs; alsa-ucm-conf alsa-utils; + apparency = callPackage ../os-specific/darwin/apparency { }; + arm-trusted-firmware = callPackage ../misc/arm-trusted-firmware { }; inherit (arm-trusted-firmware) buildArmTrustedFirmware @@ -27462,7 +27728,7 @@ with pkgs; criu = callPackage ../os-specific/linux/criu { }; cryptomator = callPackage ../tools/security/cryptomator { - jdk = jdk.override { enableJavaFX = true; }; + jdk = jdk20.override { enableJavaFX = true; }; }; cryptsetup = callPackage ../os-specific/linux/cryptsetup { }; @@ -28418,7 +28684,9 @@ with pkgs; sgx-ssl = callPackage ../os-specific/linux/sgx/ssl { }; - sgx-psw = callPackage ../os-specific/linux/sgx/psw { }; + sgx-psw = callPackage ../os-specific/linux/sgx/psw { + protobuf = protobuf3_21; + }; shadow = callPackage ../os-specific/linux/shadow { }; @@ -29613,6 +29881,8 @@ with pkgs; sampradaya = callPackage ../data/fonts/sampradaya { }; + sarabun-font = callPackage ../data/fonts/sarabun { }; + sarasa-gothic = callPackage ../data/fonts/sarasa-gothic { }; savepagenow = callPackage ../tools/misc/savepagenow { }; @@ -30025,6 +30295,8 @@ with pkgs; appvm = callPackage ../applications/virtualization/appvm { }; + anilibria-winmaclinux = libsForQt5.callPackage ../applications/video/anilibria-winmaclinux { }; + yggdrasil = callPackage ../tools/networking/yggdrasil { }; masterpdfeditor = libsForQt5.callPackage ../applications/misc/masterpdfeditor { }; @@ -30112,6 +30384,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + anytone-emu = callPackage ../applications/radio/anytone-emu { }; + anytype = callPackage ../applications/misc/anytype { }; ao = libfive; @@ -30134,8 +30408,6 @@ with pkgs; texlive = texlive.combined.scheme-medium; }; - aqemu = libsForQt5.callPackage ../applications/virtualization/aqemu { }; - ardour_6 = callPackage ../applications/audio/ardour/6.nix { }; ardour = callPackage ../applications/audio/ardour { }; @@ -30186,6 +30458,7 @@ with pkgs; astroid = callPackage ../applications/networking/mailreaders/astroid { vim = vim-full.override { features = "normal"; }; + protobuf = protobuf3_21; }; aucatctl = callPackage ../applications/audio/aucatctl { }; @@ -30264,6 +30537,8 @@ with pkgs; join-desktop = callPackage ../applications/misc/join-desktop { }; + joincap = callPackage ../tools/security/joincap { }; + json-plot = callPackage ../applications/graphics/json-plot { }; libbitcoin = callPackage ../tools/misc/libbitcoin/libbitcoin.nix { @@ -30760,6 +31035,8 @@ with pkgs; cwm = callPackage ../applications/window-managers/cwm { }; + cyber = callPackage ../development/interpreters/cyber { }; + cyberduck = callPackage ../applications/networking/cyberduck { }; cyclone = callPackage ../applications/audio/pd-plugins/cyclone { }; @@ -30817,6 +31094,8 @@ with pkgs; dia = callPackage ../applications/graphics/dia { }; + diebahn = callPackage ../applications/misc/diebahn { }; + digital = callPackage ../applications/science/electronics/digital { }; direwolf = callPackage ../applications/radio/direwolf { @@ -30995,7 +31274,8 @@ with pkgs; ecs-agent = callPackage ../applications/virtualization/ecs-agent { }; - ed = callPackage ../applications/editors/ed { }; + inherit (recurseIntoAttrs (callPackage ../applications/editors/ed { })) + ed edUnstable; edbrowse = callPackage ../applications/editors/edbrowse { }; @@ -31038,10 +31318,11 @@ with pkgs; emacs29-gtk3 emacs29-nox emacs29-pgtk - emacs-macport + emacs28-macport + emacs29-macport ; - emacsMacport = emacs-macport; + emacs-macport = emacs28-macport; emacs = emacs28; emacs-gtk = emacs28-gtk3; emacs-nox = emacs28-nox; @@ -31862,6 +32143,8 @@ with pkgs; muzika = callPackage ../applications/audio/muzika { }; + openutau = callPackage ../applications/audio/openutau { }; + pattypan = callPackage ../applications/misc/pattypan { jdk = jdk.override { enableJavaFX = true; }; }; @@ -31879,6 +32162,8 @@ with pkgs; svox = callPackage ../applications/audio/svox { }; + g4music = callPackage ../applications/audio/g4music { }; + genesys = callPackage ../applications/misc/genesys { }; giada = callPackage ../applications/audio/giada { }; @@ -32014,6 +32299,8 @@ with pkgs; gspell = callPackage ../development/libraries/gspell { }; + gst123 = callPackage ../applications/audio/gst123 { }; + gtk2fontsel = callPackage ../applications/misc/gtk2fontsel { }; gtklock = callPackage ../tools/wayland/gtklock { }; @@ -32189,7 +32476,9 @@ with pkgs; extra-packages = [ csound ]; }; - hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { }; + hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { + protobuf = protobuf3_21; + }; hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { }; @@ -32261,12 +32550,16 @@ with pkgs; pixinsight = libsForQt5.callPackage ../applications/graphics/pixinsight { }; + planner = callPackage ../applications/office/planner { }; + please-cli = callPackage ../applications/misc/please-cli { }; protonup-qt = python3Packages.callPackage ../applications/misc/protonup-qt { }; pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap { }; + pokeget-rs = callPackage ../tools/misc/pokeget-rs { }; + popura = callPackage ../tools/networking/popura { }; pureref = callPackage ../applications/graphics/pureref { }; @@ -32360,6 +32653,8 @@ with pkgs; rlaunch = callPackage ../applications/misc/rlaunch { }; + remontoire = callPackage ../applications/misc/remontoire { }; + rootbar = callPackage ../applications/misc/rootbar { }; waybar = callPackage ../applications/misc/waybar { }; @@ -32370,11 +32665,7 @@ with pkgs; waycorner = callPackage ../applications/misc/waycorner { }; - waylock = callPackage ../applications/misc/waylock { - zigHook = zigHook.override { - zig = buildPackages.zig_0_10; - }; - }; + waylock = callPackage ../applications/misc/waylock { }; wayshot = callPackage ../tools/misc/wayshot { }; @@ -32468,8 +32759,6 @@ with pkgs; id3v2 = callPackage ../applications/audio/id3v2 { }; - ideamaker = libsForQt5.callPackage ../applications/misc/ideamaker { }; - identity = callPackage ../applications/graphics/identity { }; ifenslave = callPackage ../os-specific/linux/ifenslave { }; @@ -32497,7 +32786,9 @@ with pkgs; texinfo = buildPackages.texinfo6_7; # Uses @setcontentsaftertitlepage, removed in 6.8. }; - avalonia-ilspy = callPackage ../applications/misc/avalonia-ilspy { }; + avalonia-ilspy = callPackage ../applications/misc/avalonia-ilspy { + inherit (darwin) autoSignDarwinBinariesHook; + }; image-roll = callPackage ../applications/graphics/image-roll { }; @@ -32690,6 +32981,8 @@ with pkgs; joe = callPackage ../applications/editors/joe { }; + johnny = callPackage ../applications/misc/johnny { }; + josm = callPackage ../applications/misc/josm { }; js8call = qt5.callPackage ../applications/radio/js8call { }; @@ -32774,7 +33067,7 @@ with pkgs; klayout = libsForQt5.callPackage ../applications/misc/klayout { }; - klee = callPackage ../applications/science/logic/klee (with llvmPackages_11; { + klee = callPackage ../applications/science/logic/klee (with llvmPackages_12; { clang = clang; llvm = llvm; stdenv = stdenv; @@ -32817,6 +33110,8 @@ with pkgs; krabby = callPackage ../applications/misc/krabby { }; + kraft = callPackage ../applications/virtualization/kraft { }; + krane = callPackage ../applications/networking/cluster/krane { }; krita = libsForQt5.callPackage ../applications/graphics/krita { }; @@ -32880,6 +33175,8 @@ with pkgs; kubectl-images = callPackage ../applications/networking/cluster/kubectl-images { }; + kubectl-klock = callPackage ../applications/networking/cluster/kubectl-klock { }; + kubectl-ktop = callPackage ../applications/networking/cluster/kubectl-ktop { }; kubectl-node-shell = callPackage ../applications/networking/cluster/kubectl-node-shell { }; @@ -33348,9 +33645,6 @@ with pkgs; mepo = callPackage ../applications/misc/mepo { inherit (gnome) zenity; - zigHook = zigHook.override { - zig = buildPackages.zig_0_9; - }; }; meshcentral = callPackage ../tools/admin/meshcentral { }; @@ -33590,7 +33884,18 @@ with pkgs; rofi-pulse-select = callPackage ../applications/audio/rofi-pulse-select { }; - rofi-rbw = python3Packages.callPackage ../applications/misc/rofi-rbw { }; + rofi-rbw = python3Packages.callPackage ../applications/misc/rofi-rbw { + waylandSupport = false; + x11Support = false; + }; + + rofi-rbw-wayland = python3Packages.callPackage ../applications/misc/rofi-rbw { + waylandSupport = true; + }; + + rofi-rbw-x11 = python3Packages.callPackage ../applications/misc/rofi-rbw { + x11Support = true; + }; rofi-screenshot = callPackage ../applications/misc/rofi-screenshot { }; @@ -33660,13 +33965,14 @@ with pkgs; avahi = avahi-compat; pulseSupport = config.pulseaudio or false; iceSupport = config.murmur.iceSupport or true; - grpcSupport = config.murmur.grpcSupport or true; + protobuf = protobuf3_21; }).murmur; mumble = (callPackages ../applications/networking/mumble { avahi = avahi-compat; jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; + protobuf = protobuf3_21; }).mumble; mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { @@ -33690,6 +33996,8 @@ with pkgs; mutt-ics = callPackage ../tools/networking/mutt-ics { }; + mw = callPackage ../tools/text/mw { }; + mwic = callPackage ../applications/misc/mwic { pythonPackages = python3Packages; }; @@ -33788,7 +34096,9 @@ with pkgs; osm2pgsql = callPackage ../tools/misc/osm2pgsql { }; - ostinato = libsForQt5.callPackage ../applications/networking/ostinato { }; + ostinato = libsForQt5.callPackage ../applications/networking/ostinato { + protobuf = protobuf3_21; + }; p4 = callPackage ../applications/version-management/p4 { inherit (darwin.apple_sdk.frameworks) CoreServices Foundation Security; @@ -33892,6 +34202,7 @@ with pkgs; shogun = callPackage ../applications/science/machine-learning/shogun { opencv = opencv3; + protobuf = protobuf3_21; }; smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; @@ -33902,6 +34213,8 @@ with pkgs; songrec = callPackage ../applications/audio/songrec { }; + storj-uplink = callPackage ../applications/networking/sync/storj-uplink {}; + storrent = callPackage ../applications/networking/p2p/storrent { }; speedread = callPackage ../applications/misc/speedread { }; @@ -34015,11 +34328,7 @@ with pkgs; netcoredbg = callPackage ../development/tools/misc/netcoredbg { }; - ncdu = callPackage ../tools/misc/ncdu { - zigHook = zigHook.override { - zig = buildPackages.zig_0_10; - }; - }; + ncdu = callPackage ../tools/misc/ncdu { }; ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { }; @@ -34340,6 +34649,8 @@ with pkgs; stdenv = gccStdenv; }; + peazip = libsForQt5.callPackage ../tools/archivers/peazip { }; + peek = callPackage ../applications/video/peek { }; peertube = callPackage ../servers/peertube { @@ -34529,6 +34840,8 @@ with pkgs; pwdsafety = callPackage ../tools/security/pwdsafety { }; + pwvucontrol = callPackage ../applications/audio/pwvucontrol { }; + pyload-ng = callPackage ../applications/networking/pyload-ng {}; pyrosimple = callPackage ../applications/networking/p2p/pyrosimple { }; @@ -34691,8 +35004,7 @@ with pkgs; withXineBackend = true; }; - qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { }; - qutebrowser-qt6 = callPackage ../applications/networking/browsers/qutebrowser { + qutebrowser = callPackage ../applications/networking/browsers/qutebrowser { inherit (qt6Packages) qtbase qtwebengine wrapQtAppsHook qtwayland; }; @@ -34773,7 +35085,9 @@ with pkgs; rgp = libsForQt5.callPackage ../development/tools/rgp { }; - ricochet = libsForQt5.callPackage ../applications/networking/instant-messengers/ricochet { }; + ricochet = libsForQt5.callPackage ../applications/networking/instant-messengers/ricochet { + protobuf = protobuf3_21; + }; ries = callPackage ../applications/science/math/ries { }; @@ -35097,7 +35411,10 @@ with pkgs; curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { }; - curaengine = callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; }; + curaengine = callPackage ../applications/misc/curaengine { + inherit (python3.pkgs) libarcus; + protobuf = protobuf3_21; + }; cura = libsForQt5.callPackage ../applications/misc/cura { }; @@ -35285,7 +35602,6 @@ with pkgs; inherit (callPackages ../applications/networking/syncthing { inherit (darwin) autoSignDarwinBinariesHook; - buildGoModule = buildGo119Module; # go 1.20 build failure }) syncthing syncthing-discovery @@ -35436,6 +35752,8 @@ with pkgs; tev = callPackage ../applications/graphics/tev { }; + textual-paint = callPackage ../applications/graphics/textual-paint { }; + themechanger = callPackage ../applications/misc/themechanger { }; thinkingRock = callPackage ../applications/misc/thinking-rock { }; @@ -35479,7 +35797,9 @@ with pkgs; tijolo = callPackage ../applications/editors/tijolo { }; - tilemaker = callPackage ../applications/misc/tilemaker { }; + tilemaker = callPackage ../applications/misc/tilemaker { + protobuf = protobuf3_21; + }; timbreid = callPackage ../applications/audio/pd-plugins/timbreid { fftw = fftwSinglePrec; @@ -36016,6 +36336,8 @@ with pkgs; watershot = callPackage ../applications/misc/watershot { }; + waypaper = callPackage ../applications/misc/waypaper { }; + w3m = callPackage ../applications/networking/browsers/w3m { }; # Should always be the version with the most features @@ -36330,9 +36652,7 @@ with pkgs; win-spice = callPackage ../applications/virtualization/driver/win-spice { }; win-virtio = callPackage ../applications/virtualization/driver/win-virtio { }; - win-qemu = callPackage ../applications/virtualization/driver/win-qemu { }; win-pvdrivers = callPackage ../applications/virtualization/driver/win-pvdrivers { }; - win-signed-gplpv-drivers = callPackage ../applications/virtualization/driver/win-signed-gplpv-drivers { }; xfig = callPackage ../applications/graphics/xfig { }; @@ -36438,6 +36758,8 @@ with pkgs; xscreensaver = callPackage ../misc/screensavers/xscreensaver { }; + xsubfind3r = callPackage ../tools/security/xsubfind3r { }; + xsuspender = callPackage ../applications/misc/xsuspender { }; xss-lock = callPackage ../misc/screensavers/xss-lock { }; @@ -36669,9 +36991,11 @@ with pkgs; bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc { withGui = true; + protobuf = protobuf3_21; }; bitcoind-abc = callPackage ../applications/blockchains/bitcoin-abc { mkDerivation = stdenv.mkDerivation; + protobuf = protobuf3_21; withGui = false; }; @@ -37181,11 +37505,7 @@ with pkgs; inherit (perlPackages) PathTiny; }; - blackshades = callPackage ../games/blackshades { - zigHook = zigHook.override { - zig = buildPackages.zig_0_9; - }; - }; + blackshades = callPackage ../games/blackshades { }; blobby = callPackage ../games/blobby { }; @@ -37239,7 +37559,9 @@ with pkgs; ckan = callPackage ../games/ckan { }; - cockatrice = libsForQt5.callPackage ../games/cockatrice { }; + cockatrice = libsForQt5.callPackage ../games/cockatrice { + protobuf = protobuf3_21; + }; commandergenius = callPackage ../games/commandergenius { }; @@ -37269,6 +37591,8 @@ with pkgs; curseofwar = callPackage ../games/curseofwar { SDL = null; }; curseofwar-sdl = callPackage ../games/curseofwar { ncurses = null; }; + cutechess = qt5.callPackage ../games/cutechess { }; + cutemaze = qt6Packages.callPackage ../games/cutemaze { }; cuyo = callPackage ../games/cuyo { }; @@ -37704,6 +38028,8 @@ with pkgs; nexuiz = callPackage ../games/nexuiz { }; + nile = python3Packages.callPackage ../games/nile { }; + ninvaders = callPackage ../games/ninvaders { }; njam = callPackage ../games/njam { }; @@ -37829,10 +38155,13 @@ with pkgs; pong3d = callPackage ../games/pong3d { }; - pokerth = libsForQt5.callPackage ../games/pokerth { }; + pokerth = libsForQt5.callPackage ../games/pokerth { + protobuf = protobuf3_21; + }; pokerth-server = libsForQt5.callPackage ../games/pokerth { target = "server"; + protobuf = protobuf3_21; }; pokete = callPackage ../games/pokete { }; @@ -38123,6 +38452,8 @@ with pkgs; typespeed = callPackage ../games/typespeed { }; + u2ps = callPackage ../tools/text/u2ps { }; + uchess = callPackage ../games/uchess { }; ufoai = callPackage ../games/ufoai { }; @@ -38499,6 +38830,8 @@ with pkgs; archimedes = callPackage ../applications/science/electronics/archimedes { }; + bamtools = callPackage ../applications/science/biology/bamtools { }; + bayescan = callPackage ../applications/science/biology/bayescan { }; bedops = callPackage ../applications/science/biology/bedops { }; @@ -38669,7 +39002,7 @@ with pkgs; inherit (llvmPackages) openmp; }; - mosdepth = callPackage ../applications/science/biology/mosdepth { }; + mosdepth = nim2Packages.callPackage ../applications/science/biology/mosdepth { }; niftyreg = callPackage ../applications/science/biology/niftyreg { }; @@ -39171,7 +39504,7 @@ with pkgs; hol = callPackage ../applications/science/logic/hol { }; - inherit (ocaml-ng.ocamlPackages_4_12) hol_light; + inherit (ocamlPackages) hol_light; hologram = callPackage ../tools/security/hologram { }; @@ -39443,7 +39776,7 @@ with pkgs; caffeWithCuda = caffe.override { cudaSupport = true; }; - caffeine-ng = python3Packages.callPackage ../tools/X11/caffeine-ng { }; + caffeine-ng = callPackage ../tools/X11/caffeine-ng { }; cntk = callPackage ../applications/science/math/cntk { stdenv = gcc7Stdenv; @@ -39726,12 +40059,6 @@ with pkgs; fn-cli = callPackage ../applications/networking/cluster/fn-cli { }; - areca = callPackage ../applications/backup/areca { - jdk = jdk8; - jre = jre8; - swt = swt_jdk8; - }; - argononed = callPackage ../misc/drivers/argononed { }; autotiling = python3Packages.callPackage ../misc/autotiling { }; @@ -40155,6 +40482,8 @@ with pkgs; morph = callPackage ../tools/package-management/morph { }; + mus = callPackage ../applications/audio/mus { }; + muse = libsForQt5.callPackage ../applications/audio/muse { }; museeks = callPackage ../applications/audio/museeks { }; @@ -40323,7 +40652,9 @@ with pkgs; nix-melt = callPackage ../tools/nix/nix-melt { }; - nixos-option = callPackage ../tools/nix/nixos-option { }; + nixos-option = callPackage ../tools/nix/nixos-option { + nix = nixVersions.nix_2_15; + }; nix-pin = callPackage ../tools/package-management/nix-pin { }; @@ -40416,7 +40747,7 @@ with pkgs; disnix = callPackage ../tools/package-management/disnix { }; dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or { - inherit (python2Packages) supervisor; + inherit (python3Packages) supervisor; }); dydisnix = callPackage ../tools/package-management/disnix/dydisnix { }; @@ -40532,6 +40863,8 @@ with pkgs; qperf = callPackage ../os-specific/linux/qperf { }; + qzdl = libsForQt5.callPackage ../games/qzdl { }; + rates = callPackage ../tools/misc/rates { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -40564,6 +40897,8 @@ with pkgs; rivalcfg = callPackage ../misc/rivalcfg { }; + roadrunner = callPackage ../servers/roadrunner { }; + rmfakecloud = callPackage ../servers/rmfakecloud { }; rmfuse = callPackage ../tools/filesystems/rmfuse { }; @@ -40665,6 +41000,8 @@ with pkgs; brlaser = callPackage ../misc/cups/drivers/brlaser { }; + fflinuxprint = callPackage ../misc/cups/drivers/fflinuxprint { }; + fxlinuxprint = callPackage ../misc/cups/drivers/fxlinuxprint { }; brscan4 = callPackage ../applications/graphics/sane/backends/brscan4 { }; @@ -40858,6 +41195,8 @@ with pkgs; unityhub = callPackage ../development/tools/unityhub { }; + upspin = callPackage ../tools/filesystems/upspin { }; + urbit = callPackage ../misc/urbit { }; usb-reset = callPackage ../applications/misc/usb-reset { }; @@ -40878,6 +41217,8 @@ with pkgs; vault-medusa = callPackage ../tools/security/vault-medusa { }; + vault-ssh-plus = callPackage ../tools/security/vault-ssh-plus { }; + vault-bin = callPackage ../tools/security/vault/vault-bin.nix { }; vaultenv = haskell.lib.justStaticExecutables haskellPackages.vaultenv; @@ -40893,6 +41234,10 @@ with pkgs; vazir-fonts = callPackage ../data/fonts/vazir-fonts { }; + veilid = callPackage ../tools/networking/veilid { + inherit (darwin.apple_sdk.frameworks) AppKit Security; + }; + vhs = callPackage ../applications/misc/vhs { }; vgmstream = callPackage ../applications/audio/vgmstream { }; @@ -41633,6 +41978,8 @@ with pkgs; ov = callPackage ../tools/text/ov { }; + deface = callPackage ../applications/video/deface { }; + tubekit = callPackage ../applications/networking/cluster/tubekit/wrapper.nix { }; tubekit-unwrapped = callPackage ../applications/networking/cluster/tubekit { }; @@ -41676,4 +42023,6 @@ with pkgs; gitrs = callPackage ../tools/misc/gitrs { }; wttrbar = callPackage ../applications/misc/wttrbar { }; + + wpm = callPackage ../applications/misc/wpm { }; } diff --git a/nixpkgs/pkgs/top-level/cuda-packages.nix b/nixpkgs/pkgs/top-level/cuda-packages.nix index 2044d74cab79..a2f49a98ccd5 100644 --- a/nixpkgs/pkgs/top-level/cuda-packages.nix +++ b/nixpkgs/pkgs/top-level/cuda-packages.nix @@ -47,6 +47,8 @@ let nccl = final.callPackage ../development/libraries/science/math/nccl { }; + nccl-tests = final.callPackage ../development/libraries/science/math/nccl/tests.nix { }; + autoAddOpenGLRunpathHook = final.callPackage ( { makeSetupHook, addOpenGLRunpath }: makeSetupHook { name = "auto-add-opengl-runpath-hook"; @@ -70,4 +72,4 @@ let cutensorExtension ]); -in (scope.overrideScope' composedExtension) +in (scope.overrideScope composedExtension) diff --git a/nixpkgs/pkgs/top-level/darwin-packages.nix b/nixpkgs/pkgs/top-level/darwin-packages.nix index ef4240955b9c..ed049340332c 100644 --- a/nixpkgs/pkgs/top-level/darwin-packages.nix +++ b/nixpkgs/pkgs/top-level/darwin-packages.nix @@ -1,6 +1,6 @@ { lib , buildPackages, pkgs, targetPackages -, generateSplicesForMkScope, makeScopeWithSplicing +, generateSplicesForMkScope, makeScopeWithSplicing' , stdenv , preLibcCrossHeaders , config @@ -15,7 +15,10 @@ let (stdenv.targetPlatform.config + "-"); in -makeScopeWithSplicing (generateSplicesForMkScope "darwin") (_: {}) (spliced: spliced.apple_sdk.frameworks) (self: let +makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "darwin"; + extra = spliced: spliced.apple_sdk.frameworks; + f = (self: let inherit (self) mkDerivation callPackage; # Must use pkgs.callPackage to avoid infinite recursion. @@ -133,20 +136,10 @@ impure-cmds // appleSourcePackages // chooseLibs // { sigtool = callPackage ../os-specific/darwin/sigtool { }; - postLinkSignHook = pkgs.writeTextFile { - name = "post-link-sign-hook"; - executable = true; - - text = '' - if [ "$linkerOutput" != "/dev/null" ]; then - CODESIGN_ALLOCATE=${targetPrefix}codesign_allocate \ - ${self.sigtool}/bin/codesign -f -s - "$linkerOutput" - fi - ''; - }; - signingUtils = callPackage ../os-specific/darwin/signing-utils { }; + postLinkSignHook = callPackage ../os-specific/darwin/signing-utils/post-link-sign-hook.nix { }; + autoSignDarwinBinariesHook = pkgs.makeSetupHook { name = "auto-sign-darwin-binaries-hook"; propagatedBuildInputs = [ self.signingUtils ]; @@ -251,4 +244,5 @@ impure-cmds // appleSourcePackages // chooseLibs // { } // lib.optionalAttrs config.allowAliases { builder = throw "'darwin.builder' has been changed and renamed to 'darwin.linux-builder'. The default ssh port is now 31022. Please update your configuration or override the port back to 22. See https://nixos.org/manual/nixpkgs/unstable/#sec-darwin-builder"; # added 2023-07-06 -}) +}); +} diff --git a/nixpkgs/pkgs/top-level/haskell-packages.nix b/nixpkgs/pkgs/top-level/haskell-packages.nix index 42867afef83d..c57302ccaa8b 100644 --- a/nixpkgs/pkgs/top-level/haskell-packages.nix +++ b/nixpkgs/pkgs/top-level/haskell-packages.nix @@ -5,11 +5,8 @@ let integerSimpleExcludes = [ "ghc865Binary" "ghc8102Binary" - "ghc8102BinaryMinimal" "ghc8107Binary" - "ghc8107BinaryMinimal" "ghc924Binary" - "ghc924BinaryMinimal" "ghcjs" "ghcjs810" "integer-simple" @@ -26,6 +23,7 @@ let "ghc943" "ghc944" "ghc945" + "ghc946" "ghc94" "ghc96" "ghc962" @@ -46,6 +44,7 @@ let "ghc943" "ghc944" "ghc945" + "ghc946" "ghc96" "ghc962" "ghcHEAD" @@ -89,36 +88,20 @@ in { llvmPackages = pkgs.llvmPackages_9; }; - ghc8102BinaryMinimal = callPackage ../development/compilers/ghc/8.10.2-binary.nix { - llvmPackages = pkgs.llvmPackages_9; - minimal = true; - }; - ghc8107Binary = callPackage ../development/compilers/ghc/8.10.7-binary.nix { llvmPackages = pkgs.llvmPackages_12; }; - ghc8107BinaryMinimal = callPackage ../development/compilers/ghc/8.10.7-binary.nix { - llvmPackages = pkgs.llvmPackages_12; - minimal = true; - }; - ghc924Binary = callPackage ../development/compilers/ghc/9.2.4-binary.nix { llvmPackages = pkgs.llvmPackages_12; }; - ghc924BinaryMinimal = callPackage ../development/compilers/ghc/9.2.4-binary.nix { - llvmPackages = pkgs.llvmPackages_12; - minimal = true; - }; ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix { bootPkgs = # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar # 8.10.2 is needed as using 8.10.7 is broken due to RTS-incompatibilities - if stdenv.isAarch64 then - packages.ghc8102BinaryMinimal # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them - else if stdenv.hostPlatform.isMusl then + if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isMusl then packages.ghc8102Binary else packages.ghc865Binary; @@ -129,12 +112,8 @@ in { ghc88 = compiler.ghc884; ghc8107 = callPackage ../development/compilers/ghc/8.10.7.nix { bootPkgs = - # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar # the oldest ghc with aarch64-darwin support is 8.10.5 - # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them - if stdenv.hostPlatform.isAarch then - packages.ghc8107BinaryMinimal - else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then + if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then # to my (@a-m-joseph) knowledge there are no newer official binaries for this platform packages.ghc865Binary else @@ -150,11 +129,8 @@ in { ghc810 = compiler.ghc8107; ghc902 = callPackage ../development/compilers/ghc/9.0.2.nix { bootPkgs = - # aarch64 ghc8107Binary exceeds max output size on hydra # the oldest ghc with aarch64-darwin support is 8.10.5 - if stdenv.hostPlatform.isAarch then - packages.ghc8107BinaryMinimal - else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then + if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then packages.ghc810 else packages.ghc8107Binary; @@ -166,10 +142,7 @@ in { ghc90 = compiler.ghc902; ghc924 = callPackage ../development/compilers/ghc/9.2.4.nix { bootPkgs = - # aarch64 ghc8107Binary exceeds max output size on hydra - if stdenv.hostPlatform.isAarch then - packages.ghc8107BinaryMinimal - else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then + if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then packages.ghc810 else packages.ghc8107Binary; @@ -183,10 +156,7 @@ in { }; ghc925 = callPackage ../development/compilers/ghc/9.2.5.nix { bootPkgs = - # aarch64 ghc8107Binary exceeds max output size on hydra - if stdenv.hostPlatform.isAarch then - packages.ghc8107BinaryMinimal - else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then + if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then packages.ghc810 else packages.ghc8107Binary; @@ -200,10 +170,7 @@ in { }; ghc926 = callPackage ../development/compilers/ghc/9.2.6.nix { bootPkgs = - # aarch64 ghc8107Binary exceeds max output size on hydra - if stdenv.hostPlatform.isAarch then - packages.ghc8107BinaryMinimal - else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then + if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then packages.ghc810 else packages.ghc8107Binary; @@ -217,10 +184,7 @@ in { }; ghc927 = callPackage ../development/compilers/ghc/9.2.7.nix { bootPkgs = - # aarch64 ghc8107Binary exceeds max output size on hydra - if stdenv.hostPlatform.isAarch then - packages.ghc8107BinaryMinimal - else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then + if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then packages.ghc810 else packages.ghc8107Binary; @@ -234,10 +198,7 @@ in { }; ghc928 = callPackage ../development/compilers/ghc/9.2.8.nix { bootPkgs = - # aarch64 ghc8107Binary exceeds max output size on hydra - if stdenv.hostPlatform.isAarch then - packages.ghc8107BinaryMinimal - else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then + if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then packages.ghc810 else packages.ghc8107Binary; @@ -346,7 +307,31 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; - ghc94 = compiler.ghc945; + ghc946 = callPackage ../development/compilers/ghc/9.4.6.nix { + bootPkgs = + # Building with 9.2 is broken due to + # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 + # Use 8.10 as a workaround where possible to keep bootstrap path short. + + # On ARM text won't build with GHC 8.10.* + if stdenv.hostPlatform.isAarch then + # TODO(@sternenseemann): package bindist + packages.ghc902 + # No suitable bindists for powerpc64le + else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then + packages.ghc902 + else + packages.ghc8107Binary; + inherit (buildPackages.python3Packages) sphinx; + # Need to use apple's patched xattr until + # https://github.com/xattr/xattr/issues/44 and + # https://github.com/xattr/xattr/issues/55 are solved. + inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; + # Support range >= 10 && < 14 + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; + llvmPackages = pkgs.llvmPackages_12; + }; + ghc94 = compiler.ghc946; ghc962 = callPackage ../development/compilers/ghc/9.6.2.nix { bootPkgs = # For GHC 9.2 no armv7l bindists are available. @@ -354,8 +339,6 @@ in { packages.ghc924 else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then packages.ghc924 - else if stdenv.isAarch64 then - packages.ghc924BinaryMinimal else packages.ghc924Binary; inherit (buildPackages.python3Packages) sphinx; @@ -375,8 +358,6 @@ in { packages.ghc924 else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then packages.ghc924 - else if stdenv.isAarch64 then - packages.ghc924BinaryMinimal else packages.ghc924Binary; inherit (buildPackages.python3Packages) sphinx; @@ -435,36 +416,18 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; packageSetConfig = bootstrapPackageSet; }; - ghc8102BinaryMinimal = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc8102BinaryMinimal; - ghc = bh.compiler.ghc8102BinaryMinimal; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; - packageSetConfig = bootstrapPackageSet; - }; ghc8107Binary = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc8107Binary; ghc = bh.compiler.ghc8107Binary; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; packageSetConfig = bootstrapPackageSet; }; - ghc8107BinaryMinimal = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc8107BinaryMinimal; - ghc = bh.compiler.ghc8107BinaryMinimal; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; - packageSetConfig = bootstrapPackageSet; - }; ghc924Binary = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc924Binary; ghc = bh.compiler.ghc924Binary; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; packageSetConfig = bootstrapPackageSet; }; - ghc924BinaryMinimal = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc924BinaryMinimal; - ghc = bh.compiler.ghc924BinaryMinimal; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; - packageSetConfig = bootstrapPackageSet; - }; ghc884 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc884; ghc = bh.compiler.ghc884; @@ -529,7 +492,12 @@ in { ghc = bh.compiler.ghc945; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; }; - ghc94 = packages.ghc945; + ghc946 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc946; + ghc = bh.compiler.ghc946; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; + }; + ghc94 = packages.ghc946; ghc962 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc962; ghc = bh.compiler.ghc962; diff --git a/nixpkgs/pkgs/top-level/kodi-packages.nix b/nixpkgs/pkgs/top-level/kodi-packages.nix index c975cf135e5b..edf5349f8281 100644 --- a/nixpkgs/pkgs/top-level/kodi-packages.nix +++ b/nixpkgs/pkgs/top-level/kodi-packages.nix @@ -3,7 +3,7 @@ with lib; let - inherit (libretro) fuse genesis-plus-gx mgba snes9x twenty-fortyeight; + inherit (libretro) fuse genesis-plus-gx mgba nestopia snes9x twenty-fortyeight; in let self = rec { @@ -70,6 +70,8 @@ let self = rec { libretro-mgba = callPackage ../applications/video/kodi/addons/libretro-mgba { inherit mgba; }; + libretro-nestopia = callPackage ../applications/video/kodi/addons/libretro-nestopia { inherit nestopia; }; + libretro-snes9x = callPackage ../applications/video/kodi/addons/libretro-snes9x { inherit snes9x; }; jellyfin = callPackage ../applications/video/kodi/addons/jellyfin { }; diff --git a/nixpkgs/pkgs/top-level/linux-kernels.nix b/nixpkgs/pkgs/top-level/linux-kernels.nix index 495d6f6c127d..bf2114130e74 100644 --- a/nixpkgs/pkgs/top-level/linux-kernels.nix +++ b/nixpkgs/pkgs/top-level/linux-kernels.nix @@ -372,6 +372,8 @@ in { lenovo-legion-module = callPackage ../os-specific/linux/lenovo-legion { }; + linux-gpib = callPackage ../applications/science/electronics/linux-gpib/kernel.nix { }; + liquidtux = callPackage ../os-specific/linux/liquidtux {}; lkrg = callPackage ../os-specific/linux/lkrg {}; @@ -440,7 +442,6 @@ in { rtl8821cu = callPackage ../os-specific/linux/rtl8821cu { }; rtw88 = callPackage ../os-specific/linux/rtw88 { }; - rtlwifi_new = rtw88; rtw89 = if lib.versionOlder kernel.version "5.16" then callPackage ../os-specific/linux/rtw89 { } else null; @@ -448,6 +449,8 @@ in { # Current stable release; don't backport release updates! openafs = openafs_1_8; + opensnitch-ebpf = if lib.versionAtLeast kernel.version "5.10" then callPackage ../os-specific/linux/opensnitch-ebpf { } else null; + facetimehd = callPackage ../os-specific/linux/facetimehd { }; tuxedo-keyboard = if lib.versionAtLeast kernel.version "4.14" then callPackage ../os-specific/linux/tuxedo-keyboard { } else null; diff --git a/nixpkgs/pkgs/top-level/nim-packages.nix b/nixpkgs/pkgs/top-level/nim-packages.nix index 9bd4db77d2e9..5527b9a75e58 100644 --- a/nixpkgs/pkgs/top-level/nim-packages.nix +++ b/nixpkgs/pkgs/top-level/nim-packages.nix @@ -9,7 +9,6 @@ lib.makeScope newScope (self: callPackage ../development/nim-packages/build-nim-package { inherit (buildPackages.buildPackages.nimPackages) nim_builder; }; - fetchNimble = callPackage ../development/nim-packages/fetch-nimble { }; asciigraph = callPackage ../development/nim-packages/asciigraph { }; @@ -32,6 +31,8 @@ lib.makeScope newScope (self: coap = callPackage ../development/nim-packages/coap { }; + db_connector = callPackage ../development/nim-packages/db_connector { }; + docopt = callPackage ../development/nim-packages/docopt { }; eris = callPackage ../development/nim-packages/eris { }; @@ -47,7 +48,7 @@ lib.makeScope newScope (self: hashlib = callPackage ../development/nim-packages/hashlib { }; - hts-nim = callPackage ../development/nim-packages/hts-nim { }; + hts = callPackage ../development/nim-packages/hts { }; illwill = callPackage ../development/nim-packages/illwill { }; @@ -108,6 +109,8 @@ lib.makeScope newScope (self: nimraylib-now = callPackage ../development/nim-packages/nimraylib-now { }; + smtp = callPackage ../development/nim-packages/smtp { }; + spry = callPackage ../development/nim-packages/spry { }; spryvm = callPackage ../development/nim-packages/spryvm { }; diff --git a/nixpkgs/pkgs/top-level/ocaml-packages.nix b/nixpkgs/pkgs/top-level/ocaml-packages.nix index de2acdd372da..b50358e4f2ec 100644 --- a/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -343,6 +343,8 @@ let domain-local-await = callPackage ../development/ocaml-modules/domain-local-await { }; + domain-local-timeout = callPackage ../development/ocaml-modules/domain-local-timeout { }; + domain-name = callPackage ../development/ocaml-modules/domain-name { }; domainslib = callPackage ../development/ocaml-modules/domainslib { }; @@ -797,6 +799,8 @@ let kafka_lwt = callPackage ../development/ocaml-modules/kafka/lwt.nix { }; + kcas = callPackage ../development/ocaml-modules/kcas { }; + ke = callPackage ../development/ocaml-modules/ke { }; kicadsch = callPackage ../development/ocaml-modules/kicadsch { }; @@ -1000,7 +1004,7 @@ let mirage-clock = callPackage ../development/ocaml-modules/mirage-clock { }; - mirage-clock-freestanding = callPackage ../development/ocaml-modules/mirage-clock/freestanding.nix { }; + mirage-clock-solo5 = callPackage ../development/ocaml-modules/mirage-clock/solo5.nix { }; mirage-clock-unix = callPackage ../development/ocaml-modules/mirage-clock/unix.nix { }; @@ -1149,6 +1153,8 @@ let ocaml-protoc = callPackage ../development/ocaml-modules/ocaml-protoc { }; + ocaml-protoc-plugin = callPackage ../development/ocaml-modules/ocaml-protoc-plugin { }; + ocaml-r = callPackage ../development/ocaml-modules/ocaml-r { }; ocaml-recovery-parser = callPackage ../development/tools/ocaml/ocaml-recovery-parser { }; @@ -1458,8 +1464,14 @@ let qcheck-core = callPackage ../development/ocaml-modules/qcheck/core.nix { }; + qcheck-lin = callPackage ../development/ocaml-modules/qcheck/lin.nix { }; + + qcheck-multicoretests-util = callPackage ../development/ocaml-modules/qcheck/multicoretests-util.nix { }; + qcheck-ounit = callPackage ../development/ocaml-modules/qcheck/ounit.nix { }; + qcheck-stm = callPackage ../development/ocaml-modules/qcheck/stm.nix { }; + qtest = callPackage ../development/ocaml-modules/qtest { }; ### R ### @@ -1535,6 +1547,8 @@ let sedlex = callPackage ../development/ocaml-modules/sedlex { }; + sel = callPackage ../development/ocaml-modules/sel {}; + semaphore-compat = callPackage ../development/ocaml-modules/semaphore-compat { }; semver = callPackage ../development/ocaml-modules/semver { }; @@ -1799,7 +1813,7 @@ let ### End ### - })).overrideScope' liftJaneStreet; + })).overrideScope liftJaneStreet; in let inherit (pkgs) callPackage; in rec { diff --git a/nixpkgs/pkgs/top-level/perl-packages.nix b/nixpkgs/pkgs/top-level/perl-packages.nix index 6593ec1b4882..9084595c2c45 100644 --- a/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/nixpkgs/pkgs/top-level/perl-packages.nix @@ -1565,11 +1565,11 @@ with self; { BerkeleyDB = buildPerlPackage { pname = "BerkeleyDB"; - version = "0.64"; + version = "0.65"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-0.64.tar.gz"; - hash = "sha256-U1yF6FScGsQ6IBYP3ALwpABhQVb9dhV//yiqM/2jdEs="; + url = "mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-0.65.tar.gz"; + hash = "sha256-QQqonnIylB1JEGyeBI1jN0dVQ+wdIz6nzbcly1uWNQQ=i"; }; preConfigure = '' @@ -1705,10 +1705,10 @@ with self; { BKeywords = buildPerlPackage rec { pname = "B-Keywords"; - version = "1.24"; + version = "1.26"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.24.tar.gz"; - hash = "sha256-pc9rsoXQbRfO4id4O3I7snQhP9QVOl3uMR0kDhFpYG4="; + url = "mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.26.tar.gz"; + hash = "sha256-LaoVXS8mf7De3Yf4pMT7VmOHn8EGUXse4lg1Pvh67TQ="; }; meta = { description = "Lists of reserved barewords and symbol names"; @@ -5515,10 +5515,10 @@ with self; { CryptX = buildPerlPackage { pname = "CryptX"; - version = "0.076"; + version = "0.078"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIK/CryptX-0.076.tar.gz"; - hash = "sha256-u4SsASQ4x87NtRpab/+08f7jsOrgAi6WzrwuFnUiYhw="; + url = "mirror://cpan/authors/id/M/MI/MIK/CryptX-0.078.tar.gz"; + hash = "sha256-kxYLEkL31XQ8s8kxuO/HyzmCHQ4y+U+Wkz8eiOYYvL0="; }; meta = { description = "Cryptographic toolkit"; @@ -5562,6 +5562,9 @@ with self; { hash = "sha256-L+XheYgqa5Jt/vChCLSiyHof+waJK88vuI5Mj0uEODw="; }; buildInputs = [ TestRequires ]; + patches = [ + ../development/perl-modules/Data-Clone-fix-apostrophe-package-separator.patch + ]; meta = { description = "Polymorphic data cloning"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -6604,10 +6607,10 @@ with self; { DevelCaller = buildPerlPackage { pname = "Devel-Caller"; - version = "2.06"; + version = "2.07"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RC/RCLAMP/Devel-Caller-2.06.tar.gz"; - hash = "sha256-anOuaikoNCVbkNqUCSBUJTBfz+mUsUjcttLW72KNt98="; + url = "mirror://cpan/authors/id/R/RC/RCLAMP/Devel-Caller-2.07.tar.gz"; + hash = "sha256-tnmisYA0sLcg3oLDcIckw2SxCmyhZMvGfNw68oPzUD8="; }; propagatedBuildInputs = [ PadWalker ]; meta = { @@ -7349,10 +7352,10 @@ with self; { DevelFindPerl = buildPerlPackage { pname = "Devel-FindPerl"; - version = "0.015"; + version = "0.016"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/Devel-FindPerl-0.015.tar.gz"; - hash = "sha256-UnW33CJv5/Fstp/G+Z9eKahSxqTTt4arGIajE4Z0Pfw="; + url = "mirror://cpan/authors/id/L/LE/LEONT/Devel-FindPerl-0.016.tar.gz"; + hash = "sha256-Q6K/L3h6PxuIEXkGMWKyqj58sET25eduxkZq6QqGETg="; }; meta = { description = "Find the path to your perl"; @@ -7403,10 +7406,10 @@ with self; { DevelNYTProf = buildPerlPackage { pname = "Devel-NYTProf"; - version = "6.10"; + version = "6.12"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JK/JKEENAN/Devel-NYTProf-6.10.tar.gz"; - hash = "sha256-JKxBdPHwEyIGP6ThGbJH03HTJg3cpud4xsGg4/kF9Y4="; + url = "mirror://cpan/authors/id/J/JK/JKEENAN/Devel-NYTProf-6.12.tar.gz"; + hash = "sha256-qDtZheTalr24X1McFqtvPUkHGnM80JSqMPqF+2pLAsQ="; }; propagatedBuildInputs = [ FileWhich JSONMaybeXS ]; buildInputs = [ CaptureTiny TestDifferences ]; @@ -8668,6 +8671,9 @@ with self; { hash = "sha256-VyPdePSsC00mKgXqRq9mPqANgJay6cCkNRXCEHYOHnU="; }; buildInputs = [ TestUnitLite ]; + patches = [ + ../development/perl-modules/Exception-Base-remove-smartmatch-when-5.38.0.patch + ]; meta = { description = "Lightweight exceptions"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -8823,6 +8829,9 @@ with self; { url = "mirror://cpan/authors/id/N/NW/NWCLARK/ExtUtils-Constant-0.25.tar.gz"; hash = "sha256-aTPQ6WO2IoHvdWEGjmrsrIxKwrR2srugmrC5D7rJ11c="; }; + patches = [ + ../development/perl-modules/ExtUtils-Constant-fix-indirect-method-call-in-test.patch + ]; meta = { description = "Generate XS code to import C header constants"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -9944,10 +9953,10 @@ with self; { FinanceQuote = buildPerlPackage rec { pname = "Finance-Quote"; - version = "1.57"; + version = "1.58"; src = fetchurl { url = "mirror://cpan/authors/id/B/BP/BPSCHUCK/Finance-Quote-${version}.tar.gz"; - hash = "sha256-dm7dUw+RRp+MGiU6nVs4jX167PTMiihFL0SHASOTQs4="; + hash = "sha256-jN3qDTgJo2aVzuaaKGK+qs1hU1f+uv23JkGnerRna4A="; }; buildInputs = [ DateManip DateRange DateSimple DateTime DateTimeFormatISO8601 StringUtil TestKwalitee TestPerlCritic TestPod TestPodCoverage ]; propagatedBuildInputs = [ DateManip DateTimeFormatStrptime Encode HTMLTableExtract HTMLTokeParserSimple HTMLTree HTMLTreeBuilderXPath HTTPCookies JSON IOCompress IOString LWPProtocolHttps Readonly StringUtil SpreadsheetXLSX TextTemplate TryTiny WebScraper XMLLibXML libwwwperl ]; @@ -11276,10 +11285,10 @@ with self; { HTMLMason = buildPerlPackage { pname = "HTML-Mason"; - version = "1.59"; + version = "1.60"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.59.tar.gz"; - hash = "sha256-lb7SpsSINwBGqjFL5LWSvWWmUi+IRdqLNqav+ai0OdA="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.60.tar.gz"; + hash = "sha256-qgu9WmtjxiyJVfjFXsCF43DXktZSZrbDtcXweIu8d+Y="; }; buildInputs = [ TestDeep ]; propagatedBuildInputs = [ CGI CacheCache ClassContainer ExceptionClass LogAny ]; @@ -13866,10 +13875,10 @@ with self; { locallib = buildPerlPackage { pname = "local-lib"; - version = "2.000024"; + version = "2.000029"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/local-lib-2.000024.tar.gz"; - hash = "sha256-LpuRe9SKBhXkJjOyoydJTgRhDY9xB2W5ST0wbOrZigU="; + url = "mirror://cpan/authors/id/H/HA/HAARG/local-lib-2.000029.tar.gz"; + hash = "sha256-jfh6EMFMjpCcW0fFcB5LgYfVGeUlHofIBwmwK7M+/dc="; }; propagatedBuildInputs = [ ModuleBuild ]; meta = { @@ -14070,10 +14079,10 @@ with self; { LogLog4perl = buildPerlPackage { pname = "Log-Log4perl"; - version = "1.53"; + version = "1.57"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETJ/Log-Log4perl-1.53.tar.gz"; - hash = "sha256-j7+0jQFu7HNEpTnzrXCHC0rEY45JZmv6cNEPb/1Kw44="; + url = "mirror://cpan/authors/id/E/ET/ETJ/Log-Log4perl-1.57.tar.gz"; + hash = "sha256-D4/Ldjio89tMeX35T9vFYBN0kULy+Uy8lbQ8n8oJahM="; }; meta = { description = "Log4j implementation for Perl"; @@ -15221,10 +15230,10 @@ with self; { MIMECharset = buildPerlPackage { pname = "MIME-Charset"; - version = "1.012.2"; + version = "1.013.1"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEZUMI/MIME-Charset-1.012.2.tar.gz"; - hash = "sha256-h4x3nAJWxZFma9BsDN5MDXgg7uuY/RGDCCrumh57HRM="; + url = "mirror://cpan/authors/id/N/NE/NEZUMI/MIME-Charset-1.013.1.tar.gz"; + hash = "sha256-G7em4MDSUfI9bmC/hMmt78W3TuxYR1v+5NORB+YIcPA="; }; meta = { description = "Charset Information for MIME"; @@ -15468,6 +15477,20 @@ with self; { url = "mirror://cpan/authors/id/L/LE/LEONT/Module-Build-0.4231.tar.gz"; hash = "sha256-fg9MaSwXQMGshOoU1+o9i8eYsvsmwJh3Ip4E9DCytxc="; }; + postConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + # for unknown reason, the first run of Build fails + ./Build || true + ''; + postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + # remove version check since miniperl uses a stub of File::Temp, which do not provide a version: + # https://github.com/arsv/perl-cross/blob/master/cnf/stub/File/Temp.pm + sed -i '/File::Temp/d' \ + Build.PL + + # fix discover perl function, it can not handle a wrapped perl + sed -i "s,\$self->_discover_perl_interpreter,'$(type -p perl)',g" \ + lib/Module/Build/Base.pm + ''; meta = { description = "Build and install Perl modules"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -18614,10 +18637,10 @@ with self; { NumberFormat = buildPerlPackage { pname = "Number-Format"; - version = "1.75"; + version = "1.76"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WR/WRW/Number-Format-1.75.tar.gz"; - hash = "sha256-gtZZyxZGF2T9RNEanOnmpPXodn3BBp6wNGfG5V3iV/M="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Number-Format-1.76.tar.gz"; + hash = "sha256-DgBg6zY2NaiFcGxqJvX8qv6udZ97Ksrkndpw4ZXdRNY="; }; meta = { description = "Perl extension for formatting numbers"; @@ -18741,12 +18764,12 @@ with self; { ObjectPad = buildPerlModule { pname = "Object-Pad"; - version = "0.68"; + version = "0.79"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Object-Pad-0.68.tar.gz"; - hash = "sha256-xN5jBIQxMJZNrskozF99HphTnu/X7azHvn4Yg0XhnXE="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Object-Pad-0.79.tar.gz"; + hash = "sha256-+wsQ+J5i1UFlvWqyHbVfYLVT+gCPyOddNJhwwafiKtY="; }; - buildInputs = [ TestFatal TestRefcount ]; + buildInputs = [ Test2Suite TestFatal TestRefcount ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; propagatedBuildInputs = [ XSParseKeyword XSParseSublike ]; meta = { @@ -19196,10 +19219,10 @@ with self; { Parent = buildPerlPackage { pname = "parent"; - version = "0.238"; + version = "0.241"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CO/CORION/parent-0.238.tar.gz"; - hash = "sha256-OPWP3vPiihlMnI0NxdAmcvr5PAafQMW8sfq+rbvE0tE="; + url = "mirror://cpan/authors/id/C/CO/CORION/parent-0.241.tar.gz"; + hash = "sha256-sQs5YKs5l9q3Vx/+l1ukYtl50IZFB0Ch4Is5WedRKP4="; }; meta = { description = "Establish an ISA relationship with base classes at compile time"; @@ -20237,10 +20260,10 @@ with self; { PPR = buildPerlPackage { pname = "PPR"; - version = "0.000028"; + version = "0.001008"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DC/DCONWAY/PPR-0.000028.tar.gz"; - hash = "sha256-032ndHxDN+TH11jHuO1dEsuXN2Q2krCfC9TZnFBouak="; + url = "mirror://cpan/authors/id/D/DC/DCONWAY/PPR-0.001008.tar.gz"; + hash = "sha256-EQ5xwF8uLJDrAfCgaU5VqdvpHIV+SBJeF0LRflzbHkk="; }; meta = { description = "Pattern-based Perl Recognizer"; @@ -21427,10 +21450,10 @@ with self; { ScopeUpper = buildPerlPackage { pname = "Scope-Upper"; - version = "0.33"; + version = "0.34"; src = fetchurl { - url = "mirror://cpan/authors/id/V/VP/VPIT/Scope-Upper-0.33.tar.gz"; - hash = "sha256-XzO+Aa1o/L7G74HusDs1EaL18HUq1RPZk6TBOl+xpkg="; + url = "mirror://cpan/authors/id/V/VP/VPIT/Scope-Upper-0.34.tar.gz"; + hash = "sha256-WB2LxRDevQxFal/HlSy3E4rmZ78486d+ltdz3DGWpB4="; }; meta = { description = "Act on upper scopes"; @@ -23592,10 +23615,10 @@ with self; { Test2Harness = buildPerlPackage { pname = "Test2-Harness"; - version = "1.000042"; + version = "1.000152"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Harness-1.000042.tar.gz"; - hash = "sha256-qvIxporxpv/WoRGIh1/PVy43PkPIKFlFInudaHtD2y0="; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Harness-1.000152.tar.gz"; + hash = "sha256-iIqWAdvTPuuaSTcdZmK7JE8Ad/QJlM4gvJClvlSRqls="; }; checkPhase = '' @@ -23603,7 +23626,7 @@ with self; { ./scripts/yath test -j $NIX_BUILD_CORES ''; - propagatedBuildInputs = [ DataUUID Importer LongJump ScopeGuard TermTable Test2PluginMemUsage Test2PluginUUID Test2Suite gotofile ]; + propagatedBuildInputs = [ DataUUID Importer LongJump ScopeGuard TermTable Test2PluginMemUsage Test2PluginUUID Test2Suite YAMLTiny gotofile ]; meta = { description = "A new and improved test harness with better Test2 integration"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -23659,10 +23682,10 @@ with self; { Test2Suite = buildPerlPackage { pname = "Test2-Suite"; - version = "0.000138"; + version = "0.000155"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000138.tar.gz"; - hash = "sha256-DPct8s7RFkhTW/2I6lSjxwBnhqfFlSkOOPMU41E7CHU="; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000155.tar.gz"; + hash = "sha256-x45rxNabwJeDaXaGM4K1K54MMe4YUGbOYMVL10uq1T0="; }; propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ]; meta = { @@ -25001,10 +25024,10 @@ with self; { TestSimple13 = buildPerlPackage { pname = "Test-Simple"; - version = "1.302183"; + version = "1.302195"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302183.tar.gz"; - hash = "sha256-mgO9pexCCuqWkrZQQ39NW1dPpQX91/9gzbXz7ANBBv8="; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302195.tar.gz"; + hash = "sha256-s5C7I1kuC5Rsla27PDCxG8Y0ooayhHvmEa2SnFfjmmw="; }; meta = { description = "Basic utilities for writing tests"; @@ -25228,10 +25251,10 @@ with self; { TestWithoutModule = buildPerlPackage { pname = "Test-Without-Module"; - version = "0.20"; + version = "0.21"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CO/CORION/Test-Without-Module-0.20.tar.gz"; - hash = "sha256-jprrfDKmxtC4qTEU2yqMBychJzqdmi3U+cqGz9KKpSQ="; + url = "mirror://cpan/authors/id/C/CO/CORION/Test-Without-Module-0.21.tar.gz"; + hash = "sha256-PN6vraxIU+vq/miTRtVV2l36PPqdTITj5ee/7lC+7EY="; }; meta = { description = "Test fallback behaviour in absence of modules"; @@ -25988,10 +26011,10 @@ with self; { TestTrap = buildPerlModule { pname = "Test-Trap"; - version = "0.3.4"; + version = "0.3.5"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EB/EBHANSSEN/Test-Trap-v0.3.4.tar.gz"; - hash = "sha256-CwRlbzO2yW2o7sTP/lKGFQtOS14pkdOINoaxCRAQWuI="; + url = "mirror://cpan/authors/id/E/EB/EBHANSSEN/Test-Trap-v0.3.5.tar.gz"; + hash = "sha256-VPmQFlYrWx1yEQEA8fK+Q3F4zfhDdvSV/9A3bx1+y5o="; }; propagatedBuildInputs = [ DataDump ]; meta = { @@ -26521,16 +26544,21 @@ with self; { hash = "sha256-0QbPfCPBdNBbUiZ8Ppg2zao98+Ddl3l+yX6y1/J50rg="; }; + patches = [ + # https://github.com/openstreetmap/tirex/pull/54 + (fetchpatch { + url = "https://github.com/openstreetmap/tirex/commit/da0c5db926bc0939c53dd902a969b689ccf9edde.patch"; + hash = "sha256-bnL1ZGy8ZNSZuCRbZn59qRVLg3TL0GjFYnhRKroeVO0="; + }) + ]; + buildInputs = [ GD IPCShareLite JSON LWP - HTTPDaemon - pkgs.cairo pkgs.mapnik - pkgs.zlib - ]; + ] ++ pkgs.mapnik.buildInputs; installPhase = '' install -m 755 -d $out/usr/libexec @@ -27080,10 +27108,10 @@ with self; { VariableMagic = buildPerlPackage { pname = "Variable-Magic"; - version = "0.62"; + version = "0.63"; src = fetchurl { - url = "mirror://cpan/authors/id/V/VP/VPIT/Variable-Magic-0.62.tar.gz"; - hash = "sha256-P5oYUX4z8AapwvxPQ/AbVKv+b/Lq5zIkJPMQaSlrYVw="; + url = "mirror://cpan/authors/id/V/VP/VPIT/Variable-Magic-0.63.tar.gz"; + hash = "sha256-ukCDssMf8mlPI3EzPVVMgmqvJLTZjQPki1tKQ6Kg5nk="; }; meta = { description = "Associate user-defined magic to variables from Perl"; @@ -27991,12 +28019,12 @@ with self; { XSParseKeyword = buildPerlModule { pname = "XS-Parse-Keyword"; - version = "0.25"; + version = "0.34"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Keyword-0.25.tar.gz"; - hash = "sha256-9e2zDPfH8iDQxsMdwetVQDKECpnHwpgxT1zD/vZscsc="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Keyword-0.34.tar.gz"; + hash = "sha256-EDPdtAmSTZ1Cs4MEodeXRaBDSrxrBJHrErbIu5bx1sE="; }; - buildInputs = [ ExtUtilsCChecker ]; + buildInputs = [ ExtUtilsCChecker Test2Suite ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; meta = { description = "XS functions to assist in parsing keyword syntax"; diff --git a/nixpkgs/pkgs/top-level/php-packages.nix b/nixpkgs/pkgs/top-level/php-packages.nix index ec47a9c5e65b..42df62fb1fa5 100644 --- a/nixpkgs/pkgs/top-level/php-packages.nix +++ b/nixpkgs/pkgs/top-level/php-packages.nix @@ -304,6 +304,8 @@ lib.makeScope pkgs.newScope (self: with self; { uv = callPackage ../development/php-packages/uv { }; + vld = callPackage ../development/php-packages/vld { }; + xdebug = callPackage ../development/php-packages/xdebug { }; yaml = callPackage ../development/php-packages/yaml { }; diff --git a/nixpkgs/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix b/nixpkgs/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix index 108a2b67504f..69ec5a0f09c1 100644 --- a/nixpkgs/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix +++ b/nixpkgs/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix @@ -40,7 +40,7 @@ let else if pkg.meta.broken then null - else testers.hasPkgConfigModule { inherit moduleName; package = pkg; }; + else testers.hasPkgConfigModules { moduleNames = [ moduleName ]; package = pkg; }; in lib.recurseIntoAttrs allTests // { inherit tests-combined; } diff --git a/nixpkgs/pkgs/top-level/python-aliases.nix b/nixpkgs/pkgs/top-level/python-aliases.nix index 467d1c1a4df4..8d15f5979d5c 100644 --- a/nixpkgs/pkgs/top-level/python-aliases.nix +++ b/nixpkgs/pkgs/top-level/python-aliases.nix @@ -37,6 +37,7 @@ mapAliases ({ acebinf = throw "acebinf has been removed because it is abandoned and broken."; # Added 2023-05-19 aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30 aiosenseme = throw "aiosenseme has been removed, because it does no longer work with the latest firmware and has become unmaintained"; # Added 2023-07-05 + amazon_kclpy = amazon-kclpy; # added 2023-08-08 ansible-base = throw "ansible-base has been removed, because it is end of life"; # added 2022-03-30 ansible-doctor = throw "ansible-doctor has been promoted to a top-level attribute"; # Added 2023-05-16 ansible-later = throw "ansible-later has been promoted to a top-level attribute"; # Added 2023-05-16 @@ -45,6 +46,8 @@ mapAliases ({ apache-airflow = throw "apache-airflow has been moved out of pythonPackages and is available as a standalone package"; # added 2023-06-05 argon2_cffi = argon2-cffi; # added 2022-05-09 APScheduler = apscheduler; # added 2023-02-19 + async_generator = async-generator; # added 2023-08-08 + async_stagger = async-stagger; # added 2023-08-08 asyncio-nats-client = nats-py; # added 2022-02-08 awkward0 = throw "awkward0 has been removed, use awkward instead"; # added 2022-12-13 Babel = babel; # added 2022-05-06 @@ -77,6 +80,8 @@ mapAliases ({ coronavirus = throw "coronavirus was removed, because the source is not providing the data anymore."; # added 2023-05-04 cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14 cryptography_vectors = "cryptography_vectors is no longer exposed in python*Packages because it is used for testing cryptography only."; # Added 2022-03-23 + cx_Freeze = cx-freeze; # added 2023-08-02 + d2to1 = throw "d2to1 is archived and no longer works with setuptools v68"; # added 2023-07-30 dask-xgboost = throw "dask-xgboost was removed because its features are available in xgboost"; # added 2022-05-24 dateutil = python-dateutil; # added 2021-07-03 demjson = throw "demjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 @@ -93,6 +98,7 @@ mapAliases ({ django_classytags = django-classy-tags; # added 2023-07-25 django_colorful = django-colorful; # added 2023-07-25 django_compat = django-compat; # added 2023-07-25 + django-compat = throw "django-compat has been removed. It provided forward/backport compat for django 1.x, which is long end of life."; # added 2023-07-26 django_contrib_comments = django-contrib-comments; # added 2023-07-25 django-discover-runner = throw "django-discover-runner was removed because it is no longer maintained."; # added 2022-11-21 django_environ = django-environ; # added 2021-12-25 @@ -126,6 +132,7 @@ mapAliases ({ filemagic = throw "inactive since 2014, so use python-magic instead"; # added 2022-11-19 flaskbabel = flask-babel; # added 2023-01-19 flask_login = flask-login; # added 2022-10-17 + flask_marshmallow = flask-marshmallow; # added 2023-08-16 flask-restplus = throw "flask-restplus is no longer maintained, use flask-restx instead"; # added 2023-02-21 flask_sqlalchemy = flask-sqlalchemy; # added 2022-07-20 flask_testing = flask-testing; # added 2022-04-25 @@ -182,6 +189,7 @@ mapAliases ({ jupyter_client = jupyter-client; # added 2021-10-15 jupyter_core = jupyter-core; # added 2023-01-05 jupyter_server = jupyter-server; # added 2023-01-05 + jupyter-server-ydoc = jupyter-collaboration; # added 2023-07-18 Kajiki = kajiki; # added 2023-02-19 Keras = keras; # added 2021-11-25 ldap = python-ldap; # added 2022-09-16 @@ -208,6 +216,8 @@ mapAliases ({ mrkd = throw "mrkd has been promoted to a top-level attribute"; # added 2023-08-01 mutmut = throw "mutmut has been promoted to a top-level attribute"; # added 2022-10-02 net2grid = gridnet; # add 2022-04-22 + nghttp2 = throw "in 1.52.0 removed deprecated python bindings."; # added 2023-06-08 + ninja-python = ninja; # add 2022-08-03 nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16 nose_progressive = throw "nose_progressive has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; #added 2023-02-21 notifymuch = throw "notifymuch has been promoted to a top-level attribute"; # added 2022-10-02 @@ -223,6 +233,7 @@ mapAliases ({ pep257 = pydocstyle; # added 2022-04-12 poetry = throw "poetry was promoted to a top-level attribute, use poetry-core to build Python packages"; # added 2023-01-09 poetry2conda = throw "poetry2conda was promoted to a top-level attribute"; # Added 2022-10-02 + Polygon3 = polygon3; # Added 2023-08-08 poster3 = throw "poster3 is unmaintained and source is no longer available"; # added 2023-05-29 postorius = throw "Please use pkgs.mailmanPackages.postorius"; # added 2022-04-29 powerlineMemSegment = powerline-mem-segment; # added 2021-10-08 @@ -312,6 +323,7 @@ mapAliases ({ qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages"; rabbitpy = throw "rabbitpy has been removed, since it is unmaintained and broken"; # added 2023-07-01 rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05 + rednose = throw "rednose is no longer maintained (since February 2018)"; # added 2023-08-06 retworkx = rustworkx; # added 2023-05-14 repeated_test = repeated-test; # added 2022-11-15 requests_oauthlib = requests-oauthlib; # added 2022-02-12 @@ -384,4 +396,5 @@ mapAliases ({ zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules"; zope_broken = throw "zope_broken has been removed because it is obsolete and not needed in zodb>=3.10"; # added 2023-07-26 zope_component = zope-component; # added 2023-07-28 + zope_i18nmessageid = zope-i18nmessageid; # added 2023-07-29 }) diff --git a/nixpkgs/pkgs/top-level/python-packages.nix b/nixpkgs/pkgs/top-level/python-packages.nix index eba8a51d256b..07579855b664 100644 --- a/nixpkgs/pkgs/top-level/python-packages.nix +++ b/nixpkgs/pkgs/top-level/python-packages.nix @@ -12,6 +12,8 @@ self: super: with self; { setuptools = callPackage ../development/python-modules/setuptools { }; + a2wsgi = callPackage ../development/python-modules/a2wsgi { }; + aadict = callPackage ../development/python-modules/aadict { }; aafigure = callPackage ../development/python-modules/aafigure { }; @@ -454,7 +456,7 @@ self: super: with self; { amazon-ion = callPackage ../development/python-modules/amazon-ion { }; - amazon_kclpy = callPackage ../development/python-modules/amazon_kclpy { }; + amazon-kclpy = callPackage ../development/python-modules/amazon-kclpy { }; ambee = callPackage ../development/python-modules/ambee { }; @@ -546,6 +548,8 @@ self: super: with self; { inherit (pkgs) graphviz; }; + anywidget = callPackage ../development/python-modules/anywidget { }; + aocd = callPackage ../development/python-modules/aocd { }; apache-beam = callPackage ../development/python-modules/apache-beam { }; @@ -734,10 +738,10 @@ self: super: with self; { asyauth = callPackage ../development/python-modules/asyauth { }; - async_generator = callPackage ../development/python-modules/async_generator { }; - async-dns = callPackage ../development/python-modules/async-dns { }; + async-generator = callPackage ../development/python-modules/async-generator { }; + async-interrupt = callPackage ../development/python-modules/async-interrupt { }; async-lru = callPackage ../development/python-modules/async-lru { }; @@ -752,7 +756,7 @@ self: super: with self; { asyncio-dgram = callPackage ../development/python-modules/asyncio-dgram { }; - asyncio-mqtt = callPackage ../development/python-modules/asyncio_mqtt { }; + asyncio-mqtt = callPackage ../development/python-modules/asyncio-mqtt { }; asyncio-rlock = callPackage ../development/python-modules/asyncio-rlock { }; @@ -770,11 +774,11 @@ self: super: with self; { asyncstdlib = callPackage ../development/python-modules/asyncstdlib { }; - async_stagger = callPackage ../development/python-modules/async_stagger { }; + async-stagger = callPackage ../development/python-modules/async-stagger { }; asynctest = callPackage ../development/python-modules/asynctest { }; - async-timeout = callPackage ../development/python-modules/async_timeout { }; + async-timeout = callPackage ../development/python-modules/async-timeout { }; async-tkinter-loop = callPackage ../development/python-modules/async-tkinter-loop { }; @@ -1183,6 +1187,8 @@ self: super: with self; { paddle2onnx = callPackage ../development/python-modules/paddle2onnx { }; + paddlepaddle = callPackage ../development/python-modules/paddlepaddle { }; + pulumi = callPackage ../development/python-modules/pulumi { inherit (pkgs) pulumi; }; pulumi-aws = callPackage ../development/python-modules/pulumi-aws { }; @@ -1209,6 +1215,8 @@ self: super: with self; { backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which { }; + backports-strenum = callPackage ../development/python-modules/backports-strenum { }; + backports-zoneinfo = callPackage ../development/python-modules/backports-zoneinfo { }; bacpypes = callPackage ../development/python-modules/bacpypes { }; @@ -1737,6 +1745,8 @@ self: super: with self; { celery-singleton = callPackage ../development/python-modules/celery-singleton { }; + celery-types = callPackage ../development/python-modules/celery-types { }; + cement = callPackage ../development/python-modules/cement { }; cemm = callPackage ../development/python-modules/cemm { }; @@ -1983,6 +1993,8 @@ self: super: with self; { clickhouse-cli = callPackage ../development/python-modules/clickhouse-cli { }; + clickhouse-connect = callPackage ../development/python-modules/clickhouse-connect { }; + clickhouse-driver = callPackage ../development/python-modules/clickhouse-driver { }; cliff = callPackage ../development/python-modules/cliff { }; @@ -2037,6 +2049,8 @@ self: super: with self; { cmdline = callPackage ../development/python-modules/cmdline { }; + cmdstanpy = callPackage ../development/python-modules/cmdstanpy { }; + cmigemo = callPackage ../development/python-modules/cmigemo { inherit (pkgs) cmigemo; }; @@ -2328,7 +2342,7 @@ self: super: with self; { cwlformat = callPackage ../development/python-modules/cwlformat { }; - cx_Freeze = callPackage ../development/python-modules/cx_freeze { }; + cx-freeze = callPackage ../development/python-modules/cx-freeze { }; cx_oracle = callPackage ../development/python-modules/cx_oracle { }; @@ -2349,18 +2363,16 @@ self: super: with self; { cython = callPackage ../development/python-modules/Cython { }; cython_3 = self.cython.overridePythonAttrs (old: rec { - version = "3.0.0b2"; + version = "3.0.0"; src = old.src.override { inherit version; - hash = "sha256-bEKAZWV56STBGURyR2ZLsi+v7cfezKWTqOogvdV9Z1U="; + hash = "sha256-NQsY+Wc+YxAdu/z3dO4vV8IKxGNtJVdB12ynkBaxvYI="; }; patches = [ ]; }); cytoolz = callPackage ../development/python-modules/cytoolz { }; - d2to1 = callPackage ../development/python-modules/d2to1 { }; - dacite = callPackage ../development/python-modules/dacite { }; daemonize = callPackage ../development/python-modules/daemonize { }; @@ -2417,6 +2429,8 @@ self: super: with self; { databricks-sql-connector = callPackage ../development/python-modules/databricks-sql-connector { }; + dataclass-wizard = callPackage ../development/python-modules/dataclass-wizard { }; + dataclasses-json = callPackage ../development/python-modules/dataclasses-json { }; dataclasses-serialization = callPackage ../development/python-modules/dataclasses-serialization { }; @@ -2453,6 +2467,8 @@ self: super: with self; { datauri = callPackage ../development/python-modules/datauri { }; + datefinder = callPackage ../development/python-modules/datefinder { }; + dateparser = callPackage ../development/python-modules/dateparser { }; datetime = callPackage ../development/python-modules/datetime { }; @@ -2729,12 +2745,11 @@ self: super: with self; { distutils_extra = callPackage ../development/python-modules/distutils_extra { }; - django = self.django_3; - - # Current LTS + # LTS in extended support phase django_3 = callPackage ../development/python-modules/django/3.nix { }; - # Current latest + # LTS with mainsteam support + django = self.django_4; django_4 = callPackage ../development/python-modules/django/4.nix { }; django-admin-datta = callPackage ../development/python-modules/django-admin-datta { }; @@ -2757,6 +2772,8 @@ self: super: with self; { django-bootstrap4 = callPackage ../development/python-modules/django-bootstrap4 { }; + django-bootstrap5 = callPackage ../development/python-modules/django-bootstrap5 { }; + django-cachalot = callPackage ../development/python-modules/django-cachalot { }; django-cache-url = callPackage ../development/python-modules/django-cache-url { }; @@ -2777,8 +2794,6 @@ self: super: with self; { django-colorful = callPackage ../development/python-modules/django-colorful { }; - django-compat = callPackage ../development/python-modules/django-compat { }; - django-compressor = callPackage ../development/python-modules/django-compressor { }; django-compression-middleware = callPackage ../development/python-modules/django-compression-middleware { }; @@ -3185,6 +3200,8 @@ self: super: with self; { durus = callPackage ../development/python-modules/durus { }; + dvc = callPackage ../development/python-modules/dvc { }; + dvc-azure = callPackage ../development/python-modules/dvc-azure { }; dvc-data = callPackage ../development/python-modules/dvc-data { }; @@ -3402,6 +3419,8 @@ self: super: with self; { epson-projector = callPackage ../development/python-modules/epson-projector { }; + equinox = callPackage ../development/python-modules/equinox { }; + eradicate = callPackage ../development/python-modules/eradicate { }; es-client = callPackage ../development/python-modules/es-client { }; @@ -3674,6 +3693,8 @@ self: super: with self; { ffmpeg-progress-yield = callPackage ../development/python-modules/ffmpeg-progress-yield { }; + ffmpy = callPackage ../development/python-modules/ffmpy { }; + fiblary3-fork = callPackage ../development/python-modules/fiblary3-fork { }; fido2 = callPackage ../development/python-modules/fido2 { }; @@ -3808,7 +3829,7 @@ self: super: with self; { flask-mailman = callPackage ../development/python-modules/flask-mailman { }; - flask_marshmallow = callPackage ../development/python-modules/flask-marshmallow { }; + flask-marshmallow = callPackage ../development/python-modules/flask-marshmallow { }; flask_migrate = callPackage ../development/python-modules/flask-migrate { }; @@ -4013,6 +4034,8 @@ self: super: with self; { ftputil = callPackage ../development/python-modules/ftputil { }; + fugashi = callPackage ../development/python-modules/fugashi { }; + func-timeout = callPackage ../development/python-modules/func-timeout { }; funcparserlib = callPackage ../development/python-modules/funcparserlib { }; @@ -4025,6 +4048,8 @@ self: super: with self; { funcy = callPackage ../development/python-modules/funcy { }; + funsor = callPackage ../development/python-modules/funsor { }; + furl = callPackage ../development/python-modules/furl { }; furo = callPackage ../development/python-modules/furo { }; @@ -4227,6 +4252,8 @@ self: super: with self; { git-sweep = callPackage ../development/python-modules/git-sweep { }; + git-url-parse = callPackage ../development/python-modules/git-url-parse { }; + gitdb = callPackage ../development/python-modules/gitdb { }; github-to-sqlite = callPackage ../development/python-modules/github-to-sqlite { }; @@ -4433,6 +4460,8 @@ self: super: with self; { gpaw = callPackage ../development/python-modules/gpaw { }; + gpib-ctypes = callPackage ../development/python-modules/gpib-ctypes { }; + gpiozero = callPackage ../development/python-modules/gpiozero { }; gplaycli = callPackage ../development/python-modules/gplaycli { }; @@ -4474,6 +4503,8 @@ self: super: with self; { gradient_statsd = callPackage ../development/python-modules/gradient_statsd { }; + gradio = callPackage ../development/python-modules/gradio { }; + grammalecte = callPackage ../development/python-modules/grammalecte { }; grandalf = callPackage ../development/python-modules/grandalf { }; @@ -4563,6 +4594,8 @@ self: super: with self; { gsd = callPackage ../development/python-modules/gsd { }; + gsm0338 = callPackage ../development/python-modules/gsm0338 { }; + gspread = callPackage ../development/python-modules/gspread { }; gssapi = callPackage ../development/python-modules/gssapi { @@ -4835,6 +4868,8 @@ self: super: with self; { html5lib = callPackage ../development/python-modules/html5lib { }; + html5tagger = callPackage ../development/python-modules/html5tagger { }; + html5-parser = callPackage ../development/python-modules/html5-parser { }; htmllaundry = callPackage ../development/python-modules/htmllaundry { }; @@ -5017,6 +5052,8 @@ self: super: with self; { imagecorruptions = callPackage ../development/python-modules/imagecorruptions { }; + imagededup = callPackage ../development/python-modules/imagededup { }; + imagehash = callPackage ../development/python-modules/imagehash { }; imageio = callPackage ../development/python-modules/imageio { }; @@ -5163,6 +5200,8 @@ self: super: with self; { iowait = callPackage ../development/python-modules/iowait { }; + ipadic = callPackage ../development/python-modules/ipadic { }; + ipaddr = callPackage ../development/python-modules/ipaddr { }; ipdb = callPackage ../development/python-modules/ipdb { }; @@ -5181,8 +5220,12 @@ self: super: with self; { ipy = callPackage ../development/python-modules/IPy { }; + ipycanvas = callPackage ../development/python-modules/ipycanvas { }; + ipydatawidgets = callPackage ../development/python-modules/ipydatawidgets { }; + ipynbname = callPackage ../development/python-modules/ipynbname { }; + ipyniivue = callPackage ../development/python-modules/ipyniivue { }; ipykernel = callPackage ../development/python-modules/ipykernel { }; @@ -5191,6 +5234,8 @@ self: super: with self; { ipyparallel = callPackage ../development/python-modules/ipyparallel { }; + ipytablewidgets = callPackage ../development/python-modules/ipytablewidgets { }; + ipython_genutils = callPackage ../development/python-modules/ipython_genutils { }; ipython = callPackage ../development/python-modules/ipython { }; @@ -5314,7 +5359,6 @@ self: super: with self; { # Some platforms don't have `cudaSupport` defined, hence the need for 'or false'. inherit (pkgs.config) cudaSupport; IOKit = pkgs.darwin.apple_sdk_11_0.IOKit; - protobuf = pkgs.protobuf3_20; # jaxlib-build 0.3.15 won't build with protobuf 3.21 }; jaxlib = self.jaxlib-build; @@ -5329,6 +5373,8 @@ self: super: with self; { jaxopt = callPackage ../development/python-modules/jaxopt { }; + jaxtyping = callPackage ../development/python-modules/jaxtyping { }; + jaydebeapi = callPackage ../development/python-modules/jaydebeapi { }; jc = callPackage ../development/python-modules/jc { }; @@ -5465,6 +5511,8 @@ self: super: with self; { jsonschema-spec = callPackage ../development/python-modules/jsonschema-spec { }; + jsonschema-specifications = callPackage ../development/python-modules/jsonschema-specifications { }; + jsonstreams = callPackage ../development/python-modules/jsonstreams { }; json-tricks = callPackage ../development/python-modules/json-tricks { }; @@ -5489,6 +5537,8 @@ self: super: with self; { jupyter-client = callPackage ../development/python-modules/jupyter-client { }; + jupyter-collaboration = callPackage ../development/python-modules/jupyter-collaboration { }; + jupyter-contrib-core = callPackage ../development/python-modules/jupyter-contrib-core { }; jupyter-contrib-nbextensions = callPackage ../development/python-modules/jupyter-contrib-nbextensions { }; @@ -5511,8 +5561,6 @@ self: super: with self; { jupyter-server-terminals = callPackage ../development/python-modules/jupyter-server-terminals { }; - jupyter-server-ydoc = callPackage ../development/python-modules/jupyter-server-ydoc { }; - jupyter-ui-poll = callPackage ../development/python-modules/jupyter-ui-poll { }; jupyter-ydoc = callPackage ../development/python-modules/jupyter-ydoc { }; @@ -5830,7 +5878,7 @@ self: super: with self; { }; libarcus = callPackage ../development/python-modules/libarcus { - inherit (pkgs) protobuf; + protobuf = pkgs.protobuf3_21; }; libasyncns = callPackage ../development/python-modules/libasyncns { @@ -5857,7 +5905,10 @@ self: super: with self; { inherit (pkgs.config) cudaSupport; }; - libiio = (toPythonModule (pkgs.libiio.override { inherit python; })).python; + libiio = (toPythonModule (pkgs.libiio.override { + pythonSupport = true; + inherit python; + })).python; libkeepass = callPackage ../development/python-modules/libkeepass { }; @@ -6063,7 +6114,7 @@ self: super: with self; { llvmlite = callPackage ../development/python-modules/llvmlite { # llvmlite always requires a specific version of llvm. - llvm = pkgs.llvm_11; + llvm = pkgs.llvm_14; }; lmdb = callPackage ../development/python-modules/lmdb { @@ -6148,6 +6199,8 @@ self: super: with self; { luhn = callPackage ../development/python-modules/luhn { }; + lunarcalendar = callPackage ../development/python-modules/lunarcalendar { }; + luqum = callPackage ../development/python-modules/luqum { }; luxor = callPackage ../development/python-modules/luxor { }; @@ -6440,7 +6493,9 @@ self: super: with self; { mesonpep517 = callPackage ../development/python-modules/mesonpep517 { }; - meson-python = callPackage ../development/python-modules/meson-python { }; + meson-python = callPackage ../development/python-modules/meson-python { + inherit (pkgs) ninja; + }; messagebird = callPackage ../development/python-modules/messagebird { }; @@ -6546,6 +6601,7 @@ self: super: with self; { mkdocs-jupyter = callPackage ../development/python-modules/mkdocs-jupyter { }; mkdocs-gitlab = callPackage ../development/python-modules/mkdocs-gitlab-plugin { }; mkdocs-git-authors-plugin = callPackage ../development/python-modules/mkdocs-git-authors-plugin { }; + mkdocs-git-revision-date-localized-plugin = callPackage ../development/python-modules/mkdocs-git-revision-date-localized-plugin { }; mkdocs-linkcheck = callPackage ../development/python-modules/mkdocs-linkcheck { }; mkdocs-macros = callPackage ../development/python-modules/mkdocs-macros { }; mkdocs-material = callPackage ../development/python-modules/mkdocs-material { }; @@ -6565,6 +6621,8 @@ self: super: with self; { ml-collections = callPackage ../development/python-modules/ml-collections { }; + ml-dtypes = callPackage ../development/python-modules/ml-dtypes { }; + mlflow = callPackage ../development/python-modules/mlflow { }; mlrose = callPackage ../development/python-modules/mlrose { }; @@ -6614,6 +6672,8 @@ self: super: with self; { moddb = callPackage ../development/python-modules/moddb { }; + model-bakery = callPackage ../development/python-modules/model-bakery { }; + modeled = callPackage ../development/python-modules/modeled { }; moderngl = callPackage ../development/python-modules/moderngl { }; @@ -7002,13 +7062,6 @@ self: super: with self; { withPython = true; }); - nghttp2 = (toPythonModule (pkgs.nghttp2.override { - python3Packages = self; - inherit (pkgs) ncurses; - enableApp = false; # build only libnghttp2 ... - enablePython = true; # ... and its Python bindings - })).python; - nh3 = callPackage ../development/python-modules/nh3 { }; niaaml = callPackage ../development/python-modules/niaaml { }; @@ -7039,7 +7092,7 @@ self: super: with self; { nine = callPackage ../development/python-modules/nine { }; - ninja-python = callPackage ../development/python-modules/ninja { }; + ninja = callPackage ../development/python-modules/ninja { inherit (pkgs) ninja; }; nipy = callPackage ../development/python-modules/nipy { }; @@ -7213,6 +7266,8 @@ self: super: with self; { python-jwt = callPackage ../development/python-modules/python-jwt { }; + python-ndn = callPackage ../development/python-modules/python-ndn { }; + python-nvd3 = callPackage ../development/python-modules/python-nvd3 { }; python-youtube = callPackage ../development/python-modules/python-youtube { }; @@ -7258,6 +7313,8 @@ self: super: with self; { oca-port = callPackage ../development/python-modules/oca-port { }; + ochre = callPackage ../development/python-modules/ochre { }; + oci = callPackage ../development/python-modules/oci { }; ocifs = callPackage ../development/python-modules/ocifs { }; @@ -7288,6 +7345,8 @@ self: super: with self; { okta = callPackage ../development/python-modules/okta { }; + oldest-supported-numpy = callPackage ../development/python-modules/oldest-supported-numpy { }; + olefile = callPackage ../development/python-modules/olefile { }; oletools = callPackage ../development/python-modules/oletools { }; @@ -7318,9 +7377,13 @@ self: super: with self; { onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { }; - onnx = callPackage ../development/python-modules/onnx { }; + onnx = callPackage ../development/python-modules/onnx { + protobuf = protobuf3; + }; - onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common { }; + onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common { + protobuf = protobuf3; + }; onnxmltools = callPackage ../development/python-modules/onnxmltools { }; @@ -7481,6 +7544,8 @@ self: super: with self; { optax = callPackage ../development/python-modules/optax { }; + optimum = callPackage ../development/python-modules/optimum { }; + optuna = callPackage ../development/python-modules/optuna { }; opuslib = callPackage ../development/python-modules/opuslib { }; @@ -7593,7 +7658,9 @@ self: super: with self; { panasonic-viera = callPackage ../development/python-modules/panasonic-viera { }; - pandas = callPackage ../development/python-modules/pandas { }; + pandas = callPackage ../development/python-modules/pandas { + inherit (pkgs.darwin) adv_cmds; + }; pandas-datareader = callPackage ../development/python-modules/pandas-datareader { }; @@ -8007,6 +8074,8 @@ self: super: with self; { prodict = callPackage ../development/python-modules/prodict { }; + prophet = callPackage ../development/python-modules/prophet { }; + propka = callPackage ../development/python-modules/propka { }; proxy_tools = callPackage ../development/python-modules/proxy_tools { }; @@ -8125,6 +8194,8 @@ self: super: with self; { pytest-pudb = callPackage ../development/python-modules/pytest-pudb { }; + pytlv = callPackage ../development/python-modules/pytlv { }; + python-codon-tables = callPackage ../development/python-modules/python-codon-tables { }; python-creole = callPackage ../development/python-modules/python-creole { }; @@ -8191,6 +8262,8 @@ self: super: with self; { pyuca = callPackage ../development/python-modules/pyuca { }; + pyunpack = callPackage ../development/python-modules/pyunpack { }; + pyutil = callPackage ../development/python-modules/pyutil { }; pyzbar = callPackage ../development/python-modules/pyzbar { }; @@ -8293,7 +8366,7 @@ self: super: with self; { polyline = callPackage ../development/python-modules/polyline { }; - Polygon3 = callPackage ../development/python-modules/Polygon3 { }; + polygon3 = callPackage ../development/python-modules/polygon3 { }; pomegranate = callPackage ../development/python-modules/pomegranate { }; @@ -8777,6 +8850,8 @@ self: super: with self; { pydantic = callPackage ../development/python-modules/pydantic { }; + pydantic-core = callPackage ../development/python-modules/pydantic-core { }; + pydantic-scim = callPackage ../development/python-modules/pydantic-scim { }; pydash = callPackage ../development/python-modules/pydash { }; @@ -8978,6 +9053,8 @@ self: super: with self; { pygit2 = callPackage ../development/python-modules/pygit2 { }; + pygitguardian = callPackage ../development/python-modules/pygitguardian { }; + pygithub = callPackage ../development/python-modules/pygithub { }; pyglet = callPackage ../development/python-modules/pyglet { }; @@ -9750,6 +9827,8 @@ self: super: with self; { pysigset = callPackage ../development/python-modules/pysigset { }; + pysim = callPackage ../development/python-modules/pysim { }; + pysimplegui = callPackage ../development/python-modules/pysimplegui { }; pysingleton = callPackage ../development/python-modules/pysingleton { }; @@ -10121,6 +10200,8 @@ self: super: with self; { pytest-virtualenv = callPackage ../development/python-modules/pytest-virtualenv { }; + pytest-voluptuous = callPackage ../development/python-modules/pytest-voluptuous { }; + pytest-warnings = callPackage ../development/python-modules/pytest-warnings { }; pytest-watch = callPackage ../development/python-modules/pytest-watch { }; @@ -10653,6 +10734,8 @@ self: super: with self; { pyzufall = callPackage ../development/python-modules/pyzufall { }; + qbittorrent-api = callPackage ../development/python-modules/qbittorrent-api { }; + qcelemental = callPackage ../development/python-modules/qcelemental { }; qcengine = callPackage ../development/python-modules/qcengine { }; @@ -10877,8 +10960,6 @@ self: super: with self; { redis = callPackage ../development/python-modules/redis { }; - rednose = callPackage ../development/python-modules/rednose { }; - redshift-connector = callPackage ../development/python-modules/redshift-connector { }; reedsolo = callPackage ../development/python-modules/reedsolo { }; @@ -11235,6 +11316,8 @@ self: super: with self; { s3-credentials = callPackage ../development/python-modules/s3-credentials { }; + sabctools = callPackage ../development/python-modules/sabctools { }; + sabyenc3 = callPackage ../development/python-modules/sabyenc3 { }; sabyenc = callPackage ../development/python-modules/sabyenc { }; @@ -11491,6 +11574,8 @@ self: super: with self; { setuptools-git = callPackage ../development/python-modules/setuptools-git { }; + setuptools-git-versioning = callPackage ../development/python-modules/setuptools-git-versioning { }; + setuptools-lint = callPackage ../development/python-modules/setuptools-lint { }; setuptools-rust = callPackage ../development/python-modules/setuptools-rust { }; @@ -11643,7 +11728,9 @@ self: super: with self; { skidl = callPackage ../development/python-modules/skidl { }; - skl2onnx = callPackage ../development/python-modules/skl2onnx { }; + skl2onnx = callPackage ../development/python-modules/skl2onnx { + protobuf = protobuf3; + }; sklearn-deap = callPackage ../development/python-modules/sklearn-deap { }; @@ -11725,6 +11812,8 @@ self: super: with self; { smpplib = callPackage ../development/python-modules/smpplib { }; + smpp_pdu = callPackage ../development/python-modules/smpp.pdu { }; + snack = toPythonModule (pkgs.newt.override { inherit (self) python; }); @@ -11819,6 +11908,8 @@ self: super: with self; { soupsieve = callPackage ../development/python-modules/soupsieve { }; + sourmash = callPackage ../development/python-modules/sourmash { }; + soxr = callPackage ../development/python-modules/soxr { libsoxr = pkgs.soxr; }; @@ -12161,6 +12252,8 @@ self: super: with self; { stopit = callPackage ../development/python-modules/stopit { }; + stransi = callPackage ../development/python-modules/stransi { }; + strategies = callPackage ../development/python-modules/strategies { }; stravalib = callPackage ../development/python-modules/stravalib { }; @@ -12443,6 +12536,8 @@ self: super: with self; { tensorrt = callPackage ../development/python-modules/tensorrt { }; + tensorstore = callPackage ../development/python-modules/tensorstore { }; + tellduslive = callPackage ../development/python-modules/tellduslive { }; termcolor = callPackage ../development/python-modules/termcolor { }; @@ -12783,6 +12878,8 @@ self: super: with self; { traceback2 = callPackage ../development/python-modules/traceback2 { }; + tracerite = callPackage ../development/python-modules/tracerite { }; + tracing = callPackage ../development/python-modules/tracing { }; trackpy = callPackage ../development/python-modules/trackpy { }; @@ -12859,6 +12956,8 @@ self: super: with self; { trustme = callPackage ../development/python-modules/trustme { }; + truststore = callPackage ../development/python-modules/truststore { }; + trytond = callPackage ../development/python-modules/trytond { }; tskit = callPackage ../development/python-modules/tskit { }; @@ -13119,6 +13218,8 @@ self: super: with self; { unidecode = callPackage ../development/python-modules/unidecode { }; + unidic = callPackage ../development/python-modules/unidic { }; + unidic-lite = callPackage ../development/python-modules/unidic-lite { }; unidiff = callPackage ../development/python-modules/unidiff { }; @@ -13953,7 +14054,7 @@ self: super: with self; { zope-hookable = callPackage ../development/python-modules/zope-hookable { }; - zope_i18nmessageid = callPackage ../development/python-modules/zope_i18nmessageid { }; + zope-i18nmessageid = callPackage ../development/python-modules/zope-i18nmessageid { }; zope_interface = callPackage ../development/python-modules/zope_interface { }; diff --git a/nixpkgs/pkgs/top-level/qt6-packages.nix b/nixpkgs/pkgs/top-level/qt6-packages.nix index 4fda684b54d6..792be6b3efda 100644 --- a/nixpkgs/pkgs/top-level/qt6-packages.nix +++ b/nixpkgs/pkgs/top-level/qt6-packages.nix @@ -13,24 +13,13 @@ (lib.makeScope pkgs.newScope ( self: let - libsForQt6 = self; callPackage = self.callPackage; - kdeFrameworks = let - mkFrameworks = import ../development/libraries/kde-frameworks; - attrs = { - libsForQt5 = libsForQt6; - inherit (pkgs) lib fetchurl; - }; - in (lib.makeOverridable mkFrameworks attrs); in - (qt6 // { inherit stdenv; # LIBRARIES - inherit (kdeFrameworks) kcoreaddons; - qt6ct = callPackage ../tools/misc/qt6ct { }; qt6gtk2 = callPackage ../tools/misc/qt6gtk2 { }; diff --git a/nixpkgs/pkgs/top-level/release-haskell.nix b/nixpkgs/pkgs/top-level/release-haskell.nix index 6113dcdb121d..1c5615d5dbb1 100644 --- a/nixpkgs/pkgs/top-level/release-haskell.nix +++ b/nixpkgs/pkgs/top-level/release-haskell.nix @@ -69,6 +69,7 @@ let ghc927 ghc928 ghc945 + ghc946 ghc962 ]; @@ -480,20 +481,11 @@ let # package sets (like Cabal, jailbreak-cabal) are # working as expected. cabal-install = released; - Cabal_3_6_3_0 = released; - Cabal_3_8_1_0 = released; - Cabal-syntax_3_8_1_0 = released; Cabal_3_10_1_0 = released; Cabal-syntax_3_10_1_0 = released; - cabal2nix = lib.subtractLists [ - compilerNames.ghc962 - ] released; - cabal2nix-unstable = lib.subtractLists [ - compilerNames.ghc962 - ] released; - funcmp = lib.subtractLists [ - compilerNames.ghc962 - ] released; + cabal2nix = released; + cabal2nix-unstable = released; + funcmp = released; haskell-language-server = lib.subtractLists [ # Support ceased as of 1.9.0.0 compilerNames.ghc884 @@ -504,14 +496,13 @@ let hlint = lib.subtractLists [ compilerNames.ghc962 ] released; - hpack = lib.subtractLists [ - compilerNames.ghc962 - ] released; + hpack = released; hsdns = released; jailbreak-cabal = released; - language-nix = lib.subtractLists [ - compilerNames.ghc962 - ] released; + language-nix = released; + large-hashable = [ + compilerNames.ghc928 + ]; nix-paths = released; titlecase = released; ghc-api-compat = [ @@ -526,6 +517,14 @@ let ghc-lib = released; ghc-lib-parser = released; ghc-lib-parser-ex = released; + ghc-source-gen = [ + # Feel free to remove these as they break, + # ghc-source-gen currently doesn't support GHC 9.4 + compilerNames.ghc884 + compilerNames.ghc8107 + compilerNames.ghc902 + compilerNames.ghc928 + ]; ghc-tags = [ compilerNames.ghc8107 compilerNames.ghc902 @@ -535,7 +534,11 @@ let compilerNames.ghc927 compilerNames.ghc928 compilerNames.ghc945 + compilerNames.ghc946 + compilerNames.ghc962 ]; + hashable = released; + primitive = released; weeder = [ compilerNames.ghc8107 compilerNames.ghc902 @@ -545,6 +548,8 @@ let compilerNames.ghc927 compilerNames.ghc928 compilerNames.ghc945 + compilerNames.ghc946 + compilerNames.ghc962 ]; }) { diff --git a/nixpkgs/pkgs/top-level/release.nix b/nixpkgs/pkgs/top-level/release.nix index 2ac81d0a237c..1747a32030e8 100644 --- a/nixpkgs/pkgs/top-level/release.nix +++ b/nixpkgs/pkgs/top-level/release.nix @@ -25,7 +25,7 @@ # and it will be too much painful for our users to recompile them # for no real reason. # Remove them for 23.11. - "nodejs-16.20.1" + "nodejs-16.20.2" "openssl-1.1.1v" ]; }; } diff --git a/nixpkgs/pkgs/top-level/ruby-packages.nix b/nixpkgs/pkgs/top-level/ruby-packages.nix index 3ee1a09bb2e1..6ae4443678a8 100644 --- a/nixpkgs/pkgs/top-level/ruby-packages.nix +++ b/nixpkgs/pkgs/top-level/ruby-packages.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d72cqx1h9c0yl1vc8xakvji00krg118ih6lwqlg5nbw50gbx25c"; + sha256 = "1dbzp5lk7canhdrs8n8cap3mwnanfn6i7yn76ba8kzn0h1cx077a"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.7"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12xkyfdpr7ljnd31yhc2kzl0rqrlwxzpg4qcn4yb2h364hwc6fh8"; + sha256 = "09640w7sqmxv1gxsw9gfnfdl95qgm90s38n49jyqyqavxnwgnbbs"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.7"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01x11ijfg56585vj7a7az0235idnxcnyjp1nb1jvkm08jjll5d1k"; + sha256 = "15ni57icsw1ilz5srlasff4h31h2ckgmxbdd8jnbniscvz4x2sd0"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.7"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d66w1d9rhvafd0dilqyr1ymsvr060l8hi0xvwij7cyvzzxrlrbc"; + sha256 = "150sjsk12vzj9aswjy3cz124l8n8sn52bhd0wwly73rwc1a750sg"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.7"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bpyfh8g0mzgkb8bxvf245mwnx1awbr1y6dxcdckyhsjjgrfynfl"; + sha256 = "0m6bdgspimlsakvi2dwndlf6i9wc1iwcjcm2nmpdfn2jj836fprm"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.7"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1icfh9pgjpd29apzn07cnqa9nlpvjv7i4vrygack5gp7hp54l8m7"; + sha256 = "1nn21k5psxdv2fkwxs679lr0b8n1nzli2ks343cx4azn6snp8b8a"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.7"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gawwb6550ra1xgbrki03aq4q5wafa3xfrpdr3cva4ghy3qqn53q"; + sha256 = "0s5r5z9jm57jjabh8w2823rpjd1agn8z2rlqgyyn4s9pbbhgalzy"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.7"; }; activemodel = { dependencies = ["activesupport"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "072iv0d3vpbp0xijg4jj99sjil1rykmqfj9addxj76bm5mbzwcaj"; + sha256 = "1rspbw4yxx9fh2wyl2wvgwadwapfyx7j9zlirpd4pmk31wkhl4hf"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.7"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l0rn43bhyzlfa4wwcfz016vb4lkzvl0jf5zibkjy4sppxxixzrq"; + sha256 = "1ygg145wxlgm12b1x5r0rsk2aa6i2wjz7bgb21j8vmyqyfl272cy"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.7"; }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "036mv935r5mmh7fljz10lyr43c5y5bn8b6h7gdkv8spfgwzihw4j"; + sha256 = "1gaxpqw4mv7xrk1iaw9jspf4m201mkmchc0c22ax3snm3v6jg2qv"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.7"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -115,10 +115,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cjsf26656996hv48wgv2mkwxf0fy1qc68ikgzq7mzfq2mmvmayk"; + sha256 = "1wzbnv3hns0yiwbgh1m3q5j0d7b0k52nlpwirhxyv3l0ycmljfr9"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.7"; }; addressable = { dependencies = ["public_suffix"]; @@ -126,10 +126,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20"; + sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; type = "gem"; }; - version = "2.8.4"; + version = "2.8.5"; }; algoliasearch = { dependencies = ["httpclient" "json"]; @@ -213,6 +213,16 @@ }; version = "1.2.0"; }; + base64 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cydk9p2cv25qysm0sn2pb97fcpz1isa7n3c8xm1gd99li8x6x8c"; + type = "gem"; + }; + version = "0.1.1"; + }; benchmark = { groups = ["default"]; platforms = []; @@ -223,6 +233,16 @@ }; version = "0.2.1"; }; + bindata = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04y4zgh4bbcb8wmkxwfqg4saky1d1f3xw8z6yk543q13h8ky8rz5"; + type = "gem"; + }; + version = "2.4.15"; + }; builder = { groups = ["default"]; platforms = []; @@ -685,10 +705,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "074162raa8pc92q6833hgqdlfr3z5jgid9avdz5k25cnls2rqwrf"; + sha256 = "1lb5slzbqrca49h0gaifg82xky5r7i9xgm4560pin1xl5fp15lzx"; type = "gem"; }; - version = "0.23.9"; + version = "0.23.10"; }; concurrent-ruby = { groups = ["default"]; @@ -710,6 +730,17 @@ }; version = "2.4.1"; }; + crabstone = { + dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "154g3l1flndm5pvnhjnrn47ndnsxvfm8y1kv4zhnwiys28pv40nb"; + type = "gem"; + }; + version = "4.0.4"; + }; crass = { groups = ["default"]; platforms = []; @@ -771,6 +802,17 @@ }; version = "3.3.3"; }; + dentaku = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ssmjs7x733n7x6zvcwkaq2rnl0sz1qslli19s730a7ny7pialqg"; + type = "gem"; + }; + version = "3.4.2"; + }; dep-selector-libgecode = { groups = ["default"]; platforms = []; @@ -875,6 +917,17 @@ }; version = "0.1.0"; }; + elftools = { + dependencies = ["bindata"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0p96wj4sz3sfv9yxyl8z530554bkbf82vj24w6x7yf91qa1p8z6i"; + type = "gem"; + }; + version = "1.1.3"; + }; em-websocket = { dependencies = ["eventmachine" "http_parser.rb"]; groups = ["default"]; @@ -1940,6 +1993,17 @@ }; version = "2.7.1"; }; + keystone-engine = { + dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0waz2bj1dsl63416k1n0vvrwva425rm94gsza7ci49mm1wjdabh2"; + type = "gem"; + }; + version = "0.9.0"; + }; kramdown = { dependencies = ["rexml"]; groups = ["default"]; @@ -2145,20 +2209,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb"; + sha256 = "1s95nyppk5wrpfgqrzf6f00g7nk0662zmxm4mr2vbdbl83q3k72x"; type = "gem"; }; - version = "3.4.1"; + version = "3.5.0"; }; mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pky3vzaxlgm9gw5wlqwwi7wsw3jrglrfflrppvvnsrlaiz043z9"; + sha256 = "17zdim7kzrh5j8c97vjqp4xp78wbyz7smdp4hi5iyzk0s9imdn5a"; type = "gem"; }; - version = "3.2023.0218.1"; + version = "3.2023.0808"; }; mini_magick = { groups = ["default"]; @@ -2175,10 +2239,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; + sha256 = "1vycif7pjzkr29mfk4dlqv3disc5dn0va04lkwajlpr1wkibg0c6"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.5"; }; mini_portile2 = { groups = ["default"]; @@ -2362,10 +2426,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yx0pb5fmziz92bw8qzbh8vf20lr56nd3s6q8h0gsgr307lki687"; + sha256 = "1jyj6j7w9zpj2zhp4dyhdjiwsn9rqwksj7s7fzpnn7rx2xvz2a1a"; type = "gem"; }; - version = "7.1.0"; + version = "7.2.0"; }; netrc = { groups = ["default"]; @@ -2420,6 +2484,17 @@ }; version = "0.2.3"; }; + one_gadget = { + dependencies = ["elftools"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v079xkzzr1bjff5z2wlzs0k11nk4b04kgy1p63lwhbl12jl7qz1"; + type = "gem"; + }; + version = "1.7.4"; + }; openssl = { groups = ["default"]; platforms = []; @@ -2662,6 +2737,17 @@ }; version = "6.3.0"; }; + pwntools = { + dependencies = ["crabstone" "dentaku" "elftools" "keystone-engine" "method_source" "one_gadget" "rainbow" "ruby2ruby" "rubyserial"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pxc3lcgnywglv0skzj1r8i4p8mwcj27hlwzwqf8sj2mn3iqyjnd"; + type = "gem"; + }; + version = "1.2.1"; + }; racc = { groups = ["default"]; platforms = []; @@ -2677,10 +2763,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16w217k9z02c4hqizym8dkj6bqmmzx4qdvqpnskgzf174a5pwdxk"; + sha256 = "15rdwbyk71c9nxvd527bvb8jxkcys8r3dj3vqra5b3sa63qs30vv"; type = "gem"; }; - version = "2.2.7"; + version = "2.2.8"; }; rack-protection = { dependencies = ["rack"]; @@ -2688,10 +2774,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kpm67az1wxlg76h620in2r7agfyhv177ps268j5ggsanzddzih8"; + sha256 = "0xsz78hccgza144n37bfisdkzpr2c8m0xl6rnlzgxdbsm1zrkg7r"; type = "gem"; }; - version = "3.0.6"; + version = "3.1.0"; }; rack-test = { dependencies = ["rack"]; @@ -2710,10 +2796,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08glp6jhq5yh8i5jjxzqa3aqx819l6ci6m68bx1asmimla0x9ysx"; + sha256 = "06rd03bpdg29gql5xb6ijdq9br5060v4bykaz739zx2qm8xnjs9j"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.7"; }; rails-dom-testing = { dependencies = ["activesupport" "minitest" "nokogiri"]; @@ -2721,10 +2807,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17g05y7q7934z0ib4aph8h71c2qwjmlakkm7nb2ab45q0aqkfgjd"; + sha256 = "0fx9dx1ag0s1lr6lfr34lbx5i1bvn3bhyf3w3mx6h7yz90p725g5"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.0"; }; rails-html-sanitizer = { dependencies = ["loofah" "nokogiri"]; @@ -2743,10 +2829,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dcabk5bl5flmspnb9d2qcvclcaw0nd5yr9w6m5pzsmylg3y63pv"; + sha256 = "0in2b84qqmfnigx0li9bgi6l4knmgbj3a29fzm1zzb5jnv4r1gbr"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.7"; }; rainbow = { groups = ["default"]; @@ -2867,10 +2953,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10r5z5mg1x5kjx3wvwx5d8bqgd2j8pc4dlaasq7nmnl3nsn7sn9k"; + sha256 = "00qqqzgh7f0f2j6rkbm5v7976mg8ik4sapk2vnb3rq98m8xc1wfw"; type = "gem"; }; - version = "5.0.6"; + version = "5.0.7"; }; redis-client = { dependencies = ["connection_pool"]; @@ -2878,10 +2964,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ih4zghnb888jd5vh8ymvvkfx9bq7cyhi750zgvl7s64bzphwz9v"; + sha256 = "0fbs2fbl1g5lra43qk6rawbvynj2qgdzyx1gnjsjcxbl8247bahl"; type = "gem"; }; - version = "0.14.1"; + version = "0.15.0"; }; redis-rack = { dependencies = ["rack" "redis-store"]; @@ -3033,15 +3119,15 @@ version = "3.12.1"; }; rubocop = { - dependencies = ["json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["base64" "json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17c94wl2abqzf4fj469mdxzap1sd3410x421nl6mh2w49jsgvpki"; + sha256 = "1ig23w64f9y1gi6l4pv69m0nfhn3nnr3q4s81br9vl1b1z02n5cn"; type = "gem"; }; - version = "1.55.0"; + version = "1.56.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -3103,10 +3189,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iyxcr34p3hy7rjgrrlg6z9libiqy1als62rk3d37ixsbjdy6iyd"; + sha256 = "0xzl5na2n3g47w9arf0cj0dpdlxssd0bhbsg5h12kpa8lp24ki1y"; type = "gem"; }; - version = "0.7.4"; + version = "0.8.0"; }; ruby-lxc = { groups = ["default"]; @@ -3169,6 +3255,39 @@ }; version = "0.0.5"; }; + ruby2ruby = { + dependencies = ["ruby_parser" "sexp_processor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04bz2jw3ida07mgk450l9m6xklhzbv0z4s6ak6bl7vp4rhcy41f8"; + type = "gem"; + }; + version = "2.5.0"; + }; + ruby_parser = { + dependencies = ["sexp_processor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j8w4mqhqaw53jd27cfhq1mq02d1r606x9fmrpfzz0fwjnk8j8ld"; + type = "gem"; + }; + version = "3.20.3"; + }; + rubyserial = { + dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vj5yan6srbvkf5vfp9d9b9z8wyygd0zxcy54c35yhkjl6kwd22q"; + type = "gem"; + }; + version = "0.6.0"; + }; rubyzip = { groups = ["default"]; platforms = []; @@ -3269,10 +3388,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zm5lfvhc1j7nq73s7i4g93kfbb3fg81jicf3sbfh2w5gm59nq7v"; + sha256 = "1jan1hyrsxi964caqm81w364fmczz4xrbd2fi9ciw1hmyb9cm7m4"; type = "gem"; }; - version = "5.70.0"; + version = "5.71.0"; }; sequel_pg = { dependencies = ["pg" "sequel"]; @@ -3285,6 +3404,16 @@ }; version = "1.17.1"; }; + sexp_processor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vzz9mhg4kkdqf179pm30i204h7iskanxrk53j0csf0qrrs4iajd"; + type = "gem"; + }; + version = "4.17.0"; + }; simplecov = { dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"]; groups = ["default"]; @@ -3333,10 +3462,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q0ghxfqgjhg2dq9699mn5qx6m6q2cgldg312kh41pzwwy71a7hx"; + sha256 = "00541cnypsh1mnilfxxqlz6va9afrixf9m1asn4wzjp5m59777p8"; type = "gem"; }; - version = "3.0.6"; + version = "3.1.0"; }; slather = { dependencies = ["CFPropertyList" "activesupport" "clamp" "nokogiri" "xcodeproj"]; @@ -3395,10 +3524,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n197kk9nqf955lsphns835sbkz7wcgbpppad482iqx95bhf8i6l"; + sha256 = "1abdrhb4sf5wwlvli87nh5jiy13dy2szv448h6a4bzyrg3nf47fx"; type = "gem"; }; - version = "0.5.10932"; + version = "0.5.10957"; }; sqlite3 = { dependencies = ["mini_portile2"]; @@ -3651,16 +3780,6 @@ }; version = "7.0.0"; }; - webrick = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r"; - type = "gem"; - }; - version = "1.8.1"; - }; websocket-driver = { dependencies = ["websocket-extensions"]; groups = ["default"]; @@ -3728,10 +3847,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v14hl814knwi8pm2n09bpgcd107jafv4lnj9zmcsgfwbqxin3sq"; + sha256 = "1mwdd445w63khz13hpv17m2br5xngyjl3jdj08xizjbm78i2zrxd"; type = "gem"; }; - version = "2.6.9"; + version = "2.6.11"; }; zookeeper = { groups = ["default"]; diff --git a/nixpkgs/pkgs/top-level/splice.nix b/nixpkgs/pkgs/top-level/splice.nix index 51fd6f420e80..9ac0fe2200f9 100644 --- a/nixpkgs/pkgs/top-level/splice.nix +++ b/nixpkgs/pkgs/top-level/splice.nix @@ -145,6 +145,7 @@ in # prefill 2 fields of the function for convenience makeScopeWithSplicing = lib.makeScopeWithSplicing splicePackages pkgs.newScope; + makeScopeWithSplicing' = lib.makeScopeWithSplicing' { inherit splicePackages; inherit (pkgs) newScope; }; # generate 'otherSplices' for 'makeScopeWithSplicing' generateSplicesForMkScope = attr: |