From acf0ee69ba8a4a4713b085e99fd7ddaf0daccd4b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 27 Sep 2017 18:24:29 +0200 Subject: [PATCH 01/27] vim-plugins: add `overrideAttrs` support for `buildVimPluginFrom2Nix` --- pkgs/misc/vim-plugins/vim-utils.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index b659266ace7..23749fd4ce6 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -373,8 +373,10 @@ rec { } ''; - addRtp = path: derivation: - derivation // { rtp = "${derivation}/${path}"; }; + addRtp = path: attrs: derivation: + derivation // { rtp = "${derivation}/${path}"; } // { + overrideAttrs = f: buildVimPlugin (attrs // f attrs); + }; buildVimPlugin = a@{ name, @@ -389,7 +391,7 @@ rec { addonInfo ? null, ... }: - addRtp "${rtpPath}/${path}" (stdenv.mkDerivation (a // { + addRtp "${rtpPath}/${path}" a (stdenv.mkDerivation (a // { name = namePrefix + name; inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall; From 912ec467dbf94ec0b62a6894e0d044a877a6724d Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Sat, 7 Oct 2017 10:06:34 +0100 Subject: [PATCH 02/27] openafs-client: don't remove kernel module on stop Otherwise it cannot re-insert the kernel module after a kernel upgrade when boot kernel != running kernel. --- .../services/network-filesystems/openafs-client/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/network-filesystems/openafs-client/default.nix b/nixos/modules/services/network-filesystems/openafs-client/default.nix index 94f93162cfe..0946e379e79 100644 --- a/nixos/modules/services/network-filesystems/openafs-client/default.nix +++ b/nixos/modules/services/network-filesystems/openafs-client/default.nix @@ -93,7 +93,6 @@ in preStop = '' ${pkgs.utillinux}/bin/umount /afs ${openafsPkgs}/sbin/afsd -shutdown - ${pkgs.kmod}/sbin/rmmod libafs ''; }; }; From c45c4a711aa758f8853d3002c5f103de77cb093d Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Sun, 8 Oct 2017 12:24:46 +0800 Subject: [PATCH 03/27] hackage: update snapshot of 'all-cabal-hashes' repo for callHackage --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 48b8e989e40..eddc833da9d 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -6,6 +6,6 @@ fetchFromGitHub { owner = "commercialhaskell"; repo = "all-cabal-hashes"; - rev = "b490d26340638934d13c0c0cd4089dec0fb6b85e"; - sha256 = "0cz76wcdlh5512g1aviv0ac9qwj1mmy9ncp6q4yywylxrlqgcbj5"; + rev = "901c2522e6797270f5ded4495b1a529e6c16ef45"; + sha256 = "0wng314y3yn6bbwa5ar254l7p8y99gsvm8ll4z7f3wg77v5fzish"; } From 977c8e673c4938fff42b24d80f724e67c6202f4e Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sun, 8 Oct 2017 09:03:54 +0300 Subject: [PATCH 04/27] hotpatch: init at 0.2 --- .../libraries/hotpatch/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/libraries/hotpatch/default.nix diff --git a/pkgs/development/libraries/hotpatch/default.nix b/pkgs/development/libraries/hotpatch/default.nix new file mode 100644 index 00000000000..df3581cc809 --- /dev/null +++ b/pkgs/development/libraries/hotpatch/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + name = "hotpatch-0.2"; + + src = fetchFromGitHub { + owner = "vikasnkumar"; + repo = "hotpatch"; + rev = "4b65e3f275739ea5aa798d4ad083c4cb10e29149"; + sha256 = "169vdh55wsbn6fl58lpzqx64v6ifzh7krykav33x1d9hsk98qjqh"; + }; + + enableParallelBuilding = true; + doCheck = true; + + nativeBuildInputs = [ cmake ]; + + preConfigure = '' + substituteInPlace test/loader.c \ + --replace \"/lib64/ld-linux-x86-64.so.2 \""$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --replace \"/lib/ld-linux-x86-64.so.2 \""$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --replace \"/lib/ld-linux.so.2 \""$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --replace \"/lib32/ld-linux.so.2 \""$(cat $NIX_CC/nix-support/dynamic-linker)" + ''; + + checkPhase = '' + LD_LIBRARY_PATH=$(pwd)/src make test + ''; + + meta = with stdenv.lib; { + description = "Hot patching executables on Linux using .so file injection"; + homepage = src.meta.homepage; + license = licenses.bsd3; + maintainers = [ maintainers.gnidorah ]; + platforms = ["i686-linux" "x86_64-linux"]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d017f39cb5..43a1acd7685 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2593,6 +2593,8 @@ with pkgs; host = bind.host; + hotpatch = callPackage ../development/libraries/hotpatch { }; + hotspot = libsForQt56.callPackage ../development/tools/analysis/hotspot { }; hping = callPackage ../tools/networking/hping { }; From 35f894860d7d2b59b76ced134e4155b39ea6c651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 8 Oct 2017 10:55:34 +0200 Subject: [PATCH 05/27] xf86-video-intel: fixup after #29039 This was one package in pkgs/servers/x11/xorg/default.nix that was *not* generated, and that was missed in the PR and overwritten (understandably). Now the change is properly in overrides.nix to prevent that... --- pkgs/servers/x11/xorg/overrides.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 45df7244176..c3665667107 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -562,6 +562,13 @@ in }; xf86videointel = attrs: attrs // { + # the update script only works with released tarballs :-/ + name = "xf86-video-intel-2017-04-18"; + src = args.fetchurl { + url = "http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/" + + "c72bb27a3a68ecc616ce2dc8e9a1d20354504562.tar.gz"; + sha256 = "1awxbig135nmq7qa8jzggqr4q32k6ngnal2lckrdkg7zqi40zdv8"; + }; buildInputs = attrs.buildInputs ++ [xorg.libXfixes xorg.libXScrnSaver xorg.pixman]; nativeBuildInputs = attrs.nativeBuildInputs ++ [args.autoreconfHook xorg.utilmacros]; configureFlags = "--with-default-dri=3 --enable-tools"; From 9b4f74e38fa6fbccc8e3d7843d8035c1fd2a072c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 8 Oct 2017 11:16:44 +0200 Subject: [PATCH 06/27] yabause: fix meta eval --- pkgs/misc/emulators/yabause/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix index 2fc60b543e6..fb99421a61a 100644 --- a/pkgs/misc/emulators/yabause/default.nix +++ b/pkgs/misc/emulators/yabause/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "An open-source Sega Saturn emulator"; homepage = https://yabause.org/; license = licenses.gpl2Plus; - maintainers = with maintaines; [ AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; }; } From dc5734e0634c01b2d61fa20101b0923e7362516b Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sun, 8 Oct 2017 12:05:16 +0200 Subject: [PATCH 07/27] rustRegistry: 2017-10-03 -> 2017-10-08 --- pkgs/top-level/rust-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index a4fd5ca54ee..92230993d58 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,13 +7,13 @@ { stdenv, fetchFromGitHub, git }: stdenv.mkDerivation { - name = "rustRegistry-2017-10-03"; + name = "rustRegistry-2017-10-08"; src = fetchFromGitHub { owner = "rust-lang"; repo = "crates.io-index"; - rev = "f9e21955350caf67db45c4a4a38dbab2f2250bfc"; - sha256 = "1yk0l0r9idn7crnnw44sig69kvvyq3ycv417s88hd16m1fpl5y77"; + rev = "78ab44cf22c2ce5d40e562ffc7df7ab10ac12b86"; + sha256 = "0fa3l3px6b89ap63h40bhn2x50zf5j65jrgbb7j103j0cdayk2l0"; }; phases = [ "unpackPhase" "installPhase" ]; installPhase = '' From 7f502cf6d7947cf3ef245d033a649d436d77c29d Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sun, 8 Oct 2017 12:06:04 +0200 Subject: [PATCH 08/27] fd: 3.1.0 -> 4.0.0 --- pkgs/tools/misc/fd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index c46566aeabe..07d8a661d7b 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "fd-${version}"; - version = "3.1.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "0sv7iwl44a86n92i3mib2vlzd44q9ncif34yh1s0vqffai5s1rr6"; + sha256 = "1aw4pgsmvzzqlvbxzv5jnw42nf316qfhvr50b58iqi2dxy8z8cmv"; }; - depsSha256 = "1irfx78k899qphzj8i8vr34pb6zaf9p5nx5c4zpgsrbknvn0ag5l"; + depsSha256 = "17fjlmdwp8582dvv68b5h3zzvmd71yd9sw9xalyrrww46h7fd84g"; meta = { description = "A simple, fast and user-friendly alternative to find"; From 9e4be636bacd0bd181c83280af1a0a6625fb9ed3 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Fri, 29 Sep 2017 22:51:32 +0200 Subject: [PATCH 09/27] prometheus-minio-exporter: init at 0.1.0 --- .../prometheus/minio-exporter/default.nix | 26 +++ .../prometheus/minio-exporter/deps.nix | 156 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 183 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/minio-exporter/default.nix create mode 100644 pkgs/servers/monitoring/prometheus/minio-exporter/deps.nix diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix new file mode 100644 index 00000000000..c89574e3fff --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "minio-exporter-${version}"; + version = "0.1.0"; + rev = "v${version}"; + + goPackagePath = "github.com/joe-pll/minio-exporter"; + + src= fetchFromGitHub { + inherit rev; + owner = "joe-pll"; + repo = "minio-exporter"; + sha256 = "14lz4dg0n213b6xy12fh4r20k1rcnflnfg6gjskk5zr8h7978hjx"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "A Prometheus exporter for Minio cloud storage server"; + homepage = https://github.com/joe-pll/minio-exporter; + license = licenses.asl20; + maintainers = with maintainers; [ bachp ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/deps.nix b/pkgs/servers/monitoring/prometheus/minio-exporter/deps.nix new file mode 100644 index 00000000000..562d77f3a2f --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/minio-exporter/deps.nix @@ -0,0 +1,156 @@ +# This file was generated by go2nix. +[ + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; + sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; + sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "c787282c39ac1fc618827141a1f762240def08a3"; + sha256 = "0c784qichlpqdk1zwafislskchr7f4dl7fy3g3w7xg2w63xpd7r0"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "130e6b02ab059e7b717a096f397c5b60111cae74"; + sha256 = "0zk4d7gcykig9ld8f5h86fdxshm2gs93a2xkpf52jd5m4z59q26s"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/minio/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/minio/go-homedir"; + rev = "21304a94172ae3a09dee2cd86a12fb6f842138c7"; + sha256 = "1kvz91gvdrpzddlpcbf0a2kf75bfqzd40kwzq29jwhf1y5ii6cq4"; + }; + } + { + goPackagePath = "github.com/minio/minio-go"; + fetch = { + type = "git"; + url = "https://github.com/minio/minio-go"; + rev = "cb3571b7d8d904c4714033deb984d0a0b66955be"; + sha256 = "165filzwslnqdgsp8wf5k1zm8wcpnsffsaffw25igy0ik8swr06w"; + }; + } + { + goPackagePath = "github.com/minio/minio"; + fetch = { + type = "git"; + url = "https://github.com/minio/minio"; + rev = "60cc6184d253efee4a3120683517028342229e21"; + sha256 = "0n2l163v45jraylv43jwqm0cxin68vw8cw7k21qniahhr46y4dqf"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "353b8c3f3776541879f9abfd8fa8b1ae162ab394"; + sha256 = "068fk3bdfsaij37973c66065w2cn46ahwjs44pw9v1mqk8bsrn3a"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "6f3806018612930941127f2a7c6c453ba2c527d2"; + sha256 = "1413ibprinxhni51p0755dp57r9wvbw7xgj9nmdaxmhzlqhc86j4"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "2f17f4a9d485bf34b4bfaccc273805040e4f86c8"; + sha256 = "0r1dyipnd7n9vp4p6gs1y4v7ggq4avj06pr90l4qrjll55h281js"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2"; + sha256 = "18hwygbawbqilz7h8fl25xpbciwalkslb4igqn4cr9d8sqp7d3np"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "89742aefa4b206dcf400792f3bd35b542998eb3b"; + sha256 = "0hk7fabx59msg2y0iik6xvfp80s73ybrwlcshbm9ds91iqbkcxi6"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "76eec36fa14229c4b25bb894c2d0e591527af429"; + sha256 = "1c57fdg70vhf7pigiwb2xdap6ak0c0s2pzaj9pq000aqfw54i4s8"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "314a259e304ff91bd6985da2a7149bbf91237993"; + sha256 = "0vya62c3kmhmqx6awlxx8hc84987xkym9rhs0q28vlhwk9kczdaa"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "1087e65c9441605df944fb12c33f0fe7072d18ca"; + sha256 = "18llqzkdqf62qbqcv2fd3j0igl6cwwn4dissf5skkvxrcxjcmmj0"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3316e80ec7..a565dab9d50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11787,6 +11787,7 @@ with pkgs; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { }; + prometheus-minio-exporter = callPackage ../servers/monitoring/prometheus/minio-exporter { }; prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { }; prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { }; prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { }; From 1983e6c8ccdd631e3bbf325b9c5b58b61fd7f63e Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sun, 1 Oct 2017 20:58:28 +0200 Subject: [PATCH 10/27] minio: 20170613 -> 2017-09-29T19-16-56Z The test was updated as minio now needs at least 1 GiB of free disk, otherwise it won't start. --- nixos/tests/minio.nix | 4 +++- pkgs/servers/minio/default.nix | 13 ++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/nixos/tests/minio.nix b/nixos/tests/minio.nix index a349265b2f5..07a292a9baa 100644 --- a/nixos/tests/minio.nix +++ b/nixos/tests/minio.nix @@ -12,6 +12,9 @@ import ./make-test.nix ({ pkgs, ...} : { secretKey = "V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12"; }; environment.systemPackages = [ pkgs.minio-client ]; + + # Minio requires at least 1GiB of free disk space to run. + virtualisation.diskSize = 4 * 1024; }; }; @@ -20,7 +23,6 @@ import ./make-test.nix ({ pkgs, ...} : { startAll; $machine->waitForUnit("minio.service"); $machine->waitForOpenPort(9000); - $machine->succeed("curl --fail http://localhost:9000/minio/index.html"); # Create a test bucket on the server $machine->succeed("mc config host add minio http://localhost:9000 BKIKJAA5BMMU2RHO6IBB V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12 S3v4"); diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 48b5279772a..c9dfe9136df 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -1,14 +1,13 @@ { lib, stdenv, fetchurl, go }: stdenv.mkDerivation rec { - name = "minio-${shortVersion}"; + name = "minio-${version}"; - shortVersion = "20170613"; - longVersion = "2017-06-13T19-01-01Z"; + version = "2017-09-29T19-16-56Z"; src = fetchurl { - url = "https://github.com/minio/minio/archive/RELEASE.${lib.replaceStrings [":"] ["-"] longVersion}.tar.gz"; - sha256 = "1rrlgn0nsvfn0lr9ffihjdb96n4znsvjlz1h7bwvz8nwhbn0lfsf"; + url = "https://github.com/minio/minio/archive/RELEASE.${version}.tar.gz"; + sha256 = "1h028gyfvyh5x6k4fsj4s64sgzqy7jgln6kvs27bnxzigj6dp2wx"; }; buildInputs = [ go ]; @@ -24,7 +23,7 @@ stdenv.mkDerivation rec { buildPhase = '' mkdir -p $out/bin go build -o $out/bin/minio \ - --ldflags "-X github.com/minio/minio/cmd.Version=${longVersion}" + --ldflags "-X github.com/minio/minio/cmd.Version=${version}" ''; installPhase = "true"; @@ -32,7 +31,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://www.minio.io/; description = "An S3-compatible object storage server"; - maintainers = [ lib.maintainers.eelco ]; + maintainers = with lib.maintainers; [ eelco bachp ]; platforms = lib.platforms.x86_64; license = lib.licenses.asl20; }; From 8079e52bc158b11db1dfadefbd0f48da3a10ecd4 Mon Sep 17 00:00:00 2001 From: Yann Hodique Date: Sat, 7 Oct 2017 16:08:52 -0700 Subject: [PATCH 11/27] zile: 2.4.13 -> 2.4.14 fixes #30209 --- pkgs/applications/editors/zile/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index 9274eb6889d..0f79ca33c72 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -1,14 +1,15 @@ { fetchurl, stdenv, pkgconfig, ncurses, boehmgc, perl, help2man }: stdenv.mkDerivation rec { - name = "zile-2.4.13"; + name = "zile-2.4.14"; src = fetchurl { url = "mirror://gnu/zile/${name}.tar.gz"; - sha256 = "03mcg0bxkzprlsx8y6h22w924pzx4a9zr7zm3g11j8j3x9lz75f7"; + sha256 = "0x3byaddms8l3g7igx6njycqsq98wgapysdb5c7lhcnajlkp8y3s"; }; - nativeBuildInputs = [ pkgconfig perl ] + buildInputs = [ ncurses boehmgc ]; + nativeBuildInputs = [ perl pkgconfig ] # `help2man' wants to run Zile, which won't work when the # newly-produced binary can't be run at build-time. ++ stdenv.lib.optional @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = false; # XXX: Work around cross-compilation-unfriendly `gl_FUNC_FSTATAT' macro. - preConfigure = "export gl_cv_func_fstatat_zero_flag=yes"; + gl_cv_func_fstatat_zero_flag="yes"; meta = with stdenv.lib; { description = "Lightweight Emacs clone"; From aad88ddf5bdeb25e586d4de3ef1a639d4c95f3cf Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sun, 8 Oct 2017 12:07:05 +0200 Subject: [PATCH 12/27] prometheus-minio-exporter service: init version --- nixos/modules/module-list.nix | 1 + .../monitoring/prometheus/minio-exporter.nix | 107 ++++++++++++++++++ 2 files changed, 108 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/minio-exporter.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 8ac7e5b52d6..ee796242c1a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -375,6 +375,7 @@ ./services/monitoring/prometheus/collectd-exporter.nix ./services/monitoring/prometheus/fritzbox-exporter.nix ./services/monitoring/prometheus/json-exporter.nix + ./services/monitoring/prometheus/minio-exporter.nix ./services/monitoring/prometheus/nginx-exporter.nix ./services/monitoring/prometheus/node-exporter.nix ./services/monitoring/prometheus/snmp-exporter.nix diff --git a/nixos/modules/services/monitoring/prometheus/minio-exporter.nix b/nixos/modules/services/monitoring/prometheus/minio-exporter.nix new file mode 100644 index 00000000000..4b6c96d9673 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/minio-exporter.nix @@ -0,0 +1,107 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.prometheus.minioExporter; +in { + options = { + services.prometheus.minioExporter = { + enable = mkEnableOption "prometheus minio exporter"; + + port = mkOption { + type = types.int; + default = 9290; + description = '' + Port to listen on. + ''; + }; + + listenAddress = mkOption { + type = types.nullOr types.str; + default = null; + example = "0.0.0.0"; + description = '' + Address to listen on for web interface and telemetry. + ''; + }; + + minioAddress = mkOption { + type = types.str; + example = "https://10.0.0.1:9000"; + description = '' + The URL of the minio server. + Use HTTPS if Minio accepts secure connections only. + ''; + }; + + minioAccessKey = mkOption { + type = types.str; + example = "BKIKJAA5BMMU2RHO6IBB"; + description = '' + The value of the Minio access key. + It is required in order to connect to the server. + ''; + }; + + minioAccessSecret = mkOption { + type = types.str; + description = '' + The calue of the Minio access secret. + It is required in order to connect to the server. + ''; + }; + + minioBucketStats = mkOption { + type = types.bool; + default = false; + description = '' + Collect statistics about the buckets and files in buckets. + It requires more computation, use it carefully in case of large buckets.. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options when launching the minio exporter. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open port in firewall for incoming connections. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port; + + systemd.services.prometheus-minio-exporter = { + description = "Prometheus exporter for Minio server metrics"; + unitConfig.Documentation = "https://github.com/joe-pll/minio-exporter"; + wantedBy = [ "multi-user.target" ]; + after = optional config.services.minio.enable "minio.service"; + serviceConfig = { + DynamicUser = true; + Restart = "always"; + PrivateTmp = true; + WorkingDirectory = /tmp; + ExecStart = '' + ${pkgs.prometheus-minio-exporter}/bin/minio-exporter \ + -web.listen-address ${optionalString (cfg.listenAddress != null) cfg.listenAddress}:${toString cfg.port} \ + -minio.server ${cfg.minioAddress} \ + -minio.access-key ${cfg.minioAccessKey} \ + -minio.access-secret ${cfg.minioAccessSecret} \ + ${optionalString cfg.minioBucketStats "-minio.bucket-stats"} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; + }; +} From 3144832556629dcad7c6b1b4f8044039e81bd27f Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Sun, 8 Oct 2017 11:53:20 +0100 Subject: [PATCH 13/27] zile: fix evaluation --- pkgs/applications/editors/zile/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index 0f79ca33c72..7213b22c949 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { (stdenv.hostPlatform == stdenv.buildPlatform) help2man; - buildInputs = [ ncurses boehmgc ]; - # Tests can't be run because most of them rely on the ability to # fiddle with the terminal. doCheck = false; From dfd9a2bbd012e235dd3b5a5290aac0b32d82d08b Mon Sep 17 00:00:00 2001 From: Alexey Shmalko Date: Sun, 8 Oct 2017 14:18:45 +0300 Subject: [PATCH 14/27] escrotum: Init at 2017-01-28 --- pkgs/tools/graphics/escrotum/default.nix | 25 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/graphics/escrotum/default.nix diff --git a/pkgs/tools/graphics/escrotum/default.nix b/pkgs/tools/graphics/escrotum/default.nix new file mode 100644 index 00000000000..2a4f3c9cbff --- /dev/null +++ b/pkgs/tools/graphics/escrotum/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub, buildPythonApplication +, pygtk +, numpy ? null +}: + +buildPythonApplication { + name = "escrotum-2017-01-28"; + + src = fetchFromGitHub { + owner = "Roger"; + repo = "escrotum"; + rev = "a51e330f976c1c9e1ac6932c04c41381722d2171"; + sha256 = "0vbpyihqgm0fyh22ashy4lhsrk67n31nw3bs14d1wr7ky0l3rdnj"; + }; + + propagatedBuildInputs = [ pygtk numpy ]; + + meta = with lib; { + homepage = https://github.com/Roger/escrotum; + description = "Linux screen capture using pygtk, inspired by scrot"; + platforms = platforms.linux; + maintainers = with maintainers; [ rasendubi ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e8fc79710a..6cb3fc221c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1902,6 +1902,10 @@ with pkgs; epsxe = callPackage ../misc/emulators/epsxe { }; + escrotum = callPackage ../tools/graphics/escrotum { + inherit (pythonPackages) buildPythonApplication pygtk numpy; + }; + ethtool = callPackage ../tools/misc/ethtool { }; ettercap = callPackage ../applications/networking/sniffers/ettercap { }; From 8e10a4d86267f7b59e2ab1d614243334459678df Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sun, 8 Oct 2017 15:09:25 +0200 Subject: [PATCH 15/27] prometheus-minio-exporter service: default to local minio server if enabled --- .../services/monitoring/prometheus/minio-exporter.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/services/monitoring/prometheus/minio-exporter.nix b/nixos/modules/services/monitoring/prometheus/minio-exporter.nix index 4b6c96d9673..bc3967f8612 100644 --- a/nixos/modules/services/monitoring/prometheus/minio-exporter.nix +++ b/nixos/modules/services/monitoring/prometheus/minio-exporter.nix @@ -29,26 +29,32 @@ in { minioAddress = mkOption { type = types.str; example = "https://10.0.0.1:9000"; + default = if config.services.minio.enable then "http://localhost:9000" else null; description = '' The URL of the minio server. Use HTTPS if Minio accepts secure connections only. + By default this connects to the local minio server if enabled. ''; }; minioAccessKey = mkOption { type = types.str; example = "BKIKJAA5BMMU2RHO6IBB"; + default = if config.services.minio.enable then config.services.minio.accessKey else null; description = '' The value of the Minio access key. It is required in order to connect to the server. + By default this uses the one from the local minio server if enabled. ''; }; minioAccessSecret = mkOption { type = types.str; + default = if config.services.minio.enable then config.services.minio.secretKey else null; description = '' The calue of the Minio access secret. It is required in order to connect to the server. + By default this uses the one from the local minio server if enabled. ''; }; From 2ab99df2af45d6b694b8e9bd2f8eddac5ca6d357 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 8 Oct 2017 15:56:28 +0200 Subject: [PATCH 16/27] lambda-mod-zsh-theme: 2017-07-05 -> 2017-10-08 --- pkgs/shells/lambda-mod-zsh-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/lambda-mod-zsh-theme/default.nix b/pkgs/shells/lambda-mod-zsh-theme/default.nix index 8f50448b714..bef8915dd64 100644 --- a/pkgs/shells/lambda-mod-zsh-theme/default.nix +++ b/pkgs/shells/lambda-mod-zsh-theme/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation { - name = "lambda-mod-zsh-theme-unstable-2017-07-05"; + name = "lambda-mod-zsh-theme-unstable-2017-10-08"; src = fetchFromGitHub { owner = "halfo"; repo = "lambda-mod-zsh-theme"; - sha256 = "03kdhifxsnfbly6hqpr1h6kf52kyhdbh82nvwkkyrz1lw2cxl89n"; - rev = "ba7d5fea16db91fc8de887e69250f4e501b1e36d"; + sha256 = "13yis07zyr192s0x2h04k5bm1yzbk5m3js83aa17xh5573w4b786"; + rev = "61c373c8aa5556d51522290b82ad44e7166bced1"; }; buildPhases = [ "unpackPhase" "installPhase" ]; From e7e4e0c3b6b01e905f7411b793d5909720a93cf9 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Sun, 8 Oct 2017 15:05:25 +0100 Subject: [PATCH 17/27] nixos/prometheus-minio-exporter: only inherit keys from minio if set --- .../monitoring/prometheus/minio-exporter.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/minio-exporter.nix b/nixos/modules/services/monitoring/prometheus/minio-exporter.nix index bc3967f8612..4314671523c 100644 --- a/nixos/modules/services/monitoring/prometheus/minio-exporter.nix +++ b/nixos/modules/services/monitoring/prometheus/minio-exporter.nix @@ -37,26 +37,30 @@ in { ''; }; - minioAccessKey = mkOption { + minioAccessKey = mkOption ({ type = types.str; example = "BKIKJAA5BMMU2RHO6IBB"; - default = if config.services.minio.enable then config.services.minio.accessKey else null; description = '' The value of the Minio access key. It is required in order to connect to the server. - By default this uses the one from the local minio server if enabled. + By default this uses the one from the local minio server if enabled + and config.services.minio.accessKey. ''; - }; + } // optionalAttrs (config.services.minio.enable && config.services.minio.accessKey != "") { + default = config.services.minio.accessKey; + }); - minioAccessSecret = mkOption { + minioAccessSecret = mkOption ({ type = types.str; - default = if config.services.minio.enable then config.services.minio.secretKey else null; description = '' The calue of the Minio access secret. It is required in order to connect to the server. - By default this uses the one from the local minio server if enabled. + By default this uses the one from the local minio server if enabled + and config.services.minio.secretKey. ''; - }; + } // optionalAttrs (config.services.minio.enable && config.services.minio.secretKey != "") { + default = config.services.minio.secretKey; + }); minioBucketStats = mkOption { type = types.bool; From 07efaaa722a8bf288a89e7a2047a4df643927c28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 8 Oct 2017 11:20:26 +0200 Subject: [PATCH 18/27] xorg-server: security 1.19.3 -> 1.19.4 CVE-2017-{13721,13723} https://lists.x.org/archives/xorg-announce/2017-October/002808.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 12ba110acbf..786192f6a0a 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2576,11 +2576,11 @@ let }) // {inherit ;}; xorgserver = (mkDerivation "xorgserver" { - name = "xorg-server-1.19.3"; + name = "xorg-server-1.19.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.19.3.tar.bz2; - sha256 = "162s1v901djr57gxmmk4airk8hiwcz79dqyz72972x1lw1k82yk7"; + url = mirror://xorg/individual/xserver/xorg-server-1.19.4.tar.bz2; + sha256 = "1a690fzv5l5ks45g9zhlzdskdq8q73mcbpb9a3wz3shxm778lxda"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 362ca3f2e7e..6cd4e082e8d 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -185,7 +185,7 @@ mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.19.3.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.19.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 From 9f1b54b31b11ac97d2cfc960b772354f13601481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 8 Oct 2017 17:54:49 +0200 Subject: [PATCH 19/27] tigervnc: fixup build after xorgserver changes The server itself doesn't need those build inputs anymore, but tigervnc does, apparently. --- pkgs/tools/admin/tigervnc/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index bb585f6eb64..5ba53c75371 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -87,7 +87,8 @@ stdenv.mkDerivation rec { glproto mesa_glu ] ++ xorgserver.buildInputs; - nativeBuildInputs = [ cmake zlib gettext libtool ] ++ xorg.xorgserver.nativeBuildInputs; + nativeBuildInputs = with xorg; [ cmake zlib gettext libtool utilmacros fontutil ] + ++ xorg.xorgserver.nativeBuildInputs; propagatedBuildInputs = xorg.xorgserver.propagatedBuildInputs; From c643759d414b7ca3f33f25eeb34c986c3ec8c6c7 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 8 Oct 2017 12:49:58 -0400 Subject: [PATCH 20/27] kbfs: Add package in module --- nixos/modules/services/network-filesystems/kbfs.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/network-filesystems/kbfs.nix b/nixos/modules/services/network-filesystems/kbfs.nix index 8b972ba971e..7b2eea3b585 100644 --- a/nixos/modules/services/network-filesystems/kbfs.nix +++ b/nixos/modules/services/network-filesystems/kbfs.nix @@ -59,5 +59,7 @@ in { }; services.keybase.enable = true; + + environment.systemPackages = [ pkgs.kbfs ]; }; } From e50fdb1c038e4f86504e6a3bb08f646653cdeefe Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Sun, 8 Oct 2017 18:53:28 +0200 Subject: [PATCH 21/27] devtodo: adjust platforms devtodo: adjust platforms unicode: adjust platforms --- pkgs/development/tools/devtodo/default.nix | 2 +- pkgs/tools/misc/unicode/default.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/devtodo/default.nix b/pkgs/development/tools/devtodo/default.nix index 36c489b1171..a0b0ee571d9 100644 --- a/pkgs/development/tools/devtodo/default.nix +++ b/pkgs/development/tools/devtodo/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "A hierarchical command-line task manager"; license = licenses.gpl2; maintainers = [ maintainers.woffs ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/unicode/default.nix b/pkgs/tools/misc/unicode/default.nix index d2a4ed39e9a..58f5e54fc3a 100644 --- a/pkgs/tools/misc/unicode/default.nix +++ b/pkgs/tools/misc/unicode/default.nix @@ -26,5 +26,6 @@ python3Packages.buildPythonApplication rec { homepage = https://github.com/garabik/unicode; license = licenses.gpl3; maintainers = [ maintainers.woffs ]; + platforms = platforms.all; }; } From 76cec2dfa62a29193abf36a3d623b19ef5a22b61 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 8 Oct 2017 20:53:13 +0200 Subject: [PATCH 22/27] fbterm: fix build --- pkgs/os-specific/linux/fbterm/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix index e7a540b6671..918527aa318 100644 --- a/pkgs/os-specific/linux/fbterm/default.nix +++ b/pkgs/os-specific/linux/fbterm/default.nix @@ -9,7 +9,6 @@ let url="http://fbterm.googlecode.com/files/fbterm-1.7.0.tar.gz"; sha256="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; }; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [gpm freetype fontconfig ncurses libx86]; in stdenv.mkDerivation { @@ -17,7 +16,10 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; + + nativeBuildInputs = [ pkgconfig ]; inherit buildInputs; + preConfigure = '' sed -e '/ifdef SYS_signalfd/atypedef long long loff_t;' -i src/fbterm.cpp sed -e '/install-exec-hook:/,/^[^\t]/{d}; /.NOEXPORT/iinstall-exec-hook:\ From d66a3404a62629f91cd25fd696ea92b18328fc95 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 8 Oct 2017 23:31:01 +0200 Subject: [PATCH 23/27] xmlsec: fix build (re: nss update) --- pkgs/development/libraries/xmlsec/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 32ce856eddd..264a377cb25 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { # otherwise libxmlsec1-gnutls.so won't find libgcrypt.so, after #909 NIX_LDFLAGS = [ "-lgcrypt" ]; + NIX_CFLAGS_COMPILE = [ "-I${nss.dev}/include/nss" ]; postInstall = '' moveToOutput "bin/xmlsec1-config" "$dev" From 4817454366dac6894106d81f832bcd6c24de1d98 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 9 Oct 2017 11:46:32 +0800 Subject: [PATCH 24/27] wireguard: wg-quick systemd unit was referencing /usr/bin --- pkgs/os-specific/linux/wireguard/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 5391a699b92..c8500d89d04 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -47,6 +47,8 @@ let buildInputs = [ libmnl ]; + enableParallelBuilding = true; + makeFlags = [ "WITH_BASHCOMPLETION=yes" "WITH_WGQUICK=yes" @@ -57,6 +59,11 @@ let ]; buildPhase = "make tools"; + + postInstall = '' + substituteInPlace $out/lib/systemd/system/wg-quick@.service \ + --replace /usr/bin $out/bin + ''; }; in if kernel == null From 2870979a5340060dab29db0d2a3ee7a3524f1fb1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 8 Oct 2017 17:29:41 +0000 Subject: [PATCH 25/27] ocamlPackages.ounit: fix for OCaml 4.06 --- pkgs/development/ocaml-modules/ounit/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ounit/default.nix b/pkgs/development/ocaml-modules/ounit/default.nix index 7179b8408a0..533a41cc435 100644 --- a/pkgs/development/ocaml-modules/ounit/default.nix +++ b/pkgs/development/ocaml-modules/ounit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4 }: +{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { name = "ounit-2.0.0"; @@ -8,7 +8,13 @@ stdenv.mkDerivation { sha256 = "118xsadrx84pif9vaq13hv4yh22w9kmr0ypvhrs0viir1jr0ajjd"; }; - buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; + patches = with stdenv.lib; + optional (versionAtLeast ocaml.version "4.02") (fetchpatch { + url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ounit/ounit.2.0.0/files/safe-string.patch"; + sha256 = "0hbd2sqdz75lv5ax82yhsfdk1dlcvq12xpys6n85ysmrl0c3d3lk"; + }); + + buildInputs = [ ocaml findlib ocamlbuild ]; dontAddPrefix = true; From 701316450cc044d5294add2ed25f876b7a891420 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 8 Oct 2017 19:14:49 +0000 Subject: [PATCH 26/27] ocamlPackages.oasis: remove unneeded dependencies --- pkgs/development/tools/ocaml/oasis/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index 6ff5ee72666..2364058729e 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -1,6 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4 -, ocaml_data_notation, type_conv, ocamlmod, ocamlify, ounit, expect -}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocamlmod, ocamlify }: stdenv.mkDerivation rec { version = "0.4.10"; @@ -17,11 +15,9 @@ stdenv.mkDerivation rec { buildInputs = [ - ocaml findlib ocamlbuild type_conv ocamlmod ocamlify ounit camlp4 + ocaml findlib ocamlbuild ocamlmod ocamlify ]; - propagatedBuildInputs = [ ocaml_data_notation ]; - configurePhase = "ocaml setup.ml -configure --prefix $out"; buildPhase = "ocaml setup.ml -build"; installPhase = "ocaml setup.ml -install"; From 28cd0f240a0fc73e579899adb9a6296adf3bd761 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 9 Oct 2017 07:09:09 +0000 Subject: [PATCH 27/27] ocamlPackages.ppx_ast: 0.9.0 -> 0.9.{1,2} --- .../ocaml-modules/janestreet/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index 8fc1ddf9063..4aabb976ee1 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -27,12 +27,19 @@ rec { meta.description = "OCaml compiler libraries repackaged"; }; - ppx_ast = janePackage { + ppx_ast = janePackage ({ name = "ppx_ast"; - hash = "0p9v4q3cjz8wwdrh6bjidani2npzvhdy8isnqwigqkl6n326dba9"; propagatedBuildInputs = [ ocaml-compiler-libs ocaml-migrate-parsetree ]; meta.description = "OCaml AST used by Jane Street ppx rewriters"; - }; + } // (if lib.versionAtLeast ocaml.version "4.06" + then { + version = "0.9.2"; + hash = "1h4qf26rg23z21rrw83fakiavw9km7174p3830pg0gg4bwakvba0"; + } else { + version = "0.9.1"; + hash = "0a9rxwavy2748k0yd4db3hg1ypq7mpqnwq9si5a5qdiclgkhcggw"; + } + )); ppx_traverse_builtins = janePackage { name = "ppx_traverse_builtins";