JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #33681 from obsidiansystems/fixed-output-deps

Browse Source 
Fixed output deps
This commit is contained in:
John Ericson 2018-01-10 14:28:10 -05:00 committed by GitHub
commit e017a027d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
48 changed files with 94 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/browsers/chromium/update.nix
View File

@ -145,7 +145,7 @@ in rec {
outputHashMode = "flat"; outputHashMode = "flat";
outputHashAlgo = "md5"; outputHashAlgo = "md5";
buildInputs = [ curl ]; nativeBuildInputs = [ curl ];
preferLocalBuild = true; preferLocalBuild = true;
buildCommand = '' buildCommand = ''
@ -178,7 +178,7 @@ in rec {
getHash = path: import (runCommand "gethash.nix" { getHash = path: import (runCommand "gethash.nix" {
inherit path; inherit path;
buildInputs = [ nix ]; nativeBuildInputs = [ nix ];
} '' } ''
sha256="$(nix-hash --flat --base32 --type sha256 "$path")" sha256="$(nix-hash --flat --base32 --type sha256 "$path")"
echo "\"$sha256\"" > "$out" echo "\"$sha256\"" > "$out"

2
pkgs/applications/networking/cluster/chronos/chronos-deps.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation {
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHash = "0mm2sb1p5zz6b0z2s4zhdlix6fafydsxmqjy8zbkwzw4f6lazzyl"; outputHash = "0mm2sb1p5zz6b0z2s4zhdlix6fafydsxmqjy8zbkwzw4f6lazzyl";
buildInputs = [ curl ]; nativeBuildInputs = [ curl ];
impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
} }

2
pkgs/applications/networking/cluster/mesos/mesos-deps.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation {
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHash = "10h0qs7svw0cqjkyxs8z6s3qraa8ga920zfrr59rdlanbwg4klly"; outputHash = "10h0qs7svw0cqjkyxs8z6s3qraa8ga920zfrr59rdlanbwg4klly";
buildInputs = [ curl ]; nativeBuildInputs = [ curl ];
impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
} }

2
pkgs/build-support/docker/pull.nix
View File

@ -14,7 +14,7 @@ let
builder = ./pull.sh; builder = ./pull.sh;
buildInputs = [ curl utillinux docker kmod dhcp cacert e2fsprogs ]; nativeBuildInputs = [ curl utillinux docker kmod dhcp cacert e2fsprogs ];
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHash = sha256; outputHash = sha256;

6
pkgs/build-support/fetchbower/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, bower2nix, cacert }: { stdenvNoCC, lib, bower2nix, cacert }:
let let
bowerVersion = version: bowerVersion = version:
let let
@ -9,7 +9,7 @@ let
cleanName = name: lib.replaceStrings ["/" ":"] ["-" "-"] name; cleanName = name: lib.replaceStrings ["/" ":"] ["-" "-"] name;
fetchbower = name: version: target: outputHash: stdenv.mkDerivation { fetchbower = name: version: target: outputHash: stdenvNoCC.mkDerivation {
name = "${cleanName name}-${bowerVersion version}"; name = "${cleanName name}-${bowerVersion version}";
SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
buildCommand = '' buildCommand = ''
@ -23,7 +23,7 @@ let
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
inherit outputHash; inherit outputHash;
buildInputs = [ bower2nix ]; nativeBuildInputs = [ bower2nix ];
}; };
in fetchbower in fetchbower

6
pkgs/build-support/fetchbzr/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, bazaar }: { stdenvNoCC, bazaar }:
{ url, rev, sha256 }: { url, rev, sha256 }:
stdenv.mkDerivation { stdenvNoCC.mkDerivation {
name = "bzr-export"; name = "bzr-export";
builder = ./builder.sh; builder = ./builder.sh;
buildInputs = [ bazaar ]; nativeBuildInputs = [ bazaar ];
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";

6
pkgs/build-support/fetchcvs/default.nix
View File

@ -3,14 +3,14 @@
# tag="<tagname>" (get version by tag name) # tag="<tagname>" (get version by tag name)
# If you don't specify neither one date="NOW" will be used (get latest) # If you don't specify neither one date="NOW" will be used (get latest)
{stdenv, cvs}: {stdenvNoCC, cvs}:
{cvsRoot, module, tag ? null, date ? null, sha256}: {cvsRoot, module, tag ? null, date ? null, sha256}:
stdenv.mkDerivation { stdenvNoCC.mkDerivation {
name = "cvs-export"; name = "cvs-export";
builder = ./builder.sh; builder = ./builder.sh;
buildInputs = [cvs]; nativeBuildInputs = [cvs];
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";

6
pkgs/build-support/fetchdarcs/default.nix
View File

@ -1,15 +1,15 @@
{stdenv, darcs, nix, cacert}: {stdenvNoCC, darcs, nix, cacert}:
{url, rev ? null, context ? null, md5 ? "", sha256 ? ""}: {url, rev ? null, context ? null, md5 ? "", sha256 ? ""}:
if md5 != "" then if md5 != "" then
throw "fetchdarcs does not support md5 anymore, please use sha256" throw "fetchdarcs does not support md5 anymore, please use sha256"
else else
stdenv.mkDerivation { stdenvNoCC.mkDerivation {
name = "fetchdarcs"; name = "fetchdarcs";
NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
builder = ./builder.sh; builder = ./builder.sh;
buildInputs = [darcs]; nativeBuildInputs = [darcs];
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";

8
pkgs/build-support/fetchegg/default.nix
View File

@ -1,16 +1,16 @@
# Fetches a chicken egg from henrietta using `chicken-install -r' # Fetches a chicken egg from henrietta using `chicken-install -r'
# See: http://wiki.call-cc.org/chicken-projects/egg-index-4.html # See: http://wiki.call-cc.org/chicken-projects/egg-index-4.html
{ stdenv, chicken }: { stdenvNoCC, chicken }:
{ name, version, md5 ? "", sha256 ? "" }: { name, version, md5 ? "", sha256 ? "" }:
if md5 != "" then if md5 != "" then
throw "fetchegg does not support md5 anymore, please use sha256" throw "fetchegg does not support md5 anymore, please use sha256"
else else
stdenv.mkDerivation { stdenvNoCC.mkDerivation {
name = "chicken-${name}-export"; name = "chicken-${name}-export";
builder = ./builder.sh; builder = ./builder.sh;
buildInputs = [ chicken ]; nativeBuildInputs = [ chicken ];
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";
@ -20,6 +20,6 @@ stdenv.mkDerivation {
eggName = name; eggName = name;
impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars;
} }

2
pkgs/build-support/fetchfossil/default.nix
View File

@ -5,7 +5,7 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "fossil-archive" + (if name != null then "-${name}" else ""); name = "fossil-archive" + (if name != null then "-${name}" else "");
builder = ./builder.sh; builder = ./builder.sh;
buildInputs = [fossil]; nativeBuildInputs = [fossil];
# Envvar docs are hard to find. A link for the future: # Envvar docs are hard to find. A link for the future:
# https://www.fossil-scm.org/index.html/doc/trunk/www/env-opts.md # https://www.fossil-scm.org/index.html/doc/trunk/www/env-opts.md

10
pkgs/build-support/fetchgit/default.nix
View File

@ -1,6 +1,6 @@
{stdenv, git, cacert}: let {stdenvNoCC, git, cacert}: let
urlToName = url: rev: let urlToName = url: rev: let
inherit (stdenv.lib) removeSuffix splitString last; inherit (stdenvNoCC.lib) removeSuffix splitString last;
base = last (splitString ":" (baseNameOf (removeSuffix "/" url))); base = last (splitString ":" (baseNameOf (removeSuffix "/" url)));
matched = builtins.match "(.*).git" base; matched = builtins.match "(.*).git" base;
@ -48,11 +48,11 @@ assert deepClone -> leaveDotGit;
if md5 != "" then if md5 != "" then
throw "fetchgit does not support md5 anymore, please use sha256" throw "fetchgit does not support md5 anymore, please use sha256"
else else
stdenv.mkDerivation { stdenvNoCC.mkDerivation {
inherit name; inherit name;
builder = ./builder.sh; builder = ./builder.sh;
fetcher = "${./nix-prefetch-git}"; # This must be a string to ensure it's called with bash. fetcher = "${./nix-prefetch-git}"; # This must be a string to ensure it's called with bash.
buildInputs = [git]; nativeBuildInputs = [git];
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";
@ -62,7 +62,7 @@ stdenv.mkDerivation {
GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars ++ [ impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars ++ [
"GIT_PROXY_COMMAND" "SOCKS_SERVER" "GIT_PROXY_COMMAND" "SOCKS_SERVER"
]; ];

2
pkgs/build-support/fetchgit/private.nix
View File

@ -17,7 +17,7 @@
in builtins.toString sshConfigFile}''; in builtins.toString sshConfigFile}'';
ssh-wrapped = runCommand "fetchgit-ssh" { ssh-wrapped = runCommand "fetchgit-ssh" {
buildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
} '' } ''
mkdir -p $out/bin mkdir -p $out/bin
makeWrapper ${openssh}/bin/ssh $out/bin/ssh --prefix PATH : "$out/bin" --add-flags "-F ${config}" "$@" makeWrapper ${openssh}/bin/ssh $out/bin/ssh --prefix PATH : "$out/bin" --add-flags "-F ${config}" "$@"

6
pkgs/build-support/fetchgx/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, gx, gx-go, go, cacert }: { stdenvNoCC, gx, gx-go, go, cacert }:
{ name, src, sha256 }: { name, src, sha256 }:
stdenv.mkDerivation { stdenvNoCC.mkDerivation {
name = "${name}-gxdeps"; name = "${name}-gxdeps";
inherit src; inherit src;
buildInputs = [ go gx gx-go ]; nativeBuildInputs = [ go gx gx-go ];
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";

8
pkgs/build-support/fetchhg/default.nix
View File

@ -1,15 +1,15 @@
{stdenv, mercurial, nix}: {name ? null, url, rev ? null, md5 ? null, sha256 ? null, fetchSubrepos ? false}: {stdenvNoCC, mercurial, nix}: {name ? null, url, rev ? null, md5 ? null, sha256 ? null, fetchSubrepos ? false}:
if md5 != null then if md5 != null then
throw "fetchhg does not support md5 anymore, please use sha256" throw "fetchhg does not support md5 anymore, please use sha256"
else else
# TODO: statically check if mercurial as the https support if the url starts woth https. # TODO: statically check if mercurial as the https support if the url starts woth https.
stdenv.mkDerivation { stdenvNoCC.mkDerivation {
name = "hg-archive" + (if name != null then "-${name}" else ""); name = "hg-archive" + (if name != null then "-${name}" else "");
builder = ./builder.sh; builder = ./builder.sh;
buildInputs = [mercurial]; nativeBuildInputs = [mercurial];
impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars;
subrepoClause = if fetchSubrepos then "S" else ""; subrepoClause = if fetchSubrepos then "S" else "";

2
pkgs/build-support/fetchipfs/default.nix
View File

@ -28,7 +28,7 @@ in
if (!hasHash) then throw "Specify sha for fetchipfs fixed-output derivation" else stdenv.mkDerivation { if (!hasHash) then throw "Specify sha for fetchipfs fixed-output derivation" else stdenv.mkDerivation {
name = ipfs; name = ipfs;
builder = ./builder.sh; builder = ./builder.sh;
buildInputs = [ curl ]; nativeBuildInputs = [ curl ];
# New-style output content requirements. # New-style output content requirements.
outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else

6
pkgs/build-support/fetchmtn/default.nix
View File

@ -1,5 +1,5 @@
# You can specify some extra mirrors and a cache DB via options # You can specify some extra mirrors and a cache DB via options
{stdenv, monotone, defaultDBMirrors ? [], cacheDB ? "./mtn-checkout.db"}: {stdenvNoCC, monotone, defaultDBMirrors ? [], cacheDB ? "./mtn-checkout.db"}:
# dbs is a list of strings # dbs is a list of strings
# each is an url for sync # each is an url for sync
@ -8,7 +8,7 @@
{name ? "mtn-checkout", dbs ? [], sha256 {name ? "mtn-checkout", dbs ? [], sha256
, selector ? "h:" + branch, branch}: , selector ? "h:" + branch, branch}:
stdenv.mkDerivation { stdenvNoCC.mkDerivation {
builder = ./builder.sh; builder = ./builder.sh;
nativeBuildInputs = [monotone]; nativeBuildInputs = [monotone];
@ -19,7 +19,7 @@ stdenv.mkDerivation {
dbs = defaultDBMirrors ++ dbs; dbs = defaultDBMirrors ++ dbs;
inherit branch cacheDB name selector; inherit branch cacheDB name selector;
impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars;
} }

2
pkgs/build-support/fetchnuget/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, buildDotnetPackage, unzip }: { stdenvNoCC, fetchurl, buildDotnetPackage, unzip }:
attrs @ attrs @
{ baseName { baseName

8
pkgs/build-support/fetchrepoproject/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, gitRepo, cacert, copyPathsToStore }: { stdenvNoCC, gitRepo, cacert, copyPathsToStore }:
{ name, manifest, rev ? "HEAD", sha256 { name, manifest, rev ? "HEAD", sha256
# Optional parameters: # Optional parameters:
@ -9,7 +9,7 @@
assert repoRepoRev != "" -> repoRepoURL != ""; assert repoRepoRev != "" -> repoRepoURL != "";
assert createMirror -> !useArchive; assert createMirror -> !useArchive;
with stdenv.lib; with stdenvNoCC.lib;
let let
extraRepoInitFlags = [ extraRepoInitFlags = [
@ -28,7 +28,7 @@ let
local_manifests = copyPathsToStore localManifests; local_manifests = copyPathsToStore localManifests;
in stdenv.mkDerivation { in stdenvNoCC.mkDerivation {
inherit name; inherit name;
inherit cacert manifest rev repoRepoURL repoRepoRev referenceDir; # TODO inherit cacert manifest rev repoRepoURL repoRepoRev referenceDir; # TODO
@ -44,7 +44,7 @@ in stdenv.mkDerivation {
"GIT_PROXY_COMMAND" "SOCKS_SERVER" "GIT_PROXY_COMMAND" "SOCKS_SERVER"
]; ];
buildInputs = [ gitRepo cacert ]; nativeBuildInputs = [ gitRepo cacert ];
GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";

6
pkgs/build-support/fetchs3/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, runCommand, awscli }: { stdenvNoCC, runCommand, awscli }:
{ s3url { s3url
, sha256 , sha256
@ -10,13 +10,13 @@
}: }:
let let
credentialAttrs = stdenv.lib.optionalAttrs (credentials != null) { credentialAttrs = stdenvNoCC.lib.optionalAttrs (credentials != null) {
AWS_ACCESS_KEY_ID = credentials.access_key_id; AWS_ACCESS_KEY_ID = credentials.access_key_id;
AWS_SECRET_ACCESS_KEY = credentials.secret_access_key; AWS_SECRET_ACCESS_KEY = credentials.secret_access_key;
AWS_SESSION_TOKEN = credentials.session_token ? null; AWS_SESSION_TOKEN = credentials.session_token ? null;
}; };
in runCommand "foo" ({ in runCommand "foo" ({
buildInputs = [ awscli ]; nativeBuildInputs = [ awscli ];
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHash = sha256; outputHash = sha256;
outputHashMode = if recursiveHash then "recursive" else "flat"; outputHashMode = if recursiveHash then "recursive" else "flat";

10
pkgs/build-support/fetchsvn/default.nix
View File

@ -1,9 +1,9 @@
{stdenv, subversion, glibcLocales, sshSupport ? false, openssh ? null}: {stdenvNoCC, subversion, glibcLocales, sshSupport ? false, openssh ? null}:
{url, rev ? "HEAD", md5 ? "", sha256 ? "", {url, rev ? "HEAD", md5 ? "", sha256 ? "",
ignoreExternals ? false, ignoreKeywords ? false, name ? null}: ignoreExternals ? false, ignoreKeywords ? false, name ? null}:
let let
repoName = with stdenv.lib; repoName = with stdenvNoCC.lib;
let let
fst = head; fst = head;
snd = l: head (tail l); snd = l: head (tail l);
@ -28,10 +28,10 @@ in
if md5 != "" then if md5 != "" then
throw "fetchsvn does not support md5 anymore, please use sha256" throw "fetchsvn does not support md5 anymore, please use sha256"
else else
stdenv.mkDerivation { stdenvNoCC.mkDerivation {
name = name_; name = name_;
builder = ./builder.sh; builder = ./builder.sh;
buildInputs = [ subversion glibcLocales ]; nativeBuildInputs = [ subversion glibcLocales ];
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";
@ -39,6 +39,6 @@ stdenv.mkDerivation {
inherit url rev sshSupport openssh ignoreExternals ignoreKeywords; inherit url rev sshSupport openssh ignoreExternals ignoreKeywords;
impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars;
preferLocalBuild = true; preferLocalBuild = true;
} }

6
pkgs/build-support/fetchsvnssh/default.nix
View File

@ -1,14 +1,14 @@
{stdenv, subversion, sshSupport ? false, openssh ? null, expect}: {stdenvNoCC, subversion, sshSupport ? false, openssh ? null, expect}:
{username, password, url, rev ? "HEAD", md5 ? "", sha256 ? ""}: {username, password, url, rev ? "HEAD", md5 ? "", sha256 ? ""}:
if md5 != "" then if md5 != "" then
throw "fetchsvnssh does not support md5 anymore, please use sha256" throw "fetchsvnssh does not support md5 anymore, please use sha256"
else else
stdenv.mkDerivation { stdenvNoCC.mkDerivation {
name = "svn-export-ssh"; name = "svn-export-ssh";
builder = ./builder.sh; builder = ./builder.sh;
buildInputs = [subversion expect]; nativeBuildInputs = [subversion expect];
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";

12
pkgs/build-support/fetchurl/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, curl }: # Note that `curl' may be `null', in case of the native stdenv. { stdenvNoCC, curl }: # Note that `curl' may be `null', in case of the native stdenvNoCC.
let let
@ -10,7 +10,7 @@ let
# resulting store derivations (.drv files) much smaller, which in # resulting store derivations (.drv files) much smaller, which in
# turn makes nix-env/nix-instantiate faster. # turn makes nix-env/nix-instantiate faster.
mirrorsFile = mirrorsFile =
stdenv.mkDerivation ({ stdenvNoCC.mkDerivation ({
name = "mirrors-list"; name = "mirrors-list";
builder = ./write-mirror-list.sh; builder = ./write-mirror-list.sh;
preferLocalBuild = true; preferLocalBuild = true;
@ -20,7 +20,7 @@ let
# "gnu", etc.). # "gnu", etc.).
sites = builtins.attrNames mirrors; sites = builtins.attrNames mirrors;
impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars ++ [ impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars ++ [
# This variable allows the user to pass additional options to curl # This variable allows the user to pass additional options to curl
"NIX_CURL_FLAGS" "NIX_CURL_FLAGS"
@ -103,8 +103,8 @@ let
in in
if md5 != "" then throw "fetchurl does not support md5 anymore, please use sha256 or sha512" if md5 != "" then throw "fetchurl does not support md5 anymore, please use sha256 or sha512"
else if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${stdenv.lib.concatStringsSep ", " urls_}" else if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${stdenvNoCC.lib.concatStringsSep ", " urls_}"
else stdenv.mkDerivation { else stdenvNoCC.mkDerivation {
name = name =
if showURLs then "urls" if showURLs then "urls"
else if name != "" then name else if name != "" then name
@ -112,7 +112,7 @@ else stdenv.mkDerivation {
builder = ./builder.sh; builder = ./builder.sh;
buildInputs = [ curl ]; nativeBuildInputs = [ curl ];
urls = urls_; urls = urls_;

2
pkgs/build-support/rust/fetchcargo.nix
View File

@ -2,7 +2,7 @@
{ name ? "cargo-deps", src, srcs, sourceRoot, sha256, cargoUpdateHook ? "" }: { name ? "cargo-deps", src, srcs, sourceRoot, sha256, cargoUpdateHook ? "" }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "${name}-vendor"; name = "${name}-vendor";
buildInputs = [ cacert cargoVendor git rust.cargo ]; nativeBuildInputs = [ cacert cargoVendor git rust.cargo ];
inherit src srcs sourceRoot; inherit src srcs sourceRoot;
phases = "unpackPhase installPhase"; phases = "unpackPhase installPhase";

2
pkgs/data/fonts/clearlyU/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1xn14jbv3m1khy7ydvad9ydkn7yygdbhjy9wm1v000jzjwr3lv21"; sha256 = "1xn14jbv3m1khy7ydvad9ydkn7yygdbhjy9wm1v000jzjwr3lv21";
}; };
buildInputs = [ mkfontdir mkfontscale ]; nativeBuildInputs = [ mkfontdir mkfontscale ];
installPhase = installPhase =
'' ''

2
pkgs/data/fonts/corefonts/default.nix
View File

@ -32,7 +32,7 @@ stdenv.mkDerivation {
inherit sha256; inherit sha256;
}) fonts; }) fonts;
buildInputs = [cabextract]; nativeBuildInputs = [cabextract];
buildCommand = '' buildCommand = ''
for i in $exes; do for i in $exes; do

2
pkgs/data/fonts/dejavu-fonts/default.nix
View File

@ -25,7 +25,7 @@ let
full-ttf = stdenv.mkDerivation { full-ttf = stdenv.mkDerivation {
name = "dejavu-fonts-full-${version}"; name = "dejavu-fonts-full-${version}";
buildInputs = [fontforge perl FontTTF]; nativeBuildInputs = [fontforge perl FontTTF];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dejavu-fonts"; owner = "dejavu-fonts";

2
pkgs/data/fonts/dina-pcf/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1kq86lbxxgik82aywwhawmj80vsbz3hfhdyhicnlv9km7yjvnl8z"; sha256 = "1kq86lbxxgik82aywwhawmj80vsbz3hfhdyhicnlv9km7yjvnl8z";
}; };
buildInputs = [ unzip bdftopcf mkfontdir mkfontscale ]; nativeBuildInputs = [ unzip bdftopcf mkfontdir mkfontscale ];
dontBuild = true; dontBuild = true;
patchPhase = "sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf"; patchPhase = "sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf";

2
pkgs/data/fonts/envypn-font/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "bda67b6bc6d5d871a4d46565d4126729dfb8a0de9611dae6c68132a7b7db1270"; sha256 = "bda67b6bc6d5d871a4d46565d4126729dfb8a0de9611dae6c68132a7b7db1270";
}; };
buildInputs = [ mkfontdir mkfontscale ]; nativeBuildInputs = [ mkfontdir mkfontscale ];
unpackPhase = '' unpackPhase = ''
tar -xzf $src --strip-components=1 tar -xzf $src --strip-components=1

2
pkgs/data/fonts/gohufont/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0rqqavhqbs7pajcblg92mjlz2dxk8b60vgdh271axz7kjs2wf9mr"; sha256 = "0rqqavhqbs7pajcblg92mjlz2dxk8b60vgdh271axz7kjs2wf9mr";
}; };
buildInputs = [ mkfontdir mkfontscale bdf2psf ]; nativeBuildInputs = [ mkfontdir mkfontscale bdf2psf ];
unpackPhase = '' unpackPhase = ''
mkdir pcf bdf mkdir pcf bdf

2
pkgs/data/fonts/inconsolata/lgc.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0dqjj3mlc28s8ljnph6l086b4j9r5dly4fldq59crycwys72zzai"; sha256 = "0dqjj3mlc28s8ljnph6l086b4j9r5dly4fldq59crycwys72zzai";
}; };
buildInputs = [ fontforge ]; nativeBuildInputs = [ fontforge ];
installPhase = '' installPhase = ''
mkdir -p $out/share/fonts/truetype mkdir -p $out/share/fonts/truetype

2
pkgs/data/fonts/kochi-substitute/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation {
sha256 = "91ce6c993a3a0f77ed85db76f62ce18632b4c0cbd8f864676359a17ae5e6fa3c"; sha256 = "91ce6c993a3a0f77ed85db76f62ce18632b4c0cbd8f864676359a17ae5e6fa3c";
}; };
buildInputs = [ dpkg ]; nativeBuildInputs = [ dpkg ];
unpackCmd = '' unpackCmd = ''
dpkg-deb --fsys-tarfile $src | tar xf - ./usr/share/fonts/truetype/kochi/kochi-gothic-subst.ttf dpkg-deb --fsys-tarfile $src | tar xf - ./usr/share/fonts/truetype/kochi/kochi-gothic-subst.ttf

2
pkgs/data/fonts/league-of-moveable-type/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
srcs = fonts; srcs = fonts;
buildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];
sourceRoot = "."; sourceRoot = ".";
installPhase = '' installPhase = ''

2
pkgs/data/fonts/meslo-lg/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sha256="0lnbkrvcpgz9chnvix79j6fiz36wj6n46brb7b1746182rl1l875"; sha256="0lnbkrvcpgz9chnvix79j6fiz36wj6n46brb7b1746182rl1l875";
}; };
buildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];
sourceRoot = "."; sourceRoot = ".";

2
pkgs/data/fonts/nafees/default.nix
View File

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
}) })
]; ];
buildInputs = [unzip]; nativeBuildInputs = [unzip];
sourceRoot = "."; sourceRoot = ".";

2
pkgs/data/fonts/poly/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "1chzcy3kyi7wpr4iq4aj1v24fq1wwph1v5z96dimlqcrnvm66h2l"; sha256 = "1chzcy3kyi7wpr4iq4aj1v24fq1wwph1v5z96dimlqcrnvm66h2l";
}; };
buildInputs = [unzip]; nativeBuildInputs = [unzip];
sourceRoot = "."; sourceRoot = ".";

2
pkgs/data/fonts/proggyfonts/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1plcm1sjpa3hdqhhin48fq6zmz3ndm4md72916hd8ff0w6596q0n"; sha256 = "1plcm1sjpa3hdqhhin48fq6zmz3ndm4md72916hd8ff0w6596q0n";
}; };
buildInputs = [ mkfontdir mkfontscale ]; nativeBuildInputs = [ mkfontdir mkfontscale ];
installPhase = installPhase =
'' ''

12
pkgs/data/fonts/redhat-liberation-fonts/default.nix
View File

@ -4,14 +4,14 @@ let
inherit (python2.pkgs) fonttools; inherit (python2.pkgs) fonttools;
common = common =
{version, url, sha256, buildInputs, postPatch ? null, outputHash}: {version, url, sha256, nativeBuildInputs, postPatch ? null, outputHash}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "liberation-fonts-${version}"; name = "liberation-fonts-${version}";
src = fetchurl { src = fetchurl {
inherit url sha256; inherit url sha256;
}; };
inherit buildInputs postPatch; inherit nativeBuildInputs postPatch;
installPhase = '' installPhase = ''
mkdir -p $out/share/fonts/truetype mkdir -p $out/share/fonts/truetype
@ -53,21 +53,21 @@ in {
version = "1.07.4"; version = "1.07.4";
url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz"; url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz";
sha256 = "01jlg88q2s6by7qv6fmnrlx0lwjarrjrpxv811zjz6f2im4vg65d"; sha256 = "01jlg88q2s6by7qv6fmnrlx0lwjarrjrpxv811zjz6f2im4vg65d";
buildInputs = [ fontforge ]; nativeBuildInputs = [ fontforge ];
outputHash = "1q102rmg4004p74f8m4y8a6iklmnva0q39sq260jsq3lhcfypg7p"; outputHash = "1q102rmg4004p74f8m4y8a6iklmnva0q39sq260jsq3lhcfypg7p";
}; };
liberation_ttf_v1_binary = common rec { liberation_ttf_v1_binary = common rec {
version = "1.07.4"; version = "1.07.4";
url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz"; url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";
sha256 = "0p7frz29pmjlk2d0j2zs5kfspygwdnpzxkb2hwzcfhrafjvf59v1"; sha256 = "0p7frz29pmjlk2d0j2zs5kfspygwdnpzxkb2hwzcfhrafjvf59v1";
buildInputs = [ ]; nativeBuildInputs = [ ];
outputHash = "12gwb9b4ij9d93ky4c9ykgp03fqr62axy37pds88q7y6zgciwkab"; outputHash = "12gwb9b4ij9d93ky4c9ykgp03fqr62axy37pds88q7y6zgciwkab";
}; };
liberation_ttf_v2_from_source = common rec { liberation_ttf_v2_from_source = common rec {
version = "2.00.1"; version = "2.00.1";
url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz"; url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz";
sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs"; sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs";
buildInputs = [ fontforge fonttools ]; nativeBuildInputs = [ fontforge fonttools ];
postPatch = '' postPatch = ''
substituteInPlace scripts/setisFixedPitch-fonttools.py --replace \ substituteInPlace scripts/setisFixedPitch-fonttools.py --replace \
'font = ttLib.TTFont(fontfile)' \ 'font = ttLib.TTFont(fontfile)' \
@ -79,7 +79,7 @@ in {
version = "2.00.1"; version = "2.00.1";
url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz"; url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";
sha256 = "010m4zfqan4w04b6bs9pm3gapn9hsb18bmwwgp2p6y6idj52g43q"; sha256 = "010m4zfqan4w04b6bs9pm3gapn9hsb18bmwwgp2p6y6idj52g43q";
buildInputs = [ ]; nativeBuildInputs = [ ];
outputHash = "19jky9li345zsig9pcb0rnlsjqqclh7r60vbi4pwh16f14850gpk"; outputHash = "19jky9li345zsig9pcb0rnlsjqqclh7r60vbi4pwh16f14850gpk";
}; };
} }

4
pkgs/data/fonts/tempora-lgc/default.nix
View File

@ -18,12 +18,12 @@ let
sha256 = "0iwa8wyydcpjss6d1jy4jibqxpvzph4vmaxwwmndpsqy1fz64y9i"; sha256 = "0iwa8wyydcpjss6d1jy4jibqxpvzph4vmaxwwmndpsqy1fz64y9i";
}) })
]; ];
buildInputs = [ nativeBuildInputs = [
]; ];
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "tempora-lgc"; name = "tempora-lgc";
inherit buildInputs; inherit nativeBuildInputs;
inherit srcs; inherit srcs;
phases = "installPhase"; phases = "installPhase";
installPhase = '' installPhase = ''

