3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

77729 commits

Author SHA1 Message Date
zimbatm 1f00c52880 Merge pull request #11210 from mitchty/munge-on-osx
Munge is buildable/usable on OS X/most unices
2016-02-26 23:10:53 +00:00
zimbatm 35ab3d301f Merge remote-tracking branch 'upstream/staging' 2016-02-26 22:37:04 +00:00
Tobias Geerinckx-Rice c3ed0a2494 btrfs-progs: 4.4 -> 4.4.1
Bugfix release. Changes:
https://btrfs.wiki.kernel.org/index.php/Changelog#By_version_.28btrfs-progs.29
2016-02-26 23:23:01 +01:00
zimbatm a7d34722b2 Merge pull request #13493 from zimbatm/alphabetize
Alphabetize
2016-02-26 22:16:43 +00:00
zimbatm 9f57b24b01 all-packages: alphabetize deprecated packages 2016-02-26 22:15:41 +00:00
zimbatm 07b1f78b94 lib: alphabetize things 2016-02-26 22:15:41 +00:00
zimbatm 6e5a748224 lib.platforms: alphabetize 2016-02-26 22:15:40 +00:00
zimbatm dea3279593 lib.maintainers: alphabetize 2016-02-26 22:13:58 +00:00
Arseniy Seroka c80a1baa15 Merge pull request #13486 from zimbatm/vim-default-config
vim: provide a default vimrc
2016-02-27 01:09:52 +03:00
zimbatm 951dc57716 Merge pull request #13482 from nico202/qnotero
qnotero: init at 1.0.0
2016-02-26 22:09:41 +00:00
Michael Raskin 73a9cd8aee Revert accidental revert of all-packages.nix gitlab changes during revert of revert of libreoffice update 2016-02-26 23:12:12 +01:00
zimbatm 89f0e25189 vim: provide a default vimrc
Minimal sane defaults imported from ArchLinux.

