diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-29 12:44:17 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-29 12:44:17 +0100 |
| commit | b74793bd1c458fec6e2dfc57d83ca1f33ac0f736 (patch) | |
| tree | 3a55306c8908eeecb78dedffe07bfd3e17693730 /pkgs/tools/system | |
| parent | f3c994ca11ecfdf1966a143abe7a5007cc1c84e7 (diff) | |
| parent | 898edb0fbc3f23b24b7e28bad0cdd3e57ad5dcc7 (diff) | |
| download | nixlib-b74793bd1c458fec6e2dfc57d83ca1f33ac0f736.tar nixlib-b74793bd1c458fec6e2dfc57d83ca1f33ac0f736.tar.gz nixlib-b74793bd1c458fec6e2dfc57d83ca1f33ac0f736.tar.bz2 nixlib-b74793bd1c458fec6e2dfc57d83ca1f33ac0f736.tar.lz nixlib-b74793bd1c458fec6e2dfc57d83ca1f33ac0f736.tar.xz nixlib-b74793bd1c458fec6e2dfc57d83ca1f33ac0f736.tar.zst nixlib-b74793bd1c458fec6e2dfc57d83ca1f33ac0f736.zip | |
Merge branch 'master' into staging
Conflicts: pkgs/tools/system/facter/default.nix
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/facter/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/system/runit/default.nix | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index 0ebfe36f59dc..83936ca65a5e 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, boost, cmake, curl, leatherman, libyamlcpp, openssl, ruby, utillinux }: +{ stdenv, fetchurl, boost, cmake, cpp-hocon, curl, leatherman, libyamlcpp, openssl, ruby, utillinux }: stdenv.mkDerivation rec { name = "facter-${version}"; - version = "3.1.8"; + version = "3.4.1"; src = fetchurl { url = "https://downloads.puppetlabs.com/facter/${name}.tar.gz"; - sha256 = "1fhfjf5bm5kyjiady14fxhpp7hdrkgx56vsvdbqj82km0xqcxpj9"; + sha256 = "1vvvqni68l3hmnxi8jp0n2rwzxyh1vmgv6xa2954h94dfax6dmcj"; }; cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # since we cant expand $out in cmakeFlags preConfigure = "cmakeFlags+=\" -DRUBY_LIB_INSTALL=$out/lib/ruby\""; - buildInputs = [ boost cmake curl leatherman libyamlcpp openssl ruby utillinux ]; + buildInputs = [ boost cmake cpp-hocon curl leatherman libyamlcpp openssl ruby utillinux ]; meta = with stdenv.lib; { homepage = https://github.com/puppetlabs/facter; diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix index 87cf720b981e..54899cb14df5 100644 --- a/pkgs/tools/system/runit/default.nix +++ b/pkgs/tools/system/runit/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl +, static ? false +}: stdenv.mkDerivation rec { name = "runit-${version}"; @@ -15,7 +17,9 @@ stdenv.mkDerivation rec { doCheck = true; - postPatch = '' + buildInputs = stdenv.lib.optionals static [ stdenv.cc.libc stdenv.cc.libc.static ]; + + postPatch = stdenv.lib.optionalString (!static) '' sed -i 's,-static,,g' src/Makefile ''; |