2
pkgs/data/fonts/tewi/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0c7k847cp68w20frzsdknpss2cwv3lp970asyybv65jxyl2jz3iq"; sha256 = "0c7k847cp68w20frzsdknpss2cwv3lp970asyybv65jxyl2jz3iq";
}; };
buildInputs = [ bdftopcf mkfontdir mkfontscale ]; nativeBuildInputs = [ bdftopcf mkfontdir mkfontscale ];
buildPhase = '' buildPhase = ''
for i in *.bdf; do for i in *.bdf; do
bdftopcf -o ''${i/bdf/pcf} $i bdftopcf -o ''${i/bdf/pcf} $i

2
pkgs/data/fonts/ucs-fonts/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
sourceRoot = "."; sourceRoot = ".";
buildInputs = [ mkfontdir mkfontscale ]; nativeBuildInputs = [ mkfontdir mkfontscale ];
phases = [ "unpackPhase" "installPhase" ]; phases = [ "unpackPhase" "installPhase" ];

2
pkgs/data/fonts/uni-vga/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "05sns8h5yspa7xkl81ri7y1yxf5icgsnl497f3xnaryhx11s2rv6"; sha256 = "05sns8h5yspa7xkl81ri7y1yxf5icgsnl497f3xnaryhx11s2rv6";
}; };
buildInputs = [ mkfontdir mkfontscale ]; nativeBuildInputs = [ mkfontdir mkfontscale ];
installPhase = '' installPhase = ''
mkdir -p $out/share/fonts mkdir -p $out/share/fonts

