diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2021-07-17 07:38:25 +0200 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2021-07-17 07:38:25 +0200 |
| commit | 08846decc930d81c97f6ca9b5442c14db721ef92 (patch) | |
| tree | 3fdc7ec21586022c8fba076417a8157d88b07871 /pkgs/top-level | |
| parent | 8e4bb160cb7dc47555ec332996cf54e8ea1c0183 (diff) | |
| parent | 6d11e6d03e043373ad9fe20033940339354562de (diff) | |
| download | nixpkgs-08846decc930d81c97f6ca9b5442c14db721ef92.tar nixpkgs-08846decc930d81c97f6ca9b5442c14db721ef92.tar.gz nixpkgs-08846decc930d81c97f6ca9b5442c14db721ef92.tar.bz2 nixpkgs-08846decc930d81c97f6ca9b5442c14db721ef92.tar.lz nixpkgs-08846decc930d81c97f6ca9b5442c14db721ef92.tar.xz nixpkgs-08846decc930d81c97f6ca9b5442c14db721ef92.tar.zst nixpkgs-08846decc930d81c97f6ca9b5442c14db721ef92.zip | |
Merge remote-tracking branch 'upstream/staging-next' into HEAD
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8916b8d7c2..309d68ab6f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2313,6 +2313,8 @@ in swaycwd = callPackage ../tools/wayland/swaycwd { }; + swayr = callPackage ../tools/wayland/swayr { }; + wayland-utils = callPackage ../tools/wayland/wayland-utils { }; wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { }; @@ -8481,9 +8483,7 @@ in routino = callPackage ../tools/misc/routino { }; - rq = callPackage ../development/tools/rq { - inherit (darwin) libiconv; - }; + rq = callPackage ../development/tools/rq { }; rs-git-fsmonitor = callPackage ../applications/version-management/git-and-tools/rs-git-fsmonitor { }; @@ -16532,6 +16532,8 @@ in libgksu = callPackage ../development/libraries/libgksu { }; + libgnt = callPackage ../development/libraries/libgnt { }; + libgpgerror = callPackage ../development/libraries/libgpg-error { }; # https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=README;h=fd6e1a83f55696c1f7a08f6dfca08b2d6b7617ec;hb=70058cd9f944d620764e57c838209afae8a58c78#l118 @@ -17674,6 +17676,8 @@ in oobicpl = callPackage ../development/libraries/science/biology/oobicpl { }; + ookla-speedtest = callPackage ../tools/networking/ookla-speedtest { }; + openalSoft = callPackage ../development/libraries/openal-soft { inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; }; @@ -28498,6 +28502,9 @@ in electrs = callPackage ../applications/blockchains/electrs.nix { }; + elements = libsForQt5.callPackage ../applications/blockchains/elements.nix { miniupnpc = miniupnpc_2; withGui = true; }; + elementsd = callPackage ../applications/blockchains/elements.nix { miniupnpc = miniupnpc_2; withGui = false; }; + ergo = callPackage ../applications/blockchains/ergo { }; exodus = callPackage ../applications/blockchains/exodus { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index e5a792caf0f..ebe7465fae5 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1031,6 +1031,8 @@ let inherit (pkgs) secp256k1; }; + secp256k1-internal = callPackage ../development/ocaml-modules/secp256k1-internal { }; + seq = callPackage ../development/ocaml-modules/seq { }; sosa = callPackage ../development/ocaml-modules/sosa { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0a95f238993..084a7a30f45 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4989,6 +4989,8 @@ in { openshift = callPackage ../development/python-modules/openshift { }; + opensimplex = callPackage ../development/python-modules/opensimplex { }; + opentimestamps = callPackage ../development/python-modules/opentimestamps { }; opentracing = callPackage ../development/python-modules/opentracing { }; |