diff options
| author | volth <volth@webmaster.ms> | 2018-10-13 13:22:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-13 13:22:11 +0000 |
| commit | a974ecf803ff858e65f4e6172bdf8d35ec5019f2 (patch) | |
| tree | b2353dc656b6157820928d029a9da07e078e7987 /pkgs/top-level/aliases.nix | |
| parent | ccd4024c56df7a084d112779daafa5ddc1a09e24 (diff) | |
| parent | 548ced628d233e6ec5431ae3d8d1668d65177639 (diff) | |
| download | nixlib-a974ecf803ff858e65f4e6172bdf8d35ec5019f2.tar nixlib-a974ecf803ff858e65f4e6172bdf8d35ec5019f2.tar.gz nixlib-a974ecf803ff858e65f4e6172bdf8d35ec5019f2.tar.bz2 nixlib-a974ecf803ff858e65f4e6172bdf8d35ec5019f2.tar.lz nixlib-a974ecf803ff858e65f4e6172bdf8d35ec5019f2.tar.xz nixlib-a974ecf803ff858e65f4e6172bdf8d35ec5019f2.tar.zst nixlib-a974ecf803ff858e65f4e6172bdf8d35ec5019f2.zip | |
Merge branch 'staging' into remove-top-perlXMLParser
Diffstat (limited to 'pkgs/top-level/aliases.nix')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c89ce2c5d344..d76320a95bed 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -49,6 +49,11 @@ mapAliases ({ bashCompletion = bash-completion; # Added 2016-09-28 bridge_utils = bridge-utils; # added 2015-02-20 btrfsProgs = btrfs-progs; # added 2016-01-03 + buildbot = pythonPackages.buildbot; # added 2018-10-11 + buildbot-full = pythonPackages.buildbot-full; # added 2018-10-11 + buildbot-pkg = pythonPackages.buildbot-pkg; # added 2018-10-11 + buildbot-ui = pythonPackages.buildbot-ui; # added 2018-10-11 + buildbot-worker = pythonPackages.buildbot-worker; # added 2018-10-11 bundler_HEAD = bundler; # added 2015-11-15 cantarell_fonts = cantarell-fonts; # added 2018-03-03 checkbashism = checkbashisms; # added 2016-08-16 @@ -204,6 +209,7 @@ mapAliases ({ p11_kit = p11-kit; # added 2018-02-25 pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04 perlXMLParser = perlPackages.XMLParser; # added 2018-10-12 + perlArchiveCpio = perlPackages.ArchiveCpio; # added 2018-10-12 pgp-tools = signing-party; # added 2017-03-26 pidgin-with-plugins = pidgin; # added 2016-06 pidginlatex = pidgin-latex; # added 2018-01-08 @@ -330,7 +336,6 @@ mapAliases ({ callPackage_i686 = pkgsi686Linux.callPackage; inherit (ocaml-ng) # added 2016-09-14 - ocamlPackages_3_10_0 ocamlPackages_3_11_2 ocamlPackages_3_12_1 ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02 ocamlPackages_4_03 ocamlPackages_latest; @@ -349,10 +354,6 @@ mapAliases ({ gst-ffmpeg = pkgs.gst-ffmpeg; }; } // (with ocaml-ng; { # added 2016-09-14 - ocaml_3_08_0 = ocamlPackages_3_08_0.ocaml; - ocaml_3_10_0 = ocamlPackages_3_10_0.ocaml; - ocaml_3_11_2 = ocamlPackages_3_11_2.ocaml; - ocaml_3_12_1 = ocamlPackages_3_12_1.ocaml; ocaml_4_00_1 = ocamlPackages_4_00_1.ocaml; ocaml_4_01_0 = ocamlPackages_4_01_0.ocaml; ocaml_4_02 = ocamlPackages_4_02.ocaml; |