From a513a38066d4b6d594385d4be10aca9841050756 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sun, 30 Apr 2017 21:12:29 +1000 Subject: [PATCH 1/3] cpp-hocon: 0.1.4 -> 0.1.5 --- pkgs/development/libraries/cpp-hocon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix index 90c27083d770..6014c9f4eafe 100644 --- a/pkgs/development/libraries/cpp-hocon/default.nix +++ b/pkgs/development/libraries/cpp-hocon/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "cpp-hocon-${version}"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { - sha256 = "1abalk0sjfg4yfz148hdknsbnl2xwjb8li7lqc64d07ifxhcqr87"; + sha256 = "0fc5468458mz572nbp45x5sblp6dsb4d1b6jqv77zf3mx5xyziz7"; rev = version; repo = "cpp-hocon"; owner = "puppetlabs"; From 7dbab8b2ffc254846b36ff3dad55b3a0dd826e90 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sun, 30 Apr 2017 21:12:47 +1000 Subject: [PATCH 2/3] leatherman: 0.10.1 -> 0.11.2 --- pkgs/development/libraries/leatherman/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index ea092a336375..d45a616606d9 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, boost, cmake, curl }: +{ stdenv, fetchFromGitHub, boost, cmake, curl, ruby }: stdenv.mkDerivation rec { name = "leatherman-${version}"; - version = "0.10.1"; + version = "0.11.2"; src = fetchFromGitHub { - sha256 = "0kjk3xq7v6bqq35ymj9vr9xz5kpcka51ms6489pm48adyaf53hs7"; + sha256 = "1rnk204mvzc44i69b8gfb1fjj5r4qby7ymal782rdplnlbm065r8"; rev = version; repo = "leatherman"; owner = "puppetlabs"; }; - buildInputs = [ boost cmake curl ]; + buildInputs = [ boost cmake curl ruby ]; meta = with stdenv.lib; { homepage = https://github.com/puppetlabs/leatherman/; From 673ac9506be3ac058f03f4f6c29f443c7af7872a Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sun, 30 Apr 2017 21:13:26 +1000 Subject: [PATCH 3/3] facter: 3.6.0 -> 3.6.4 --- pkgs/tools/system/facter/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index 9f97a403159a..b66cd7d6112e 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "facter-${version}"; - version = "3.6.0"; + version = "3.6.4"; src = fetchFromGitHub { - sha256 = "1fwvjd84nw39lgclkz4kn90z84fs9lsama3ikq0qs1in3y3jfmvi"; + sha256 = "177mmg5a4s4q2p76df4z6c51nfnr73qya1pvvj6fcs1gld01xjr6"; rev = version; repo = "facter"; owner = "puppetlabs"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e04319607ef9..98cb5fab1376 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -923,7 +923,6 @@ with pkgs; facter = callPackage ../tools/system/facter { boost = boost160; - ruby = ruby_2_1; }; fasd = callPackage ../tools/misc/fasd { };