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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-10-09 15:37:52 +02:00
parent f1987fb58f eeaf3a131f
commit bc9bd012c4
597 changed files with 14496 additions and 7862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "blacksphere";
repo = "blackmagic";
rev = "d3a8f27fdbf952194e8fc5ce9b2fc9bcef7c545c";
sha256 = "0c3l7cfqag3g7zrfn4mmikkx7076hb1r856ybhhdh0f6zji2j6jx";
rev = "29386aee140e5e99a958727358f60980418b4c88";
sha256 = "05x19y80mixk6blpnfpfngy5d41jpjvdqgjzkmhv1qc03bhyhc82";
fetchSubmodules = true;
};

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

@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
name = "fswatch-${version}";
version = "1.12.0";
version = "1.13.0";
src = fetchFromGitHub {
owner = "emcrisostomo";
repo = "fswatch";
rev = version;
sha256 = "16f3g6s79gs1sp2ra3cka4c5mf5b557cx697bwcdfgj6r19ni5j7";
sha256 = "18nrp2l1rzrhnw4p6d9r6jaxkkvxkiahvahgws2j00q623v0f3ij";
};
nativeBuildInputs = [ autoreconfHook ];

2
pkgs/development/tools/misc/lsof/default.nix
View File

@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); ";
patches = stdenv.lib.optional stdenv.isDarwin ./darwin-dfile.patch;
patches = [ ./no-build-info.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-dfile.patch;
postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
substituteInPlace dialects/linux/dlsof.h --replace "defined(__UCLIBC__)" 1

43
pkgs/development/tools/misc/lsof/no-build-info.patch Normal file
View File

@@ -0,0 +1,43 @@
diff -ru -x '*~' lsof_4.91_src-orig/usage.c lsof_4.91_src/usage.c
--- lsof_4.91_src-orig/usage.c 2018-02-14 15:20:32.000000000 +0100
+++ lsof_4.91_src/usage.c 2018-10-08 21:57:45.718560869 +0200
@@ -930,26 +930,6 @@
(void) fprintf(stderr, " configuration info: %s\n", cp);
#endif /* defined(LSOF_CINFO) */
- if ((cp = isnullstr(LSOF_CCDATE)))
- (void) fprintf(stderr, " constructed: %s\n", cp);
- cp = isnullstr(LSOF_HOST);
- if (!(cp1 = isnullstr(LSOF_LOGNAME)))
- cp1 = isnullstr(LSOF_USER);
- if (cp || cp1) {
- if (cp && cp1)
- cp2 = "by and on";
- else if (cp)
- cp2 = "on";
- else
- cp2 = "by";
- (void) fprintf(stderr, " constructed %s: %s%s%s\n",
- cp2,
- cp1 ? cp1 : "",
- (cp && cp1) ? "@" : "",
- cp ? cp : ""
- );
- }
-
#if defined(LSOF_BLDCMT)
if ((cp = isnullstr(LSOF_BLDCMT)))
(void) fprintf(stderr, " builder's comment: %s\n", cp);
@@ -959,12 +939,8 @@
(void) fprintf(stderr, " compiler: %s\n", cp);
if ((cp = isnullstr(LSOF_CCV)))
(void) fprintf(stderr, " compiler version: %s\n", cp);
- if ((cp = isnullstr(LSOF_CCFLAGS)))
- (void) fprintf(stderr, " compiler flags: %s\n", cp);
if ((cp = isnullstr(LSOF_LDFLAGS)))
(void) fprintf(stderr, " loader flags: %s\n", cp);
- if ((cp = isnullstr(LSOF_SYSINFO)))
- (void) fprintf(stderr, " system info: %s\n", cp);
(void) report_SECURITY(" ", ".\n");
(void) report_WARNDEVACCESS(" ", "are", ".\n");
(void) report_HASKERNIDCK(" K", "is");

2
pkgs/development/tools/misc/xxdiff/tip.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, fetchFromBitbucket, qtbase, flex, bison, docutils }:
stdenv.mkDerivation rec {
name = "xxdiff-4.0.1.20170623";
name = "xxdiff-5.0b1";
src = fetchFromBitbucket {
owner = "blais";