3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

110273 commits

Author SHA1 Message Date
Volth 535a6c3520 fetchFromGitHub: fix fetchSubmodules=true when revision is not hexadecimal 2017-07-04 20:22:13 +00:00
Vladimír Čunát c73f0caea5
mesa: maintenance 17.1.2 -> 17.1.4
The announcement seems safe, as usual.

Hydra's Darwin machines will be busy for quite some time on staging,
so let me squeeze this, as it will only be mass rebuild on *-linux.
2017-07-03 20:12:23 +02:00
David McFarland bb3c8a164c lib: Include darwin in isUnix 2017-07-03 09:31:25 -03:00
Vladimír Čunát d1a89ae9d7
Merge branch 'master' into staging 2017-07-03 09:48:58 +02:00
Emanuele Peruffo 0b1c8793fc gnomeExtensions.caffeine: init at revision unstable-2017-06-21 (#26901)
Caffeine extension for Gnome 3
2017-07-03 08:35:31 +01:00
Emmanuel Rosa 7ec7aa0bb1 Revert "splix: enable JBIG" (#27054)
This reverts commit 0878ca7ab4.

My change to enable JBIG for splix did not work correctly. I was unable to get to the bottom of it because the build never completed. Given that it's also timing out in Hydra (see https://hydra.nixos.org/eval/1372226) I think it's best to simply back it out.
2017-07-03 08:09:54 +01:00
Jörg Thalheim 40c6f7e108 Merge pull request #27058 from Nadrieril/fzf-shell-scripts
fzf: Include fzf shell scripts in output
2017-07-03 08:01:04 +01:00
Samuel W. Flint fa2c22ea97 x11idle: init at unstable-2017-07-01 (#27062)
* Add myself to the maintainers list

* Define the derivation for x11idle
2017-07-03 07:46:26 +01:00
Vladimír Čunát cc83f35118
Merge #27076: mariadb: fix URL for source tarball
Not even all their mirrors serve our version, unfortunately.
2017-07-03 08:42:09 +02:00
aszlig 69da1807f0
nixos/xserver: Allow more than one keyboard layout
Regression introduced by 44c64fef16.

The services.xserver.layout option allows to specify more than one
layout separated by comma, which the commit above didn't take into
account.

This is very similar to @lheckemann's pull request (#26984) but differs
in the following ways:

  * Print out the full list available layouts (as suggested by @0xABAB
    in [1]).
  * Loop over $layout using the default IFS (and thus no need for
    escaping ${cfg.layout}), because the layouts won't contain white
    spaces.
  * Re-do the error message, which now uses multiple echos instead of a
    heredoc, so the line is wrapped according to the viewers terminal
    width.

I've tested this with several good and bad layouts and also against the
keymap NixOS VM subtests.

[1]: https://github.com/NixOS/nixpkgs/pull/26984#discussion_r125146700

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Fixes: #26961
Closes: #26984
2017-07-03 08:29:20 +02:00
aszlig d97cdfc591
nixos/xserver: Document the layouts sed expression
This was brought up by @0xABAB in #26984 by the following comment:

https://github.com/NixOS/nixpkgs/pull/26984#discussion_r125146405

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-07-03 08:29:16 +02:00
Jörg Thalheim 02ce696304 Merge pull request #27074 from sh01/shpr_fixurls_kmod_debian
kmod-debian-aliases: Fix source tarball URL.
2017-07-03 07:26:09 +01:00
Vladimír Čunát 1f0de2dce2
Merge #27075: p7zip: Update CVE-2016-9296 patch URL 2017-07-03 08:21:52 +02:00
Jörg Thalheim e33ddf0fec Merge pull request #27077 from sh01/shpr_fixurls_openslp
Openslp: Fix patch references.
2017-07-03 07:21:26 +01:00
Vladimír Čunát 6cad339a0e
p7zip: add commit ID to the patch
We still do mirror the patch (I think), as `nix-build -Q -A p7zip.patches`
downloaded it on my machine.  I verified that only the diff headers differ;
it's still better to have another working download and Fedora's URLs are
less likely to disappear than Debian's.
/cc #27075.
2017-07-03 08:19:20 +02:00
Jörg Thalheim 64f922bf18 Merge pull request #27064 from LutzCle/master
makemkv: 1.10.5 -> 1.10.6
2017-07-03 07:16:36 +01:00
es_github 674e46d643 p7zip: Update CVE-2016-9296 patch URL.
The debian source for this patch file has gone away, rendering this derivation
unbuildable from scratch.
This change updates the URL to a src.fedoraproject.org location that is still
serving a p7zip patch. This file is not the same bytewise, so I'm also updating
the hash; I didn't manage to find a location still serving a file with the
original hash, and my best guess is that this one is functionally equivalent.
2017-07-03 02:58:38 +01:00
Sebastian Hagen cb9fe8cead Mariadb: Fix URL for source tarball.
mariadb.org appears to have changed their URL schemes, and the tarball URL used
by this derivation no longer works, which makes this unbuildable from scratch.

This change updates that URL to a mariadb.org location that will still serve
this tarball.

Hash is unchanged.
2017-07-03 02:53:13 +01:00
es_github 5d989f4d93 kmod-debian-aliases: Fix source tarball URL.
The original URL for this package was pointed at a location that wasn't
longterm-stable, and has by now been removed by Debian.
This commit fixes the URL to point at a debian snapshot entry, which should
stick around for the long run.

Hash is unchanged, so this is safe.
2017-07-03 02:50:24 +01:00
es_github 05a1a2a2d3 Openslp: Fix patch references.
The previous sources for these files have gone away, making this derivation
unbuildable from scratch. We change the URLs to point at locations that will
still serve those patches.
This involves updating one of the hashes, also; I couldn't find an address
that will serve the patch with the original hash, but I expect these only
differ in irrelevant metadata.
2017-07-03 02:40:51 +01:00
Clemens Lutz 4c1ecbb669 makemkv: 1.10.5 -> 1.10.6 2017-07-02 22:28:28 +02:00
Joachim F c5e314dabe Merge pull request #27059 from fadenb/emby_3.2.22.0
emby: 3.2.20.0 -> 3.2.22.0
2017-07-02 20:47:20 +01:00
romildo 6cd8de8ba6 offlineimap: 7.1.0 -> 7.1.1 2017-07-02 21:29:30 +02:00
Tristan Helmich b87993e2fb emby: 3.2.20.0 -> 3.2.22.0 2017-07-02 20:36:04 +02:00
Nadrieril a0f9386d53 fzf: Include fzf shell scripts in output 2017-07-02 19:33:07 +01:00
Joachim F 79df6e8068 Merge pull request #27037 from dywedir/xsv
xsv: 0.11.0 -> 0.12.1
2017-07-02 17:31:28 +01:00
Joachim F fa1153980c Merge pull request #27047 from elitak/factorio-version
factorio: 0.15.16 -> 0.15.26
2017-07-02 17:29:36 +01:00
Vincent Laporte 3beb47ff2a ocamlPackages.inotify: init at 2.3
This package contains bindings for Linux's filesystem monitoring interface, inotify.

Homepage: https://github.com/whitequark/ocaml-inotify
2017-07-02 17:28:53 +02:00
Vincent Laporte dbe61c96ae ocamlPackages: make lwt-3.0.0 the default 2017-07-02 15:22:04 +00:00
Joachim F e4ca35a4f6 Merge pull request #26990 from jfrankenau/mpd-create-playlistDir
mpd service: Create playlist directory
2017-07-02 14:23:53 +01:00
Vincent Laporte 8ad273d4f0 ocamlPackages.lambda-term: 1.10 -> 1.11 2017-07-02 12:56:56 +00:00
Eric Litak a72c1e4e1c factorio: 0.15.16 -> 0.15.26 2017-07-02 05:43:33 -07:00
Vincent Laporte ca15a36d0e ocamlPackages.lwt_react: init at 1.0.1 2017-07-02 11:59:18 +00:00
Vincent Laporte d3a29b393a ocamlPackages.lwt: 2.7.1 -> 3.0.0 2017-07-02 11:59:17 +00:00
Vincent Laporte e8c0e8a04b ocamlPackages.git-unix: init at 1.11.0
Unix backend for the Git protocol(s)
2017-07-02 11:59:16 +00:00
Vincent Laporte ed12c7a9b9 ocamlPackages.git-http: init at 1.11.0
Client implementation of the “Smart” HTTP Git protocol in pure OCaml.
2017-07-02 11:59:16 +00:00
Vincent Laporte 6f3696784d ocamlPackages.lablgl: mark as broken on Darwin 2017-07-02 11:28:25 +00:00
Michael Raskin b084b93faa Merge pull request #27034 from mimadrid/update/vifm-0.9
vifm: 0.8.2 -> 0.9
2017-07-02 13:26:01 +02:00
Sebastian Jordan b300472568 guetzli: init at 1.0.1 (#26595)
* guetzli: init at  1.0.1
* guetzli: move pkgconfig from buildInputs to nativeBuildInputs
* guetzli: use fetchFromGitHub instead of fetchgit
2017-07-02 13:01:18 +02:00
Pascal Wittmann 2dc599083c
fsql: 0.2.1 -> 0.3.1 2017-07-02 12:58:11 +02:00
Joachim F c2576ac2d3 Merge pull request #26978 from volth/lighttpd-collectd-submodule
lighttpd: add collectd submodule
2017-07-02 11:49:06 +01:00
Joachim F e20364a937 Merge pull request #26980 from volth/collectd-service-minor-refactoring
collectd service: minor refactoring
2017-07-02 11:48:56 +01:00
Joachim F c0086b8996 Merge pull request #27019 from fadenb/heartbeat_service
heartbeat service: init
2017-07-02 11:42:54 +01:00
Frederik Rietdijk d15e20f9c9 Merge pull request #26397 from FRidh/django
python.pkgs.django cleanup
2017-07-02 11:22:14 +02:00
Lancelot SIX 70e169460a pythonPackages: mark disabled and broken packages 2017-07-02 11:21:21 +02:00
dywedir 8197e4dffa xsv: 0.11.0 -> 0.12.1 2017-07-02 12:05:00 +03:00
Frederik Rietdijk a5a98f98a0 krename: fix build 2017-07-02 11:01:22 +02:00
Frederik Rietdijk 09aa1ca935 Merge pull request #27036 from zraexy/streamlink
streamlink: 0.6.0 -> 0.7.0
2017-07-02 10:55:33 +02:00
Joachim F d88f83de6b Merge pull request #17681 from ericsagnes/feat/releaseTools.channel
releaseTools: add channel function
2017-07-02 09:46:17 +01:00
Tristan Helmich 97e8422541 heartbeat service: init 2017-07-02 10:45:59 +02:00