Tuomas Tynkkynen
84982c28de
Merge remote-tracking branch 'upstream/master' into staging
2017-04-24 15:04:43 +03:00
Benno Fünfstück
30a9923f4c
Merge pull request #24359 from rnhmjoj/radeon-profile
...
radeon-profile: init at 20161221
2017-04-24 11:28:34 +02:00
rnhmjoj
9b1b22fcb6
radeon-profile: init at 20161221
2017-04-24 10:52:14 +02:00
Daiderd Jordan
80828429d7
Merge pull request #25066 from matthewbauer/less-darwin-eval-errors
...
Add Darwin as platform to various "broken" packages that actually build
2017-04-24 08:14:21 +02:00
Matthew Bauer
02285dcd10
cron: supports darwin
2017-04-23 18:08:42 -05:00
Matthew Bauer
9e92c53b53
flvstreamer: supports darwin
2017-04-23 18:08:41 -05:00
Matthew Bauer
fe9b9e7f38
icoutils: already supports darwin
2017-04-23 18:08:38 -05:00
Matthew Bauer
bd07af92ec
desktop-file-utils: support darwin
2017-04-23 18:08:37 -05:00
Matthew Bauer
0293d0dbec
lhasa: supports darwin
2017-04-23 18:08:36 -05:00
Matthew Bauer
d3084b2798
sourceHighlight: supports darwin
2017-04-23 18:08:35 -05:00
Matthew Bauer
5312c48399
miniupnpc: supports darwin
2017-04-23 18:08:35 -05:00
Vladimír Čunát
5a3e454db3
Revert "kdiff3: fixup patch hash after #25059 "
...
This reverts commit b72d4e13c72f5761642e8a664e21bb83e4b11dd9.
The problem was fixed by the parent commit.
2017-04-23 20:53:34 +02:00
Tuomas Tynkkynen
814772e93e
Revert "patchutils: 0.3.3 -> 0.3.4"
...
This reverts commit d550c9071206013cb90ee9317080db82e286f69b.
This changes the output of filterpatch thus affects hashes of any
fetchpatch calls in nixpkgs:
https://github.com/NixOS/nixpkgs/issues/25154
2017-04-23 21:46:35 +03:00
Tuomas Tynkkynen
f3b1d6925e
Revert "patchutils: Drop patch applied upstream"
...
This reverts commit 1e1b68b4a02f7e671b8e56d841b4c0962e5d6be9.
2017-04-23 21:46:29 +03:00
Nikolay Amiantov
5565728670
system-config-printer: 1.5.7 -> 1.5.9
...
Use gappsWrapHook.
2017-04-23 17:08:56 +03:00
Benno Fünfstück
c3e830f1a6
Merge pull request #25134 from MP2E/ripgrep_update
...
ripgrep: 0.5.0 -> 0.5.1
2017-04-23 13:59:27 +02:00
Frederik Rietdijk
4fc9b1852a
Merge remote-tracking branch 'upstream/master' into HEAD
2017-04-23 11:26:47 +02:00
Joachim Fasting
5a04a30653
runit: replace hardcoded /sbin/runit with in-store runit binary
...
runit-init calls the runit executable as /sbin/runit, which
obviously fails for us.
This should improve support for using runit as an init replacement.
2017-04-23 11:00:55 +02:00
Joachim Fasting
160b9ab43f
runit: explain what static actually does
2017-04-23 11:00:53 +02:00
Rok Garbas
0feca1abb6
Merge pull request #25135 from garbas/update-asciinema
...
Update asciinema
2017-04-23 04:33:27 +02:00
Rok Garbas
93cacf61a8
asciinema: 1.3.0 -> 1.4.0
2017-04-23 04:18:11 +02:00
Cray Elliott
df86c9731b
ripgrep: 0.5.0 -> 0.5.1
2017-04-22 19:03:09 -07:00
Vladimír Čunát
b72d4e13c7
kdiff3: fixup patch hash after #25059
...
I'm sorry; not sure why the hash didn't match;
I probably kept the hash of an older version by mistake.
2017-04-22 16:37:48 +02:00
Edward Tjörnhammar
da2518fe25
i2pd: 0.12.0 -> 0.13.0
2017-04-22 09:43:24 +02:00
Benno Fünfstück
cfcceaee27
Merge pull request #24473 from jgertm/tj/xsv
...
xsv: init at 0.11.0
2017-04-22 00:26:10 +02:00
Eelco Dolstra
d387a1f0ae
youtube-dl: 2017.04.02 -> 2017.04.17
2017-04-21 23:32:37 +02:00
obadz
c4fecfb1ec
ecryptfs-helper: fix makeWrapper use after 7ff6eec5
2017-04-21 21:25:30 +01:00
Tomas Hlavaty
6878d0661b
stunnel: 5.39 -> 5.41
2017-04-20 23:37:24 +02:00
Vincent Laporte
a76841e399
asymptote: 2.40 -> 2.41
2017-04-20 19:56:14 +00:00
Michael Raskin
38933324a6
Merge pull request #25059 from vcunat/p/kdiff3-git-mergetool
...
kdiff3: fix with git mergetool
2017-04-20 16:55:15 +02:00
Vladimír Čunát
be7ce1b0e9
kdiff3: fix with git mergetool
...
The quick patch has been submitted upstream.
2017-04-20 14:48:40 +02:00
Jörg Thalheim
b7984d3077
Merge pull request #25053 from Mesh33/buildtorrent-0.8
...
buildtorrent: init at 0.8
2017-04-20 13:08:53 +02:00
Jörg Thalheim
67adf69a16
inetutils: fix service name
2017-04-20 10:33:42 +02:00
Michael Raskin
1aadcd712d
Merge pull request #25042 from Mesh33/update-units
...
units: 2.13 -> 2.14
2017-04-20 08:34:37 +02:00
Jörg Thalheim
080c799f38
jwhois: fix service name
...
after an update of iana-etc the service name of whois changed
2017-04-20 07:33:38 +02:00
Unknown
2f66670162
buildtorrent: init at 0.8
2017-04-20 03:42:49 +02:00
Mesh33
1675d54db3
units: 2.13 -> 2.14
2017-04-20 00:09:54 +02:00
Benno Fünfstück
bc09640d91
Merge pull request #24977 from dsprenkels/master
...
mpDris2: 0.6 -> 0.7
2017-04-18 22:29:06 +02:00
armijnhemel
a8c8d5a588
upx: 3.91 -> 3.93
...
* moved from sourceforge to github
2017-04-18 21:49:54 +02:00
Daan Sprenkels
0479e68db9
mpDris2: 0.6 -> 0.7
2017-04-18 14:38:24 +02:00
Frederik Rietdijk
e0abe74baf
Merge remote-tracking branch 'upstream/master' into HEAD
2017-04-18 11:25:43 +02:00
John Ericson
37e5e71fdf
Merge pull request #24974 from Ericson2314/mapNullable
...
Introduce `mapNullable` into lib and use it in a few places
2017-04-17 17:12:14 -04:00
John Ericson
85aa5005af
Introduce mapNullable into lib and use it in a few places
...
Also simply some configure flag logic my grep also alerted me too.
2017-04-17 17:04:04 -04:00
Chris Hodapp
228f33b21d
osm2pgsql: init at 0.92.1-unstable
2017-04-17 16:19:41 -04:00
Daniel Peebles
e9f1d8693a
Merge pull request #23026 from copumpkin/nixos-install-wip
...
Refactor nixos-install to separate out filesystem build logic
2017-04-17 09:50:35 -04:00
Joachim Fasting
c2130eca44
logcheck: point homepage to alioth.debian.org
...
The page at logcheck dot org contains questionable links and it is unclear
whether it is controlled by the logcheck project at all. Fix by using the
homepage debian points to instead.
Fixes https://github.com/NixOS/nixpkgs/issues/24952
2017-04-16 20:52:14 +02:00
Jörg Thalheim
769de5629c
Merge pull request #24932 from jb55/add/cargo-edit
...
cargo-edit: init at 0.1.6
2017-04-16 20:51:44 +02:00
Dan Peebles
d990aa7163
Refactor nixos-install to separate out filesystem build logic
...
The key distinction I'm drawing is that there's a component that deals
with the store of the machine being built, and another component for
the store building it. The inner part of it assumes nothing from the
builder (doesn't need chroot or root powers) so it can run comfortably
inside a Nix build, as well as nixos-rebuild. I have some upcoming work
that will use that to significantly speed up and streamline image builds
for NixOS, especially on virtualized hosts like EC2, but it's also a
reasonable speedup on native hosts.
2017-04-16 16:09:41 +00:00
Joachim F
901a0bb9fa
Merge pull request #24908 from adamruzicka/cjdns-v19.1
...
cjdns: 18 -> 19.1
2017-04-16 12:10:59 +01:00
Michael Raskin
ba7151e2b5
clac: add missing expression body; thanks @joachifm for the catch
2017-04-16 12:02:35 +02:00