This is basically `set :nocompatible` with some other small changes.
2016-02-26 21:58:21 +00:00
Arseniy Seroka c373daff17 Merge pull request #13495 from heydojo/kernel--use-cdn
fetchurl: use kernel.org cdn by default
2016-02-27 00:54:16 +03:00
Michael Raskin a94e433936 libreoffice: 5.0.4.2 -> 5.1.0.3 (a new attempt); set XDG_DATA_DIRS for access to GSettings schemas 2016-02-26 22:58:27 +01:00
Graham Christensen 483a130f89 cpio: patch CVE-2016-2037, out of bounds write (close #13489) 2016-02-26 22:46:13 +01:00
Tony White 4806cddda3 fetchurl: use kernel.org cdn by default
- use http://cdn.kernel.org/pub/ as the default mirror
for kernel source requests.
Discovered by browsing :
 https://www.kernel.org/introducing-fastly-cdn.html
2016-02-26 21:32:00 +00:00
= 728b1ce557 qnotero: init at 1.0.0 2016-02-26 22:09:54 +01:00
Arseniy Seroka b9ab76c2b2 Merge pull request #13479 from hrdinka/add/pcsx2
pcsx2: init at 1.4.0
2016-02-26 23:56:55 +03:00
Arseniy Seroka c6788f42cc Merge pull request #13494 from gilligan/add-galen-to-all-packages
Add galen to all-packages.nix
2016-02-26 23:35:38 +03:00
Tobias Pflug 3386d73d06 Add galen to all-packages.nix 2016-02-26 21:01:41 +01:00
aszlig 54b4912566
chromium: Regenerate sources.nix with new updater
No changes in functionality, but to make future source updates a bit
easier on the eyes when viewing the diff.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-02-26 20:55:17 +01:00
aszlig 28b289efa6
chromium: Refactor updater entirely in Nix
The update.sh shell script now is only a call to nix-build, which does
all the hard work of updating the Chromium source channels and the
plugins. It results in a store path with the new sources.nix that
replaces the already existing sources.nix.

Along the way, this has led to a quite massive workaround, which abuses
MD5 collisions to detect whether an URL is existing, because something
like builtins.tryEval (builtins.fetchurl url) unfortunately doesn't
work. Further explanations and implementation details are documented in
the actual implementation.

The drawback of this is that we don't have nice status messages anymore,
but on the upside we have a more robust generation of the sources.nix
file, which now also should work properly on missing upstream
sources/binaries.

This also makes it much easier to implement fetching non-GNU/Linux
versions of Chromium and we have all values from omahaproxy available as
an attribute set (see the csv2nix and channels attributes in the update
attribute).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-02-26 20:55:17 +01:00
Jude Taylor f6c3b13c7c ghcjs: pull in ghcjsi branch 2016-02-26 11:27:47 -08:00
zimbatm 26b59efa8a Merge pull request #13491 from grahamc/patch-1
go-1.6: remove the cacert 1.5 patch
2016-02-26 18:58:59 +00:00
Franz Pletz 082cd3edd3 Merge pull request #13473 from grahamc/libssh2-1.7.0
libssh2: 1.6.0 -> 1.7.0
2016-02-26 19:34:54 +01:00
Graham Christensen 8132a5ae76 go-1.6: remove the cacert 1.5 patch
Removed in 58dbaf69b7
2016-02-26 12:32:33 -06:00
zimbatm 2c7e5a6d8e Merge pull request #13434 from spacefrogg/oath-module
config.security.oath: new module
2016-02-26 18:06:28 +00:00
zimbatm c183117aee Merge pull request #13441 from gilligan/add-galen-package
galen init at 2.2.1
2016-02-26 18:05:40 +00:00
zimbatm 8b4edf10cf Merge pull request #13144 from zimbatm/go-ssl-cleanup
go: remove ssl certs patches
2016-02-26 18:00:44 +00:00
zimbatm accc1f1484 go: 1.4: disable failing test in sandbox 2016-02-26 18:00:11 +00:00
zimbatm 58dbaf69b7 go: remove ssl certs patches
Those are not needed since we now use a standard location to store our
bundles.

See bfebc7342e
2016-02-26 17:58:58 +00:00
Charles Strahan 53ea7dee75 emacs: fix priority for ctags
This fixes the previous attempt (in commit 46d1dd5) to make ctags' ctags
override emacs' ctags. The higher the value of the priority attribute,
the higher the priority (see the definition of `buildEnv`).
2016-02-26 12:27:04 -05:00
Michael Raskin 32e954db64 Reverting dependency src for revert 2016-02-26 16:28:08 +01:00
Nikolay Amiantov c88a06a860 cups service: set path for cups-genppdupdate 2016-02-26 18:27:41 +03:00
Nikolay Amiantov d9c10d6f56 gutenprint: fix cups and gimp paths
Also disable GIMP support by default to reduce closure
2016-02-26 18:27:41 +03:00
Michael Raskin 66febbdfa7 Temporarily revert LibreOffice update 2016-02-26 16:26:34 +01:00
Peter Simons 2bcec4272f Merge pull request #13480 from phile314/master
uhc: 1.1.9.2 -> 1.1.9.3
2016-02-26 13:18:13 +01:00
zimbatm 3833591d95 Merge pull request #13164 from romildo/fix/eclipse-plugin-cup
eclipse-plugins-cup: fix plugin file names
2016-02-26 11:23:28 +00:00
zimbatm 8d4c2340d3 Merge pull request #13396 from mayflower/pkg/gitlab
gitlab: 8.0.5 -> 8.5.1, service improvements
2016-02-26 11:19:28 +00:00
Domen Kožar a469681a51 Merge pull request #13365 from abbradar/cups-second-attempt
CUPS update (second attempt)
2016-02-26 11:13:30 +00:00
Philipp Hausmann fbd857ab72
uhc: 1.1.9.2 -> 1.1.9.3 2016-02-26 12:12:53 +01:00
Domen Kožar c99d589162 Merge pull request #13116 from kragniz/requests2-2.9.1
requests2: 2.8.1 -> 2.9.1
2016-02-26 11:11:36 +00:00
Domen Kožar fe9f5dbbbc Merge pull request #6600 from 4z3/tlsdate
tlsdate doesn't build on x86_64-darwin
2016-02-26 10:59:00 +00:00
zimbatm c86e10c115 Merge pull request #13469 from tg-x/acme-external
simp_le: external_pem.sh plugin is now called external.sh
2016-02-26 10:48:55 +00:00
zimbatm d8c3a83b5c Merge pull request #13477 from cstrahan/vte-ng
vte-ng: 0.42.1.a -> 0.42.4.a
2016-02-26 10:46:06 +00:00
vbgl d39595c54f Merge pull request #13404 from knedlsepp/fix-darwin-tcl-tk
Fix darwin tcl tk
2016-02-26 11:38:26 +01:00
Frederik Rietdijk 48085add39 Merge pull request #13461 from FRidh/kcalc
kde5.kcalc: init at 15.12
2016-02-26 11:33:42 +01:00
Franz Pletz 0bbe8e1884 Merge pull request #13454 from grahamc/xerces
xerces-c: 3.1.1 -> 3.1.3
2016-02-26 11:25:25 +01:00
zimbatm 6035c3a136 Merge pull request #9400 from Mathnerd314/package-overrides-fix
all-packages: Apply packageOverrides package-by-package
2016-02-26 10:17:53 +00:00
Franz Pletz ef0325e940 Merge pull request #13435 from tg-x/calc
calc: init at 2.12.5.3
2016-02-26 11:16:11 +01:00