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 | 110 | ||||
-rw-r--r-- | pkgs/top-level/coq-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/java-packages.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 21 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 10 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 30 | ||||
-rw-r--r-- | pkgs/top-level/release-haskell.nix | 78 |
9 files changed, 122 insertions, 139 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 19637022545e7..ab8a257bd456b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -58,6 +58,7 @@ mapAliases ({ AusweisApp2 = ausweisapp; # Added 2023-11-08 a4term = a4; # Added 2023-10-06 + acorn = throw "acorn has been removed as the upstream project was archived"; # Added 2024-04-27 adtool = throw "'adtool' has been removed, as it was broken and unmaintained"; advcpmv = throw "'advcpmv' has been removed, as it is not being actively maintained and break recent coreutils."; # Added 2024-03-29 aether = throw "aether has been removed from nixpkgs; upstream unmaintained, security issues"; # Added 2023-10-03 @@ -130,6 +131,7 @@ mapAliases ({ boost174 = throw "boost174 has been deprecated in favor of the latest version"; # Added 2023-06-08 boost17x = throw "boost17x has been deprecated in favor of the latest version"; # Added 2023-07-13 boost18x = throw "boost18x has been deprecated in favor of the latest version"; # Added 2023-07-13 + bpb = throw "bpb has been removed as it is unmaintained and not compatible with recent Rust versions"; # Added 2024-04-30 bpftool = bpftools; # Added 2021-05-03 bpytop = throw "bpytop has been deprecated by btop"; # Added 2023-02-16 bro = throw "'bro' has been renamed to/replaced by 'zeek'"; # Converted to throw 2023-09-10 @@ -1017,6 +1019,8 @@ mapAliases ({ pocket-updater-utility = pupdate; # Added 2024-01-25 poetry2nix = throw "poetry2nix is now maintained out-of-tree. Please use https://github.com/nix-community/poetry2nix/"; # Added 2023-10-26 prayer = throw "prayer has been removed from nixpkgs"; # Added 2023-11-09 + prismlauncher-qt5 = throw "'prismlauncher-qt5' has been removed from nixpkgs. Please use 'prismlauncher'"; # Added 2024-04-20 + prismlauncher-qt5-unwrapped = throw "'prismlauncher-qt5-unwrapped' has been removed from nixpkgs. Please use 'prismlauncher-unwrapped'"; # Added 2024-04-20 privacyidea = throw "privacyidea has been removed from nixpkgs"; # Added 2023-10-31 probe-rs-cli = throw "probe-rs-cli is now part of the probe-rs package"; # Added 2023-07-03 processing3 = throw "'processing3' has been renamed to/replaced by 'processing'"; # Converted to throw 2023-09-10 @@ -1225,6 +1229,7 @@ mapAliases ({ teleport_12 = throw "teleport 12 has been removed as it is EOL. Please upgrade to Teleport 13 or later"; # Added 2024-02-04 teleprompter = throw "teleprompter has been removed. reason: upstream dead and does not work with recent electron versions"; # Added 2024-03-14 tensile = throw "'tensile' has been replaced with 'rocmPackages.tensile'"; # Added 2023-10-08 + tepl = libgedit-tepl; # Added 2024-04-29 testVersion = testers.testVersion; # Added 2022-04-20 tfplugindocs = terraform-plugin-docs; # Added 2023-11-01 thrift-0_10 = throw "'thrift-0_10' has been removed because it is impacted by security issues and not used in nixpkgs, move to 'thrift'"; # Added 2024-03-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9aafd5c52b37e..ea07c7564b2ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2736,10 +2736,6 @@ with pkgs; description = mame.meta.description + " (tools only)"; } (lib.getOutput "tools" mame); - melonDS = libsForQt5.callPackage ../applications/emulators/melonDS { }; - - mgba = libsForQt5.callPackage ../applications/emulators/mgba { }; - mupen64plus = callPackage ../applications/emulators/mupen64plus { }; np2kai = callPackage ../applications/emulators/np2kai { }; @@ -2795,9 +2791,7 @@ with pkgs; simplenes = callPackage ../applications/emulators/simplenes { }; - snes9x = callPackage ../applications/emulators/snes9x { }; - - snes9x-gtk = callPackage ../applications/emulators/snes9x { + snes9x-gtk = snes9x.override { withGtk = true; }; @@ -3576,8 +3570,6 @@ with pkgs; changelogger = callPackage ../tools/misc/changelogger { }; - chezmoi = callPackage ../tools/misc/chezmoi { }; - chipsec = callPackage ../tools/security/chipsec { kernel = null; withDriver = false; @@ -3621,8 +3613,6 @@ with pkgs; codespell = callPackage ../development/tools/codespell { }; - codux = callPackage ../applications/editors/codux { }; - conjure = callPackage ../applications/graphics/conjure { }; coolreader = libsForQt5.callPackage ../applications/misc/coolreader { }; @@ -4056,10 +4046,6 @@ with pkgs; reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace { }; - skhd = darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/skhd { - inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa; - }; - qes = callPackage ../os-specific/darwin/qes { inherit (darwin.apple_sdk.frameworks) Carbon; }; @@ -4294,8 +4280,6 @@ with pkgs; biliass = with python3.pkgs; toPythonApplication biliass; - bilibili = callPackage ../applications/video/bilibili { }; - bindfs = callPackage ../tools/filesystems/bindfs { }; binwalk = with python3Packages; toPythonApplication binwalk; @@ -4397,8 +4381,6 @@ with pkgs; bozohttpd = callPackage ../servers/http/bozohttpd { }; bozohttpd-minimal = callPackage ../servers/http/bozohttpd { minimal = true; }; - bpb = callPackage ../tools/security/bpb { inherit (darwin.apple_sdk.frameworks) Security; }; - brasero-original = lowPrio (callPackage ../tools/cd-dvd/brasero { }); brasero = callPackage ../tools/cd-dvd/brasero/wrapper.nix { }; @@ -4758,8 +4740,6 @@ with pkgs; wlay = callPackage ../tools/wayland/wlay { }; - wl-clip-persist = callPackage ../tools/wayland/wl-clip-persist { }; - wl-clipboard = callPackage ../tools/wayland/wl-clipboard { }; wl-clipboard-x11 = callPackage ../tools/wayland/wl-clipboard-x11 { }; @@ -5349,6 +5329,7 @@ with pkgs; # TeX Live; see https://nixos.org/nixpkgs/manual/#sec-language-texlive texlive = callPackage ../tools/typesetting/tex/texlive { }; inherit (texlive.schemes) texliveBasic texliveBookPub texliveConTeXt texliveFull texliveGUST texliveInfraOnly texliveMedium texliveMinimal texliveSmall texliveTeTeX; + texlivePackages = recurseIntoAttrs (lib.filterAttrs (_: lib.isDerivation) texlive.pkgs); fop = callPackage ../tools/typesetting/fop { }; @@ -6291,8 +6272,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) PCSC; }; - step-cli = callPackage ../tools/security/step-cli { }; - step-kms-plugin = callPackage ../tools/security/step-kms-plugin { }; string-machine = callPackage ../applications/audio/string-machine { }; @@ -8454,8 +8433,6 @@ with pkgs; gitea-actions-runner = callPackage ../development/tools/continuous-integration/gitea-actions-runner { }; - forgejo = callPackage ../applications/version-management/forgejo { }; - gokart = callPackage ../development/tools/gokart { }; gl2ps = callPackage ../development/libraries/gl2ps { }; @@ -8816,8 +8793,6 @@ with pkgs; gssdp-tools = callPackage ../development/libraries/gssdp/tools.nix { }; - grype = callPackage ../tools/security/grype { }; - gt5 = callPackage ../tools/system/gt5 { }; gtest = callPackage ../development/libraries/gtest { }; @@ -10537,8 +10512,6 @@ with pkgs; lwc = callPackage ../tools/misc/lwc { }; - lxc = callPackage ../os-specific/linux/lxc { }; - lxd-image-server = callPackage ../tools/virtualization/lxd-image-server { }; lzfse = callPackage ../tools/compression/lzfse { }; @@ -11554,9 +11527,7 @@ with pkgs; opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector { }; opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { }; - openvswitch = callPackage ../os-specific/linux/openvswitch { }; - - openvswitch-lts = callPackage ../os-specific/linux/openvswitch/lts.nix { }; + openvswitch-lts = callPackage ../by-name/op/openvswitch/lts.nix { }; ovn-lts = callPackage ../by-name/ov/ovn/lts.nix { }; @@ -13076,10 +13047,6 @@ with pkgs; sixpair = callPackage ../tools/misc/sixpair { }; - sketchybar = darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/sketchybar { - inherit (darwin.apple_sdk_11_0.frameworks) AppKit Carbon CoreAudio CoreWLAN CoreVideo DisplayServices IOKit MediaRemote SkyLight; - }; - skippy-xd = callPackage ../tools/X11/skippy-xd { }; sks = callPackage ../servers/sks { @@ -13504,8 +13471,6 @@ with pkgs; systrayhelper = callPackage ../tools/misc/systrayhelper { }; - syft = callPackage ../tools/admin/syft { }; - Sylk = callPackage ../applications/networking/Sylk { }; privoxy = callPackage ../tools/networking/privoxy { @@ -13534,9 +13499,6 @@ with pkgs; tailer = callPackage ../tools/misc/tailer { }; - inherit (callPackages ../applications/networking/taler { }) - taler-exchange taler-merchant; - tandoor-recipes = callPackage ../applications/misc/tandoor-recipes { }; tango = callPackage ../applications/misc/tango { }; @@ -14441,11 +14403,8 @@ with pkgs; xl2tpd = callPackage ../tools/networking/xl2tpd { }; - xlights = callPackage ../applications/misc/xlights/default.nix { }; - xe = callPackage ../tools/system/xe { }; - xray = callPackage ../tools/networking/xray { }; xteve = callPackage ../servers/xteve { }; @@ -15362,6 +15321,8 @@ with pkgs; colmap = libsForQt5.callPackage ../applications/science/misc/colmap { inherit (config) cudaSupport; }; colmapWithCuda = colmap.override { cudaSupport = true; }; + opensplatWithCuda = opensplat.override { cudaSupport = true; }; + chickenPackages_4 = recurseIntoAttrs (callPackage ../development/compilers/chicken/4 { }); chickenPackages_5 = recurseIntoAttrs (callPackage ../development/compilers/chicken/5 { }); chickenPackages = dontRecurseIntoAttrs chickenPackages_5; @@ -15491,6 +15452,7 @@ with pkgs; corretto11 = javaPackages.compiler.corretto11; corretto17 = javaPackages.compiler.corretto17; corretto19 = javaPackages.compiler.corretto19; + corretto21 = javaPackages.compiler.corretto21; cotton = callPackage ../development/tools/cotton { inherit (darwin.apple_sdk.frameworks) CoreServices; @@ -16709,7 +16671,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; cargo-clone = callPackage ../development/tools/rust/cargo-clone { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; }; cargo-codspeed = callPackage ../development/tools/rust/cargo-codspeed { rustPlatform = makeRustPlatform { @@ -18947,8 +18909,6 @@ with pkgs; grail = callPackage ../development/libraries/grail { }; - graphene-hardened-malloc = callPackage ../development/libraries/graphene-hardened-malloc { }; - graphene = callPackage ../development/libraries/graphene { }; griffe = with python3Packages; toPythonApplication griffe; @@ -20371,10 +20331,6 @@ with pkgs; captive-browser = callPackage ../applications/networking/browsers/captive-browser { }; catboost = callPackage ../development/libraries/catboost { - # catboost requires clang 12+ for build - # after bumping the default version of llvm, check for compatibility with the cuda backend and pin it. - inherit (llvmPackages_12) stdenv; - # https://github.com/catboost/catboost/issues/2540 cudaPackages = cudaPackages_11; }; @@ -23856,7 +23812,8 @@ with pkgs; inherit (callPackages ../development/libraries/openssl { }) openssl_1_1 openssl_3 - openssl_3_2; + openssl_3_2 + openssl_3_3; opensubdiv = callPackage ../development/libraries/opensubdiv { }; @@ -24642,8 +24599,6 @@ with pkgs; stb = callPackage ../development/libraries/stb { }; - stduuid = callPackage ../development/libraries/stduuid { }; - steghide = callPackage ../tools/graphics/steghide { }; stegsolve = callPackage ../tools/graphics/stegsolve { }; @@ -24768,8 +24723,6 @@ with pkgs; harfbuzz = harfbuzzFull; }; - tepl = callPackage ../development/libraries/tepl { }; - termbench-pro = callPackage ../development/libraries/termbench-pro { fmt = fmt_8; }; telepathy-glib = callPackage ../development/libraries/telepathy/glib { }; @@ -26370,8 +26323,6 @@ with pkgs; if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; }; - nginx-sso = callPackage ../servers/nginx-sso { }; - immudb = callPackage ../servers/nosql/immudb { }; influxdb = callPackage ../servers/nosql/influxdb { }; @@ -29692,8 +29643,6 @@ with pkgs; requests requests-toolbelt setuptools sqlalchemy fusepy; }; - acorn = callPackage ../applications/networking/cluster/acorn { }; - inherit (qt6Packages.callPackage ../applications/office/activitywatch { }) aw-qt aw-server-rust @@ -30753,8 +30702,6 @@ with pkgs; evilpixie = libsForQt5.callPackage ../applications/graphics/evilpixie { }; - eww = callPackage ../applications/window-managers/eww { }; - exaile = callPackage ../applications/audio/exaile { }; exercism = callPackage ../applications/misc/exercism { }; @@ -31430,8 +31377,6 @@ with pkgs; goffice = callPackage ../development/libraries/goffice { }; - got = darwin.apple_sdk_11_0.callPackage ../applications/version-management/got { }; - gtkterm = callPackage ../tools/misc/gtkterm { }; gtk-pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { withGtk3 = true; }; @@ -32337,7 +32282,7 @@ with pkgs; kid3-qt = qt6Packages.callPackage ../applications/audio/kid3 { withCLI = true; withKDE = false; withQt = true; }; kid3 = kid3-kde; - kile = libsForQt5.callPackage ../applications/editors/kile { }; + kile = callPackage ../applications/editors/kile { }; kitsas = libsForQt5.callPackage ../applications/office/kitsas { }; @@ -32528,8 +32473,6 @@ with pkgs; kiln = callPackage ../applications/misc/kiln { }; - karmor = callPackage ../applications/networking/cluster/karmor { }; - kubernetes-code-generator = callPackage ../development/tools/kubernetes-code-generator { }; kubernetes-controller-tools = callPackage ../development/tools/kubernetes-controller-tools { }; @@ -33580,7 +33523,9 @@ with pkgs; netcoredbg = callPackage ../development/tools/misc/netcoredbg { }; - ncdu = callPackage ../tools/misc/ncdu { }; + ncdu = callPackage ../tools/misc/ncdu { + zig = zig_0_12; + }; ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { }; @@ -34568,10 +34513,7 @@ with pkgs; wavebox = libsForQt5.callPackage ../applications/networking/instant-messengers/wavebox { }; - sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { - elixir = elixir_1_14; - beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_14; }); - }; + sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { }; stag = callPackage ../applications/misc/stag { curses = ncurses; @@ -35939,8 +35881,6 @@ with pkgs; xplugd = callPackage ../tools/X11/xplugd { }; - xpointerbarrier = callPackage ../tools/X11/xpointerbarrier { }; - xkb-switch = callPackage ../tools/X11/xkb-switch { }; xkb-switch-i3 = callPackage ../tools/X11/xkb-switch-i3 { }; @@ -37357,17 +37297,11 @@ with pkgs; principia = callPackage ../games/principia { }; - prismlauncher-qt5-unwrapped = libsForQt5.callPackage ../games/prismlauncher { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; - - prismlauncher-qt5 = libsForQt5.callPackage ../games/prismlauncher/wrapper.nix { prismlauncher-unwrapped = prismlauncher-qt5-unwrapped; }; - - prismlauncher-unwrapped = qt6Packages.callPackage ../games/prismlauncher { + prismlauncher-unwrapped = kdePackages.callPackage ../games/prismlauncher { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - prismlauncher = qt6Packages.callPackage ../games/prismlauncher/wrapper.nix { }; + prismlauncher = kdePackages.callPackage ../games/prismlauncher/wrapper.nix { }; pong3d = callPackage ../games/pong3d { }; @@ -38861,7 +38795,9 @@ with pkgs; stdenv = gccStdenv; }; - why3 = callPackage ../applications/science/logic/why3 { }; + why3 = callPackage ../applications/science/logic/why3 { + coqPackages = coqPackages_8_18; + }; wayback-machine-archiver = callPackage ../tools/misc/wayback-machine-archiver { }; @@ -40386,16 +40322,12 @@ with pkgs; terraform-backend-git = callPackage ../applications/networking/cluster/terraform-backend-git { }; - terraform-compliance = python3Packages.callPackage ../applications/networking/cluster/terraform-compliance { }; - terraform-docs = callPackage ../applications/networking/cluster/terraform-docs { }; terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory { }; terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape { }; - terragrunt = callPackage ../applications/networking/cluster/terragrunt { }; - tfautomv = callPackage ../applications/networking/cluster/tfautomv { }; terranix = callPackage ../applications/networking/cluster/terranix { }; @@ -40726,10 +40658,6 @@ with pkgs; xzoom = callPackage ../tools/X11/xzoom { }; - yabai = darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/yabai { - inherit (darwin.apple_sdk_11_0.frameworks) SkyLight Cocoa Carbon ScriptingBridge; - }; - yacreader = libsForQt5.callPackage ../applications/graphics/yacreader { }; yadm = callPackage ../applications/version-management/yadm { }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 256652f07b0cc..1964f666a86ba 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -214,7 +214,7 @@ in rec { coqPackages_8_18 = mkCoqPackages coq_8_18 // { __attrsFailEvaluation = true; }; coqPackages_8_19 = mkCoqPackages coq_8_19 // { __attrsFailEvaluation = true; }; coqPackages = - let cp = recurseIntoAttrs coqPackages_8_18; + let cp = recurseIntoAttrs coqPackages_8_19; in cp // { coqPackages = cp.coqPackages // { __attrsFailEvaluation = true; }; } // { __recurseIntoDerivationForReleaseJobs = true; }; coq = coqPackages.coq; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3a5481f45a905..ec050d7431780 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -308,7 +308,7 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; llvmPackages = pkgs.llvmPackages_15; }; - ghc96 = compiler.ghc964; + ghc96 = compiler.ghc965; ghc981 = callPackage ../development/compilers/ghc/9.8.1.nix { bootPkgs = # For GHC 9.6 no armv7l bindists are available. @@ -513,7 +513,7 @@ in { ghc = bh.compiler.ghc965; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; }; - ghc96 = packages.ghc964; + ghc96 = packages.ghc965; ghc981 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc981; ghc = bh.compiler.ghc981; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 1028c2f62bae8..2d59c358863b2 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -99,6 +99,7 @@ in { corretto11 = callPackage ../development/compilers/corretto/11.nix { }; corretto17 = callPackage ../development/compilers/corretto/17.nix { }; corretto19 = callPackage ../development/compilers/corretto/19.nix { }; + corretto21 = callPackage ../development/compilers/corretto/21.nix { }; openjdk8-bootstrap = mkBootstrap adoptopenjdk-8 ../development/compilers/openjdk/bootstrap.nix diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f379917ca0da1..8a7ad8a70aeb3 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -88,8 +88,12 @@ let biniou = callPackage ../development/ocaml-modules/biniou { }; + binning = callPackage ../development/ocaml-modules/binning { }; + biocaml = janeStreet_0_15.biocaml; + biotk = janeStreet_0_15.biotk; + bisect_ppx = callPackage ../development/ocaml-modules/bisect_ppx { }; bistro = callPackage ../development/ocaml-modules/bistro { }; @@ -819,10 +823,18 @@ let cfstream = self.cfstream.override { inherit core_kernel; }; }; + biotk = let + angstrom = self.angstrom.override { inherit ppx_let; }; + in callPackage ../development/ocaml-modules/biotk { + angstrom-unix = self.angstrom-unix.override { inherit angstrom; }; + ppx_deriving = self.ppx_deriving.override { inherit (jsDeps) ppxlib; }; + uri = self.uri.override { inherit angstrom; }; + vg = self.vg.override { htmlcBackend = false; }; + }; + phylogenetics = let angstrom = self.angstrom.override { inherit ppx_let; }; in callPackage ../development/ocaml-modules/phylogenetics { - inherit biocaml; ppx_deriving = self.ppx_deriving.override { inherit (jsDeps) ppxlib; }; angstrom-unix = self.angstrom-unix.override { inherit angstrom; }; }; @@ -1172,7 +1184,6 @@ let msat = callPackage ../development/ocaml-modules/msat { }; - mtime_1 = callPackage ../development/ocaml-modules/mtime/1_x.nix { }; mtime = callPackage ../development/ocaml-modules/mtime { }; multipart-form-data = callPackage ../development/ocaml-modules/multipart-form-data { }; @@ -1183,6 +1194,8 @@ let netchannel = callPackage ../development/ocaml-modules/netchannel { }; + ninja_utils = callPackage ../development/ocaml-modules/ninja_utils { }; + nonstd = callPackage ../development/ocaml-modules/nonstd { }; note = callPackage ../development/ocaml-modules/note { }; @@ -1373,7 +1386,7 @@ let inherit (pkgs) unzip; }; - opium = callPackage ../development/ocaml-modules/opium { mtime = mtime_1; }; + opium = callPackage ../development/ocaml-modules/opium { }; opti = callPackage ../development/ocaml-modules/opti { }; @@ -1715,6 +1728,8 @@ let stog_asy = callPackage ../applications/misc/stog/asy.nix { }; stog_markdown = callPackage ../applications/misc/stog/markdown.nix { }; + streaming = callPackage ../development/ocaml-modules/streaming { }; + stringext = callPackage ../development/ocaml-modules/stringext { }; syslog = callPackage ../development/ocaml-modules/syslog { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d2f882832c3b6..42226374159fc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11383,7 +11383,7 @@ with self; { propagatedBuildInputs = [ DateCalc ]; meta = { description = "Finnish APRS Parser (Fabulous APRS Parser)"; - maintainers = with maintainers; [ andrew-d ]; + maintainers = with maintainers; [ ]; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18175,9 +18175,11 @@ with self; { url = "mirror://cpan/authors/id/N/NJ/NJH/MusicBrainz-DiscID-0.06.tar.gz"; hash = "sha256-ugtu0JiX/1Y7pZhy7pNxW+83FXUVsZt8bW8obmVI7Ks="; }; - perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' - # Makefile.PL in this package uses which to find pkg-config -- make it use path instead - patchPhase = ''sed -ie 's/`which pkg-config`/"pkg-config"/' Makefile.PL''; + # Makefile.PL in this package uses which to find pkg-config -- make it use envvar instead + postPatch = '' + substituteInPlace Makefile.PL \ + --replace-fail '`which pkg-config`' "'$PKG_CONFIG'" + ''; doCheck = false; # The main test performs network access nativeBuildInputs = [ pkgs.pkg-config ]; propagatedBuildInputs = [ pkgs.libdiscid ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9f1185611005c..8ba934720ea54 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2400,6 +2400,12 @@ self: super: with self; { conda = callPackage ../development/python-modules/conda { }; + conda-libmamba-solver = callPackage ../development/python-modules/conda-libmamba-solver { }; + + conda-package-handling = callPackage ../development/python-modules/conda-package-handling { }; + + conda-package-streaming = callPackage ../development/python-modules/conda-package-streaming { }; + confection = callPackage ../development/python-modules/confection { }; configargparse = callPackage ../development/python-modules/configargparse { }; @@ -3843,6 +3849,8 @@ self: super: with self; { epion = callPackage ../development/python-modules/epion { }; + epitran = callPackage ../development/python-modules/epitran { }; + epson-projector = callPackage ../development/python-modules/epson-projector { }; equinox = callPackage ../development/python-modules/equinox { }; @@ -5507,6 +5515,8 @@ self: super: with self; { httpx-socks = callPackage ../development/python-modules/httpx-socks { }; + httpx-sse = callPackage ../development/python-modules/httpx-sse { }; + huawei-lte-api = callPackage ../development/python-modules/huawei-lte-api { }; huey = callPackage ../development/python-modules/huey { }; @@ -6405,6 +6415,8 @@ self: super: with self; { kornia = callPackage ../development/python-modules/kornia { }; + kornia-rs = callPackage ../development/python-modules/kornia-rs { }; + krakenex = callPackage ../development/python-modules/krakenex { }; krfzf-py = callPackage ../development/python-modules/krfzf-py { }; @@ -6621,6 +6633,8 @@ self: super: with self; { inherit (pkgs) lzfse; }; + libmambapy = callPackage ../development/python-modules/libmambapy { }; + libmodulemd = lib.pipe pkgs.libmodulemd [ toPythonModule (p: @@ -7494,8 +7508,6 @@ self: super: with self; { mkdocs-rss-plugin = callPackage ../development/python-modules/mkdocs-rss-plugin { }; - mkdocs-simple-hooks = callPackage ../development/python-modules/mkdocs-simple-hooks { }; - mkdocs-swagger-ui-tag = callPackage ../development/python-modules/mkdocs-swagger-ui-tag { }; mkdocstrings = callPackage ../development/python-modules/mkdocstrings { }; @@ -9377,6 +9389,8 @@ self: super: with self; { panflute = callPackage ../development/python-modules/panflute { }; + panphon = callPackage ../development/python-modules/panphon { }; + papermill = callPackage ../development/python-modules/papermill { }; openpaperwork-core = callPackage ../applications/office/paperwork/openpaperwork-core.nix { }; @@ -9926,6 +9940,8 @@ self: super: with self; { pynose = callPackage ../development/python-modules/pynose { }; + pynotifier = callPackage ../development/python-modules/pynotifier { }; + pynuki = callPackage ../development/python-modules/pynuki { }; pynut2 = callPackage ../development/python-modules/pynut2 { }; @@ -12678,6 +12694,8 @@ self: super: with self; { pywaterkotte = callPackage ../development/python-modules/pywaterkotte { }; + pywavefront = callPackage ../development/python-modules/pywavefront { }; + pywavelets = callPackage ../development/python-modules/pywavelets { }; pywayland = callPackage ../development/python-modules/pywayland { }; @@ -12851,6 +12869,8 @@ self: super: with self; { quandl = callPackage ../development/python-modules/quandl { }; + quantile-forest = callPackage ../development/python-modules/quantile-forest { }; + quantities = callPackage ../development/python-modules/quantities { }; quantiphy = callPackage ../development/python-modules/quantiphy { }; @@ -12879,6 +12899,8 @@ self: super: with self; { quil = callPackage ../development/python-modules/quil { }; + quixote = callPackage ../development/python-modules/quixote { }; + qutip = callPackage ../development/python-modules/qutip { }; qmk-dotty-dict = callPackage ../development/python-modules/qmk-dotty-dict { }; @@ -14324,6 +14346,8 @@ self: super: with self; { spyder-kernels = callPackage ../development/python-modules/spyder-kernels { }; + spylls = callPackage ../development/python-modules/spylls { }; + spyse-python = callPackage ../development/python-modules/spyse-python { }; spython = callPackage ../development/python-modules/spython { }; @@ -14414,6 +14438,8 @@ self: super: with self; { sslib = callPackage ../development/python-modules/sslib { }; + ssg = callPackage ../development/python-modules/ssg { }; + stack-data = callPackage ../development/python-modules/stack-data { }; stanio = callPackage ../development/python-modules/stanio { }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index ed1d3240d1cf7..5ebc1c78a89fe 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -319,6 +319,7 @@ let madlang mailctl matterhorn + mkjson mueval naproche niv @@ -330,6 +331,8 @@ let nix-script nix-tree nixfmt + nixfmt-classic + nixfmt-rfc-style nota nvfetcher ormolu @@ -470,6 +473,15 @@ let inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskellPackages) ghc hello + microlens + ; + }; + + haskell.packages.ghc98 = { + inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskell.packages.ghc98) + ghc + hello + microlens ; }; @@ -477,6 +489,7 @@ let inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskell.packages.ghcHEAD) ghc hello + microlens ; }; }; @@ -594,42 +607,35 @@ let maintainers = lib.teams.haskell.members; }; constituents = - let - # Filter out all Darwin derivations. We don't want flakey Darwin - # derivations and flakey Hydra Darwin builders to block the - # mergeable job from successfully building. - filterInLinux = - lib.filter (drv: drv.system == "x86_64-linux" || drv.system == "aarch64-linux"); - in - filterInLinux - (accumulateDerivations [ - # haskell specific tests - jobs.tests.haskell - # important top-level packages - jobs.cabal-install - jobs.cabal2nix - jobs.cachix - jobs.darcs - jobs.haskell-language-server - jobs.hledger - jobs.hledger-ui - jobs.hpack - jobs.niv - jobs.pandoc - jobs.stack - jobs.stylish-haskell - # important haskell (library) packages - jobs.haskellPackages.cabal-plan - jobs.haskellPackages.distribution-nixpkgs - jobs.haskellPackages.hackage-db - jobs.haskellPackages.xmonad - jobs.haskellPackages.xmonad-contrib - # haskell packages maintained by @peti - # imported from the old hydra jobset - jobs.haskellPackages.hopenssl - jobs.haskellPackages.hsemail - jobs.haskellPackages.hsyslog - ]); + accumulateDerivations [ + # haskell specific tests + jobs.tests.haskell + # important top-level packages + jobs.cabal-install + jobs.cabal2nix + jobs.cachix + jobs.darcs + jobs.haskell-language-server + jobs.hledger + jobs.hledger-ui + jobs.hpack + jobs.niv + jobs.pandoc + jobs.stack + jobs.stylish-haskell + jobs.shellcheck + # important haskell (library) packages + jobs.haskellPackages.cabal-plan + jobs.haskellPackages.distribution-nixpkgs + jobs.haskellPackages.hackage-db + jobs.haskellPackages.xmonad + jobs.haskellPackages.xmonad-contrib + # haskell packages maintained by @peti + # imported from the old hydra jobset + jobs.haskellPackages.hopenssl + jobs.haskellPackages.hsemail + jobs.haskellPackages.hsyslog + ]; }; maintained = pkgs.releaseTools.aggregate { name = "maintained-haskell-packages"; |