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

Merge branch 'master' into staging-next

Browse Source 
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.

Hydra nixpkgs: ?compare=1538611
This commit is contained in:
Vladimír Čunát
2019-08-25 14:57:11 +02:00
parent bc238b8df5 f188bad6ea
commit 985d1ac425
111 changed files with 1767 additions and 1313 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/misc/ckb-next/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, substituteAll, udev
{ stdenv, mkDerivation, fetchFromGitHub, substituteAll, udev
, pkgconfig, qtbase, cmake, zlib, kmod }:
stdenv.mkDerivation rec {
mkDerivation rec {
version = "0.3.2";
pname = "ckb-next";