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

Merge branch 'master' into staging-next

Browse Source 
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
This commit is contained in:
Vladimír Čunát
2019-08-24 08:55:37 +02:00
parent 84a91208a9 8943fb5f24
commit 2e6bf42a22
865 changed files with 29587 additions and 14316 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/X11/nx-libs/default.nix
+2 -2
View File
@@ -2,12 +2,12 @@
libpng, libtool, libxml2, pkgconfig, which, xorg }:
stdenv.mkDerivation rec {
pname = "nx-libs";
version = "3.5.99.20";
version = "3.5.99.21";
src = fetchFromGitHub {
owner = "ArcticaProject";
repo = "nx-libs";
rev = version;
sha256 = "1c3xjbmnylw53h04g77lk9va1sk1dgg7zhirwz3mpn73r6dkyzix";
sha256 = "10xid8mhhid5mrap5jb51k9fm63cm03ss4k4sfymc8zsn0wrqnr9";
};
nativeBuildInputs = [ autoconf automake libtool pkgconfig which