git.iko.soy/typeable/nixpkgs
on master help sign in
uhd: 3.14.0.0 -> 3.15.0.0

Use rec instead of let in and use only 1 version attribute.

commitb68894b2cfb34daba6f6a8c6eee78986a6a50278 authorDoron Behar <doron.behar@gmail.com> dateMon 9 Mar 2020, 14:06 (7 years ago) parent7121160
1 file changed+10−16
pkgs/applications/radio/uhd/default.nix+10−16
pkgs/applications/radio/uhd/default.nix+10−16
@@ -7,28 +7,22 @@
77# SUBSYSTEMS=="usb", ATTRS{idVendor}=="fffe", ATTRS{idProduct}=="0002", MODE:="0666"
88# SUBSYSTEMS=="usb", ATTRS{idVendor}=="2500", ATTRS{idProduct}=="0002", MODE:="0666"
99
10−let
11− uhdVer = "v" + version;
12−
10+stdenv.mkDerivation rec {
11+ pname = "uhd";
1312 # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz
1413 # and xxx.yyy.zzz. Hrmpf... style keeps changing
15− version = "3.14.0.0";
16−
17− # Firmware images are downloaded (pre-built) from the respective release on Github
18− uhdImagesSrc = fetchurl {
19− url = "https://github.com/EttusResearch/uhd/releases/download/${uhdVer}/uhd-images_${version}.tar.xz";
20− sha256 = "1fp37wgqkbr14cxg9l7ghfd4r92y2bxwgb7cfjzs96hbpd9s6al0";
21− };
22−
23−in stdenv.mkDerivation {
24− pname = "uhd";
25− inherit version;
14+ version = "3.15.0.0";
2615
2716 src = fetchFromGitHub {
2817 owner = "EttusResearch";
2918 repo = "uhd";
30− rev = uhdVer;
31− sha256 = "0y1hff4vslfv36vxgvjqajg4862a11d4wgr0vcb0visgh1bi8qgy";
19+ rev = "v${version}";
20+ sha256 = "0jknln88a69fh244670nb7qrflbyv0vvdxfddb5g8ncpb6hcg8qf";
21+ };
22+ # Firmware images are downloaded (pre-built) from the respective release on Github
23+ uhdImagesSrc = fetchurl {
24+ url = "https://github.com/EttusResearch/uhd/releases/download/v${version}/uhd-images_${version}.tar.xz";
25+ sha256 = "1fir1a13ac07mqhm4sr34cixiqj2difxq0870qv1wr7a7cbfw6vp";
3226 };
3327
3428 enableParallelBuilding = true;