diff options
| author | Doron Behar <doron.behar@gmail.com> | 2023-12-20 15:37:31 +0200 |
|---|---|---|
| committer | Doron Behar <doron.behar@gmail.com> | 2023-12-21 15:39:38 +0200 |
| commit | a68d59d0796e999da4db62a9bdfd4539b8c54091 (patch) | |
| tree | fff7e2ccd1ff7858d4f1564e16c1e266bf809912 /pkgs/applications/radio | |
| parent | 2b348b79c1daf73c9bb436d71e470e6d4e51fed6 (diff) | |
| download | nixlib-a68d59d0796e999da4db62a9bdfd4539b8c54091.tar nixlib-a68d59d0796e999da4db62a9bdfd4539b8c54091.tar.gz nixlib-a68d59d0796e999da4db62a9bdfd4539b8c54091.tar.bz2 nixlib-a68d59d0796e999da4db62a9bdfd4539b8c54091.tar.lz nixlib-a68d59d0796e999da4db62a9bdfd4539b8c54091.tar.xz nixlib-a68d59d0796e999da4db62a9bdfd4539b8c54091.tar.zst nixlib-a68d59d0796e999da4db62a9bdfd4539b8c54091.zip | |
gnuradioMinimal: 3.10.7.0 -> 3.10.8.0
Diff: https://github.com/gnuradio/gnuradio/compare/v3.10.7.0...v3.10.8.0 Close #275427 .
Diffstat (limited to 'pkgs/applications/radio')
| -rw-r--r-- | pkgs/applications/radio/gnuradio/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/applications/radio/gnuradio/modtool-newmod-permissions.patch | 14 |
2 files changed, 9 insertions, 15 deletions
diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index d1f0a3fd6fb6..7765b92c1d26 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -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 diff --git a/pkgs/applications/radio/gnuradio/modtool-newmod-permissions.patch b/pkgs/applications/radio/gnuradio/modtool-newmod-permissions.patch index 7cab73fede0c..671a7559f4e4 100644 --- a/pkgs/applications/radio/gnuradio/modtool-newmod-permissions.patch +++ b/pkgs/applications/radio/gnuradio/modtool-newmod-permissions.patch @@ -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"), |