Commit Graph

65 Commits

Author SHA1 Message Date
Doron Behar
88519c6309 gnuradio: Inherit log dependencies in passthrus
Inherit spdlog for GR 3.10 and log4cpp for lower GR versions. Inherit
both of these in the scope of the GR packages attribute set. Also use
the inherited log4cpp in qradiolink, gqrx & gnss-sdr.
2022-02-18 10:53:48 +02:00
Doron Behar
c970bece30 gnuradio: 3.10.1.0 -> 3.10.1.1 2022-02-18 10:29:57 +02:00
Doron Behar
53474ff6f7 gnuradio: 3.10.0.0 -> 3.10.1.0 2022-01-29 21:54:25 +02:00
Franz Pletz
3a13cdf0c1
Merge pull request #155148 from doronbehar/pkg/gnuradio/update
gnuradio: 3.9 -> 3.10
2022-01-16 12:51:23 +01:00
Frederik Rietdijk
7c1d6cfb95 gnuradio3_7: remove
Remove older version of gnuradio that still depends on python2.
2022-01-16 09:47:12 +01:00
Doron Behar
1794554a9a gnuradio: 3.9 -> 3.10 2022-01-15 23:18:00 +02:00
Doron Behar
9ad4900480 gnuradio: 3.9.4.0 -> 3.9.5.0 2022-01-09 23:53:33 +02:00
Doron Behar
06ed1e74c3 gnuradio3_8: 3.8.4.0 -> 3.8.5.0 2022-01-09 23:53:22 +02:00
Doron Behar
1b0014970d gnuradio3_8: Fix build with boost177
Fails to compile otherwise, see: #151469
2021-12-21 22:14:15 +02:00
Doron Behar
3baeba2654 gnuradio: 3.9.3.0 -> 3.9.4.0 2021-12-03 10:39:42 +02:00
Doron Behar
58025e8587 gnuradio: Reenable thrift support
Apparently, this requires thrift to be added to all other reverse
dependencies.
2021-10-23 23:46:45 +03:00
Doron Behar
6e552641b7 gnuradio: Add missing runtime python packages
Although they are not detected as missing during build.
2021-10-23 23:02:52 +03:00
Doron Behar
a7851a7a96 gnuradio: Fix 2 upstream issues 2021-10-23 23:02:21 +03:00
Doron Behar
d60a4a4492 gnuradio: Remove fetchSubmodules argument
No GR package needs this argument now, and in case someone wishes to use
a bundled version of Volk for example they may do so via `overrideSrc`
argument.
2021-10-23 23:01:50 +03:00
Doron Behar
d6fa3fef68 gnuradio: Make hasFeature function simpler
It always needs the `features` attribute of it's derivation as a last
argument, so let's make it do it by it's own.
2021-10-23 23:01:21 +03:00
Doron Behar
18eb4531cd gnuradio-wrapped: Assume that wrapping is done with python-support
Add all needed pythonPkgs to the list without checking if the
python-support feature is set.
2021-10-21 11:38:59 +03:00
Doron Behar
63b4f69e40 gnuradio: 3.9.2.0 -> 3.9.3.0 2021-10-21 11:38:59 +03:00
Doron Behar
b6be203ec4 gnuradio3_8: 3.8.3.1 -> 3.8.4.0 2021-10-21 11:22:37 +03:00
Doron Behar
e717ab4389
Merge pull request #128491 from eduardosm/gnuradio3_8
gnuradio3_8: 3.8.3.0 -> 3.8.3.1
2021-06-29 10:59:35 +00:00
Eduardo Sánchez Muñoz
c8d0af7cff gnuradio3_8: 3.8.3.0 -> 3.8.3.1 2021-06-29 11:34:40 +03:00
Eduardo Sánchez Muñoz
a7260e81fc gnuradio: 3.9.1.0 -> 3.9.2.0
- Add sopysdr support.
- Remove some workarounds around upstream issues.
2021-06-29 11:25:31 +03:00
AndersonTorres
e9e5f5f84d Change all alsaLib references to alsa-lib 2021-06-10 01:12:49 -03:00
Doron Behar
210784b7c8
Merge pull request #121563 from austinbutler/wrap 2021-05-14 05:50:35 +00:00
Austin Butler
4b349864ca gnuradio: rename wrap option to doWrap
Prevents naming conflict, see NixOS#121563
2021-05-13 20:53:35 -07:00
Alexandre Iooss
07d9edeaea
gnuradio: add Qt5 wrapper for version 3.9+ 2021-05-11 10:23:35 +02:00
Eduardo Sánchez Muñoz
667da29962 gnuradio3_8: remove fetchpatch from inputs (not used) 2021-04-04 21:33:57 +02:00
Robert Scott
ee33b8b17c
Merge pull request #118347 from eduardosm/gr3.8
gnuradio3_8: 3.8.2.0 -> 3.8.3.0
2021-04-04 17:51:39 +01:00
Eduardo Sánchez Muñoz
07700e51dc gnuradio: remove volk cmake flags mistakenly added
see https://github.com/NixOS/nixpkgs/pull/118345#discussion_r606706207
2021-04-03 22:39:40 +02:00
Eduardo Sánchez Muñoz
525420ef36 gnuradio3_8: 3.8.2.0 -> 3.8.3.0 2021-04-03 22:39:11 +02:00
Eduardo Sánchez Muñoz
6242f38c30 gnuradio: enable gr-vocoder 2021-04-03 14:47:43 +02:00
Eduardo Sánchez Muñoz
24abc4bfc4 gnuradio: 3.9.0.0 -> 3.9.1.0 2021-04-02 20:14:22 +02:00
Doron Behar
fb024f50e5 gnuradio: 3.8 -> 3.9
Add some "3.9" attributes to srcs in gnuradio packages And update
packages using GR3.8 and that are incompatible yet with GR3.9 to use
GR3.8 explicitly.
2021-03-13 19:07:34 +02:00
Doron Behar
650ee258fd gnuradio3_{7,8}: Use external volk
Now that volk is packaged, we can use our build and save some closure
space for those that have more then 1 version of gnuradio installed.
Also, simplify a bit how attributes are inherited in the expression.
2021-03-13 19:07:20 +02:00
Doron Behar
fea0ac887e qradiolink: 0.5.0 -> 0.8.5-2
Use gnuradio.pkgs.mkDerivation (gnuradio 3.8) and updated deps.
2021-03-13 12:47:00 +02:00
Doron Behar
6a4744a094 gnuradio: Remove qt5 and gtk from passthru if not used
Attributes such as gnuradioMinimal built without gui support should not
have the `qt` and `gtk` attributes in it's passthru.
2021-03-13 12:46:59 +02:00
Doron Behar
2d08e55e9b gnuradio.pkgs: init
- Write a `mkDerivation` and `mkDerivationWith` function for gnuradio,
  like qt5.
