nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 15:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

gnuradioMinimal: 3.10.7.0 -> 3.10.8.0

Browse Source 
Diff: https://github.com/gnuradio/gnuradio/compare/v3.10.7.0...v3.10.8.0

Close #275427 .
This commit is contained in:
Doron Behar 2023-12-20 15:37:31 +02:00
parent 2b348b79c1
commit a68d59d079
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,11 +45,11 @@
# If one wishes to use a different src or name for a very custom build # If one wishes to use a different src or name for a very custom build
, overrideSrc ? {} , overrideSrc ? {}
, pname ? "gnuradio" , pname ? "gnuradio"
, version ? "3.10.7.0" , version ? "3.10.8.0"
}: }:
let let
sourceSha256 = "sha256-7fIQMcx90wI4mAZmR26/rkBKPKhNxgu3oWpJTV3C+Ek="; sourceSha256 = "sha256-4BoJciL3ffd9Dgk3HxXCOOwnGHqCEVuo+a1AtzJG4IY=";
featuresInfo = { featuresInfo = {
# Needed always # Needed always
basic = { basic = {
@ -291,12 +291,6 @@ stdenv.mkDerivation (finalAttrs: (shared // {
patches = [ patches = [
# Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227
./modtool-newmod-permissions.patch ./modtool-newmod-permissions.patch
# https://github.com/gnuradio/gnuradio/pull/6808
(fetchpatch {
name = "gnuradio-fmt10.1.patch";
url = "https://github.com/gnuradio/gnuradio/commit/9357c17721a27cc0aae3fe809af140c84e492f37.patch";
hash = "sha256-w3b22PTqoORyYQ3RKRG+2htQWbITzQiOdSDyuejUtHQ=";
})
]; ];
passthru = shared.passthru // { passthru = shared.passthru // {
# Deps that are potentially overridden and are used inside GR plugins - the same version must # Deps that are potentially overridden and are used inside GR plugins - the same version must

14
pkgs/applications/radio/gnuradio/modtool-newmod-permissions.patch
View File

@ -1,8 +1,8 @@
diff --git c/gr-utils/modtool/core/newmod.py w/gr-utils/modtool/core/newmod.py diff --git i/gr-utils/modtool/core/newmod.py w/gr-utils/modtool/core/newmod.py
index babebfcde..9a02f663e 100644 index 8b222473f..c82fcd538 100644
--- c/gr-utils/modtool/core/newmod.py --- i/gr-utils/modtool/core/newmod.py
+++ w/gr-utils/modtool/core/newmod.py +++ w/gr-utils/modtool/core/newmod.py
@@ -62,7 +62,9 @@ class ModToolNewModule(ModTool): @@ -66,7 +66,9 @@ class ModToolNewModule(ModTool):
self._setup_scm(mode='new') self._setup_scm(mode='new')
logger.info(f"Creating out-of-tree module in {self.dir}...") logger.info(f"Creating out-of-tree module in {self.dir}...")
try: try:
@ -10,6 +10,6 @@ index babebfcde..9a02f663e 100644
+ # https://stackoverflow.com/a/17022146/4935114 + # https://stackoverflow.com/a/17022146/4935114
+ shutil.copystat = lambda x, y: x + shutil.copystat = lambda x, y: x
+ shutil.copytree(self.srcdir, self.dir, copy_function=shutil.copyfile) + shutil.copytree(self.srcdir, self.dir, copy_function=shutil.copyfile)
try: source_dir = os.path.join(gr.prefix(), "share", "gnuradio")
shutil.copyfile(os.path.join(gr.prefix(), 'share', 'gnuradio', 'clang-format.conf'), for source_name, target_name in (
os.path.join(self.dir, '.clang-format')) ("clang-format.conf", ".clang-format"),