diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-18 06:01:22 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-18 06:01:22 +0000 |
commit | 385e4f85318e0567c542ce671d4e14fe23797c63 (patch) | |
tree | ebf1d48257b1aa7f40c19844e8ca91f55ac54e5b /pkgs/top-level | |
parent | 841469e4d8c3802d84f735b0ba0f5e72473ca0e3 (diff) | |
parent | 42d32516400c1d821d275a5460900bbaef3d3bf1 (diff) | |
download | nixpkgs-385e4f85318e0567c542ce671d4e14fe23797c63.tar nixpkgs-385e4f85318e0567c542ce671d4e14fe23797c63.tar.gz nixpkgs-385e4f85318e0567c542ce671d4e14fe23797c63.tar.bz2 nixpkgs-385e4f85318e0567c542ce671d4e14fe23797c63.tar.lz nixpkgs-385e4f85318e0567c542ce671d4e14fe23797c63.tar.xz nixpkgs-385e4f85318e0567c542ce671d4e14fe23797c63.tar.zst nixpkgs-385e4f85318e0567c542ce671d4e14fe23797c63.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 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index df9c18fceaa..48c2069bff1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -893,6 +893,7 @@ mapAliases ({ stanchion = throw "Stanchion was part of riak-cs which is not maintained anymore"; # added 2020-10-14 stumpwm-git = throw "stumpwm-git has been broken for a long time and lispPackages.stumpwm follows Quicklisp that is close to git version"; # added 2021-05-09 surf-webkit2 = surf; # added 2017-04-02 + svgcleaner = throw "svgcleaner has been removed."; # added 2021-11-17 swec = throw "swec has been removed; broken and abandoned upstream."; # added 2021-10-14 swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23 swtpm-tpm2 = swtpm; # added 2021-02-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1ef1d313b9..6c6268af15b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9692,8 +9692,6 @@ with pkgs; svgbob = callPackage ../tools/graphics/svgbob { }; - svgcleaner = callPackage ../tools/graphics/svgcleaner { }; - ssb = callPackage ../tools/security/ssb { }; ssb-patchwork = callPackage ../applications/networking/ssb-patchwork { }; @@ -13910,7 +13908,8 @@ with pkgs; electron_12 electron_13 electron_14 - electron_15; + electron_15 + electron_16; autobuild = callPackage ../development/tools/misc/autobuild { }; |