about summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@users.noreply.github.com>2018-12-28 22:45:47 -0500
committerGitHub <noreply@github.com>2018-12-28 22:45:47 -0500
commit94164f0d04e99ce7c525b1d8dc89710fd57d895c (patch)
treef0bd424efe486adc0493fd46d139c53e74221128 /pkgs/development
parentbd98a3d770ef16b5aca2e1aff8faac1e8d7f0284 (diff)
parentdfc35f1203ad73da62a2174d242db035209da0d1 (diff)
downloadnixlib-94164f0d04e99ce7c525b1d8dc89710fd57d895c.tar
nixlib-94164f0d04e99ce7c525b1d8dc89710fd57d895c.tar.gz
nixlib-94164f0d04e99ce7c525b1d8dc89710fd57d895c.tar.bz2
nixlib-94164f0d04e99ce7c525b1d8dc89710fd57d895c.tar.lz
nixlib-94164f0d04e99ce7c525b1d8dc89710fd57d895c.tar.xz
nixlib-94164f0d04e99ce7c525b1d8dc89710fd57d895c.tar.zst
nixlib-94164f0d04e99ce7c525b1d8dc89710fd57d895c.zip
Merge pull request #53017 from dtzWill/update/strace-4.26
strace: 4.25 -> 4.26
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/tools/misc/strace/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index e2022156870d..4b6dc50a9311 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "strace-${version}";
-  version = "4.25";
+  version = "4.26";
 
   src = fetchurl {
     url = "https://strace.io/files/${version}/${name}.tar.xz";
-    sha256 = "00f7zagfh3np5gwi0z7hi7zjd7s5nixcaq7z78n87dvhakkgi1fn";
+    sha256 = "070yz8xii8gnb4psiz628zwm5srh266sfb06f7f1qzagxzz2ykbw";
   };
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://strace.io/;
     description = "A system call tracer for Linux";
-    license = licenses.bsd3;
+    license =  with licenses; [ lgpl21Plus gpl2Plus ]; # gpl2Plus is for the test suite
     platforms = platforms.linux;
     maintainers = with maintainers; [ jgeerds globin ];
   };