diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 16 | ||||
-rw-r--r-- | pkgs/top-level/stage.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/unix-tools.nix | 4 |
4 files changed, 6 insertions, 22 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f310fd156c33..5dafcfe22575 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1,4 +1,4 @@ -self: +lib: self: super: with self; @@ -19,7 +19,7 @@ let # Make sure that we are not shadowing something from # all-packages.nix. - checkInPkgs = n: alias: if builtins.hasAttr n self + checkInPkgs = n: alias: if builtins.hasAttr n super then throw "Alias ${n} is still in all-packages.nix" else alias; @@ -32,7 +32,7 @@ in ### Deprecated aliases - for backward compatibility -mapAliases (rec { +mapAliases ({ PPSSPP = ppsspp; # added 2017-10-01 QmidiNet = qmidinet; # added 2016-05-22 accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19 diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6c2b726a06b9..00689e1f5b2e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1464,21 +1464,7 @@ let self = _self // overrides; _self = with self; { }; }; - CatalystPluginUnicodeEncoding = buildPerlPackage { - name = "Catalyst-Plugin-Unicode-Encoding-1.9"; - src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Unicode-Encoding-1.9.tar.gz; - sha256 = "1glxkh79zz71bmgk44hnhsi37z2mgxcwf7bkmwlnwv3jh1iaz0ah"; - }; - buildInputs = [ HTTPMessage IOStringy ]; - propagatedBuildInputs = [ CatalystRuntime ClassDataInheritable LWP TryTiny URI ]; - meta = { - description = "Unicode aware Catalyst"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; - }; + CatalystPluginUnicodeEncoding = CatalystRuntime; CatalystPluginHTMLWidget = buildPerlPackage rec { name = "Catalyst-Plugin-HTML-Widget-1.1"; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index e38f5442d3aa..f9941a1c500d 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -98,7 +98,7 @@ let in res; aliases = self: super: if config.skipAliases or false then {} - else import ./aliases.nix super; + else import ./aliases.nix lib self super; # stdenvOverrides is used to avoid having multiple of versions # of certain dependencies that were used in bootstrapping the diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 362715e82623..c1bd46ad68dc 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -19,14 +19,12 @@ let in runCommand "${cmd}-${version}" { meta.platforms = map (n: { kernel.name = n; }) (pkgs.lib.attrNames providers); } '' - mkdir -p $out/bin - if ! [ -x "${provider}" ]; then echo "Cannot find command ${cmd}" exit 1 fi - ln -s "${provider}" "$out/bin/${cmd}" + install -D "${provider}" "$out/bin/${cmd}" ''; # more is unavailable in darwin |