diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 5 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 247 | ||||
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 56 | ||||
-rw-r--r-- | pkgs/top-level/java-packages.nix | 11 | ||||
-rw-r--r-- | pkgs/top-level/kodi-packages.nix | 12 | ||||
-rw-r--r-- | pkgs/top-level/linux-kernels.nix | 25 | ||||
-rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 26 | ||||
-rw-r--r-- | pkgs/top-level/php-packages.nix | 58 | ||||
-rw-r--r-- | pkgs/top-level/python-aliases.nix | 7 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 123 | ||||
-rw-r--r-- | pkgs/top-level/python2-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/qt5-packages.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/release-haskell.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/unixtools.nix | 2 |
15 files changed, 433 insertions, 159 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3537726c85fbb..4c31867174f62 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -768,6 +768,8 @@ mapAliases ({ jbuilder = throw "'jbuilder' has been renamed to/replaced by 'dune_1'"; # Converted to throw 2022-02-22 jd = throw "jd has been dropped due to the lack of maintenance from upstream since 2016"; # Added 2022-06-03 jellyfin_10_5 = throw "Jellyfin 10.5 is no longer supported and contains a security vulnerability. Please upgrade to a newer version"; # Added 2021-04-26 + jfbpdf = throw "'jfbpdf' has been removed, because it depends on an outdated and insecure version of mupdf"; # Added 2023-06-27 + jfbview = throw "'jfbview' has been removed, because it depends on an outdated and insecure version of mupdf"; # Added 2023-06-27 jira-cli = throw "jira-cli was removed because it is no longer maintained"; # Added 2023-02-28 joseki = throw "'joseki' has been renamed to/replaced by 'apache-jena-fuseki'"; # Converted to throw 2022-02-22 journalbeat = throw "journalbeat7 has been removed upstream. Use filebeat with the journald input instead"; # Added 2022-10-04 @@ -944,6 +946,7 @@ mapAliases ({ linuxPackages_6_1 = linuxKernel.packages.linux_6_1; linuxPackages_6_2 = linuxKernel.packages.linux_6_2; linuxPackages_6_3 = linuxKernel.packages.linux_6_3; + linuxPackages_6_4 = linuxKernel.packages.linux_6_4; linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14; linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3; @@ -967,6 +970,7 @@ mapAliases ({ linux_6_1 = linuxKernel.kernels.linux_6_1; linux_6_2 = linuxKernel.kernels.linux_6_2; linux_6_3 = linuxKernel.kernels.linux_6_3; + linux_6_4 = linuxKernel.kernels.linux_6_4; linuxPackages_mptcp = throw "'linuxPackages_mptcp' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04 linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04 linux_mptcp_95 = throw "'linux_mptcp_95' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04 @@ -1535,6 +1539,7 @@ mapAliases ({ seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # Added 2020-06-21 sepolgen = throw "sepolgen was merged into selinux-python"; # Added 2021-11-11 session-desktop-appimage = session-desktop; + sequoia = sequoia-sq; # Added 2023-06-26 sget = throw "sget has been removed from nixpkgs, as it is not supported upstream anymore see https://github.com/sigstore/sget/issues/145"; # Added 2023-05-26 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 175f022efc3db..9395d609a1268 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -316,6 +316,8 @@ with pkgs; atomic-operator = callPackage ../tools/security/atomic-operator { }; + atomic-swap = callPackage ../applications/blockchains/atomic-swap { }; + avro-tools = callPackage ../development/tools/avro-tools { }; bacnet-stack = callPackage ../tools/networking/bacnet-stack { }; @@ -346,6 +348,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; + blst = callPackage ../development/libraries/blst { }; + bodyclose = callPackage ../development/tools/bodyclose { }; bootstrap-studio = callPackage ../development/web/bootstrap-studio { }; @@ -427,6 +431,8 @@ with pkgs; chatgpt-retrieval-plugin = callPackage ../servers/chatgpt-retrieval-plugin { }; + mswatch = callPackage ../applications/networking/mailreaders/mswatch { }; + chef-cli = callPackage ../tools/misc/chef-cli { }; checkov = callPackage ../development/tools/analysis/checkov { @@ -911,6 +917,8 @@ with pkgs; graphw00f = callPackage ../tools/security/graphw00f { }; + graphite-cursors = callPackage ../data/icons/graphite-cursors { }; + opendrop = python3Packages.callPackage ../tools/networking/opendrop { }; owl = callPackage ../tools/networking/owl { }; @@ -1547,6 +1555,10 @@ with pkgs; asleap = callPackage ../tools/networking/asleap { }; + awsbck = callPackage ../tools/backup/awsbck { + inherit (darwin.apple_sdk.frameworks) Security; + }; + balena-cli = callPackage ../tools/admin/balena-cli { }; basez = callPackage ../tools/misc/basez { }; @@ -1677,6 +1689,8 @@ with pkgs; kaufkauflist = callPackage ../applications/misc/kaufkauflist { }; + kicli = callPackage ../tools/misc/kicli { }; + ksmbd-tools = callPackage ../os-specific/linux/ksmbd-tools { }; ksnip = libsForQt5.callPackage ../tools/misc/ksnip { }; @@ -1811,6 +1825,8 @@ with pkgs; topicctl = callPackage ../tools/misc/topicctl { }; + transmission-rss = callPackage ../tools/networking/transmission-rss { }; + trigger-control = callPackage ../tools/games/trigger-control { }; ttchat = callPackage ../tools/misc/ttchat { }; @@ -1944,8 +1960,8 @@ with pkgs; gita = python3Packages.callPackage ../applications/version-management/gita { }; - gitoxide = callPackage ../applications/version-management/gitoxide { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + gitoxide = darwin.apple_sdk_11_0.callPackage ../applications/version-management/gitoxide { + inherit (darwin.apple_sdk_11_0.frameworks) Security SystemConfiguration; }; gg-scm = callPackage ../applications/version-management/gg { }; @@ -2059,6 +2075,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + git-graph = callPackage ../applications/version-management/git-graph { }; + git-hound = callPackage ../applications/version-management/git-hound { }; git-hub = callPackage ../applications/version-management/git-hub { }; @@ -2973,6 +2991,8 @@ with pkgs; arduino-mk = callPackage ../development/embedded/arduino/arduino-mk { }; + arduinoOTA = callPackage ../development/embedded/arduino/arduinoOTA { }; + apio = python3Packages.callPackage ../development/embedded/fpga/apio { }; apitrace = libsForQt5.callPackage ../applications/graphics/apitrace { }; @@ -3022,7 +3042,7 @@ with pkgs; astc-encoder = callPackage ../tools/graphics/astc-encoder { }; - asymptote = callPackage ../tools/graphics/asymptote { + asymptote = libsForQt5.callPackage ../tools/graphics/asymptote { texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super texinfo media9 ocgx2 collection-latexextra; }; }; @@ -3532,6 +3552,8 @@ with pkgs; github-commenter = callPackage ../development/tools/github-commenter { }; + github-copilot-intellij-agent = callPackage ../development/tools/github-copilot-intellij-agent { }; + github-desktop = callPackage ../applications/version-management/github-desktop { openssl = openssl_1_1; curl = curl.override { openssl = openssl_1_1; }; @@ -4392,7 +4414,7 @@ with pkgs; comma = callPackage ../tools/package-management/comma { }; - commitizen = python3Packages.callPackage ../applications/version-management/commitizen { }; + commitizen = callPackage ../applications/version-management/commitizen { }; common-licenses = callPackage ../data/misc/common-licenses { }; @@ -4494,6 +4516,8 @@ with pkgs; wl-mirror = callPackage ../tools/wayland/wl-mirror { }; + wl-screenrec = callPackage ../tools/wayland/wl-screenrec { }; + wlogout = callPackage ../tools/wayland/wlogout { }; wlopm = callPackage ../tools/wayland/wlopm { }; @@ -5013,10 +5037,16 @@ with pkgs; flitter = callPackage ../tools/misc/flitter { }; + flowgger = callPackage ../tools/misc/flowgger { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; + frangipanni = callPackage ../tools/text/frangipanni { }; frawk = callPackage ../tools/text/frawk { }; + fre = callPackage ../tools/misc/fre { }; + frei = callPackage ../tools/misc/frei { }; frogmouth = callPackage ../tools/text/frogmouth { }; @@ -5029,6 +5059,8 @@ with pkgs; fsql = callPackage ../tools/misc/fsql { }; + kitty-img = callPackage ../tools/misc/kitty-img { }; + ### TOOLS/TYPESETTING/TEX advi = callPackage ../tools/typesetting/tex/advi { }; @@ -5149,6 +5181,8 @@ with pkgs; go-neb = callPackage ../applications/networking/instant-messengers/go-neb { }; + go-thumbnailer = callPackage ../applications/misc/go-thumbnailer { }; + geckodriver = callPackage ../development/tools/geckodriver { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -5507,6 +5541,8 @@ with pkgs; long-shebang = callPackage ../misc/long-shebang { }; + lssecret = callPackage ../misc/lssecret {}; + lowdown = callPackage ../tools/typesetting/lowdown { }; numatop = callPackage ../os-specific/linux/numatop { }; @@ -5841,6 +5877,8 @@ with pkgs; pscale = callPackage ../development/tools/pscale { }; + pulsarctl = callPackage ../tools/admin/pulsarctl { }; + psstop = callPackage ../tools/system/psstop { }; precice = callPackage ../development/libraries/precice { }; @@ -6646,6 +6684,8 @@ with pkgs; bombardier = callPackage ../tools/networking/bombardier { }; + caeml = callPackage ../applications/networking/mailreaders/caeml { }; + calyx-vpn = libsForQt5.callPackage ../tools/networking/bitmask-vpn { provider = "calyx"; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; @@ -7187,6 +7227,8 @@ with pkgs; ecmtools = callPackage ../tools/cd-dvd/ecm-tools { }; + erofs-utils = callPackage ../tools/filesystems/erofs-utils { }; + e2tools = callPackage ../tools/filesystems/e2tools { }; e2fsprogs = callPackage ../tools/filesystems/e2fsprogs { }; @@ -7425,7 +7467,7 @@ with pkgs; easeprobe = callPackage ../tools/misc/easeprobe { }; emscripten = callPackage ../development/compilers/emscripten { - llvmPackages = llvmPackages_14; + llvmPackages = llvmPackages_16; }; emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { }); @@ -7818,6 +7860,8 @@ with pkgs; forktty = callPackage ../os-specific/linux/forktty { }; + fortran-fpm = callPackage ../tools/package-management/fortran-fpm { }; + fortune = callPackage ../tools/misc/fortune { }; fox = callPackage ../development/libraries/fox { @@ -7830,6 +7874,8 @@ with pkgs; fpart = callPackage ../tools/misc/fpart { }; + fpattern = callPackage ../development/libraries/fpattern { }; + fping = callPackage ../tools/networking/fping { }; fpm = callPackage ../tools/package-management/fpm { }; @@ -7917,6 +7963,8 @@ with pkgs; fusee-launcher = callPackage ../development/tools/fusee-launcher { }; + fusee-nano = callPackage ../development/tools/fusee-nano { }; + fverb = callPackage ../applications/audio/fverb { }; fwknop = callPackage ../tools/security/fwknop { @@ -9131,6 +9179,8 @@ with pkgs; jsduck = callPackage ../development/tools/jsduck { }; + jsluice = callPackage ../tools/security/jsluice { }; + json-schema-for-humans = with python3Packages; toPythonApplication json-schema-for-humans; jsonfmt = callPackage ../development/tools/misc/jsonfmt { }; @@ -9682,6 +9732,8 @@ with pkgs; netsniff-ng = callPackage ../tools/networking/netsniff-ng { }; + networkminer = callPackage ../tools/security/networkminer { }; + nixpacks = callPackage ../applications/virtualization/nixpacks { }; nkeys = callPackage ../tools/system/nkeys { }; @@ -10203,6 +10255,8 @@ with pkgs; mediawiki = callPackage ../servers/web-apps/mediawiki { }; + mediawriter = callPackage ../tools/system/mediawriter { }; + memtier-benchmark = callPackage ../tools/networking/memtier-benchmark { }; memtest86-efi = callPackage ../tools/misc/memtest86-efi { }; @@ -10702,6 +10756,8 @@ with pkgs; pcmsolver = callPackage ../development/libraries/pcmsolver { }; + pegasus-frontend = libsForQt5.callPackage ../games/pegasus-frontend {}; + pgbadger = perlPackages.callPackage ../tools/misc/pgbadger { }; pffft = callPackage ../development/libraries/pffft { }; @@ -10931,9 +10987,7 @@ with pkgs; onlykey = callPackage ../tools/security/onlykey { node_webkit = nwjs; }; - ooniprobe-cli = callPackage ../tools/networking/ooniprobe-cli { - buildGoModule = buildGo119Module; # go 1.20 build failure - }; + ooniprobe-cli = callPackage ../tools/networking/ooniprobe-cli { }; openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { jre = pkgs.jre_headless; }; openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { jre = pkgs.jre_headless; }; @@ -11077,6 +11131,8 @@ with pkgs; owncast = callPackage ../servers/owncast { }; + owntracks-recorder = callPackage ../servers/owntracks-recorder { }; + update-dotdee = with python3Packages; toPythonApplication update-dotdee; update-nix-fetchgit = haskell.lib.compose.justStaticExecutables haskellPackages.update-nix-fetchgit; @@ -11345,6 +11401,8 @@ with pkgs; pdfcrack = callPackage ../tools/security/pdfcrack { }; + pdfposter = callPackage ../applications/misc/pdfposter { }; + pdfsandwich = callPackage ../tools/typesetting/pdfsandwich { }; pdftag = callPackage ../tools/graphics/pdftag { }; @@ -11636,6 +11694,8 @@ with pkgs; profile-sync-daemon = callPackage ../tools/misc/profile-sync-daemon { }; + projectable = callPackage ../applications/file-managers/projectable { }; + projectlibre = callPackage ../applications/misc/projectlibre { jre = jre8; jdk = jdk8; @@ -11885,6 +11945,8 @@ with pkgs; qrcp = callPackage ../tools/networking/qrcp { }; + qrscan = callPackage ../tools/misc/qrscan { }; + qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { }; qtspim = libsForQt5.callPackage ../development/tools/misc/qtspim { }; @@ -11957,6 +12019,8 @@ with pkgs; rc = callPackage ../shells/rc { }; + rc-9front = callPackage ../shells/rc-9front { }; + rcon = callPackage ../tools/networking/rcon { }; rconc = callPackage ../tools/networking/rconc { }; @@ -12427,14 +12491,18 @@ with pkgs; seqdiag = with python3Packages; toPythonApplication seqdiag; - sequoia = callPackage ../tools/security/sequoia { - pythonPackages = python3Packages; - }; + sequoia-sq = callPackage ../tools/security/sequoia-sq { }; + + sequoia-sqv = callPackage ../tools/security/sequoia-sqv { }; + + sequoia-sqop = callPackage ../tools/security/sequoia-sqop { }; sequoia-chameleon-gnupg = callPackage ../tools/security/sequoia-chameleon-gnupg { }; sewer = callPackage ../tools/admin/sewer { }; + sexp = callPackage ../development/libraries/sexp { }; + sfeed = callPackage ../tools/misc/sfeed { }; sftpman = callPackage ../tools/filesystems/sftpman { }; @@ -12782,6 +12850,8 @@ with pkgs; sockperf = callPackage ../tools/networking/sockperf { }; + softnet = callPackage ../tools/networking/softnet { }; + solaar = callPackage ../applications/misc/solaar { }; solanum = callPackage ../servers/irc/solanum { @@ -13022,6 +13092,8 @@ with pkgs; tagtime = callPackage ../applications/misc/tagtime { }; + tailer = callPackage ../tools/misc/tailer { }; + inherit (callPackages ../applications/networking/taler { }) taler-exchange taler-merchant; @@ -13459,6 +13531,8 @@ with pkgs; tuhi = callPackage ../applications/misc/tuhi { }; + tui-journal = callPackage ../applications/misc/tui-journal { }; + tuir = callPackage ../applications/misc/tuir { }; tuifeed = callPackage ../applications/networking/feedreaders/tuifeed { @@ -13627,6 +13701,8 @@ with pkgs; usbmuxd2 = callPackage ../tools/misc/usbmuxd2 { }; + usort = with python3Packages; toPythonApplication usort; + ustreamer = callPackage ../applications/video/ustreamer { }; usync = callPackage ../applications/misc/usync { }; @@ -14005,6 +14081,8 @@ with pkgs; udunits = callPackage ../development/libraries/udunits { }; + ufmt = with python3Packages; toPythonApplication ufmt; + uftp = callPackage ../servers/uftp { }; uhttpmock = callPackage ../development/libraries/uhttpmock { }; @@ -14715,6 +14793,9 @@ with pkgs; _4th = callPackage ../development/compilers/4th { }; + temurin-bin-20 = javaPackages.compiler.temurin-bin.jdk-20; + temurin-jre-bin-20 = javaPackages.compiler.temurin-bin.jre-20; + temurin-bin-19 = javaPackages.compiler.temurin-bin.jdk-19; temurin-jre-bin-19 = javaPackages.compiler.temurin-bin.jre-19; @@ -15026,6 +15107,10 @@ with pkgs; crystal2nix = callPackage ../development/compilers/crystal2nix { }; + crystalline = callPackage ../development/tools/language-servers/crystalline { + llvmPackages = llvmPackages_15; + }; + icr = callPackage ../development/tools/icr { }; scry = callPackage ../development/tools/scry { crystal = crystal_1_2; }; @@ -15800,7 +15885,7 @@ with pkgs; hugs = callPackage ../development/interpreters/hugs { }; - inherit (javaPackages) openjfx11 openjfx15 openjfx17 openjfx19; + inherit (javaPackages) openjfx11 openjfx15 openjfx17 openjfx19 openjfx20; openjfx = openjfx17; openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap; @@ -15830,6 +15915,11 @@ with pkgs; jdk19 = openjdk19; jdk19_headless = openjdk19_headless; + openjdk20 = javaPackages.compiler.openjdk20; + openjdk20_headless = javaPackages.compiler.openjdk20.headless; + jdk20 = openjdk20; + jdk20_headless = openjdk20_headless; + /* default JDK */ jdk = jdk19; jdk_headless = jdk19_headless; @@ -16234,7 +16324,7 @@ with pkgs; inherit (callPackage ../development/tools/ocaml/ocamlformat { }) ocamlformat # latest version ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0 - ocamlformat_0_22_4 ocamlformat_0_23_0 ocamlformat_0_24_1; + ocamlformat_0_22_4 ocamlformat_0_23_0 ocamlformat_0_24_1 ocamlformat_0_25_1; orc = callPackage ../development/compilers/orc { }; @@ -16887,9 +16977,7 @@ with pkgs; swiftpm2nix = callPackage ../development/tools/swiftpm2nix { }; swiProlog = callPackage ../development/compilers/swi-prolog { - openssl = openssl_1_1; inherit (darwin.apple_sdk.frameworks) Security; - jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; swiPrologWithGui = swiProlog.override { withGui = true; }; @@ -16904,7 +16992,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa Foundation; }; - teyjus = callPackage ../development/compilers/teyjus { }; + teyjus = callPackage ../development/compilers/teyjus { + inherit (ocamlPackages) buildDunePackage; + }; thrust = callPackage ../development/tools/thrust { gconf = gnome2.GConf; @@ -17338,6 +17428,16 @@ with pkgs; phpExtensions = php.extensions; phpPackages = php.packages; + # Import PHP83 interpreter, extensions and packages + php83 = callPackage ../development/interpreters/php/8.3.nix { + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; + pcre2 = pcre2.override { + withJitSealloc = false; # See https://bugs.php.net/bug.php?id=78927 and https://bugs.php.net/bug.php?id=78630 + }; + }; + php83Extensions = recurseIntoAttrs php83.extensions; + php83Packages = recurseIntoAttrs php83.packages; + # Import PHP82 interpreter, extensions and packages php82 = callPackage ../development/interpreters/php/8.2.nix { stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; @@ -17685,6 +17785,8 @@ with pkgs; gimme-aws-creds = callPackage ../tools/admin/gimme-aws-creds { }; + gimoji = callPackage ../applications/misc/gimoji { }; + guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { }; # Needed for autogen @@ -17845,6 +17947,8 @@ with pkgs; phpunit = callPackage ../development/tools/misc/phpunit { }; + teller = callPackage ../development/tools/teller { }; + ### DEVELOPMENT / TOOLS / LANGUAGE-SERVERS ansible-language-server = callPackage ../development/tools/language-servers/ansible-language-server { }; @@ -17938,12 +18042,14 @@ with pkgs; apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; ant = apacheAnt; - apacheKafka = apacheKafka_3_3; + apacheKafka = apacheKafka_3_5; apacheKafka_2_8 = callPackage ../servers/apache-kafka { majorVersion = "2.8"; }; apacheKafka_3_0 = callPackage ../servers/apache-kafka { majorVersion = "3.0"; }; apacheKafka_3_1 = callPackage ../servers/apache-kafka { majorVersion = "3.1"; }; apacheKafka_3_2 = callPackage ../servers/apache-kafka { majorVersion = "3.2"; }; apacheKafka_3_3 = callPackage ../servers/apache-kafka { majorVersion = "3.3"; }; + apacheKafka_3_4 = callPackage ../servers/apache-kafka { majorVersion = "3.4"; }; + apacheKafka_3_5 = callPackage ../servers/apache-kafka { majorVersion = "3.5"; }; kt = callPackage ../tools/misc/kt { }; @@ -18640,6 +18746,8 @@ with pkgs; fastddsgen = callPackage ../development/tools/fastddsgen { }; + fastgron = callPackage ../development/tools/fastgron { }; + findbugs = callPackage ../development/tools/analysis/findbugs { }; findnewest = callPackage ../development/tools/misc/findnewest { }; @@ -19285,6 +19393,8 @@ with pkgs; procodile = callPackage ../tools/system/procodile { }; + protox = callPackage ../development/tools/misc/protox { }; + proxmove = callPackage ../tools/admin/proxmove { }; pry = callPackage ../development/tools/pry { }; @@ -20006,6 +20116,8 @@ with pkgs; ayatana-ido = callPackage ../development/libraries/ayatana-ido { }; + ayatana-webmail = callPackage ../applications/networking/mailreaders/ayatana-webmail { }; + babl = callPackage ../development/libraries/babl { }; backward-cpp = callPackage ../development/libraries/backward-cpp { }; @@ -20662,9 +20774,9 @@ with pkgs; flyway = callPackage ../development/tools/flyway { }; - inherit (callPackages ../development/libraries/fmt { }) fmt_8 fmt_9; + inherit (callPackages ../development/libraries/fmt { }) fmt_8 fmt_9 fmt_10; - fmt = fmt_9; + fmt = fmt_10; fplll = callPackage ../development/libraries/fplll { }; fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix { }; @@ -21503,7 +21615,7 @@ with pkgs; indicator-sound-switcher = callPackage ../applications/audio/indicator-sound-switcher { }; - indilib = callPackage ../development/libraries/science/astronomy/indilib { }; + indilib = darwin.apple_sdk_11_0.callPackage ../development/libraries/science/astronomy/indilib { }; indi-full = callPackage ../development/libraries/science/astronomy/indilib/indi-full.nix { }; inih = callPackage ../development/libraries/inih { }; @@ -21544,6 +21656,7 @@ with pkgs; ispc = callPackage ../development/compilers/ispc { inherit (llvmPackages) stdenv; + xcode = darwin.xcode_14; }; isso = callPackage ../servers/isso { @@ -22016,9 +22129,7 @@ with pkgs; libe57format = callPackage ../development/libraries/libe57format { }; - libeatmydata = callPackage ../development/libraries/libeatmydata { - autoreconfHook = buildPackages.autoreconfHook269; - }; + libeatmydata = callPackage ../development/libraries/libeatmydata { }; libeb = callPackage ../development/libraries/libeb { }; @@ -23317,7 +23428,7 @@ with pkgs; mlc = callPackage ../tools/system/mlc { }; - mlt = callPackage ../development/libraries/mlt { }; + mlt = darwin.apple_sdk_11_0.callPackage ../development/libraries/mlt { }; mlib = callPackage ../development/libraries/mlib { }; @@ -23405,6 +23516,8 @@ with pkgs; nanomsg = callPackage ../development/libraries/nanomsg { }; + nanosvg = callPackage ../development/libraries/nanosvg { }; + nanovna-saver = libsForQt5.callPackage ../applications/science/electronics/nanovna-saver { }; nanotts = callPackage ../tools/audio/nanotts { }; @@ -24504,6 +24617,8 @@ with pkgs; sqlite-jdbc = callPackage ../servers/sql/sqlite/jdbc { }; + sregex = callPackage ../development/libraries/sregex { }; + dqlite = callPackage ../development/libraries/dqlite { }; sqlcipher = callPackage ../development/libraries/sqlcipher { }; @@ -25323,17 +25438,17 @@ with pkgs; pkg = callPackage ../development/compilers/sbcl/bootstrap.nix {}; faslExt = "fasl"; }; - sbcl_2_3_4 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.4"; }; + sbcl_2_3_5 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.5"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl_2_3_5 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.5"; }; + sbcl_2_3_6 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.6"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl = sbcl_2_3_5; + sbcl = sbcl_2_3_6; sbclPackages = recurseIntoAttrs sbcl.pkgs; @@ -25426,6 +25541,8 @@ with pkgs; alps = callPackage ../servers/alps { }; + anuko-time-tracker = callPackage ../servers/web-apps/anuko-time-tracker { }; + apache-directory-server = callPackage ../servers/ldap/apache-directory-server { }; apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { @@ -25837,6 +25954,8 @@ with pkgs; jitsi-videobridge = callPackage ../servers/jitsi-videobridge { }; + kamailio = callPackage ../servers/sip/kamailio { }; + kanidm = callPackage ../servers/kanidm { }; kapowbang = callPackage ../servers/kapowbang { }; @@ -26424,6 +26543,7 @@ with pkgs; prometheus-nut-exporter = callPackage ../servers/monitoring/prometheus/nut-exporter.nix { }; prometheus-openldap-exporter = callPackage ../servers/monitoring/prometheus/openldap-exporter.nix { } ; prometheus-openvpn-exporter = callPackage ../servers/monitoring/prometheus/openvpn-exporter.nix { }; + prometheus-php-fpm-exporter = callPackage ../servers/monitoring/prometheus/php-fpm-exporter.nix { }; prometheus-pihole-exporter = callPackage ../servers/monitoring/prometheus/pihole-exporter.nix { }; prometheus-postfix-exporter = callPackage ../servers/monitoring/prometheus/postfix-exporter.nix { }; prometheus-postgres-exporter = callPackage ../servers/monitoring/prometheus/postgres-exporter.nix { }; @@ -26829,6 +26949,8 @@ with pkgs; ### OS-SPECIFIC + airbuddy = callPackage ../os-specific/darwin/airbuddy { }; + afuse = callPackage ../os-specific/linux/afuse { }; autofs5 = callPackage ../os-specific/linux/autofs { }; @@ -26897,6 +27019,8 @@ with pkgs; ath9k-htc-blobless-firmware-unstable = callPackage ../os-specific/linux/firmware/ath9k { enableUnstable = true; }; + bartender = callPackage ../os-specific/darwin/bartender { }; + b43Firmware_5_1_138 = callPackage ../os-specific/linux/firmware/b43-firmware/5.1.138.nix { }; b43Firmware_6_30_163_46 = callPackage ../os-specific/linux/firmware/b43-firmware/6.30.163.46.nix { }; @@ -26959,6 +27083,8 @@ with pkgs; cockroachdb = callPackage ../servers/sql/cockroachdb { }; + coconutbattery = callPackage ../os-specific/darwin/coconutbattery { }; + conky = callPackage ../os-specific/linux/conky ({ lua = lua5_3_compat; inherit (linuxPackages.nvidia_x11.settings) libXNVCtrl; @@ -27031,8 +27157,6 @@ with pkgs; dstat = callPackage ../os-specific/linux/dstat { }; - erofs-utils = callPackage ../os-specific/linux/erofs-utils { }; - evdev-proto = callPackage ../os-specific/bsd/freebsd/evdev-proto { }; fscryptctl = callPackage ../os-specific/linux/fscryptctl { }; @@ -27223,13 +27347,6 @@ with pkgs; iwd = callPackage ../os-specific/linux/iwd { }; - jfbview = callPackage ../os-specific/linux/jfbview { - imlib2 = imlib2Full; - }; - jfbpdf = jfbview.override { - imageSupport = false; - }; - jool-cli = callPackage ../os-specific/linux/jool/cli.nix { }; juju = callPackage ../applications/networking/juju { }; @@ -27266,6 +27383,8 @@ with pkgs; libcgroup = callPackage ../os-specific/linux/libcgroup { }; + libdatachannel = callPackage ../development/libraries/libdatachannel { }; + libkrun = callPackage ../development/libraries/libkrun { inherit (darwin.apple_sdk.frameworks) Hypervisor; }; @@ -27401,6 +27520,8 @@ with pkgs; linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened; linuxPackages_6_1_hardened = linuxKernel.packages.linux_6_1_hardened; linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened; + linuxPackages_6_3_hardened = linuxKernel.packages.linux_6_3_hardened; + linux_6_3_hardened = linuxKernel.kernels.linux_6_3_hardened; # Hardkernel (Odroid) kernels. linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest; @@ -27539,6 +27660,8 @@ with pkgs; }; checkMeta = callPackage ../stdenv/generic/check-meta.nix { }; }); + minimal-bootstrap-sources = callPackage ../os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix { }; + make-minimal-bootstrap-sources = callPackage ../os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix { }; mingetty = callPackage ../os-specific/linux/mingetty { }; @@ -27570,6 +27693,8 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) AppKit Security; }; + nushellFull = nushell.override { additionalFeatures = p: p ++ ["dataframe" "extra"]; }; + nu_scripts = callPackage ../shells/nushell/nu_scripts { }; nushellPlugins = callPackage ../shells/nushell/plugins { @@ -27731,7 +27856,9 @@ with pkgs; octomap = callPackage ../development/libraries/octomap { }; - odin = callPackage ../development/compilers/odin { }; + odin = callPackage ../development/compilers/odin { + inherit (pkgs.darwin.apple_sdk_11_0) MacOSX-SDK; + }; odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { }; @@ -28566,6 +28693,8 @@ with pkgs; freepats = callPackage ../data/misc/freepats { }; + game-devices-udev-rules = callPackage ../os-specific/linux/game-devices-udev-rules { }; + garamond-libre = callPackage ../data/fonts/garamond-libre { }; g15daemon = callPackage ../os-specific/linux/g15daemon { }; @@ -29739,6 +29868,8 @@ with pkgs; cheesecutter = callPackage ../applications/audio/cheesecutter { }; + cutecapture = callPackage ../applications/video/cutecapture { }; + milkytracker = callPackage ../applications/audio/milkytracker { }; ptcollab = libsForQt5.callPackage ../applications/audio/ptcollab { }; @@ -31054,6 +31185,8 @@ with pkgs; firefox-beta = wrapFirefox firefox-beta-unwrapped { }; firefox-devedition = wrapFirefox firefox-devedition-unwrapped { }; + firefox-mobile = callPackage ../applications/networking/browsers/firefox/mobile-config.nix { }; + firefox-esr = firefox-esr-102; firefox-esr-102 = wrapFirefox firefox-esr-102-unwrapped { }; @@ -32909,8 +33042,9 @@ with pkgs; moonlight-embedded = callPackage ../applications/misc/moonlight-embedded { }; moonlight-qt = libsForQt5.callPackage ../applications/misc/moonlight-qt { + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; SDL2 = buildPackages.SDL2.override { - drmSupport = true; + drmSupport = stdenv.isLinux; }; }; @@ -33757,6 +33891,8 @@ with pkgs; pencil = callPackage ../applications/graphics/pencil { }; + pentestgpt = callPackage ../tools/security/pentestgpt { }; + perseus = callPackage ../applications/science/math/perseus { }; petrifoo = callPackage ../applications/audio/petrifoo { @@ -34491,6 +34627,8 @@ with pkgs; sway-launcher-desktop = callPackage ../applications/misc/sway-launcher-desktop { }; + tart = callPackage ../applications/virtualization/tart { }; + tecoc = callPackage ../applications/editors/tecoc { }; viber = callPackage ../applications/networking/instant-messengers/viber { }; @@ -36158,6 +36296,7 @@ with pkgs; cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { }; + dcrctl = callPackage ../applications/blockchains/dcrctl { }; dcrd = callPackage ../applications/blockchains/dcrd { }; dcrwallet = callPackage ../applications/blockchains/dcrwallet { }; @@ -36753,6 +36892,7 @@ with pkgs; }; devilutionx = callPackage ../games/devilutionx { + fmt = fmt_9; SDL2 = SDL2.override { withStatic = true; }; @@ -37200,7 +37340,10 @@ with pkgs; otto-matic = callPackage ../games/otto-matic { }; - openraPackages_2019 = import ../games/openra_2019 pkgs.__splicedPackages; + openraPackages_2019 = import ../games/openra_2019 { + inherit lib; + pkgs = pkgs.__splicedPackages; + }; openra_2019 = openraPackages_2019.engines.release; @@ -37453,6 +37596,8 @@ with pkgs; steam-acf = callPackage ../tools/games/steam-acf { }; + steamback = python311.pkgs.callPackage ../tools/games/steamback { }; + protontricks = python3Packages.callPackage ../tools/package-management/protontricks { inherit winetricks steam-run yad; }; @@ -37539,6 +37684,8 @@ with pkgs; trackballs = callPackage ../games/trackballs { }; + try = callPackage ../tools/admin/try { }; + tumiki-fighters = callPackage ../games/tumiki-fighters { }; tuxpaint = callPackage ../games/tuxpaint { }; @@ -37632,6 +37779,8 @@ with pkgs; widelands = callPackage ../games/widelands { }; + wolfstoneextract = callPackage ../games/wolfstoneextract { }; + worldofgoo = callPackage ../games/worldofgoo { }; xboard = callPackage ../games/xboard { }; @@ -37702,6 +37851,7 @@ with pkgs; zeroadPackages = recurseIntoAttrs (callPackage ../games/0ad { wxGTK = wxGTK32; + fmt = fmt_9; }); zeroad = zeroadPackages.zeroad; @@ -38885,9 +39035,7 @@ with pkgs; gap-full = lowPrio (gap.override { packageSet = "full"; }); geogebra = callPackage ../applications/science/math/geogebra { }; - geogebra6 = callPackage ../applications/science/math/geogebra/geogebra6.nix { - electron = electron_14; - }; + geogebra6 = callPackage ../applications/science/math/geogebra/geogebra6.nix { }; maxima = callPackage ../applications/science/math/maxima { lisp-compiler = sbcl; @@ -39396,6 +39544,8 @@ with pkgs; gummy = callPackage ../tools/misc/gummy { }; + hashpump = callPackage ../tools/misc/hashpump { }; + hck = callPackage ../tools/text/hck { }; helm = callPackage ../applications/audio/helm { }; @@ -39776,7 +39926,7 @@ with pkgs; alejandra = callPackage ../tools/nix/alejandra { }; - nixfmt = haskell.lib.compose.justStaticExecutables haskellPackages.nixfmt; + nixfmt = haskellPackages.nixfmt.bin; nixpkgs-fmt = callPackage ../tools/nix/nixpkgs-fmt { }; @@ -40384,6 +40534,7 @@ with pkgs; winePackages = recurseIntoAttrs (winePackagesFor (config.wine.build or "wine32")); wine64Packages = recurseIntoAttrs (winePackagesFor "wine64"); wineWowPackages = recurseIntoAttrs (winePackagesFor "wineWow"); + wineWow64Packages = recurseIntoAttrs (winePackagesFor "wineWow64"); wine = winePackages.full; wine64 = wine64Packages.full; @@ -40569,7 +40720,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; }; - spdlog = callPackage ../development/libraries/spdlog { }; + spdlog = callPackage ../development/libraries/spdlog { + fmt = fmt_9; + }; dart = callPackage ../development/compilers/dart { }; @@ -41049,4 +41202,6 @@ with pkgs; reindeer = callPackage ../development/tools/reindeer { }; charasay = callPackage ../tools/misc/charasay { }; + + waylyrics = callPackage ../applications/audio/waylyrics { }; } diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6001039689c4c..42867afef83d8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -28,7 +28,6 @@ let "ghc945" "ghc94" "ghc96" - "ghc961" "ghc962" "ghcHEAD" ]; @@ -48,7 +47,6 @@ let "ghc944" "ghc945" "ghc96" - "ghc961" "ghc962" "ghcHEAD" ]; @@ -82,8 +80,7 @@ in { package-list = callPackage ../development/haskell-modules/package-list.nix {}; - compiler = rec { - + compiler = { ghc865Binary = callPackage ../development/compilers/ghc/8.6.5-binary.nix { llvmPackages = pkgs.llvmPackages_6; }; @@ -129,7 +126,7 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_7; llvmPackages = pkgs.llvmPackages_7; }; - ghc88 = ghc884; + ghc88 = compiler.ghc884; ghc8107 = callPackage ../development/compilers/ghc/8.10.7.nix { bootPkgs = # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar @@ -150,7 +147,7 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; - ghc810 = ghc8107; + ghc810 = compiler.ghc8107; ghc902 = callPackage ../development/compilers/ghc/9.0.2.nix { bootPkgs = # aarch64 ghc8107Binary exceeds max output size on hydra @@ -166,7 +163,7 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; - ghc90 = ghc902; + ghc90 = compiler.ghc902; ghc924 = callPackage ../development/compilers/ghc/9.2.4.nix { bootPkgs = # aarch64 ghc8107Binary exceeds max output size on hydra @@ -252,7 +249,7 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; - ghc92 = ghc928; + ghc92 = compiler.ghc928; ghc942 = callPackage ../development/compilers/ghc/9.4.2.nix { bootPkgs = # Building with 9.2 is broken due to @@ -349,27 +346,7 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; - ghc94 = ghc945; - ghc961 = callPackage ../development/compilers/ghc/9.6.1.nix { - bootPkgs = - # For GHC 9.2 no armv7l bindists are available. - if stdenv.hostPlatform.isAarch32 then - 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; - # 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 && < 15 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_14; - llvmPackages = pkgs.llvmPackages_14; - }; + ghc94 = compiler.ghc945; ghc962 = callPackage ../development/compilers/ghc/9.6.2.nix { bootPkgs = # For GHC 9.2 no armv7l bindists are available. @@ -390,7 +367,7 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; llvmPackages = pkgs.llvmPackages_15; }; - ghc96 = ghc962; + ghc96 = compiler.ghc962; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { bootPkgs = # For GHC 9.2 no armv7l bindists are available. @@ -444,7 +421,7 @@ in { packageOverrides = self : super : {}; # Always get compilers from `buildPackages` - packages = let bh = buildPackages.haskell; in rec { + packages = let bh = buildPackages.haskell; in { ghc865Binary = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc865Binary; @@ -493,19 +470,19 @@ in { ghc = bh.compiler.ghc884; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { }; }; - ghc88 = ghc884; + ghc88 = packages.ghc884; ghc8107 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc8107; ghc = bh.compiler.ghc8107; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; }; - ghc810 = ghc8107; + ghc810 = packages.ghc8107; ghc902 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc902; ghc = bh.compiler.ghc902; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.0.x.nix { }; }; - ghc90 = ghc902; + ghc90 = packages.ghc902; ghc924 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc924; ghc = bh.compiler.ghc924; @@ -531,7 +508,7 @@ in { ghc = bh.compiler.ghc928; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; }; - ghc92 = ghc928; + ghc92 = packages.ghc928; ghc942 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc942; ghc = bh.compiler.ghc942; @@ -552,18 +529,13 @@ in { ghc = bh.compiler.ghc945; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; }; - ghc94 = ghc945; - ghc961 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc961; - ghc = bh.compiler.ghc961; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; - }; + ghc94 = packages.ghc945; ghc962 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc962; ghc = bh.compiler.ghc962; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; }; - ghc96 = ghc962; + ghc96 = packages.ghc962; ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 98567c7b9fcae..7439ba7892fbe 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -7,11 +7,12 @@ let openjfx15 = callPackage ../development/compilers/openjdk/openjfx/15.nix { }; openjfx17 = callPackage ../development/compilers/openjdk/openjfx/17.nix { }; openjfx19 = callPackage ../development/compilers/openjdk/openjfx/19.nix { }; + openjfx20 = callPackage ../development/compilers/openjdk/openjfx/20.nix { }; mavenfod = pkgs.maven.buildMavenPackage; in { - inherit mavenfod openjfx11 openjfx15 openjfx17 openjfx19; + inherit mavenfod openjfx11 openjfx15 openjfx17 openjfx19 openjfx20; compiler = let @@ -201,6 +202,14 @@ in { openjfx = openjfx19; }; + openjdk20 = mkOpenjdk + ../development/compilers/openjdk/20.nix + ../development/compilers/openjdk/darwin/20.nix + { + openjdk20-bootstrap = temurin-bin.jdk-20; + openjfx = openjfx20; + }; + temurin-bin = recurseIntoAttrs (callPackage ( if stdenv.isLinux then ../development/compilers/temurin-bin/jdk-linux.nix diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index d3d2451729442..c975cf135e5b5 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -3,7 +3,7 @@ with lib; let - inherit (libretro) genesis-plus-gx mgba snes9x; + inherit (libretro) fuse genesis-plus-gx mgba snes9x twenty-fortyeight; in let self = rec { @@ -62,6 +62,10 @@ let self = rec { libretro = callPackage ../applications/video/kodi/addons/libretro { }; + libretro-2048 = callPackage ../applications/video/kodi/addons/libretro-2048 { inherit twenty-fortyeight; }; + + libretro-fuse = callPackage ../applications/video/kodi/addons/libretro-fuse { inherit fuse; }; + libretro-genplus = callPackage ../applications/video/kodi/addons/libretro-genplus { inherit genesis-plus-gx; }; libretro-mgba = callPackage ../applications/video/kodi/addons/libretro-mgba { inherit mgba; }; @@ -96,10 +100,12 @@ let self = rec { osmc-skin = callPackage ../applications/video/kodi/addons/osmc-skin { }; - vfs-sftp = callPackage ../applications/video/kodi/addons/vfs-sftp { }; - vfs-libarchive = callPackage ../applications/video/kodi/addons/vfs-libarchive { }; + vfs-rar = callPackage ../applications/video/kodi/addons/vfs-rar { }; + + vfs-sftp = callPackage ../applications/video/kodi/addons/vfs-sftp { }; + visualization-fishbmc = callPackage ../applications/video/kodi/addons/visualization-fishbmc { }; visualization-goom = callPackage ../applications/video/kodi/addons/visualization-goom { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index fc6f2288349a9..9beff06712794 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -150,6 +150,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.fix-amdgpu-5_15 ]; }; @@ -183,6 +184,13 @@ in { ]; }; + linux_6_4 = callPackage ../os-specific/linux/kernel/linux-6.4.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux_testing = let testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ @@ -197,16 +205,8 @@ in { linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix { # Pinned on the last version which Kent's commits can be cleany rebased up. - kernel = buildLinux rec { - version = "6.1.3"; - modDirVersion = lib.versions.pad 3 version; - extraMeta.branch = lib.versions.majorMinor version; - src = fetchurl { - url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - hash = "sha256-bcia56dRPkM8WXxzRu1/9L/RFepDo7XiemvbOMVYAxc="; - }; - }; - kernelPatches = linux_6_1.kernelPatches; + kernel = linux_6_4; + kernelPatches = linux_6_4.kernelPatches; }; linux_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix { @@ -268,6 +268,7 @@ in { linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { }; linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { }; + linux_6_3_hardened = hardenedKernelFor kernels.linux_6_3 { }; } // lib.optionalAttrs config.allowAliases { linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; @@ -576,6 +577,7 @@ in { linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); linux_6_3 = recurseIntoAttrs (packagesFor kernels.linux_6_3); + linux_6_4 = recurseIntoAttrs (packagesFor kernels.linux_6_4); } // lib.optionalAttrs config.allowAliases { linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08 linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17 @@ -613,6 +615,7 @@ in { linux_5_10_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_10_hardened); linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened); linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened); + linux_6_3_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_3_hardened); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); @@ -635,7 +638,7 @@ in { packageAliases = { linux_default = packages.linux_6_1; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_6_3; + linux_latest = packages.linux_6_4; linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; linux_rt_default = packages.linux_rt_5_4; linux_rt_latest = packages.linux_rt_6_1; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 11547ffad9760..60252c1905ef6 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -56,8 +56,6 @@ let awa = callPackage ../development/ocaml-modules/awa { mtime = mtime_1; }; - awa-lwt = callPackage ../development/ocaml-modules/awa/lwt.nix { mtime = mtime_1; }; - awa-mirage = callPackage ../development/ocaml-modules/awa/mirage.nix { mtime = mtime_1; }; ### B ### @@ -1172,7 +1170,9 @@ let ocamlc-loc = callPackage ../development/ocaml-modules/ocamlc-loc { }; - ocamlformat-rpc-lib = callPackage ../development/ocaml-modules/ocamlformat-rpc-lib { }; + ocamlformat-lib = callPackage ../development/ocaml-modules/ocamlformat/ocamlformat-lib.nix { }; + + ocamlformat-rpc-lib = callPackage ../development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix { }; ocamlfuse = callPackage ../development/ocaml-modules/ocamlfuse { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ffa2532f99b94..bf94343be2f73 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12935,6 +12935,32 @@ with self; { }; }; + LatexIndent = buildPerlPackage rec { + pname = "latexindent.pl"; + version = "3.21"; + + src = fetchFromGitHub { + owner = "cmhughes"; + repo = pname; + rev = "V${version}"; + hash = "sha256-STXHOzsshyN7rc2VtJxxt6La4UPGpRYlMO8TX1Jd7pM="; + }; + + outputs = [ "out" ]; + + propagatedBuildInputs = [ FileHomeDir YAMLTiny ]; + + preBuild = '' + patchShebangs ./latexindent.pl + ''; + + meta = { + description = "Perl script to add indentation to LaTeX files"; + homepage = "https://github.com/cmhughes/latexindent.pl"; + license = lib.licenses.gpl3Plus; + }; + }; + LaTeXML = buildPerlPackage rec { pname = "LaTeXML"; version = "0.8.7"; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 6d03fddc015c2..2be6447f83bee 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -1,7 +1,6 @@ { stdenv , lib , pkgs -, fetchgit , phpPackage , autoconf , pkg-config @@ -10,22 +9,16 @@ , curl , cyrus_sasl , enchant2 -, fetchpatch , freetds -, freetype , gd , gettext , gmp , html-tidy , icu64 -, libXpm , libffi , libiconv -, libjpeg , libkrb5 -, libpng , libsodium -, libwebp , libxml2 , libxslt , libzip @@ -46,6 +39,7 @@ , uwimap , valgrind , zlib +, fetchpatch }: lib.makeScope pkgs.newScope (self: with self; { @@ -84,15 +78,15 @@ lib.makeScope pkgs.newScope (self: with self; { # will mark the extension as a zend extension or not. mkExtension = lib.makeOverridable ({ name - , configureFlags ? [ "--enable-${extName}" ] - , internalDeps ? [ ] - , postPhpize ? "" - , buildInputs ? [ ] - , zendExtension ? false - , doCheck ? true - , extName ? name - , ... - }@args: stdenv.mkDerivation ((builtins.removeAttrs args [ "name" ]) // { + , configureFlags ? [ "--enable-${extName}" ] + , internalDeps ? [ ] + , postPhpize ? "" + , buildInputs ? [ ] + , zendExtension ? false + , doCheck ? true + , extName ? name + , ... + }@args: stdenv.mkDerivation ((builtins.removeAttrs args [ "name" ]) // { pname = "php-${name}"; extensionName = extName; @@ -216,8 +210,6 @@ lib.makeScope pkgs.newScope (self: with self; { ast = callPackage ../development/php-packages/ast { }; - blackfire = pkgs.callPackage ../development/tools/misc/blackfire/php-probe.nix { inherit php; }; - couchbase = callPackage ../development/php-packages/couchbase { }; datadog_trace = callPackage ../development/php-packages/datadog_trace { }; @@ -282,7 +274,7 @@ lib.makeScope pkgs.newScope (self: with self; { redis = callPackage ../development/php-packages/redis { }; - relay = callPackage ../development/php-packages/relay { inherit php; }; + relay = callPackage ../development/php-packages/relay { inherit php; }; smbclient = callPackage ../development/php-packages/smbclient { }; @@ -332,7 +324,16 @@ lib.makeScope pkgs.newScope (self: with self; { } { name = "exif"; doCheck = false; } { name = "ffi"; buildInputs = [ libffi ]; } - { name = "fileinfo"; buildInputs = [ pcre2 ]; } + { + name = "fileinfo"; + buildInputs = [ pcre2 ]; + patches = lib.optionals (lib.versionAtLeast php.version "8.3") [ + # Fix the extension unable to be loaded due to missing `get_module` function. + # `ZEND_GET_MODULE` macro that creates it is conditional on `COMPILE_DL_FILEINFO` being defined. + # https://github.com/php/php-src/issues/11408#issuecomment-1602106200 + ../development/interpreters/php/fix-fileinfo-ext-php83.patch + ]; + } { name = "filter"; buildInputs = [ pcre2 ]; } { name = "ftp"; buildInputs = [ openssl ]; } { @@ -519,7 +520,18 @@ lib.makeScope pkgs.newScope (self: with self; { ''; doCheck = false; } - { name = "session"; doCheck = false; } + { name = "session"; + doCheck = false; + patches = lib.optionals (lib.versionAtLeast php.version "8.3") [ + # Fix GH-11529: Crash after dealing with an Apache request + # To be removed in next alpha + # See https://github.com/php/php-src/issues/11529 + (fetchpatch { + url = "https://github.com/php/php-src/commit/8d4370954ec610164a4503431bb0c52da6954aa7.patch"; + hash = "sha256-w1uF9lRdfhz9I0gux0J4cvMzNS93uSHL1fYG23VLDPc="; + }) + ]; + } { name = "shmop"; } { name = "simplexml"; @@ -625,5 +637,7 @@ lib.makeScope pkgs.newScope (self: with self; { # Produce the final attribute set of all extensions defined. in builtins.listToAttrs namedExtensions - ); + ) // lib.optionalAttrs (!(lib.versionAtLeast php.version "8.3")) { + blackfire = callPackage ../development/tools/misc/blackfire/php-probe.nix { inherit php; }; + }; }) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index c8418129950c3..91e78eae47f25 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -156,6 +156,7 @@ mapAliases ({ JayDeBeApi = jaydebeapi; # added 2023-02-19 jinja2_time = jinja2-time; # added 2022-11-07 JPype1 = jpype1; # added 2023-02-19 + jsonschema_3 = throw "jsonschema 3 is neither the latest version nor needed inside nixpkgs anymore"; # added 2023-06-28 jupyter_client = jupyter-client; # added 2021-10-15 jupyter_core = jupyter-core; # added 2023-01-05 jupyter_server = jupyter-server; # added 2023-01-05 @@ -193,6 +194,7 @@ mapAliases ({ pam = python-pam; # added 2020-09-07. PasteDeploy = pastedeploy; # added 2021-10-07 pathpy = path; # added 2022-04-12 + pdfposter = throw "pdfposter was promoted to a top-level attribute"; # Added 2023-06-29 pdfminer = pdfminer-six; # added 2022-05-25 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 @@ -211,6 +213,7 @@ mapAliases ({ pyblake2 = throw "pyblake2 is deprecated in favor of hashlib"; # added 2023-04-23 pyblock = throw "pyblock has been removed, since it is abandoned and broken"; # added 2023-06-20 pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01 + pygbm = throw "pygbm has been removed, since it is abandoned and broken"; # added 2023-06-20 PyGithub = pygithub; # added 2023-02-19 pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15 pycallgraph = throw "pycallgraph has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 @@ -250,9 +253,11 @@ mapAliases ({ PyStemmer = pystemmer; # added 2023-02-19 pytest_6 = pytest; # added 2022-02-10 pytestcov = pytest-cov; # added 2021-01-04 + pytest-ordering = throw "pytest-ordering has been removed, since it is no longer maintained and broken"; # added 2023-06-22 pytest-pep8 = pytestpep8; # added 2021-01-04 pytest-pep257 = throw "pytest-pep257 was removed, as the pep257 package was migrated into pycodestyle"; # added 2022-04-12 pytest-pythonpath = throw "pytest-pythonpath is obsolete as of pytest 7.0.0 and has been removed"; # added 2022-03-09 + pytest-sanic = throw "pytest-sanic has been removed because it is unmaintained and broken"; # added 2023-06-22 pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 pytestquickcheck = pytest-quickcheck; # added 2021-07-20 pytestrunner = pytest-runner; # added 2021-01-04 @@ -278,6 +283,7 @@ mapAliases ({ qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 Quandl = quandl; # added 2023-02-19 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 retworkx = rustworkx; # added 2023-05-14 repeated_test = repeated-test; # added 2022-11-15 @@ -297,6 +303,7 @@ mapAliases ({ scikitimage = scikit-image; # added 2023-05-14 scikitlearn = scikit-learn; # added 2021-07-21 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10 + sequoia = throw "python3Packages.sequoia was replaced by pysequoia - built from a dedicated repository, with a new API."; # added 2023-06-24 setuptools_scm = setuptools-scm; # added 2021-06-03 sharkiqpy = sharkiq; # added 2022-05-21 ssh-mitm = throw "ssh-mitm was removed in favor of the top-level ssh-mitm"; # added 2023-05-09 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 08cdc2ecfe97d..9063d90590ca8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -412,6 +412,8 @@ self: super: with self; { alembic = callPackage ../development/python-modules/alembic { }; + alexapy = callPackage ../development/python-modules/alexapy { }; + algebraic-data-types = callPackage ../development/python-modules/algebraic-data-types { }; aliyun-python-sdk-cdn = callPackage ../development/python-modules/aliyun-python-sdk-cdn { }; @@ -732,6 +734,8 @@ self: super: with self; { asynccmd = callPackage ../development/python-modules/asynccmd { }; + asyncinotify = callPackage ../development/python-modules/asyncinotify { }; + asyncio-dgram = callPackage ../development/python-modules/asyncio-dgram { }; asyncio-mqtt = callPackage ../development/python-modules/asyncio_mqtt { }; @@ -957,6 +961,8 @@ self: super: with self; { azure-mgmt-appconfiguration = callPackage ../development/python-modules/azure-mgmt-appconfiguration { }; + azure-mgmt-appcontainers = callPackage ../development/python-modules/azure-mgmt-appcontainers { }; + azure-mgmt-applicationinsights = callPackage ../development/python-modules/azure-mgmt-applicationinsights { }; azure-mgmt-authorization = callPackage ../development/python-modules/azure-mgmt-authorization { }; @@ -1326,6 +1332,8 @@ self: super: with self; { binwalk-full = self.binwalk.override { visualizationSupport = true; }; + biopandas = callPackage ../development/python-modules/biopandas { }; + biopython = callPackage ../development/python-modules/biopython { }; biplist = callPackage ../development/python-modules/biplist { }; @@ -1629,8 +1637,12 @@ self: super: with self; { callee = callPackage ../development/python-modules/callee { }; + calmjs = callPackage ../development/python-modules/calmjs { }; + calmjs-parse = callPackage ../development/python-modules/calmjs-parse { }; + calmjs-types = callPackage ../development/python-modules/calmjs-types { }; + calysto = callPackage ../development/python-modules/calysto { }; calysto-scheme = callPackage ../development/python-modules/calysto-scheme { }; @@ -1861,6 +1873,10 @@ self: super: with self; { ckcc-protocol = callPackage ../development/python-modules/ckcc-protocol { }; + clarifai = callPackage ../development/python-modules/clarifai { }; + + clarifai-grpc = callPackage ../development/python-modules/clarifai-grpc { }; + claripy = callPackage ../development/python-modules/claripy { }; classify-imports = callPackage ../development/python-modules/classify-imports { }; @@ -1889,6 +1905,8 @@ self: super: with self; { class-doc = callPackage ../development/python-modules/class-doc { }; + cliche = callPackage ../development/python-modules/cliche { }; + click = callPackage ../development/python-modules/click { }; clickclick = callPackage ../development/python-modules/clickclick { }; @@ -2209,6 +2227,8 @@ self: super: with self; { crytic-compile = callPackage ../development/python-modules/crytic-compile { }; + cson = callPackage ../development/python-modules/cson { }; + csrmesh = callPackage ../development/python-modules/csrmesh { }; csscompressor = callPackage ../development/python-modules/csscompressor { }; @@ -2555,6 +2575,8 @@ self: super: with self; { diff-match-patch = callPackage ../development/python-modules/diff-match-patch { }; + diffimg = callPackage ../development/python-modules/diffimg { }; + digital-ocean = callPackage ../development/python-modules/digitalocean { }; digi-xbee = callPackage ../development/python-modules/digi-xbee { }; @@ -2857,6 +2879,8 @@ self: super: with self; { django-reversion = callPackage ../development/python-modules/django-reversion { }; + django-sekizai = callPackage ../development/python-modules/django-sekizai { }; + django-sesame = callPackage ../development/python-modules/django-sesame { }; django_silk = callPackage ../development/python-modules/django_silk { }; @@ -3248,6 +3272,8 @@ self: super: with self; { enamlx = callPackage ../development/python-modules/enamlx { }; + encodec = callPackage ../development/python-modules/encodec { }; + energyflip-client = callPackage ../development/python-modules/energyflip-client { }; energyflow = callPackage ../development/python-modules/energyflow { }; @@ -3443,6 +3469,10 @@ self: super: with self; { ezyrb = callPackage ../development/python-modules/ezyrb { }; + f5-icontrol-rest = callPackage ../development/python-modules/f5-icontrol-rest { }; + + f5-sdk = callPackage ../development/python-modules/f5-sdk { }; + f90nml = callPackage ../development/python-modules/f90nml { }; fabric = callPackage ../development/python-modules/fabric { }; @@ -4167,6 +4197,10 @@ self: super: with self; { goodwe = callPackage ../development/python-modules/goodwe { }; + google = callPackage ../development/python-modules/google { }; + + google-ai-generativelanguage = callPackage ../development/python-modules/google-ai-generativelanguage { }; + google-api-core = callPackage ../development/python-modules/google-api-core { }; google-api-python-client = callPackage ../development/python-modules/google-api-python-client { }; @@ -4277,6 +4311,8 @@ self: super: with self; { inherit (pkgs) crc32c; }; + google-generativeai = callPackage ../development/python-modules/google-generativeai { }; + google-i18n-address = callPackage ../development/python-modules/google-i18n-address { }; google-nest-sdm = callPackage ../development/python-modules/google-nest-sdm { }; @@ -4871,6 +4907,8 @@ self: super: with self; { imageio-ffmpeg = callPackage ../development/python-modules/imageio-ffmpeg { }; + image-diff = callPackage ../development/python-modules/image-diff { }; + image-go-nord = callPackage ../development/python-modules/image-go-nord { }; imagesize = callPackage ../development/python-modules/imagesize { }; @@ -4889,6 +4927,8 @@ self: super: with self; { imgaug = callPackage ../development/python-modules/imgaug { }; + imgdiff = callPackage ../development/python-modules/imgdiff { }; + imgsize = callPackage ../development/python-modules/imgsize { }; iminuit = callPackage ../development/python-modules/iminuit { }; @@ -5299,8 +5339,6 @@ self: super: with self; { jsonschema = callPackage ../development/python-modules/jsonschema { }; - jsonschema_3 = callPackage ../development/python-modules/jsonschema/3_x.nix { }; - jsonschema-spec = callPackage ../development/python-modules/jsonschema-spec { }; jsonstreams = callPackage ../development/python-modules/jsonstreams { }; @@ -5826,6 +5864,8 @@ self: super: with self; { lima = callPackage ../development/python-modules/lima { }; + lime = callPackage ../development/python-modules/lime { }; + limiter= callPackage ../development/python-modules/limiter { }; limitlessled = callPackage ../development/python-modules/limitlessled { }; @@ -5864,6 +5904,8 @@ self: super: with self; { lit = callPackage ../development/python-modules/lit { }; + litemapy = callPackage ../development/python-modules/litemapy { }; + littleutils = callPackage ../development/python-modules/littleutils { }; livelossplot = callPackage ../development/python-modules/livelossplot { }; @@ -6099,6 +6141,8 @@ self: super: with self; { marshmallow-sqlalchemy = callPackage ../development/python-modules/marshmallow-sqlalchemy { }; + mashumaro = callPackage ../development/python-modules/mashumaro { }; + mask-rcnn = callPackage ../development/python-modules/mask-rcnn { }; masky = callPackage ../development/python-modules/masky { }; @@ -6123,6 +6167,8 @@ self: super: with self; { matplotlib-inline = callPackage ../development/python-modules/matplotlib-inline { }; + matplotlib-sixel = callPackage ../development/python-modules/matplotlib-sixel { }; + matplotx = callPackage ../development/python-modules/matplotx { }; matrix-api-async = callPackage ../development/python-modules/matrix-api-async { }; @@ -6312,6 +6358,8 @@ self: super: with self; { mip = callPackage ../development/python-modules/mip { }; + mir_eval = callPackage ../development/python-modules/mir_eval { }; + misaka = callPackage ../development/python-modules/misaka { }; misoc = callPackage ../development/python-modules/misoc { }; @@ -6377,6 +6425,8 @@ self: super: with self; { mmpython = callPackage ../development/python-modules/mmpython { }; + mmtf-python = callPackage ../development/python-modules/mmtf-python { }; + mnemonic = callPackage ../development/python-modules/mnemonic { }; mne-python = callPackage ../development/python-modules/mne-python { }; @@ -6446,6 +6496,8 @@ self: super: with self; { more-properties = callPackage ../development/python-modules/more-properties { }; + moreorless = callPackage ../development/python-modules/moreorless { }; + moretools = callPackage ../development/python-modules/moretools { }; morfessor = callPackage ../development/python-modules/morfessor { }; @@ -6476,6 +6528,10 @@ self: super: with self; { mplfinance = callPackage ../development/python-modules/mplfinance { }; + mplhep = callPackage ../development/python-modules/mplhep { }; + + mplhep-data = callPackage ../development/python-modules/mplhep-data { }; + mplleaflet = callPackage ../development/python-modules/mplleaflet { }; mpmath = callPackage ../development/python-modules/mpmath { }; @@ -6682,6 +6738,8 @@ self: super: with self; { nbsphinx = callPackage ../development/python-modules/nbsphinx { }; + nbtlib = callPackage ../development/python-modules/nbtlib { }; + nbval = callPackage ../development/python-modules/nbval { }; nbxmpp = callPackage ../development/python-modules/nbxmpp { }; @@ -6724,6 +6782,10 @@ self: super: with self; { netaddr = callPackage ../development/python-modules/netaddr { }; + netapp-lib = callPackage ../development/python-modules/netapp-lib { }; + + netapp-ontap = callPackage ../development/python-modules/netapp-ontap { }; + netcdf4 = callPackage ../development/python-modules/netcdf4 { }; netdata = callPackage ../development/python-modules/netdata { }; @@ -7047,6 +7109,8 @@ self: super: with self; { omegaconf = callPackage ../development/python-modules/omegaconf { }; + omemo-dr = callPackage ../development/python-modules/omemo-dr { }; + ome-zarr = callPackage ../development/python-modules/ome-zarr { }; omnikinverter = callPackage ../development/python-modules/omnikinverter { }; @@ -7145,6 +7209,8 @@ self: super: with self; { openrazer-daemon = callPackage ../development/python-modules/openrazer/daemon.nix { }; + openrgb-python = callPackage ../development/python-modules/openrgb-python { }; + openrouteservice = callPackage ../development/python-modules/openrouteservice { }; opensearch-py = callPackage ../development/python-modules/opensearch-py { }; @@ -7472,8 +7538,6 @@ self: super: with self; { pdfminer-six = callPackage ../development/python-modules/pdfminer-six { }; - pdfposter = callPackage ../development/python-modules/pdfposter { }; - pdfrw = callPackage ../development/python-modules/pdfrw { }; pdftotext = callPackage ../development/python-modules/pdftotext { }; @@ -7572,6 +7636,8 @@ self: super: with self; { phonenumbers = callPackage ../development/python-modules/phonenumbers { }; + pkgutil-resolve-name = callPackage ../development/python-modules/pkgutil-resolve-name { }; + micloud = callPackage ../development/python-modules/micloud { }; msgraph-core = callPackage ../development/python-modules/msgraph-core { }; @@ -7743,6 +7809,8 @@ self: super: with self; { pycontrol4 = callPackage ../development/python-modules/pycontrol4 { }; + pycookiecheat = callPackage ../development/python-modules/pycookiecheat { }; + pycoolmasternet-async = callPackage ../development/python-modules/pycoolmasternet-async { }; pyfibaro = callPackage ../development/python-modules/pyfibaro { }; @@ -7811,6 +7879,8 @@ self: super: with self; { pysbd = callPackage ../development/python-modules/pysbd { }; + pysequoia = callPackage ../development/python-modules/pysequoia { }; + pyschemes = callPackage ../development/python-modules/pyschemes { }; pyschlage = callPackage ../development/python-modules/pyschlage { }; @@ -8666,8 +8736,6 @@ self: super: with self; { pygatt = callPackage ../development/python-modules/pygatt { }; - pygbm = callPackage ../development/python-modules/pygbm { }; - pygccxml = callPackage ../development/python-modules/pygccxml { }; pygdbmi = callPackage ../development/python-modules/pygdbmi { }; @@ -9284,6 +9352,8 @@ self: super: with self; { pyrate-limiter = callPackage ../development/python-modules/pyrate-limiter { }; + pyreaderwriterlock = callPackage ../development/python-modules/pyreaderwriterlock { }; + pyreadstat = callPackage ../development/python-modules/pyreadstat { inherit (pkgs.darwin) libiconv; }; @@ -9681,6 +9751,8 @@ self: super: with self; { pytest-httpx = callPackage ../development/python-modules/pytest-httpx { }; + pytest-image-diff = callPackage ../development/python-modules/pytest-image-diff { }; + pytest-instafail = callPackage ../development/python-modules/pytest-instafail { }; pytest-isort = callPackage ../development/python-modules/pytest-isort { }; @@ -9713,8 +9785,6 @@ self: super: with self; { pytest-order = callPackage ../development/python-modules/pytest-order { }; - pytest-ordering = callPackage ../development/python-modules/pytest-ordering { }; - pytest-param-files = callPackage ../development/python-modules/pytest-param-files { }; pytest-playwright = callPackage ../development/python-modules/pytest-playwright {}; @@ -9755,10 +9825,6 @@ self: super: with self; { pytest-runner = callPackage ../development/python-modules/pytest-runner { }; - pytest-sanic = callPackage ../development/python-modules/pytest-sanic { - sanic = self.sanic.override { doCheck = false; }; - }; - pytest-server-fixtures = callPackage ../development/python-modules/pytest-server-fixtures { }; pytest-services = callPackage ../development/python-modules/pytest-services { }; @@ -10448,8 +10514,6 @@ self: super: with self; { r2pipe = callPackage ../development/python-modules/r2pipe { }; - rabbitpy = callPackage ../development/python-modules/rabbitpy { }; - rachiopy = callPackage ../development/python-modules/rachiopy { }; radicale_infcloud = callPackage ../development/python-modules/radicale_infcloud { @@ -10541,6 +10605,8 @@ self: super: with self; { recipe-scrapers = callPackage ../development/python-modules/recipe-scrapers { }; + recline = callPackage ../development/python-modules/recline { }; + recoll = toPythonModule (pkgs.recoll.override { python3Packages = self; }); @@ -10561,6 +10627,8 @@ self: super: with self; { reedsolo = callPackage ../development/python-modules/reedsolo { }; + referencing = callPackage ../development/python-modules/referencing { }; + reflink = callPackage ../development/python-modules/reflink { }; regenmaschine = callPackage ../development/python-modules/regenmaschine { }; @@ -10815,6 +10883,8 @@ self: super: with self; { rouge-score = callPackage ../development/python-modules/rouge-score { }; + routeros-api = callPackage ../development/python-modules/routeros-api { }; + routes = callPackage ../development/python-modules/routes { }; rova = callPackage ../development/python-modules/rova { }; @@ -10823,6 +10893,8 @@ self: super: with self; { rpdb = callPackage ../development/python-modules/rpdb { }; + rpds-py = callPackage ../development/python-modules/rpds-py { }; + rpi-bad-power = callPackage ../development/python-modules/rpi-bad-power { }; rpi-gpio = callPackage ../development/python-modules/rpi-gpio { }; @@ -11133,11 +11205,6 @@ self: super: with self; { seqeval = callPackage ../development/python-modules/seqeval { }; - sequoia = disabledIf isPyPy (toPythonModule (pkgs.sequoia.override { - pythonPackages = self; - pythonSupport = true; - })); - serialio = callPackage ../development/python-modules/serialio { }; serpent = callPackage ../development/python-modules/serpent { }; @@ -11526,6 +11593,8 @@ self: super: with self; { speedtest-cli = callPackage ../development/python-modules/speedtest-cli { }; + speg = callPackage ../development/python-modules/speg { }; + spglib = callPackage ../development/python-modules/spglib { }; sphfile = callPackage ../development/python-modules/sphfile { }; @@ -11796,6 +11865,8 @@ self: super: with self; { stdlib-list = callPackage ../development/python-modules/stdlib-list { }; + stdlibs = callPackage ../development/python-modules/stdlibs { }; + steamodd = callPackage ../development/python-modules/steamodd { }; steamship = callPackage ../development/python-modules/steamship { }; @@ -11981,6 +12052,8 @@ self: super: with self; { tago = callPackage ../development/python-modules/tago { }; + tagoio-sdk = callPackage ../development/python-modules/tagoio-sdk { }; + tahoma-api = callPackage ../development/python-modules/tahoma-api { }; tailer = callPackage ../development/python-modules/tailer { }; @@ -12205,6 +12278,8 @@ self: super: with self; { inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate CoreFoundation CoreGraphics CoreVideo; }; + thorlabspm100 = callPackage ../development/python-modules/thorlabspm100 { }; + threadloop = callPackage ../development/python-modules/threadloop { }; threadpool = callPackage ../development/python-modules/threadpool { }; @@ -12436,6 +12511,8 @@ self: super: with self; { trackpy = callPackage ../development/python-modules/trackpy { }; + trailrunner = callPackage ../development/python-modules/trailrunner {}; + trainer = callPackage ../development/python-modules/trainer {}; traitlets = callPackage ../development/python-modules/traitlets { }; @@ -12692,6 +12769,8 @@ self: super: with self; { inherit (pkgs.xorg) libX11 libXext; }; + ufmt = callPackage ../development/python-modules/ufmt { }; + ufo2ft = callPackage ../development/python-modules/ufo2ft { }; ufoLib2 = callPackage ../development/python-modules/ufoLib2 { }; @@ -12848,6 +12927,8 @@ self: super: with self; { ush = callPackage ../development/python-modules/ush { }; + usort = callPackage ../development/python-modules/usort { }; + utils = callPackage ../development/python-modules/utils { }; uuid = callPackage ../development/python-modules/uuid { }; @@ -12964,6 +13045,8 @@ self: super: with self; { vobject = callPackage ../development/python-modules/vobject { }; + volatile = callPackage ../development/python-modules/volatile { }; + volkszaehler = callPackage ../development/python-modules/volkszaehler { }; voluptuous = callPackage ../development/python-modules/voluptuous { }; @@ -13174,6 +13257,8 @@ self: super: with self; { wifi = callPackage ../development/python-modules/wifi { }; + wikipedia = callPackage ../development/python-modules/wikipedia { }; + willow = callPackage ../development/python-modules/willow { }; winacl = callPackage ../development/python-modules/winacl { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index a79dc31ed9dd9..1a19118678eb3 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -71,8 +71,6 @@ with self; with super; { scandir = callPackage ../development/python2-modules/scandir { }; - sequoia = disabled super.sequoia; - setuptools = callPackage ../development/python2-modules/setuptools { }; setuptools-scm = callPackage ../development/python2-modules/setuptools-scm { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 6de840951521d..58c2e20018390 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -154,7 +154,9 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea maui-core = libsForQt5.callPackage ../development/libraries/maui-core { }; - mlt = callPackage ../development/libraries/mlt/qt-5.nix { }; + mlt = pkgs.mlt.override { + enableQt = true; + }; phonon = callPackage ../development/libraries/phonon { }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 09087a3c73e16..6113dcdb121d3 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -69,7 +69,6 @@ let ghc927 ghc928 ghc945 - ghc961 ghc962 ]; @@ -487,15 +486,12 @@ let Cabal_3_10_1_0 = released; Cabal-syntax_3_10_1_0 = released; cabal2nix = lib.subtractLists [ - compilerNames.ghc961 compilerNames.ghc962 ] released; cabal2nix-unstable = lib.subtractLists [ - compilerNames.ghc961 compilerNames.ghc962 ] released; funcmp = lib.subtractLists [ - compilerNames.ghc961 compilerNames.ghc962 ] released; haskell-language-server = lib.subtractLists [ @@ -503,21 +499,17 @@ let compilerNames.ghc884 ] released; hoogle = lib.subtractLists [ - compilerNames.ghc961 compilerNames.ghc962 ] released; hlint = lib.subtractLists [ - compilerNames.ghc961 compilerNames.ghc962 ] released; hpack = lib.subtractLists [ - compilerNames.ghc961 compilerNames.ghc962 ] released; hsdns = released; jailbreak-cabal = released; language-nix = lib.subtractLists [ - compilerNames.ghc961 compilerNames.ghc962 ] released; nix-paths = released; diff --git a/pkgs/top-level/unixtools.nix b/pkgs/top-level/unixtools.nix index aa282adf6a3af..40faa76421297 100644 --- a/pkgs/top-level/unixtools.nix +++ b/pkgs/top-level/unixtools.nix @@ -72,7 +72,7 @@ let darwin = pkgs.darwin.system_cmds; }; getent = { - linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.stdenv.cc.libc + linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.stdenv.cc.libc.getent else pkgs.netbsd.getent; darwin = pkgs.netbsd.getent; }; |