diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-22 12:01:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-22 12:01:52 +0000 |
| commit | a63cf4f913bc7fb45d9efbf2a786ecbbd09f1cb7 (patch) | |
| tree | 689c9d22a723d3410be4214bbaa4781ac68f7a5f /pkgs/top-level | |
| parent | dceb7e528cb0af03c29e6d6f14a97d2a4f2ed88f (diff) | |
| parent | 994b97d73cce5c257bb549af7c43f03e533e8e89 (diff) | |
| download | nixpkgs-a63cf4f913bc7fb45d9efbf2a786ecbbd09f1cb7.tar nixpkgs-a63cf4f913bc7fb45d9efbf2a786ecbbd09f1cb7.tar.gz nixpkgs-a63cf4f913bc7fb45d9efbf2a786ecbbd09f1cb7.tar.bz2 nixpkgs-a63cf4f913bc7fb45d9efbf2a786ecbbd09f1cb7.tar.lz nixpkgs-a63cf4f913bc7fb45d9efbf2a786ecbbd09f1cb7.tar.xz nixpkgs-a63cf4f913bc7fb45d9efbf2a786ecbbd09f1cb7.tar.zst nixpkgs-a63cf4f913bc7fb45d9efbf2a786ecbbd09f1cb7.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 6 |
4 files changed, 14 insertions, 3 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e9ee946d393..17313e0090d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1138,6 +1138,7 @@ mapAliases ({ kwin-dynamic-workspaces kwin-tiling krohnkite + krunner-symbols ; inherit (libsForQt5) sddm diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85148a8a6dd..03d4078b11b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1562,6 +1562,8 @@ in github-commenter = callPackage ../development/tools/github-commenter { }; + github-desktop = callPackage ../applications/version-management/github-desktop { }; + github-to-sqlite = with python3Packages; toPythonApplication github-to-sqlite; gitless = callPackage ../applications/version-management/gitless { python = python3; }; @@ -2565,7 +2567,9 @@ in dtrx = callPackage ../tools/compression/dtrx { }; - dua = callPackage ../tools/misc/dua { }; + dua = callPackage ../tools/misc/dua { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; duf = callPackage ../tools/misc/duf { }; @@ -25234,6 +25238,8 @@ in ktorrent = libsForQt5.callPackage ../applications/networking/p2p/ktorrent { }; + kubedb-cli = callPackage ../applications/networking/cluster/kubedb-cli { }; + kubecfg = callPackage ../applications/networking/cluster/kubecfg { }; kube-score = callPackage ../applications/networking/cluster/kube-score { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 28f8436ea99..4febee5f5a8 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -848,8 +848,6 @@ let ocamlgraph = callPackage ../development/ocaml-modules/ocamlgraph { }; ocamlgraph_gtk = callPackage ../development/ocaml-modules/ocamlgraph/gtk.nix { }; - ocaml_http = callPackage ../development/ocaml-modules/http { }; - ocaml_libvirt = callPackage ../development/ocaml-modules/ocaml-libvirt { }; ocamlify = callPackage ../development/tools/ocaml/ocamlify { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 172fdc4b668..a1bd5d816af 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1914,6 +1914,8 @@ in { devpi-common = callPackage ../development/python-modules/devpi-common { }; + devtools = callPackage ../development/python-modules/devtools { }; + diagrams = callPackage ../development/python-modules/diagrams { }; diceware = callPackage ../development/python-modules/diceware { }; @@ -4735,6 +4737,8 @@ in { ndtypes = callPackage ../development/python-modules/ndtypes { }; + nengo = callPackage ../development/python-modules/nengo { }; + neo = callPackage ../development/python-modules/neo { }; nest-asyncio = callPackage ../development/python-modules/nest-asyncio { }; @@ -6007,6 +6011,8 @@ in { pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { }; + pygame-gui = callPackage ../development/python-modules/pygame-gui { }; + pygatt = callPackage ../development/python-modules/pygatt { }; pygbm = callPackage ../development/python-modules/pygbm { }; |