Jan Tojnar
01a4d350c7
Merge branch 'master' into staging-next
...
Reverted https://github.com/NixOS/nixpkgs/pull/115228 for kodi to avoid conflict.
It does not look like unzip would be used but not investigating now to speed up merge conflict resolution.
2021-03-13 19:16:43 +01:00
Doron Behar
5e367ecef9
Merge pull request #106599 from doronbehar/pkg/gnuradio/pkgs
2021-03-13 17:27:40 +00: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
Mario Rodas
30d4de10ee
Merge pull request #116179 from r-ryantm/auto-update/pueue
...
pueue: 0.12.0 -> 0.12.1
2021-03-13 11:10:26 -05:00
Frederik Rietdijk
89f4b3b5d1
pythonPackages: pytest_6_1CheckHook -> pytestCheckHook_6_1
...
Versions are supposed to be at the end.
2021-03-13 16:24:30 +01:00
Sandro Jäckel
cb60634ebf
pythonPackages.urllib3: use pytest 6.1.2
2021-03-13 16:21:31 +01:00
Sandro Jäckel
c20c8df84f
pythonPackages: aiohttp: use pytest_6_1CheckHook
2021-03-13 16:21:31 +01:00
Sandro Jäckel
45ede7d4ea
pythonPackages.werkzeug: fix test execution, add empty maintainers field
2021-03-13 16:21:31 +01:00
Sandro Jäckel
1b127bd94e
pythonPackages.trio: fix tests
2021-03-13 16:21:31 +01:00
Sandro Jäckel
ed44183ff0
pythonPackages.async-upnp-client: use pytest_6_1CheckHook
2021-03-13 16:21:30 +01:00
Sandro Jäckel
d0f00f69b4
pythonPackages: Init pytest_6_1CheckHook with pytest 6.1.X
2021-03-13 16:21:30 +01:00
Aaron Andersen
0bf8f56105
Merge pull request #115871 from aanderse/kodi-packages
...
kodi: plugins cleanup
2021-03-13 10:10:20 -05:00
WilliButz
3971cda05f
Merge pull request #116037 from petabyteboy/feature/jitsi-exporter
...
prometheus-jitsi-exporter: init at 0.2.18
2021-03-13 13:37:10 +01:00
github-actions[bot]
e1ede8b801
Merge master into staging-next
2021-03-13 12:21:02 +00:00
Mario Rodas
22eb13d3ed
pueue: fix build on darwin
...
Fixes #116175
2021-03-13 11:44:00 +00:00
Doron Behar
7df0fa108a
volk: init at 2.4.1
2021-03-13 13:28:07 +02:00
Doron Behar
9545bbadfa
inspectrum: Refactor to use gnuradioMinimal.pkgs.mkDerivation
...
Use the same deps of gnuradioMinimal - thanks to gnuradio's
mkDerivation.
2021-03-13 12:47:00 +02:00
Doron Behar
b944ca9350
gnss-sdr: Refactor to use gnuradio.pkgs.mkDerivation
...
Use the same dependencies that gnuradio uses, thanks to gnuradio's
`mkDerivation`. Add `gnuradio.pkgs.osmosdr` as dependency.
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
Frederik Rietdijk
782afeb11c
python3Packages.pythran: init at 0.9.8post3
2021-03-13 11:33:31 +01:00
Frederik Rietdijk
6e452303a7
pythonPackages.beniget: init at 0.3.0
2021-03-13 11:33:01 +01:00
github-actions[bot]
4181409166
Merge master into staging-next
2021-03-13 06:17:31 +00:00
Mario Rodas
cf0dd74db3
Merge pull request #116123 from fzakaria/faridzakaria/fix-mysql80
...
mysql80: downgrade icu to icu67
2021-03-12 20:55:16 -05:00
Aaron Andersen
4786ad9059
Merge pull request #115965 from etu/php-init-swoole
...
php.extensions.swoole: init at 4.6.4
2021-03-12 20:38:08 -05:00
Farid Zakaria
2e3e184d8a
mysql80: downgrade icu to icu67
2021-03-12 17:06:43 -08:00
github-actions[bot]
b0a6c2b8a5
Merge master into staging-next
2021-03-13 00:38:26 +00:00
Peter Simons
795ef4f46f
Merge pull request #115256 from NixOS/haskell-updates
...
Update Haskell package set to Stackage Nightly 2021-03-06 (plus other fixes)
2021-03-12 20:53:42 +01:00
Jan Tojnar
f747bcb868
Merge branch 'master' into staging-next
2021-03-12 19:58:39 +01:00
Sandro
255eac0c93
Merge pull request #115544 from superherointj/package-tfk8s
...
tfk8s: init at 0.1.0
2021-03-12 17:23:11 +01:00
Robert Schütz
abdf8a25ef
Merge pull request #115907 from dotlambda/google-play-music-desktop-player-reinit
...
Revert "google-play-music-desktop-player: drop"
2021-03-12 13:28:28 +01:00
github-actions[bot]
c2eb9a753a
Merge master into staging-next
2021-03-12 12:25:52 +00:00
superherointj
c870a98ba3
tfk8s: init at 0.1.0
...
With contributions & review by @SuperSandro2000
2021-03-12 08:50:03 -03:00
Milan Pässler
942bd5cc2f
prometheus-jitsi-exporter: init at 0.2.18
2021-03-12 11:10:43 +01:00
Sandro
05c4e04b93
Merge pull request #115998 from SuperSandro2000/lilypond
...
lilypond-unstable: drop because lilypond is newer and it does not build
2021-03-12 10:36:20 +01:00
Vincent Laporte
22d9482360
opa: build with OCaml 4.04
2021-03-12 08:51:50 +01:00
github-actions[bot]
121cc02fe8
Merge master into staging-next
2021-03-12 06:17:54 +00:00
Aaron Andersen
4ef33dd12d
kodi: rename useWayland and useGbm flags to waylandSupport and gbmSupport
2021-03-11 20:35:54 -05:00
Aaron Andersen
ce0621ec4f
kodi: introduce kodi.withPackages to replace kodiPackages.kodiWithAddons
2021-03-11 20:35:54 -05:00
Aaron Andersen
587a8b2837
kodi: drop wrapKodi function and disregard config.kodi.* options
2021-03-11 20:35:54 -05:00
Aaron Andersen
f8f037b51d
kodiPlain: rename default.nix to unwrapped.nix
2021-03-11 20:35:54 -05:00
Aaron Andersen
3a70d376fe
kodiPackages: rename plugins.nix to packages.nix
2021-03-11 20:35:54 -05:00
Aaron Andersen
917f7efdc5
kodiPlugins: rename to kodiPackages
2021-03-11 20:35:50 -05:00
Sandro
2b839d7a0f
Merge pull request #115500 from SuperSandro2000/override-new-lines
...
pythonPackages: move overrides into new lines
2021-03-12 02:16:18 +01:00
Sandro Jäckel
8a26c93b4c
pythonPackages: move overrides into new lines
2021-03-12 00:12:56 +01:00
Sandro Jäckel
389c7cf0a8
lilypond-unstable: drop because lilypond is newer and it does not build
2021-03-11 23:56:33 +01:00
github-actions[bot]
d6257d451b
Merge master into staging-next
2021-03-11 18:23:54 +00:00
WilliButz
f5c01cf9d4
Merge pull request #113370 from chkno/prometheus-systemd-exporter-no-flags
...
prometheus-systemd-exporter: Init at 0.4.0
2021-03-11 19:18:29 +01:00
WilliButz
3ceef8186c
Merge pull request #115185 from Ma27/knot-exporter
...
prometheus-knot-exporter: init at 2021-01-30; minor module improvements
2021-03-11 18:58:59 +01:00
WilliButz
902a479225
Merge pull request #111364 from lbpdt/feature/prometheus-artifactory-exporter
...
nixos/prometheus-exporters/artifactory: init at 1.9.0
2021-03-11 18:44:03 +01:00