public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-12-31 12:00:36 +01:00
parent ec1f78d1cb 42575040fc
commit 070290bda7
172 changed files with 2734 additions and 2541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/misc/lit/default.nix
View File

@@ -2,11 +2,11 @@
python2.pkgs.buildPythonApplication rec {
pname = "lit";
version = "0.6.0";
version = "0.7.1";
src = python2.pkgs.fetchPypi {
inherit pname version;
sha256 = "1png3jgbhrw8a602gy6rnzvjcrj8w2p2kk6szdg9lz42zr090lgb";
sha256 = "ecef2833aef7f411cb923dac109c7c9dcc7dbe7cafce0650c1e8d19c243d955f";
};
# Non-standard test suite. Needs custom checkPhase.

6
pkgs/development/tools/misc/strace/default.nix
View File

@@ -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 ];
};