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

Merge pull request #154192 from doronbehar/pkg/gnuradio/update

Browse Source
This commit is contained in:
Doron Behar 2022-01-10 18:41:39 +02:00 committed by GitHub
commit ca3c54a88d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/radio/gnuradio/3.8.nix
View File

@ -43,13 +43,13 @@
, pname ? "gnuradio"
, versionAttr ? {
major = "3.8";
minor = "4";
minor = "5";
patch = "0";
}
}:
let
sourceSha256 = "sha256-C8S3iF7vj9A8SpxriW9y7idrhXzonvenoQtVAMex+Iw=";
sourceSha256 = "sha256-p4VFjTE0GXmdA7QGhWSUzO/WxJ+8Dq3JEnOABtQtJUU=";
featuresInfo = {
# Needed always
basic = {
@ -243,11 +243,6 @@ stdenv.mkDerivation rec {
patches = [
# Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227
./modtool-newmod-permissions.3_8.patch
(fetchpatch {
# https://github.com/gnuradio/gnuradio/pull/5226
url = "https://github.com/gnuradio/gnuradio/commit/9d7343526dd793120b6425cd9a6969416ed32503.patch";
sha256 = "sha256-usSoRDDuClUfdX4yFbQNu8wDzve6UEhZYTFj1oZbFic=";
})
# Fix compilation with boost 177
(fetchpatch {
url = "https://github.com/gnuradio/gnuradio/commit/2c767bb260a25b415e8c9c4b3ea37280b2127cec.patch";

4
pkgs/applications/radio/gnuradio/default.nix
View File

@ -46,13 +46,13 @@
, pname ? "gnuradio"
, versionAttr ? {
major = "3.9";
minor = "4";
minor = "5";
patch = "0";
}
}:
let
sourceSha256 = "sha256-O+37CyF0IVPdUB1e68HsaXD0T2VsOLPXOpLNlRYEXUk=";
sourceSha256 = "sha256-TWCXLoS+ImKNd2zkxMks4FXsQMvGKgcW5/MW8S1Y1TY=";
featuresInfo = {
# Needed always
basic = {