diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-06 10:16:39 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-06 10:16:39 +0100 |
| commit | 0518ccf5af90017df31c445f52badaff45b6b7cd (patch) | |
| tree | f60c912ecd598722d76947f6bd5230955210eb66 /pkgs/tools/system | |
| parent | c96407720010658b44dcd2a8801b05879105b9ff (diff) | |
| parent | 782a12e450a58b815cd702c65da75855124d1572 (diff) | |
| download | nixpkgs-0518ccf5af90017df31c445f52badaff45b6b7cd.tar nixpkgs-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.gz nixpkgs-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.bz2 nixpkgs-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.lz nixpkgs-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.xz nixpkgs-0518ccf5af90017df31c445f52badaff45b6b7cd.tar.zst nixpkgs-0518ccf5af90017df31c445f52badaff45b6b7cd.zip | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/stdenv/generic/default.nix
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/ipmiutil/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/system/sleuthkit/default.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index 46c36926c36..c19b6007f01 100644 --- a/pkgs/tools/system/ipmiutil/default.nix +++ b/pkgs/tools/system/ipmiutil/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { baseName = "ipmiutil"; - version = "2.9.4"; + version = "2.9.5"; name = "${baseName}-${version}"; src = fetchurl { url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz"; - sha256 = "1pmpmpc0wymnw8i2rxnyq3v2y7p8930b2rb8nw5w60x2vf15wlaa"; + sha256 = "1rnv72qfrijcm0kiy2lsbdckjxnxdma8sf8y6y6iypp75rcg007b"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix index 016e2ccda37..872dbf0c20e 100644 --- a/pkgs/tools/system/sleuthkit/default.nix +++ b/pkgs/tools/system/sleuthkit/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "A forensic/data recovery tool"; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; - license = "IBM Public License"; + license = stdenv.lib.licenses.ipl10; inherit version; }; } |