Commit graph

36293 commits

Author SHA1 Message Date
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
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
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
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
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
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 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
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
Doron Behar 4f2573e875 uhd: 3.15.0.0 -> 4.0.0.0 2021-03-11 18:40:41 +02:00
Travis Whitton 32b9415613
maelstrom: init at 3.0.7 (#114179)
* maelstrom: init at 3.0.7

* maelstrom: fix license and add patch docs
2021-03-11 14:50:31 +01:00
github-actions[bot] b4d5951d9e
Merge master into staging-next 2021-03-11 12:21:28 +00:00
Michael Weiss 938453eacd
Merge pull request #102225 from luc65r/fetchsrht
Add fetcher: fetchFromSourcehut
2021-03-11 12:51:13 +01:00
Robert Schütz 4770987f92 Revert "google-play-music-desktop-player: drop"
This reverts commit aef2a70f67.
The package is still useful for YouTube Music.
2021-03-11 09:18:06 +01:00
github-actions[bot] 0a8ec23e51
Merge master into staging-next 2021-03-11 00:39:21 +00:00
Robert T. McGibbon 0741cb4ffd
fst: init at 0.4.5 (#115214) 2021-03-11 00:43:57 +01:00
Sarah Brofeldt 33d6e71133
Merge pull request #98446 from srhb/fix-kafka
apache-kafka: Fix, update and adjust JRE/JVM
2021-03-10 20:25:13 +01:00
github-actions[bot] 6a3a358b0d
Merge master into staging-next 2021-03-10 18:23:15 +00:00
Léo Gaspard 4ee87cfead
Merge pull request #113620 from imlonghao/borgmatic
borgmatic: init at 1.5.12
2021-03-10 18:13:04 +01:00
github-actions[bot] aea4725648
Merge master into staging-next 2021-03-10 12:21:24 +00:00
Sandro 075fefaa03
Merge pull request #115716 from fabaff/uddup
uddup: init at 0.9.3
2021-03-10 10:00:44 +01:00
Fabian Affolter 01bfce3a8d uddup: init at 0.9.3 2021-03-10 08:46:34 +01:00