2
pkgs/data/fonts/unifont/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0ypkmwyfrsnag69h1c0mx89ranz4f6jc9y1sqkpq2rbzg64maik0"; sha256 = "0ypkmwyfrsnag69h1c0mx89ranz4f6jc9y1sqkpq2rbzg64maik0";
}; };
buildInputs = [ mkfontscale mkfontdir ]; nativeBuildInputs = [ mkfontscale mkfontdir ];
phases = "installPhase"; phases = "installPhase";

1
pkgs/data/fonts/unscii/default.nix
View File

@ -8,7 +8,6 @@ stdenv.mkDerivation rec {
url = "http://pelulamu.net/${pname}/${name}-src.tar.gz"; url = "http://pelulamu.net/${pname}/${name}-src.tar.gz";
sha256 = "0qcxcnqz2nlwfzlrn115kkp3n8dd7593h762vxs6vfqm13i39lq1"; sha256 = "0qcxcnqz2nlwfzlrn115kkp3n8dd7593h762vxs6vfqm13i39lq1";
}; };
buildInputs = [];
nativeBuildInputs = [perl bdftopcf perlPackages.TextCharWidth fontforge nativeBuildInputs = [perl bdftopcf perlPackages.TextCharWidth fontforge
SDL SDL_image]; SDL SDL_image];
preConfigure = '' preConfigure = ''