- qradiolink, gqrx: Use gnuradio's callPackage and mkDerivation.
- Use gnuradio.callPackage to define all gnuradio.pkgs.
- Move all gnuradio packages expressions to pkgs/development/gnuradio-modules/ -
  modeled after Python's.
- Add more paths to gnuradio's wrapper - add the extra packages as
  python modules, and add their executables with proper env vars
  wrapping.

Co-authored-by: Frederik Rietdijk <fridh@fridh.nl>
2021-03-13 12:46:59 +02:00
Doron Behar
7690f9a312 gnuradio, uhd: Use boost17x
gnss-sdr needs it: https://github.com/boostorg/format/issues/67 .
uhd and gnuradio need to use the same boost version to avoid
incompatibilities issues. icu is needed from some reason with boost17x.
2021-03-11 18:40:42 +02:00
github-actions[bot]
5f9df37683
Merge master into staging-next 2021-02-11 00:36:09 +00:00
Thomas Tuegel
0e418a1a18
Merge pull request #108888 from ttuegel/feature--staging--qt-no-mkDerivation
Qt: Do not require mkDerivation
2021-01-26 16:24:41 -06:00
Sandro Jäckel
b00ab7489e
gr-ais: fetch commit from master and use fetchpatch for PR commit 2021-01-26 15:18:57 +01:00
Thomas Tuegel
5590e365e4
qtbase: Check for wrapQtAppsHook in setupHook 2021-01-25 15:56:15 -06:00
volth
bc0d605cf1 treewide: fix double quoted strings in meta.description
Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
2021-01-24 19:56:59 +07:00
Ben Siraphob
5d566c43b4 pkgs/applications: pkgconfig -> pkg-config 2021-01-16 23:49:59 -08:00
Ben Siraphob
108bdac3d9 pkgs/applications: stdenv.lib -> lib 2021-01-15 14:24:03 +07:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Ben Siraphob
3ae5e6ce03 treewide: remove enableParallelBuilding = true if using cmake 2021-01-03 18:37:40 +07:00
Ben Siraphob
b04fc593e7 treewide: cmake buildInputs to nativeBuildInputs, minor cleanups 2021-01-01 11:52:33 +07:00
Doron Behar
0f615e80a0 fixup! gnuradio: rewrite 2020-12-05 13:24:09 +02:00
Doron Behar
d3b3bf7eb8 fixup! gnuradio: rewrite 2020-12-05 13:24:09 +02:00
Doron Behar
ed44b466e6 treewide/(gnuradio plugins): Add log4cpp as it's needed now.
Since gnuradio-runtime is compiled with log4cpp, all plugins that need
gnuradio-runtime (which is all of them probably) need log4cpp as well.

Add python.pkgs.cheetah to inputs of gr-osmosdr as it somehow started to
be needed.
2020-12-05 13:23:00 +02:00