diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-18 00:02:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-18 00:02:06 +0000 |
| commit | 08a8809bfe1688df8419f41fd31c2f794c4debdf (patch) | |
| tree | 02c532b4ebeac226362c3723c8b9cfa1ef7e4c5c /pkgs/top-level | |
| parent | 11332e9137fbbab82b10312da9dad67e3607f553 (diff) | |
| parent | 382fdc7ad3184c7d47f54feb535a970fe64a0f35 (diff) | |
| download | nixpkgs-08a8809bfe1688df8419f41fd31c2f794c4debdf.tar nixpkgs-08a8809bfe1688df8419f41fd31c2f794c4debdf.tar.gz nixpkgs-08a8809bfe1688df8419f41fd31c2f794c4debdf.tar.bz2 nixpkgs-08a8809bfe1688df8419f41fd31c2f794c4debdf.tar.lz nixpkgs-08a8809bfe1688df8419f41fd31c2f794c4debdf.tar.xz nixpkgs-08a8809bfe1688df8419f41fd31c2f794c4debdf.tar.zst nixpkgs-08a8809bfe1688df8419f41fd31c2f794c4debdf.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 8 |
2 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 294276048b4..5a284902061 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1333,6 +1333,8 @@ in blockbench-electron = callPackage ../applications/graphics/blockbench-electron { }; + blocksat-cli = with python3Packages; toPythonApplication blocksat-cli; + bmap-tools = callPackage ../tools/misc/bmap-tools { }; bonnmotion = callPackage ../development/tools/misc/bonnmotion { }; @@ -4081,6 +4083,8 @@ in debootstrap = callPackage ../tools/misc/debootstrap { }; + debugedit-unstable = callPackage ../development/tools/misc/debugedit { }; + deer = callPackage ../shells/zsh/zsh-deer { }; delta = callPackage ../applications/version-management/git-and-tools/delta { @@ -13894,6 +13898,10 @@ in modd = callPackage ../development/tools/modd { }; + mold = callPackage ../development/tools/mold { + stdenv = llvmPackages_latest.stdenv; + }; + msgpack-tools = callPackage ../development/tools/msgpack-tools { }; msgpuck = callPackage ../development/libraries/msgpuck { }; @@ -27922,6 +27930,8 @@ in wofi = callPackage ../applications/misc/wofi { }; + wofi-emoji = callPackage ../applications/misc/wofi-emoji { }; + wordnet = callPackage ../applications/misc/wordnet { inherit (darwin.apple_sdk.frameworks) Cocoa; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a1a219672ca..7c6164618cf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1141,6 +1141,8 @@ in { block-io = callPackage ../development/python-modules/block-io { }; + blocksat-cli = callPackage ../development/python-modules/blocksat-cli { }; + blspy = callPackage ../development/python-modules/blspy { }; bluepy = callPackage ../development/python-modules/bluepy { }; @@ -2357,6 +2359,8 @@ in { et_xmlfile = callPackage ../development/python-modules/et_xmlfile { }; + ev3dev2 = callPackage ../development/python-modules/ev3dev2 { }; + evdev = callPackage ../development/python-modules/evdev { }; eve = callPackage ../development/python-modules/eve { }; @@ -5413,6 +5417,8 @@ in { python-tado = callPackage ../development/python-modules/python-tado { }; + pyutil = callPackage ../development/python-modules/pyutil { }; + pkutils = callPackage ../development/python-modules/pkutils { }; plac = callPackage ../development/python-modules/plac { }; @@ -9474,6 +9480,8 @@ in { zetup = callPackage ../development/python-modules/zetup { }; + zfec = callPackage ../development/python-modules/zfec { }; + zha-quirks = callPackage ../development/python-modules/zha-quirks { }; zict = callPackage ../development/python-modules/zict { }; |