Commit Graph

4172 Commits

Author SHA1 Message Date
Vladimír Čunát
ded9a4b1aa
Merge branch 'staging-next' into staging
Commits from master, conflict resolutions, etc.
2018-08-13 20:57:50 +02:00
Vladimír Čunát
5b0398dc36
Merge branch 'master' into staging-next
Conflicts: gobby and libinfinity - I took the hand-edited versions
instead of those resuting from the mass-replacement.

Hydra: ?compare=1473190
2018-08-13 20:43:59 +02:00
R. RyanTM
1725a321ca skim: 0.5.0 -> 0.5.1 (#44700)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/skim/versions.
2018-08-13 14:28:37 +02:00
Vladimír Čunát
00df25ee57
Merge branch 'master' into staging-next
Hydra: ?compare=1472947
2018-08-12 10:33:41 +02:00
Jan Malakhovski
10a4cc14de system-config-printer: disable tests 2018-08-11 09:35:39 +00:00
Jan Malakhovski
f360278c8d memtest86plus: disable tests 2018-08-11 09:35:39 +00:00
Jan Malakhovski
49dd9d8ab2 jdupes: disable tests 2018-08-11 09:35:35 +00:00
Jan Malakhovski
3f843e0de6 recutils: use checkInputs, fix tests, also fix build 2018-08-11 09:35:29 +00:00
Jan Malakhovski
1563671e88 parted: use checkInputs 2018-08-11 09:35:26 +00:00
Pascal Wittmann
a34579e01e
Merge branch 'master' into add-missing-licenses
Conflicts:
	pkgs/tools/networking/network-manager/fortisslvpn.nix
2018-08-11 09:36:34 +02:00
Alexey Shmalko
6b1a04d788 alarm-clock-applet: fix build (#44872)
The build has been failing because sourceforge-served release include
-Werror=format=2 flag, which enabled -Werror=format-y2k, which in turn
stopped the build because of a debug log message formatting.

Building release from GitHub works fine.
2018-08-10 19:37:48 +02:00
Maximilian Bosch
b93d8a0837 opentimestamps-client: fix build (#44844)
Build was broken as release-0.6.0 didn't support opentimestamps-0.4.0.
Applying the patch which relaxes the version contraints in `setup.py`
helps.

Furthermore the tests were broken as they missed the `git` executable.
2018-08-10 00:10:55 +02:00
Silvan Mosberger
14fc982e0c
uudeview: fix build 2018-08-09 20:35:25 +02:00
Jan Tojnar
c83e929b94
Merge pull request #44689 from jtojnar/gnome-cleanup
GNOME2 cleanup
2018-08-09 18:55:59 +02:00
Frederik Rietdijk
d9fa74ba78 Merge master into staging 2018-08-09 18:28:15 +02:00
Jan Tojnar
635f4a2938
appdata-tools: drop 2018-08-09 17:36:46 +02:00
Fahad Sadah
8c7fa1e836 youtube-dl: 2018.07.10 -> 2018.08.04 (#44817) 2018-08-09 17:16:17 +02:00
Pascal Wittmann
af8cd3c74e
Merge branch 'master' into add-missing-licenses
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
2018-08-09 13:10:27 +02:00
Frederik Rietdijk
786cbba7be
Merge pull request #44447 from NixOS/staging-next
Staging next
2018-08-09 09:04:03 +02:00
R. RyanTM
a31ab46499 plantuml: 1.2018.8 -> 1.2018.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/plantuml/versions.
2018-08-09 00:40:40 +02:00
R. RyanTM
829786a566 ttfautohint: 1.8.1 -> 1.8.2 (#44682)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ttfautohint/versions.
2018-08-08 23:20:21 +02:00
Vladyslav M
93b6d5f9e7 geekbench: 4.1.1 -> 4.2.3 (#44709) 2018-08-08 15:39:33 +02:00
rnhmjoj
f428ac60eb
asciinema: remove pythonPackages alias 2018-08-08 02:20:54 +02:00
Pascal Wittmann
77d5aff75e
moreutils: add license
see issue #43716
2018-08-06 12:42:49 +02:00
Pascal Wittmann
2e57556e62
multitail: add license
see issue #43716
2018-08-06 12:41:40 +02:00
Pascal Wittmann
934c71f806
riemann-tools: add meta-data
see issue #43716
2018-08-06 12:29:24 +02:00
Pascal Wittmann
21b81f41ae
renameutils: add license
see issue #43716
2018-08-06 12:20:53 +02:00
Vladimír Čunát
f504af072b
Merge branch 'master' into staging-next
There's been some large rebuild on master.
I don't really have time ATM to find what it was.
2018-08-06 12:07:37 +02:00
Pascal Wittmann
f7be21f4c9
Merge branch 'master' into add-missing-licenses
Conflicts:
	pkgs/development/libraries/exiv2/default.nix
        Set license to gpl2Plus
2018-08-06 12:04:52 +02:00
Pascal Wittmann
03b2a4dd79
fondu: add license
see issue #43716
2018-08-05 16:41:49 +02:00
Pascal Wittmann
9ff03a7716
disper: add license
see issue #43716
2018-08-05 16:29:27 +02:00
Pascal Wittmann
f611b23aee
diskscan: add license
see issue #43716
2018-08-05 16:28:41 +02:00
Pascal Wittmann
71caa7c54a
convmv: add license
see issue #43716
2018-08-05 16:14:20 +02:00
Robert Schütz
ad377b4cba
svtplay-dl: use python3Packages 2018-08-05 10:39:44 +02:00
Vladimír Čunát
7b67a32d5a
Merge file upgrade into staging-next
One more change from staging containing security fix
and looking relatively safe (wrt. breakage).
2018-08-04 21:26:59 +02:00
Tuomas Tynkkynen
008fd5fcf5 Merge remote-tracking branch 'upstream/master' into staging 2018-08-04 15:17:42 +03:00
Jörg Thalheim
44e4dbf9ac
Merge pull request #44403 from dotlambda/bashplotlib-python3
bashplotlib: use python3Packages
2018-08-03 23:54:22 +01:00
Jörg Thalheim
c065349282
Merge pull request #44402 from dotlambda/doitlive-python3
doitlive: use python3Packages
2018-08-03 23:49:58 +01:00
John Ericson
7a337cde31
Merge pull request #44423 from obsidiansystems/configureFlags-cleanup
treewide: All configureFlags are lists
2018-08-03 17:49:01 -04:00
John Ericson
f0d6b385d1 treewide: Make all the rest of configureFlags 2018-08-03 17:06:03 -04:00
John Ericson
db965063b3 treewide: Make configureFlags lists 2018-08-03 17:06:03 -04:00
John Ericson
85a9913edd treewide: Make more complicated configureFlags lists 2018-08-03 17:06:03 -04:00
Robert Schütz
c0589af34e apt-offline: 1.3 -> 1.8.1 2018-08-03 19:13:38 +02:00
Robert Schütz
c5fb1d70ca bashplotlib: use python3Packages 2018-08-03 16:02:33 +02:00
Robert Schütz
2f5bbbebfd doitlive: use python3Packages 2018-08-03 15:53:52 +02:00
Gabriel Ebner
feabc475c0 vdirsyncer: 0.17.0a2 -> 0.17.0a3
fixes build
2018-08-03 12:42:22 +02:00
Jörg Thalheim
ed5531383e tldr: override makeFlags to set CC 2018-08-03 05:43:43 +01:00
Carlos D
dc8aa01c91 tldr: add support for darwin 2018-08-03 12:36:24 +10:00
Kai
405cc5b1a0 lbdb: 0.46 -> 0.47 (#44376) 2018-08-02 22:16:29 +02:00
John Ericson
89c21fce3f Merge commit 'master' into staging 2018-08-02 16:13:33 -04:00