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

Merge pull request #275645 from doronbehar/pkg/gnuradio

Browse Source 
gnuradio.unwrapped: 3.10.7.0 -> 3.10.8.0
This commit is contained in:
Doron Behar 2023-12-21 16:16:30 +00:00 committed by GitHub
commit 0bf4be0751
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/radio/gnuradio/3.9.nix
View File

@ -276,7 +276,7 @@ stdenv.mkDerivation (finalAttrs: (shared // {
'';
patches = [
# Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227
./modtool-newmod-permissions.patch
./modtool-newmod-permissions.3_9.patch
];
passthru = shared.passthru // {
# Deps that are potentially overridden and are used inside GR plugins - the same version must

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
, overrideSrc ? {}
, pname ? "gnuradio"
, version ? "3.10.7.0"
, version ? "3.10.8.0"
}:
let
sourceSha256 = "sha256-7fIQMcx90wI4mAZmR26/rkBKPKhNxgu3oWpJTV3C+Ek=";
sourceSha256 = "sha256-4BoJciL3ffd9Dgk3HxXCOOwnGHqCEVuo+a1AtzJG4IY=";
featuresInfo = {
# Needed always
basic = {
@ -291,12 +291,6 @@ stdenv.mkDerivation (finalAttrs: (shared // {
patches = [
# Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227
./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 // {
# Deps that are potentially overridden and are used inside GR plugins - the same version must

15
pkgs/applications/radio/gnuradio/modtool-newmod-permissions.3_9.patch Normal file
View File

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

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