diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 17 | ||||
-rw-r--r-- | pkgs/top-level/cuda-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 36 | ||||
-rw-r--r-- | pkgs/top-level/python-aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 8 |
5 files changed, 29 insertions, 35 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f07cc19c7b3e4..e13755dc7f04c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -656,6 +656,8 @@ with pkgs; evhz = callPackage ../tools/misc/evhz { }; + expand-response-params = callPackage ../build-support/expand-response-params { }; + expressvpn = callPackage ../applications/networking/expressvpn { }; faq = callPackage ../development/tools/faq { }; @@ -9778,14 +9780,7 @@ with pkgs; ldc = callPackage ../development/compilers/ldc { }; ligo = - let ocaml_p = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15.overrideScope (self: super: { - zarith = super.zarith.overrideAttrs (o: { - src = fetchzip { - url = "https://github.com/ocaml/Zarith/archive/refs/tags/release-1.12.tar.gz"; - hash = "sha256-SQegsMc1+UIod8XeJDE+H5q1huNDQI8CUh7IsHOoVMs="; - }; - }); - }); in + let ocaml_p = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15; in callPackage ../development/compilers/ligo { coq = coq_8_13.override { customOCamlPackages = ocaml_p; @@ -28713,8 +28708,6 @@ with pkgs; fanwood = callPackage ../data/fonts/fanwood { }; - fira = callPackage ../data/fonts/fira { }; - fira-code = callPackage ../data/fonts/fira-code { }; fira-code-symbols = callPackage ../data/fonts/fira-code/symbols.nix { }; fira-code-nerdfont = nerdfonts.override { @@ -28723,8 +28716,6 @@ with pkgs; fira-go = callPackage ../data/fonts/fira-go { }; - fira-mono = callPackage ../data/fonts/fira-mono { }; - flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme { inherit (plasma5Packages) breeze-icons; }; @@ -33449,8 +33440,6 @@ with pkgs; ptex = callPackage ../development/libraries/ptex { }; - pyright = nodePackages.pyright; - qbec = callPackage ../applications/networking/cluster/qbec { }; qemacs = callPackage ../applications/editors/qemacs { }; diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix index 92960422af44c..d34a37294ae0a 100644 --- a/pkgs/top-level/cuda-packages.nix +++ b/pkgs/top-level/cuda-packages.nix @@ -90,7 +90,7 @@ let [ (import ../development/cuda-modules/setup-hooks/extension.nix) (callPackage ../development/cuda-modules/cuda/extension.nix { inherit cudaVersion; }) - (callPackage ../development/cuda-modules/cuda/overrides.nix { inherit cudaVersion; }) + (import ../development/cuda-modules/cuda/overrides.nix) (callPackage ../development/cuda-modules/generic-builders/multiplex.nix { inherit cudaVersion flags mkVersionedPackageName; pname = "cudnn"; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 2403b1d57300a..529e893894cf0 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -56,9 +56,9 @@ let atdgen-runtime = callPackage ../development/ocaml-modules/atdgen/runtime.nix { }; - awa = callPackage ../development/ocaml-modules/awa { mtime = mtime_1; }; + awa = callPackage ../development/ocaml-modules/awa { }; - awa-mirage = callPackage ../development/ocaml-modules/awa/mirage.nix { mtime = mtime_1; }; + awa-mirage = callPackage ../development/ocaml-modules/awa/mirage.nix { }; ### B ### @@ -192,6 +192,8 @@ let cil = callPackage ../development/ocaml-modules/cil { }; + clap = callPackage ../development/ocaml-modules/clap { }; + class_group_vdf = callPackage ../development/ocaml-modules/class_group_vdf { }; cmarkit = callPackage ../development/ocaml-modules/cmarkit { }; @@ -321,11 +323,11 @@ let dns-certify = callPackage ../development/ocaml-modules/dns/certify.nix { }; - dns-cli = callPackage ../development/ocaml-modules/dns/cli.nix { mtime = mtime_1; }; + dns-cli = callPackage ../development/ocaml-modules/dns/cli.nix { }; - dns-client = callPackage ../development/ocaml-modules/dns/client.nix { mtime = mtime_1; }; + dns-client = callPackage ../development/ocaml-modules/dns/client.nix { }; - dns-client-lwt = callPackage ../development/ocaml-modules/dns/client-lwt.nix { mtime = mtime_1; }; + dns-client-lwt = callPackage ../development/ocaml-modules/dns/client-lwt.nix { }; dns-client-mirage = callPackage ../development/ocaml-modules/dns/client-mirage.nix { }; @@ -586,7 +588,6 @@ let git-unix = callPackage ../development/ocaml-modules/git/unix.nix { git-binary = pkgs.git; - mtime = mtime_1; }; github = callPackage ../development/ocaml-modules/github { }; @@ -639,7 +640,7 @@ let happy-eyeballs = callPackage ../development/ocaml-modules/happy-eyeballs { }; - happy-eyeballs-lwt = callPackage ../development/ocaml-modules/happy-eyeballs/lwt.nix { mtime = mtime_1; }; + happy-eyeballs-lwt = callPackage ../development/ocaml-modules/happy-eyeballs/lwt.nix { }; happy-eyeballs-mirage = callPackage ../development/ocaml-modules/happy-eyeballs/mirage.nix { }; @@ -669,7 +670,7 @@ let imagelib = callPackage ../development/ocaml-modules/imagelib { }; - index = callPackage ../development/ocaml-modules/index { mtime = mtime_1; }; + index = callPackage ../development/ocaml-modules/index { }; inifiles = callPackage ../development/ocaml-modules/inifiles { }; @@ -691,29 +692,27 @@ let iri = callPackage ../development/ocaml-modules/iri { }; - irmin = callPackage ../development/ocaml-modules/irmin { mtime = mtime_1; }; + irmin = callPackage ../development/ocaml-modules/irmin { }; irmin-chunk = callPackage ../development/ocaml-modules/irmin/chunk.nix { }; - irmin-containers = callPackage ../development/ocaml-modules/irmin/containers.nix { mtime = mtime_1; }; + irmin-containers = callPackage ../development/ocaml-modules/irmin/containers.nix { }; irmin-fs = callPackage ../development/ocaml-modules/irmin/fs.nix { }; - irmin-git = callPackage ../development/ocaml-modules/irmin/git.nix { mtime = mtime_1; }; + irmin-git = callPackage ../development/ocaml-modules/irmin/git.nix { }; irmin-graphql = callPackage ../development/ocaml-modules/irmin/graphql.nix { }; - irmin-http = callPackage ../development/ocaml-modules/irmin/http.nix { }; - irmin-mirage = callPackage ../development/ocaml-modules/irmin/mirage.nix { }; irmin-mirage-git = callPackage ../development/ocaml-modules/irmin/mirage-git.nix { }; irmin-mirage-graphql = callPackage ../development/ocaml-modules/irmin/mirage-graphql.nix { }; - irmin-pack = callPackage ../development/ocaml-modules/irmin/pack.nix { mtime = mtime_1; }; + irmin-pack = callPackage ../development/ocaml-modules/irmin/pack.nix { }; - irmin-test = callPackage ../development/ocaml-modules/irmin/test.nix { mtime = mtime_1; }; + irmin-test = callPackage ../development/ocaml-modules/irmin/test.nix { }; irmin-tezos = callPackage ../development/ocaml-modules/irmin/tezos.nix { }; @@ -1065,7 +1064,6 @@ let metrics-unix = callPackage ../development/ocaml-modules/metrics/unix.nix { inherit (pkgs) gnuplot; - mtime = mtime_1; }; mew = callPackage ../development/ocaml-modules/mew { }; @@ -1122,7 +1120,7 @@ let mirage-crypto-rng-async = callPackage ../development/ocaml-modules/mirage-crypto/rng-async.nix { }; - mirage-crypto-rng-lwt = callPackage ../development/ocaml-modules/mirage-crypto/rng-lwt.nix { mtime = mtime_1; }; + mirage-crypto-rng-lwt = callPackage ../development/ocaml-modules/mirage-crypto/rng-lwt.nix { }; mirage-crypto-rng-mirage = callPackage ../development/ocaml-modules/mirage-crypto/rng-mirage.nix { }; @@ -1546,7 +1544,7 @@ let prometheus = callPackage ../development/ocaml-modules/prometheus { }; - progress = callPackage ../development/ocaml-modules/progress { mtime = mtime_1; }; + progress = callPackage ../development/ocaml-modules/progress { }; promise_jsoo = callPackage ../development/ocaml-modules/promise_jsoo { }; @@ -1761,6 +1759,8 @@ let tezos-base58 = callPackage ../development/ocaml-modules/tezos-base58 { }; + tezt = callPackage ../development/ocaml-modules/tezt { }; + theora = callPackage ../development/ocaml-modules/theora { }; thread-table = callPackage ../development/ocaml-modules/thread-table { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 40351281d5c53..4a4a5addeac02 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -518,6 +518,7 @@ mapAliases ({ update_checker = update-checker; # added 2024-01-07 uproot3 = throw "uproot3 has been removed, use uproot instead"; # added 2022-12-13 uproot3-methods = throw "uproot3-methods has been removed"; # added 2022-12-13 + uuid = throw "uuid is a Python standard module"; # added 2024-04-18 validictory = throw "validictory has been removed, since it abandoned"; # added 2023-07-07 vega_datasets = vega-datasets; # added 2023-11-04 ViennaRNA = viennarna; # added 2023-08-23 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7adc954a45c80..3cadc417f7631 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1932,6 +1932,8 @@ self: super: with self; { }; }; + catkin-pkg = callPackage ../development/python-modules/catkin-pkg { }; + catppuccin = callPackage ../development/python-modules/catppuccin { }; cattrs = callPackage ../development/python-modules/cattrs { }; @@ -2484,6 +2486,8 @@ self: super: with self; { craft-application-1 = callPackage ../development/python-modules/craft-application-1 { }; + craft-application = callPackage ../development/python-modules/craft-application { }; + craft-archives = callPackage ../development/python-modules/craft-archives { }; craft-cli = callPackage ../development/python-modules/craft-cli { }; @@ -12186,6 +12190,8 @@ self: super: with self; { python3-openid = callPackage ../development/python-modules/python3-openid { }; + python-apt = callPackage ../development/python-modules/python-apt { }; + python-arango = callPackage ../development/python-modules/python-arango { }; python-awair = callPackage ../development/python-modules/python-awair { }; @@ -16435,8 +16441,6 @@ self: super: with self; { utils = callPackage ../development/python-modules/utils { }; - uuid = callPackage ../development/python-modules/uuid { }; - uvcclient = callPackage ../development/python-modules/uvcclient { }; uvicorn = callPackage ../development/python-modules/uvicorn { }; |