diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-19 21:31:51 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-19 21:31:51 +0000 |
| commit | 84c018503859be28aded86677c9dbc54c7067e11 (patch) | |
| tree | 44896c72bb5eaddc3b9ebc5e4701f40560774ff0 /pkgs/tools/system | |
| parent | 3980444b2b918ef74ac7b9f1128f399767d06fa1 (diff) | |
| parent | b94fef3cbad6b3b830f8f7c4a987c65c81c9e93d (diff) | |
| download | nixlib-84c018503859be28aded86677c9dbc54c7067e11.tar nixlib-84c018503859be28aded86677c9dbc54c7067e11.tar.gz nixlib-84c018503859be28aded86677c9dbc54c7067e11.tar.bz2 nixlib-84c018503859be28aded86677c9dbc54c7067e11.tar.lz nixlib-84c018503859be28aded86677c9dbc54c7067e11.tar.xz nixlib-84c018503859be28aded86677c9dbc54c7067e11.tar.zst nixlib-84c018503859be28aded86677c9dbc54c7067e11.zip | |
svn merge ^/nixpkgs/trunk, one simple conflict in jruby
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/ddrescue/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/system/freeipmi/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index 0cc3fb369947..0ca5d6af2d75 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ddrescue-1.14"; + name = "ddrescue-1.15"; src = fetchurl { url = "mirror://gnu/ddrescue/${name}.tar.gz"; - sha256 = "01m9m8lisf7ly7xl97plqnl5dj253ms1gbk1bbpwv3nnchnvj5yd"; + sha256 = "0y1dxkbl82nli6xjlg2kaq5kxd19480rvpay4ydbb9av01i17q3m"; }; doCheck = true; diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 2330de1d11e4..fe0bf0384db0 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libgcrypt, readline }: stdenv.mkDerivation rec { - name = "freeipmi-1.0.9"; + name = "freeipmi-1.1.1"; src = fetchurl { url = "mirror://gnu/freeipmi/${name}.tar.gz"; - sha256 = "00ix8cigf6nl5kg95hla43kf27jkb3lljhcihbfriwq0wrghcfx4"; + sha256 = "03q6wg1wdmr94dxh81lxllb53nmab0d637wgh2s1xn6rfmxf7ypf"; }; buildInputs = [ libgcrypt readline ]; |