1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 21:50:55 +00:00
Commit graph

11 commits

Author SHA1 Message Date
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
R. RyanTM 374033add2 libosmocore: 1.1.0 -> 1.2.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libosmocore/versions
2019-08-19 10:38:24 -07:00
volth 46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
R. RyanTM 74e8673173 libosmocore: 1.0.1 -> 1.1.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libosmocore/versions
2019-06-01 20:32:44 -07:00
R. RyanTM d652f61916 libosmocore: 0.12.1 -> 1.0.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libosmocore/versions
2019-01-28 02:34:22 -08:00
Markus Kowalewski 09f9e5456b
gnuradio-with-packages: build gsm and limesdr only on linux
This allows to build gnuradio-with-packages again on darwin

* libosmocore: remove darwin from platforms
* gnuradio-limesdr: remove darwin from platforms
2018-12-09 13:41:58 +01:00
Markus Kowalewski 0534ed2c59
libosmocore: 0.9.6 -> 0.12.1
Add gnutls to buildInputs
2018-12-09 13:41:58 +01:00
Luke Adams 9be55b0d04 libosmocore: enable Darwin building 2017-11-22 16:42:18 -06:00
Luke Adams b32e8ce7d7 libosmocore: 0.9.0 -> 0.9.6
add new required talloc, python2 inputs; enableParallelBuilding
2017-11-22 16:42:18 -06:00
John Ericson ed14223f8c treewide: Manual fix more pkg-config build-inputs 2017-09-21 15:49:54 -04:00
Matthew O'Gorman 1e88272f55
added gr-ais and gr-gsm gr-rds as plugins 2016-09-14 12:54:20 -04:00