From 2890a38652fc6c4904856fde5bd4224ff2018827 Mon Sep 17 00:00:00 2001 From: Kevin Rauwolf Date: Tue, 29 Jan 2019 20:29:18 -0800 Subject: Use nativeBuildInputs for building Docker images --- pkgs/build-support/docker/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'pkgs/build-support') diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 83ff846db7ab..81a8e2a8d932 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -68,7 +68,7 @@ rec { # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash. # And we cannot untar it, because then we cannot preserve permissions ecc. tarsum = runCommand "tarsum" { - buildInputs = [ go ]; + nativeBuildInputs = [ go ]; } '' mkdir tarsum cd tarsum @@ -157,7 +157,7 @@ rec { }; inherit fromImage fromImageName fromImageTag; - buildInputs = [ utillinux e2fsprogs jshon rsync jq ]; + nativeBuildInputs = [ utillinux e2fsprogs jshon rsync jq ]; } '' rm -rf $out @@ -282,7 +282,7 @@ rec { runCommand "${name}-granular-docker-layers" { inherit maxLayers; paths = referencesByPopularity closure; - buildInputs = [ jshon rsync tarsum ]; + nativeBuildInputs = [ jshon rsync tarsum ]; enableParallelBuilding = true; } '' @@ -320,7 +320,7 @@ rec { uid ? 0, gid ? 0, }: runCommand "${name}-customisation-layer" { - buildInputs = [ jshon rsync tarsum ]; + nativeBuildInputs = [ jshon rsync tarsum ]; inherit extraCommands; } '' @@ -365,7 +365,7 @@ rec { }: runCommand "docker-layer-${name}" { inherit baseJson contents extraCommands; - buildInputs = [ jshon rsync tarsum ]; + nativeBuildInputs = [ jshon rsync tarsum ]; } '' mkdir layer @@ -520,7 +520,7 @@ rec { os = "linux"; }); impure = runCommand "${baseName}-standard-dynamic-date.json" - { buildInputs = [ jq ]; } + { nativeBuildInputs = [ jq ]; } '' jq ".created = \"$(TZ=utc date --iso-8601="seconds")\"" ${pure} > $out ''; @@ -541,7 +541,7 @@ rec { inherit uid gid extraCommands; }; result = runCommand "docker-image-${baseName}.tar.gz" { - buildInputs = [ jshon pigz coreutils findutils jq ]; + nativeBuildInputs = [ jshon pigz coreutils findutils jq ]; # Image name and tag must be lowercase imageName = lib.toLower name; baseJson = configJson; @@ -638,7 +638,7 @@ rec { os = "linux"; }); impure = runCommand "${baseName}-config.json" - { buildInputs = [ jq ]; } + { nativeBuildInputs = [ jq ]; } '' jq ".created = \"$(TZ=utc date --iso-8601="seconds")\"" ${pure} > $out ''; @@ -656,7 +656,7 @@ rec { extraCommands; }; result = runCommand "docker-image-${baseName}.tar.gz" { - buildInputs = [ jshon pigz coreutils findutils jq ]; + nativeBuildInputs = [ jshon pigz coreutils findutils jq ]; # Image name and tag must be lowercase imageName = lib.toLower name; imageTag = if tag == null then "" else lib.toLower tag; -- cgit 1.4.1 From 61f8332a02adb56eabed30cbf6587e0deb15b00d Mon Sep 17 00:00:00 2001 From: Corey O'Connor Date: Sun, 21 Apr 2019 11:10:31 -0700 Subject: appimage build-support: add xorg.xcbutil* --- pkgs/build-support/appimage/default.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'pkgs/build-support') diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 6db626464fb7..48dccfe771c3 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -133,6 +133,11 @@ rec { xorg.libXt xorg.libXmu xorg.libxcb + xorg.xcbutil + xorg.xcbutilwm + xorg.xcbutilimage + xorg.xcbutilkeysyms + xorg.xcbutilrenderutil libGLU libuuid libogg -- cgit 1.4.1 From c0eaf5e917a2bdc8bcdf4cc8dcea2907f6f76016 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 8 Jun 2019 23:25:47 -0500 Subject: mirrors: rename sourceforgejp to osdn SourceForge.jp renamed to OSDN on May 11, 2015. https://osdn.net/projects/sourceforge/news/24923 --- pkgs/build-support/fetchurl/mirrors.nix | 4 ++-- pkgs/data/fonts/hanazono/default.nix | 2 +- pkgs/data/fonts/kochi-substitute-naga10/default.nix | 2 +- pkgs/data/fonts/migmix/default.nix | 8 ++++---- pkgs/data/fonts/migu/default.nix | 8 ++++---- pkgs/data/fonts/mplus-outline-fonts/default.nix | 2 +- pkgs/tools/text/nkf/default.nix | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) (limited to 'pkgs/build-support') diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 404cea7532bf..664e4d67723e 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -19,8 +19,8 @@ rec { https://kent.dl.sourceforge.net/sourceforge/ ]; - # SourceForge.jp. - sourceforgejp = [ + # OSDN (formerly SourceForge.jp). + osdn = [ https://osdn.dl.sourceforge.jp/ https://jaist.dl.sourceforge.jp/ ]; diff --git a/pkgs/data/fonts/hanazono/default.nix b/pkgs/data/fonts/hanazono/default.nix index cc219b74179d..29c982ed8aea 100644 --- a/pkgs/data/fonts/hanazono/default.nix +++ b/pkgs/data/fonts/hanazono/default.nix @@ -5,7 +5,7 @@ let in fetchzip { name = "hanazono-${version}"; - url = "mirror://sourceforgejp/hanazono-font/68253/hanazono-${version}.zip"; + url = "mirror://osdn/hanazono-font/68253/hanazono-${version}.zip"; postFetch = '' mkdir -p $out/share/{doc,fonts} diff --git a/pkgs/data/fonts/kochi-substitute-naga10/default.nix b/pkgs/data/fonts/kochi-substitute-naga10/default.nix index cc2ec0d641f8..515f6efd725d 100644 --- a/pkgs/data/fonts/kochi-substitute-naga10/default.nix +++ b/pkgs/data/fonts/kochi-substitute-naga10/default.nix @@ -5,7 +5,7 @@ in fetchzip { name = "kochi-substitute-naga10-${version}"; - url = "mirror://sourceforgejp/efont/5411/kochi-substitute-${version}.tar.bz2"; + url = "mirror://osdn/efont/5411/kochi-substitute-${version}.tar.bz2"; postFetch = '' tar -xjf $downloadedFile --strip-components=1 diff --git a/pkgs/data/fonts/migmix/default.nix b/pkgs/data/fonts/migmix/default.nix index 986751645e3c..9507819fe497 100644 --- a/pkgs/data/fonts/migmix/default.nix +++ b/pkgs/data/fonts/migmix/default.nix @@ -6,19 +6,19 @@ stdenv.mkDerivation rec { srcs = [ (fetchzip { - url = "mirror://sourceforgejp/mix-mplus-ipa/63544/migmix-1p-${version}.zip"; + url = "mirror://osdn/mix-mplus-ipa/63544/migmix-1p-${version}.zip"; sha256 = "0wp44axcalaak04nj3dgpx0vk13nqa3ihx2vjv4acsgv83x8ciph"; }) (fetchzip { - url = "mirror://sourceforgejp/mix-mplus-ipa/63544/migmix-2p-${version}.zip"; + url = "mirror://osdn/mix-mplus-ipa/63544/migmix-2p-${version}.zip"; sha256 = "0y7s3rbxrp5bv56qgihk8b847lqgibfhn2wlkzx7z655fbzdgxw9"; }) (fetchzip { - url = "mirror://sourceforgejp/mix-mplus-ipa/63544/migmix-1m-${version}.zip"; + url = "mirror://osdn/mix-mplus-ipa/63544/migmix-1m-${version}.zip"; sha256 = "1sfym0chy8ilyd9sr3mjc0bf63vc33p05ynpdc11miivxn4qsshx"; }) (fetchzip { - url = "mirror://sourceforgejp/mix-mplus-ipa/63544/migmix-2m-${version}.zip"; + url = "mirror://osdn/mix-mplus-ipa/63544/migmix-2m-${version}.zip"; sha256 = "0hg04rvm39fh4my4akmv4rhfc14s3ipz2aw718h505k9hppkhkch"; }) ]; diff --git a/pkgs/data/fonts/migu/default.nix b/pkgs/data/fonts/migu/default.nix index 3b03460125fa..57fbf1a830fc 100644 --- a/pkgs/data/fonts/migu/default.nix +++ b/pkgs/data/fonts/migu/default.nix @@ -6,19 +6,19 @@ stdenv.mkDerivation rec { srcs = [ (fetchzip { - url = "mirror://sourceforgejp/mix-mplus-ipa/63545/migu-1p-${version}.zip"; + url = "mirror://osdn/mix-mplus-ipa/63545/migu-1p-${version}.zip"; sha256 = "04wpbk5xbbcv2rzac8yzj4ww7sk2hy2rg8zs96yxc5vzj9q7svf6"; }) (fetchzip { - url = "mirror://sourceforgejp/mix-mplus-ipa/63545/migu-1c-${version}.zip"; + url = "mirror://osdn/mix-mplus-ipa/63545/migu-1c-${version}.zip"; sha256 = "1k7ymix14ac5fb44bjvbaaf24784zzpyc1jj2280c0zdnpxksyk6"; }) (fetchzip { - url = "mirror://sourceforgejp/mix-mplus-ipa/63545/migu-1m-${version}.zip"; + url = "mirror://osdn/mix-mplus-ipa/63545/migu-1m-${version}.zip"; sha256 = "07r8id83v92hym21vrqmfsfxb646v8258001pkjhgfnfg1yvw8lm"; }) (fetchzip { - url = "mirror://sourceforgejp/mix-mplus-ipa/63545/migu-2m-${version}.zip"; + url = "mirror://osdn/mix-mplus-ipa/63545/migu-2m-${version}.zip"; sha256 = "1pvzbrawh43589j8rfxk86y1acjbgzzdy5wllvdkpm1qnx28zwc2"; }) ]; diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/pkgs/data/fonts/mplus-outline-fonts/default.nix index 9be8eea16fbb..b13a4826975b 100644 --- a/pkgs/data/fonts/mplus-outline-fonts/default.nix +++ b/pkgs/data/fonts/mplus-outline-fonts/default.nix @@ -5,7 +5,7 @@ let in fetchzip rec { name = "mplus-${version}"; - url = "mirror://sourceforgejp/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz"; + url = "mirror://osdn/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz"; postFetch = '' tar -xJf $downloadedFile --strip-components=1 diff --git a/pkgs/tools/text/nkf/default.nix b/pkgs/tools/text/nkf/default.nix index ae236cc22263..fd38466ce440 100644 --- a/pkgs/tools/text/nkf/default.nix +++ b/pkgs/tools/text/nkf/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.1.4"; src = fetchurl { - url = "mirror://sourceforgejp/nkf/64158/${name}.tar.gz"; + url = "mirror://osdn/nkf/64158/${name}.tar.gz"; sha256 = "b4175070825deb3e98577186502a8408c05921b0c8ff52e772219f9d2ece89cb"; }; -- cgit 1.4.1 From b2e56ccea079345db158f829bc636120405b84f6 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 8 Jun 2019 23:37:36 -0500 Subject: mirrors: add osdn mirrors --- pkgs/build-support/fetchurl/mirrors.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pkgs/build-support') diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 664e4d67723e..d9e44afb68df 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -21,6 +21,9 @@ rec { # OSDN (formerly SourceForge.jp). osdn = [ + https://osdn.dl.osdn.jp/ + https://osdn.mirror.constant.com/ + https://mirrors.gigenet.com/OSDN/ https://osdn.dl.sourceforge.jp/ https://jaist.dl.sourceforge.jp/ ]; -- cgit 1.4.1