From da6f5e3b77529ad4bc4c2e8ca40792ac8a7af9f9 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Mon, 22 May 2017 23:26:15 +0200 Subject: [PATCH 01/20] gitlab-runner: add patch for shell from v1 to latest version --- .../tools/continuous-integration/gitlab-runner/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index d7f13de1d26..b27ec45ec80 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -32,6 +32,8 @@ buildGoPackage rec { sha256 = "0n8hcj2b1pb95x4bd7fb9ri43vgc4h2dj2v3iiziw2imqjyphfx4"; }; + patches = [ ./v1-fix-shell-path.patch ]; + buildInputs = [ go-bindata ]; preBuild = '' From aea157a1ec0f77186a39645522c02c616d48543c Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Mon, 22 May 2017 23:26:39 +0200 Subject: [PATCH 02/20] gitlab-runner_1_11: 1.11.2 -> 1.11.4 --- .../tools/continuous-integration/gitlab-runner/v1.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix index e0c3854740a..1ef0d41f364 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: let - version = "1.11.2"; + version = "1.11.4"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "08lacd2p7915y7yjnwkj2k0b0x4qj9kc53p7qgvmq8kdi31xnh4z"; + sha256 = "1ijkzn8jkzx1dzxhkf17987ligyf758xzas6ysix5b781jnkdm8z"; }; docker_arm = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "0lzvx3jfy8493q8zkbs7kgm5a3jgsi3f2x25jwg4lx7agcwwsygw"; + sha256 = "0sq2nndnkzqv2yjljg08xwa3ppddn6vqcivhfh43zwwmansvb9ha"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-ci-multi-runner"; rev = "v${version}"; - sha256 = "1sjvlb5981ykc8hr4kp1ibh9jw2wdjjp9zs2nqs9lpsav4nda5fr"; + sha256 = "1pm88546cijmrrcvvrajp2g6rsrzxhy83cwwwky8jjkl5w4hhmz4"; }; patches = [ ./v1-fix-shell-path.patch ]; From 86e714095c4446466fafa47f1a546d0da4410530 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Mon, 22 May 2017 23:26:53 +0200 Subject: [PATCH 03/20] gitlab-runner: 9.1.0 -> 9.2.0 --- .../continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index b27ec45ec80..5b2ddf1f102 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: let - version = "9.1.0"; + version = "9.2.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "1mdcw755fygnf30v0gr13mx20zjqmxg5w2kj3k2jgcsh3gyrvymr"; + sha256 = "0x6pwh3wjq2czvzb8rl8npa8a58snwf1f9dwr6rbbxijaf886jfc"; }; docker_arm = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "1m5p6mlhy3xf0chrjlfpdyp24pv32b61s8iryh6a617i91vpzjg6"; + sha256 = "1y6i5dn1l1qlwyg95qw4sff2y9zypxwmvsw4mb0555vf157h88kg"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-ci-multi-runner"; rev = "v${version}"; - sha256 = "0n8hcj2b1pb95x4bd7fb9ri43vgc4h2dj2v3iiziw2imqjyphfx4"; + sha256 = "0gz6byjnnfn9acy40hcbyzdql4199xn0yvjx2cfjjjzd9kryjrxp"; }; patches = [ ./v1-fix-shell-path.patch ]; From 335865b9437cc5b382ac0498fb1e688569ff77b6 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Tue, 23 May 2017 22:34:22 +0200 Subject: [PATCH 04/20] gitlab-runner, gitlab-runner_1_11: change path fix patch to work on non NixOS It now tries to find the shell via path first and then falls back to the original behavior. --- .../gitlab-runner/default.nix | 2 +- .../gitlab-runner/fix-shell-path.patch | 25 +++++++++++++++++++ .../gitlab-runner/v1-fix-shell-path.patch | 13 ---------- .../gitlab-runner/v1.nix | 2 +- 4 files changed, 27 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch delete mode 100644 pkgs/development/tools/continuous-integration/gitlab-runner/v1-fix-shell-path.patch diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 5b2ddf1f102..a87ea5ae5c7 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -32,7 +32,7 @@ buildGoPackage rec { sha256 = "0gz6byjnnfn9acy40hcbyzdql4199xn0yvjx2cfjjjzd9kryjrxp"; }; - patches = [ ./v1-fix-shell-path.patch ]; + patches = [ ./fix-shell-path.patch ]; buildInputs = [ go-bindata ]; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch b/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch new file mode 100644 index 00000000000..8f71f9ed630 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch @@ -0,0 +1,25 @@ +diff --git a/shells/bash.go b/shells/bash.go +index 839b7781..2b478e1e 100644 +--- a/shells/bash.go ++++ b/shells/bash.go +@@ -7,6 +7,7 @@ import ( + "gitlab.com/gitlab-org/gitlab-ci-multi-runner/common" + "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers" + "io" ++ "os/exec" + "path" + "runtime" + "strconv" +@@ -208,7 +209,11 @@ func (b *BashShell) GetConfiguration(info common.ShellScriptInfo) (script *commo + if info.User != "" { + script.Command = "su" + if runtime.GOOS == "linux" { +- script.Arguments = append(script.Arguments, "-s", "/bin/"+b.Shell) ++ shellPath, err := exec.LookPath(b.Shell) ++ if err != nil { ++ shellPath = "/bin/"+b.Shell ++ } ++ script.Arguments = append(script.Arguments, "-s", shellPath) + } + script.Arguments = append(script.Arguments, info.User) + script.Arguments = append(script.Arguments, "-c", shellCommand) \ No newline at end of file diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/v1-fix-shell-path.patch b/pkgs/development/tools/continuous-integration/gitlab-runner/v1-fix-shell-path.patch deleted file mode 100644 index 612c9a51f28..00000000000 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/v1-fix-shell-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/shells/bash.go b/shells/bash.go -index c9c8b68..c97dbb5 100644 ---- a/shells/bash.go -+++ b/shells/bash.go -@@ -208,7 +208,7 @@ func (b *BashShell) GetConfiguration(info common.ShellScriptInfo) (script *commo - if info.User != "" { - script.Command = "su" - if runtime.GOOS == "linux" { -- script.Arguments = append(script.Arguments, "-s", "/bin/"+b.Shell) -+ script.Arguments = append(script.Arguments, "-s", "/run/current-system/sw/bin/"+b.Shell) - } - script.Arguments = append(script.Arguments, info.User) - script.Arguments = append(script.Arguments, "-c", shellCommand) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix index 1ef0d41f364..d51a3270592 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix @@ -32,7 +32,7 @@ buildGoPackage rec { sha256 = "1pm88546cijmrrcvvrajp2g6rsrzxhy83cwwwky8jjkl5w4hhmz4"; }; - patches = [ ./v1-fix-shell-path.patch ]; + patches = [ ./fix-shell-path.patch ]; buildInputs = [ go-bindata ]; From e845495edb4bb8bbf4c89da632e861cac6017614 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 21 May 2017 15:25:55 +0200 Subject: [PATCH 05/20] lkl: add meta.homepage --- pkgs/applications/virtualization/lkl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index 134df59159b..878c10e01dc 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LKL (Linux Kernel Library) aims to allow reusing the Linux kernel code as extensively as possible with minimal effort and reduced maintenance overhead"; + homepage = https://github.com/lkl/linux/; platforms = [ "x86_64-linux" ]; # Darwin probably works too but I haven't tested it license = licenses.gpl2; maintainers = with maintainers; [ copumpkin ]; From e983d4306e2a72774411f813b2dd1348a034a417 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 23 May 2017 01:41:22 +0200 Subject: [PATCH 06/20] lkl: bc & python are native build inputs --- pkgs/applications/virtualization/lkl/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index 878c10e01dc..d99377a3233 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -4,7 +4,9 @@ stdenv.mkDerivation rec { name = "lkl-${stdenv.lib.substring 0 7 rev}"; rev = "d74707304d4e4614081ae2a612a833aeb46622b5"; - buildInputs = [ bc python fuse libarchive ]; + nativeBuildInputs = [ bc python ]; + + buildInputs = [ fuse libarchive ]; src = fetchFromGitHub { inherit rev; From 8c8f40a1285bda11ccd972a83aca0ea41f208446 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 23 May 2017 01:59:49 +0200 Subject: [PATCH 07/20] lkl: d747073 -> 2017-03-24 - Moves to a more recent kernel (4.10, I think ...) - API break re the previous version - cptofs: fix root directory copy - add support for disks with custom ops - add LKL_HIJACK_NET_QDISC to configure qdisc policy - add LKL_HIJACK_SYSCTL to configure sysctl values --- pkgs/applications/virtualization/lkl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index d99377a3233..26a0e097c47 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, bc, python, fuse, libarchive }: stdenv.mkDerivation rec { - name = "lkl-${stdenv.lib.substring 0 7 rev}"; - rev = "d74707304d4e4614081ae2a612a833aeb46622b5"; + name = "lkl-2017-03-24"; + rev = "a063e1631db5e2b9b04f184c5e6d185c1cd645cb"; nativeBuildInputs = [ bc python ]; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { inherit rev; owner = "lkl"; repo = "linux"; - sha256 = "0x1hdjsrj6hfk1sgfw11ihm00fmp6g158sr2q3cgjy2b6jnsr4hp"; + sha256 = "07dmira76i0ki577sra4fdl1wvzfzxzd75252lza0sc6jdzrrwvj"; }; # Fix a /usr/bin/env reference in here that breaks sandboxed builds From e0b623a56d7d3914cedaafaeaf9cff2d722c6615 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 23 May 2017 23:55:55 +0200 Subject: [PATCH 08/20] lkl: break description into longDescription and a briefer descr --- pkgs/applications/virtualization/lkl/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index 26a0e097c47..2f563ab635e 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -40,7 +40,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - description = "LKL (Linux Kernel Library) aims to allow reusing the Linux kernel code as extensively as possible with minimal effort and reduced maintenance overhead"; + description = "The Linux kernel as a library"; + longDescription = '' + LKL (Linux Kernel Library) aims to allow reusing the Linux kernel code as + extensively as possible with minimal effort and reduced maintenance + overhead + ''; homepage = https://github.com/lkl/linux/; platforms = [ "x86_64-linux" ]; # Darwin probably works too but I haven't tested it license = licenses.gpl2; From 49ecd62c087473f0e60aa8c89a0dd1d196427b2e Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 24 May 2017 00:43:22 +0200 Subject: [PATCH 09/20] lkl: split outputs Breaking out lib allows users to link against lkl without pulling the kitchen sink into their closure. --- pkgs/applications/virtualization/lkl/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index 2f563ab635e..e40d054520f 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -4,6 +4,8 @@ stdenv.mkDerivation rec { name = "lkl-2017-03-24"; rev = "a063e1631db5e2b9b04f184c5e6d185c1cd645cb"; + outputs = [ "dev" "lib" "out" ]; + nativeBuildInputs = [ bc python ]; buildInputs = [ fuse libarchive ]; @@ -19,15 +21,15 @@ stdenv.mkDerivation rec { prePatch = "patchShebangs arch/lkl/scripts"; installPhase = '' - mkdir -p $out/{bin,lib} + mkdir -p $out/bin $lib/lib $dev - # This tool assumes a different directory structure so let's point it at the right location cp tools/lkl/bin/lkl-hijack.sh $out/bin - substituteInPlace $out/bin/lkl-hijack.sh --replace '/../' '/../lib' + sed -i $out/bin/lkl-hijack.sh \ + -e "s,LD_LIBRARY_PATH=.*,LD_LIBRARY_PATH=$lib/lib," cp tools/lkl/{cptofs,cpfromfs,fs2tar,lklfuse} $out/bin - cp -r tools/lkl/include $out - cp tools/lkl/liblkl*.{a,so} $out/lib + cp -r tools/lkl/include $dev/ + cp tools/lkl/liblkl*.{a,so} $lib/lib ''; # We turn off format and fortify because of these errors (fortify implies -O2, which breaks the jitter entropy code): From b0adb09b328e5394e1a44ceb0a8ce50b40f52b48 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Tue, 23 May 2017 19:38:25 -0400 Subject: [PATCH 10/20] pants13-pre: pre-download the native engine This saves pants 1.3 from having to download it at startup. Eventually we'll build it ourselves (it's a rust binary) but for now this works. --- .../tools/build-managers/pants/default.nix | 49 ++++++++++++++++++- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix index 624e273cc90..f2953a10dfa 100644 --- a/pkgs/development/tools/build-managers/pants/default.nix +++ b/pkgs/development/tools/build-managers/pants/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pythonPackages }: +{ stdenv, pythonPackages, runCommand, curl }: with stdenv.lib; with pythonPackages; @@ -22,6 +22,37 @@ let maintainers = with maintainers; [ copumpkin ]; }; }; + + pants13-version = "1.3.0rc2"; + + # TODO: compile the rust native engine ourselves so we don't need to do this shit. We don't use + # fetchurl because we don't know the URL ahead of time, even though it's deterministic. So we have + # this downloader figure out the URL on the fly and then produce the deterministic result, so we + # can still be a fixed-output derivation. + pants13-native-engine-prefix = { + "x86_64-darwin" = "mac/10.11"; + "x86_64-linux" = "linux/x86_64"; + "i686-linux" = "linux/i386"; + }.${stdenv.system} or (throw "Unsupported system ${stdenv.system}!"); + + pants13-native-engine = runCommand "pants-native-${pants13-version}" { + buildInputs = [ curl ]; + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "0n8z7rg0yfpxplvcw88lwv733zkhbzhc4w4zd4aznbcmfqdiz5br"; + } '' + native_version=$(curl -k -L https://raw.githubusercontent.com/pantsbuild/pants/release_${pants13-version}/src/python/pants/engine/subsystem/native_engine_version) + curl -kLO "https://dl.bintray.com/pantsbuild/bin/build-support/bin/native-engine/${pants13-native-engine-prefix}/$native_version/native_engine.so" + + # Ugh it tries to "download" from this prefix so let's just replicate their directory structure for now... + mkdir -p $out/bin/native-engine/${pants13-native-engine-prefix}/$native_version/ + + # These should behave the same way in Nix land and we try not to differentiate between OS revisions... + ln -s 10.11 $out/bin/native-engine/mac/10.10 + ln -s 10.11 $out/bin/native-engine/mac/10.12 + + cp native_engine.so $out/bin/native-engine/${pants13-native-engine-prefix}/$native_version/ + ''; in { pants = pythonPackages.buildPythonPackage rec { @@ -61,7 +92,7 @@ in { pants13-pre = buildPythonApplication rec { pname = "pantsbuild.pants"; - version = "1.3.0rc2"; + version = pants13-version; name = "${pname}-${version}"; src = fetchPypi { @@ -71,6 +102,9 @@ in { prePatch = '' sed -E -i "s/'([[:alnum:].-]+)[=><][[:digit:]=><.,]*'/'\\1'/g" setup.py + + substituteInPlace src/pants/option/global_options.py \ + --replace "'/etc/pantsrc'" "'$out/etc/pantsrc', '/etc/pantsrc'" ''; # Unnecessary, and causes some really weird behavior around .class files, which @@ -84,6 +118,17 @@ in { fasteners coverage pywatchman futures cffi ]; + # Teach pants about where its native engine lives. + # TODO: there's probably a better way to teach it this without having it "download" + # from a local file: URL to its cache, but I don't know how and this seems to work. + postFixup = '' + mkdir -p $out/etc + cat >$out/etc/pantsrc < Date: Tue, 23 May 2017 20:46:10 -0700 Subject: [PATCH 11/20] ffmpeg: fix sha256 hash for 3.3.1 ffmpeg-full uses the .xz source release while ffmpeg uses .bz2 so hashes cannot be shared between them --- pkgs/development/libraries/ffmpeg/3.3.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ffmpeg/3.3.nix b/pkgs/development/libraries/ffmpeg/3.3.nix index 0227d7489ba..d6380b795af 100644 --- a/pkgs/development/libraries/ffmpeg/3.3.nix +++ b/pkgs/development/libraries/ffmpeg/3.3.nix @@ -7,6 +7,6 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; branch = "3.3.1"; - sha256 = "0bwgm6z6k3khb91qh9xv15inykkfchpkm0lcdckkxhkacpyaf0mp"; + sha256 = "0c37bdqwmaziikr2d5pqp7504ail6i7a1mfcmc06mdpwfxxwvcpw"; darwinFrameworks = [ Cocoa CoreMedia ]; }) From 4e704b144a63b3ca0bce372a28734e6407d70af2 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 24 May 2017 11:55:16 +0800 Subject: [PATCH 12/20] ffmpeg: incorrectly updated sha sums broke the build --- pkgs/development/libraries/ffmpeg-full/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 848cae09ed4..47be28f5130 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -234,7 +234,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "0bwgm6z6k3khb91qh9xv15inykkfchpkm0lcdckkxhkacpyaf0mp"; + sha256 = "0c37bdqwmaziikr2d5pqp7504ail6i7a1mfcmc06mdpwfxxwvcpw"; }; patchPhase = ''patchShebangs . From a43e104adae1487b42397c42f0b0381ced90c8e2 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 24 May 2017 00:05:10 -0400 Subject: [PATCH 13/20] pants13-pre: fix on non-Darwin platforms --- pkgs/development/tools/build-managers/pants/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix index f2953a10dfa..66d99c7fd93 100644 --- a/pkgs/development/tools/build-managers/pants/default.nix +++ b/pkgs/development/tools/build-managers/pants/default.nix @@ -48,6 +48,7 @@ let mkdir -p $out/bin/native-engine/${pants13-native-engine-prefix}/$native_version/ # These should behave the same way in Nix land and we try not to differentiate between OS revisions... + mkdir -p $out/bin/native-engine/mac/ ln -s 10.11 $out/bin/native-engine/mac/10.10 ln -s 10.11 $out/bin/native-engine/mac/10.12 From 4e2b190d52830ee2e11c51bba8c4e1c187b83978 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 24 May 2017 13:07:28 +0800 Subject: [PATCH 14/20] vlc: 2.2.4 -> 2.2.5.1 Fixes a nasty vulnerability caused by broken subtitle handling: http://blog.checkpoint.com/2017/05/23/hacked-in-translation/ --- pkgs/applications/video/vlc/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index c52d1439012..48e5af7162d 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -20,19 +20,13 @@ assert (!withQt5 -> qt4 != null); stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "2.2.4"; + version = "2.2.5.1"; src = fetchurl { url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz"; - sha256 = "1gjkrwlg8ab3skzl67cxb9qzg4187ifckd1z9kpy11q058fyjchn"; + sha256 = "1k51vm6piqlrnld7sxyg0s4kdkd3lan97lmy3v5wdh3qyll8m2xj"; }; - patches = optional withQt5 (fetchurl { - name = "Fix-build-using-old-GCC-intrinsics.patch"; - url = "https://patches.videolan.org/patch/14061/raw/"; - sha256 = "16v4k7378a590diz11bdvdaqi9cpf6333hp5wr6v5sfrsma8qvpx"; - }); - # Comment-out the Qt 5.5 version check, as we do apply the relevant patch. # https://trac.videolan.org/vlc/ticket/16497 postPatch = if (!withQt5) then null else From cf3d53153161e40251969856ba4d7297bf6824b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 24 May 2017 07:15:02 +0100 Subject: [PATCH 15/20] pythonPackages.feedgenerator: add missing directory fixes #26045 --- .../python-modules/feedgenerator/default.nix | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/feedgenerator/default.nix diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix new file mode 100644 index 00000000000..4a10b088d98 --- /dev/null +++ b/pkgs/development/python-modules/feedgenerator/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, glibcLocales, fetchurl, six, pytz }: + +buildPythonPackage rec { + name = "feedgenerator-1.9"; + + src = fetchurl { + url = "mirror://pypi/f/feedgenerator/${name}.tar.gz"; + sha256 = "01mirwkm7xfx539hmvj7g9da1j51gw5lsx74dr0glizskjm5vq2s"; + }; + + buildInputs = [ glibcLocales ]; + + LC_ALL="en_US.UTF-8"; + + propagatedBuildInputs = [ six pytz ]; + + meta = with stdenv.lib; { + description = "Standalone version of django.utils.feedgenerator, compatible with Py3k"; + homepage = https://github.com/dmdm/feedgenerator-py3k.git; + maintainers = with maintainers; [ garbas ]; + }; +} From 8fd2f022f043eca6df0d7961f7edd52ddb61b782 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 24 May 2017 16:03:17 +0800 Subject: [PATCH 16/20] kodi: 17.1 -> 17.2 --- pkgs/applications/video/kodi/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 649dad0bb57..4d3474a1db2 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -54,17 +54,16 @@ let }; in stdenv.mkDerivation rec { name = "kodi-${version}"; - version = "17.1"; + version = "17.2"; src = fetchurl { url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz"; - sha256 = "1vmvrq0qdjnphw34yils2b5jnm05cmsg777hc4lwqz5mrc1kjgrh"; + sha256 = "1zmgw65dbdpv72xfimrh02m8sdg4cb9i3hbmqzgs8x00b9n27ndf"; }; buildInputs = [ - makeWrapper libxml2 gnutls - pkgconfig cmake gnumake yasm python2 - boost libmicrohttpd autoreconfHook + libxml2 gnutls yasm python2 + boost libmicrohttpd gettext pcre-cpp yajl fribidi libva openssl gperf tinyxml2 taglib libssh swig jre libX11 xproto inputproto which @@ -91,6 +90,9 @@ in stdenv.mkDerivation rec { ++ lib.optional rtmpSupport rtmpdump ++ lib.optional joystickSupport SDL2; + nativeBuildInputs = [ + autoreconfHook cmake gnumake makeWrapper pkgconfig + ]; dontUseCmakeConfigure = true; From a69ae2c7f955b9790776245c3a308dbca7be4a58 Mon Sep 17 00:00:00 2001 From: Yann Hodique Date: Wed, 24 May 2017 01:18:56 -0700 Subject: [PATCH 17/20] go: 1.7.5 -> 1.7.6 --- pkgs/development/compilers/go/1.7.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix index 7ecae36a4d5..d7a824239b8 100644 --- a/pkgs/development/compilers/go/1.7.nix +++ b/pkgs/development/compilers/go/1.7.nix @@ -24,13 +24,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.7.5"; + version = "1.7.6"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "00radlwbrssn0x3naamb33cfx7ap2jv7s51bqr705nmn2j5yyblk"; + sha256 = "1gacjwbs1qbx8x84746qdxx2xwylirvd31ybgagfglfsl77vi4m2"; }; # perl is used for testing go vet From ccfc81397bff1364b016c3fa5ec71ca5a0d0244c Mon Sep 17 00:00:00 2001 From: Yann Hodique Date: Wed, 24 May 2017 01:30:39 -0700 Subject: [PATCH 18/20] go: 1.8.1 -> 1.8.2 --- pkgs/development/compilers/go/1.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix index 24a40ca0ba0..99744d76cd0 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.8.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "1157mmzjpk887cpcpn2qy9c69anc22c4p3cjpl84zl7an41x660j"; + sha256 = "0haazh0sk1zys1gbmbi128rmcyrd6f32amp6a872jqhadjlvj9qv"; }; # perl is used for testing go vet From 4f6ab299a0d433e041bde292ddd2996489fb3d21 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 24 May 2017 11:18:56 +0100 Subject: [PATCH 19/20] gitlab-runner: 9.1.0 -> 9.2.0 --- .../continuous-integration/gitlab-runner/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index d7f13de1d26..4c2520e43ba 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: let - version = "9.1.0"; + version = "9.2.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "1mdcw755fygnf30v0gr13mx20zjqmxg5w2kj3k2jgcsh3gyrvymr"; + sha256 = "0x6pwh3wjq2czvzb8rl8npa8a58snwf1f9dwr6rbbxijaf886jfc"; }; docker_arm = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "1m5p6mlhy3xf0chrjlfpdyp24pv32b61s8iryh6a617i91vpzjg6"; + sha256 = "1y6i5dn1l1qlwyg95qw4sff2y9zypxwmvsw4mb0555vf157h88kg"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-ci-multi-runner"; rev = "v${version}"; - sha256 = "0n8hcj2b1pb95x4bd7fb9ri43vgc4h2dj2v3iiziw2imqjyphfx4"; + sha256 = "0gz6byjnnfn9acy40hcbyzdql4199xn0yvjx2cfjjjzd9kryjrxp"; }; buildInputs = [ go-bindata ]; @@ -60,7 +60,7 @@ buildGoPackage rec { description = "GitLab Runner the continuous integration executor of GitLab"; license = licenses.mit; homepage = "https://about.gitlab.com/gitlab-ci/"; - platforms = platforms.unix; - maintainers = [ lib.maintainers.bachp ]; + platforms = platforms.unix ++ platforms.darwin; + maintainers = with maintainers; [ bachp zimbatm ]; }; } From dacfe8109e5d326a1c8cd5ed833c47eca4e10ac4 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Wed, 24 May 2017 11:40:16 +0200 Subject: [PATCH 20/20] cups_filters: 1.11.1 -> 1.14.0 --- pkgs/misc/cups/filters.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index e4c70e2fe98..6d6fab265b1 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, pkgconfig, cups, poppler, poppler_utils, fontconfig , libjpeg, libpng, perl, ijs, qpdf, dbus, substituteAll, bash, avahi -, makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which +, makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which, ghostscript +, mupdf }: let @@ -8,18 +9,18 @@ let in stdenv.mkDerivation rec { name = "cups-filters-${version}"; - version = "1.11.1"; + version = "1.14.0"; src = fetchurl { url = "http://openprinting.org/download/cups-filters/${name}.tar.xz"; - sha256 = "0x0jxn1hnif92m7dyqrqh015gpsf79dviarb7dfl0zya2drlk1m8"; + sha256 = "1v553wvr8qdwb1g04if7cw1mfm42vs6xfyg0cvzvbng6yr6jg93s"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ cups poppler poppler_utils fontconfig libjpeg libpng perl - ijs qpdf dbus avahi + ijs qpdf dbus avahi ghostscript mupdf ]; configureFlags = [ @@ -41,6 +42,9 @@ in stdenv.mkDerivation rec { # Ensure that gstoraster can find gs in $PATH. substituteInPlace filter/gstoraster.c --replace execve execvpe + + # Patch shebangs of generated build scripts + patchShebangs filter ''; postInstall = @@ -57,5 +61,6 @@ in stdenv.mkDerivation rec { description = "Backends, filters, and other software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ layus ]; }; }