Frederik Rietdijk
|
98640fd482
|
Merge master into staging-next
|
2019-08-27 16:36:47 +02:00 |
|
Alkeryn
|
43ab91e6c4
|
ckb-next: fix #67371
|
2019-08-26 15:02:10 +02:00 |
|
Vladimír Čunát
|
985d1ac425
|
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.
Hydra nixpkgs: ?compare=1538611
|
2019-08-25 14:57:11 +02:00 |
|
Alkeryn
|
af9f401b9a
|
ckb-next: use qt5's mkDerivation
|
2019-08-25 13:51:50 +09:00 |
|
volth
|
46420bbaa3
|
treewide: name -> pname (easy cases) (#66585)
treewide replacement of
stdenv.mkDerivation rec {
name = "*-${version}";
version = "*";
to pname
|
2019-08-15 13:41:18 +01:00 |
|
Kier Davis
|
7a0d849653
|
ckb-next: rename ckb-modprobe.patch to modprobe.patch
This keeps the naming consistent with the other two patches in
this directory.
|
2018-10-22 13:23:30 +01:00 |
|
Kier Davis
|
81178785c9
|
ckb, ckb module: rename to ckb-next
The upstream package has officially changed its name to ckb-next.
|
2018-10-22 13:23:30 +01:00 |
|