diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-06 18:00:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-06 18:00:56 +0000 |
| commit | e72d04004ef65961e8b14e3d9a4debb2c4ddde70 (patch) | |
| tree | df569938bc28e7ded949f3fcce86cc6e14b9d8ba /pkgs/top-level | |
| parent | f48be2ac66b503e69d0ea2c820d59d10ee66b549 (diff) | |
| parent | 782726e9a48173e86ed2eace03a714451e8b6b89 (diff) | |
| download | nixlib-e72d04004ef65961e8b14e3d9a4debb2c4ddde70.tar nixlib-e72d04004ef65961e8b14e3d9a4debb2c4ddde70.tar.gz nixlib-e72d04004ef65961e8b14e3d9a4debb2c4ddde70.tar.bz2 nixlib-e72d04004ef65961e8b14e3d9a4debb2c4ddde70.tar.lz nixlib-e72d04004ef65961e8b14e3d9a4debb2c4ddde70.tar.xz nixlib-e72d04004ef65961e8b14e3d9a4debb2c4ddde70.tar.zst nixlib-e72d04004ef65961e8b14e3d9a4debb2c4ddde70.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7d9481e1bab2..7343be24d115 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -285,6 +285,7 @@ mapAliases ({ geekbench5 = throw "'geekbench5' has been renamed to 'geekbench_5'"; # Added 2023-03-10 ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18 go-dependency-manager = throw "'go-dependency-manager' is unmaintained and the go community now uses 'go.mod' mostly instead"; # Added 2023-10-04 + gotktrix = throw "'gotktrix' has been removed, as it was broken and unmaintained"; # Added 2023-12-06 git-subset = throw "'git-subset' has been removed in favor of 'git-filter-repo'"; # Added 2023-01-13 gitAndTools = self // { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a3a02c4904d..d7a38be3e40a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3916,8 +3916,6 @@ with pkgs; goperf = callPackage ../development/tools/goperf { }; - gotktrix = callPackage ../applications/networking/instant-messengers/gotktrix { }; - graphite-cli = nodePackages.graphite-cli; gucci = callPackage ../tools/text/gucci { }; @@ -24583,6 +24581,9 @@ with pkgs; protobuf = protobuf_24; + protobuf_25 = callPackage ../development/libraries/protobuf/25.nix { + abseil-cpp = abseil-cpp_202308; + }; protobuf_24 = callPackage ../development/libraries/protobuf/24.nix { }; protobuf_23 = callPackage ../development/libraries/protobuf/23.nix { }; protobuf_21 = callPackage ../development/libraries/protobuf/21.nix { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a5c05d2b2655..5f8285d98963 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12312,6 +12312,8 @@ self: super: with self; { rencode = callPackage ../development/python-modules/rencode { }; + renson-endura-delta = callPackage ../development/python-modules/renson-endura-delta { }; + reorder-python-imports = callPackage ../development/python-modules/reorder-python-imports { }; reolink = callPackage ../development/python-modules/reolink { }; |