2
pkgs/games/factorio/fetch.nix
View File

@ -18,7 +18,7 @@
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
buildInputs = [ curl xidel ]; nativeBuildInputs = [ curl xidel ];
inherit name url loginUrl username password cacert; inherit name url loginUrl username password cacert;

2
pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
View File

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
# traffic, so don't do that. # traffic, so don't do that.
preferLocalBuild = true; preferLocalBuild = true;
buildInputs = [ git gnupg ]; nativeBuildInputs = [ git gnupg ];
NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
} '' } ''
git init src && ( git init src && (

2
pkgs/servers/xmpp/ejabberd/default.nix
View File

@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
configureFlags = [ "--enable-all" "--with-sqlite3=${sqlite.dev}" ]; configureFlags = [ "--enable-all" "--with-sqlite3=${sqlite.dev}" ];
buildInputs = [ git erlang openssl expat libyaml sqlite pam zlib elixir ]; nativeBuildInputs = [ git erlang openssl expat libyaml sqlite pam zlib elixir ];
GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";

4
pkgs/stdenv/darwin/default.nix
View File

@ -118,8 +118,8 @@ in rec {
initialPath = [ bootstrapTools ]; initialPath = [ bootstrapTools ];
fetchurlBoot = import ../../build-support/fetchurl { fetchurlBoot = import ../../build-support/fetchurl {
stdenv = stage0.stdenv; stdenvNoCC = stage0.stdenv;
curl = bootstrapTools; curl = bootstrapTools;
}; };
# The stdenvs themselves don't use mkDerivation, so I need to specify this here # The stdenvs themselves don't use mkDerivation, so I need to specify this here

4
pkgs/top-level/all-packages.nix
View File

@ -180,10 +180,10 @@ with pkgs;
# `fetchurl' downloads a file from the network. # `fetchurl' downloads a file from the network.
fetchurl = import ../build-support/fetchurl { fetchurl = import ../build-support/fetchurl {
inherit stdenv; inherit stdenvNoCC;
# On darwin, libkrb5 needs bootstrap_cmds which would require # On darwin, libkrb5 needs bootstrap_cmds which would require
# converting many packages to fetchurl_boot to avoid evaluation cycles. # converting many packages to fetchurl_boot to avoid evaluation cycles.
curl = curl.override (lib.optionalAttrs stdenv.isDarwin { gssSupport = false; }); curl = buildPackages.curl.override (lib.optionalAttrs stdenv.isDarwin { gssSupport = false; });
}; };
fetchRepoProject = callPackage ../build-support/fetchrepoproject { }; fetchRepoProject = callPackage ../build-support/fetchrepoproject { };