1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 13:41:26 +00:00
Commit graph

3303 commits

Author SHA1 Message Date
Frederik Rietdijk 5f4734b1dd Merge remote-tracking branch 'upstream/gcc-8' into staging-next
Earlier the gcc8 branch was merged instead of the gcc-8 branch (note the dash)...
2019-09-08 20:44:26 +02:00
worldofpeace 84b39ae0f8
Merge pull request #68297 from peterhoeg/f/strawberry
strawberry: environment variable was missing
2019-09-08 05:55:53 -04:00
Jan Tojnar f9237f3152
Merge branch 'master' into staging-next 2019-09-06 16:55:11 +02:00
worldofpeace 3b39b03f05
Merge pull request #68144 from fgaz/fgaz/remove-qt-stdenv
Switch my qt packages to qt-specific mkDerivation
2019-09-06 05:19:39 -04:00
Francesco Gazzetta 4f49bcf905 sfxr-qt: switch to qt-specific mkDerivation 2019-09-06 05:03:56 -04:00
Peter Hoeg c1a37ca8b1 strawberry: environment variable was missing 2019-09-06 13:01:03 +08:00
Jan Tojnar cdf426488b
Merge branch 'master' into staging-next
Fixed trivial conflicts caused by removing rec.
2019-09-06 03:20:09 +02:00
Jan Tojnar ed54a5b51d
Merge branch 'gtk-no-plus' 2019-09-06 02:57:51 +02:00
Jan Tojnar 72e7d569a7
tree-wide: s/GTK+/GTK/g
GTK was renamed.
2019-09-06 02:54:53 +02:00
Robin Gloster e7297363c9
amarok: 2.9.0-20180618 -> 2.9.0-20190824
gcc 8 support
2019-09-05 15:05:05 +02:00
Vladimír Čunát 4aad2947f8
Merge branch 'master' into staging-next 2019-09-04 11:00:56 +02:00
Peter Hoeg afa6c910a9
Merge pull request #67603 from peterhoeg/u/sayonara
sayonara: 1.1.1 -> 1.5.1
2019-09-04 15:41:08 +08:00
Peter Hoeg ac9b16dfa8
Merge pull request #67605 from peterhoeg/p/strawberry
strawberry: init at 0.6.3
2019-09-04 15:39:33 +08:00
Peter Hoeg 5a12e12b49 strawberry: init at 0.6.3 2019-09-04 14:39:53 +08:00
Peter Hoeg aba7db77e9 sayonara: 1.1.1 -> 1.5.1 2019-09-04 14:36:29 +08:00
Marek Mahut c02fe4620b
Merge pull request #67941 from suhr/musescore
musescore: 3.0.5 ->  3.2.3
2019-09-03 11:27:12 +02:00
Ryan Mulligan 32f9c619f5
Merge pull request #67969 from petabyteboy/feature/remove-dobuild
treewide: remove uses of doBuild and doConfigure
2019-09-02 15:13:47 -07:00
gnidorah 70aa3807cf qmmp: use qt5's mkDerivation 2019-09-02 23:44:40 +02:00
Milan Pässler (work) 185fd61631 treewide: remove uses of doBuild and doConfigure
doBuild and doConfigure are not actually used by any builders, they were
probably added by mistake and just confuse people.
2019-09-02 23:42:12 +02:00
Сухарик cf4fa9f708 musescore: 3.0.5 -> 3.2.3 2019-09-02 15:05:26 +03:00
R. RyanTM 857fb6744a flac: 1.3.2 -> 1.3.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/flac/versions
2019-08-31 12:34:17 +02:00
Frederik Rietdijk ad1d58c622 Merge staging-next into staging 2019-08-31 10:04:20 +02:00
Frederik Rietdijk fc74ba8291 Merge master into staging-next 2019-08-31 09:50:38 +02:00
Averell Dalton 1e8e8d1867 pithos: 1.1.2 -> 1.4.1 2019-08-30 03:44:48 +02:00
volth 08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Frederik Rietdijk 5061fe0c2c Merge staging-next into staging 2019-08-28 08:26:42 +02:00
Frederik Rietdijk 98640fd482 Merge master into staging-next 2019-08-27 16:36:47 +02:00
Nathan Yong a5d13ad225 vcv-rack: 1.1.3 -> 1.1.4 2019-08-26 09:51:10 +10:00
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
Marek Mahut 2a667bd79e
Merge pull request #67138 from r-ryantm/auto-update/reaper
reaper: 5.980 -> 5.981
2019-08-21 08:42:49 +02:00
Michael Raskin d1bfaf54af
Merge pull request #67125 from r-ryantm/auto-update/snd
snd: 19.5 -> 19.6
2019-08-21 05:23:11 +00:00
R. RyanTM b5331ed196 reaper: 5.980 -> 5.981
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/reaper/versions
2019-08-20 16:39:16 -07:00
R. RyanTM e19ca8e7ed snd: 19.5 -> 19.6
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/snd/versions
2019-08-20 14:36:24 -07:00
Marek Mahut abb99f4631
Merge pull request #67006 from r-ryantm/auto-update/padthv1
padthv1: 0.9.8 -> 0.9.9
2019-08-20 21:18:23 +02:00
Robin Gloster 8c0786babe
Merge pull request #67103 from mayflower/globin-maintainership
treewide: update globin's maintained drvs
2019-08-20 17:57:47 +00:00
Marek Mahut c6ecbc83c1 padthv1: using Qt5's mkDerivation 2019-08-20 19:53:37 +02:00
Robin Gloster 4e60b0efae
treewide: update globin's maintained drvs 2019-08-20 19:36:05 +02:00
worldofpeace 89da4d678d
Merge pull request #67075 from jtojnar/paprefs-cleanup
paprefs: clean up dependencies
2019-08-20 13:03:43 -04:00
Rickard Nilsson 225e412edb Remove myself as maintainer of some packages. 2019-08-20 15:24:01 +02:00
Jan Tojnar 151d86c455
pulseeffects: 4.6.5 -> 4.6.6 (#67045)
pulseeffects: 4.6.5 -> 4.6.6
2019-08-20 15:07:35 +02:00
Jan Tojnar 012ff89b79
paprefs: clean up dependencies
Since 1.1, paprefs no longer depends on dbus-glib but the dependencies
were not refreshed during an automated update.

While at it, also format inputs for diff-friendliness.
2019-08-20 14:44:15 +02:00
R. RyanTM fcadb6a1a1 pulseeffects: 4.6.5 -> 4.6.6
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pulseeffects/versions
2019-08-20 01:43:41 -07:00
R. RyanTM 70a9ca44fa padthv1: 0.9.8 -> 0.9.9
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/padthv1/versions
2019-08-19 18:48:55 -07:00
Peter Hoeg 9554ffe051 amarok: 2.9.0-20180618 -> 2.9.0-20190731 2019-08-19 22:39:27 +08:00
gnidorah be820b8761 munt: use qt5's mkDerivation 2019-08-19 08:04:51 +02:00
Frederik Rietdijk f65aa21bb2 Merge master into staging-next 2019-08-18 12:53:44 +02:00
volth c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
Frederik Rietdijk fe9a3e3e63 Merge staging-next into staging 2019-08-17 09:39:23 +02:00
Matthias Beyer 45a961fa5d mixxx: 2.2.1 -> 2.2.2 2019-08-16 13:54:06 +02:00
Marek Mahut aba586ad2d
Merge pull request #66633 from jonringer/bump-fmit
fmit: 1.1.14 -> 1.2.6
2019-08-15 15:42:10 +02:00