public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
256,345 Commits 1 Branch 0 Tags
6794dea1f8ea4aca559cba4634e6e0cfef0bcfed
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathijs Kwik b63ec64521 lib/recursiveUpdateUntil: fix code to match documentation 
$ nix repl lib
Welcome to Nix version 2.0.2. Type :? for help.

Loading 'lib'...
Added 350 variables.

-- this is the exact example from the function's documentation:
nix-repl> recursiveUpdateUntil (path: l: r: path == ["foo"]) {
                   # first attribute set
                   foo.bar = 1;
                   foo.baz = 2;
                   bar = 3;
                 } {
                   #second attribute set
                   foo.bar = 1;
                   foo.quz = 2;
                   baz = 4;
                 }
{ bar = 3; baz = 4; foo = { bar = 1; baz = 2; quz = 2; }; }

-- although the documentation says:
{
    foo.bar = 1; # 'foo.*' from the second set
    foo.quz = 2; #
    bar = 3;     # 'bar' from the first set
    baz = 4;     # 'baz' from the second set
}
 2018-08-15 17:16:56 +02:00
Mathijs Kwik c4fd2b7318 nixos/docker-registry: allow running on ports < 1024 2018-06-06 22:26:26 +02:00
Mathijs Kwik 5f1ad29340 nixos/docker-registry: allow nested config options 
for example:

services.dockerRegistry = {
    enable = true;
    extraConfig = {
        http = {
            host = "https://${config.networking.hostName}:5000";

            tls = {
                certificate = "${registry-tls}/snakeoil.pem";
                key = "${registry-tls}/snakeoil.key";
            };
        };
    };
};
 2018-06-05 11:26:02 +02:00
Mathijs Kwik 05761e9504 firewall: fix rpfilter blocking dhcp offers when no ip was bound yet 2017-11-19 22:24:56 +01:00
Mathijs Kwik c90be3dd3a geolite-legacy 2015-11-23 -> 2016-01-06 2016-01-06 11:59:54 +01:00
Mathijs Kwik 59b31f5771 Merge pull request #8010 from ardumont/update-sqldeveloper 
Update: Latest sqldeveloper stable
 2015-05-26 20:07:37 +02:00
Mathijs Kwik 5cac50b3bf kernel: add support for experimental Realtek2800 models 
tested with AVM Fritz wlan Stick N
 2015-03-22 13:49:29 +01:00
Mathijs Kwik 2fe44b95d0 nixos/wpa_supplicant: fix conflicting documentation 
fixes #6298
 2015-02-17 22:16:20 +01:00
Mathijs Kwik 6e728a42ec virtualisation.qemuNetworkingOptions -> virtualisation.qemu.networkingOptions 2014-12-19 11:59:00 +01:00
Mathijs Kwik aa16d75e01 Merge pull request #5388 from bluescreen303/qemu-vm-networking 
nixos/qemu-vm: make networking options configurable
 2014-12-19 08:52:39 +01:00
Mathijs Kwik 6cdacdd4a2 nixos/qemu-vm: make networking options configurable 2014-12-19 08:52:06 +01:00
Mathijs Kwik 4aebd5ef87 Merge pull request #5358 from bluescreen303/nixos-extra-modules 
nixos: allow adding extra modules through environment
 2014-12-17 09:48:35 +01:00
Mathijs Kwik 73f18fd42f nixos: allow adding extra modules through environment 
This is useful for adding extra functionality or defaults to _every_
nixos evaluation.

My use case is overriding behaviour for all nixos tests, for example
setting packageOverrides to newer versions and changing some default
dependencies/settings.

By making this accessible through an environment variable, this can now
be fully accomplished externally. No more need to fork
nixos/nixpkgs (which becomes a maintenance burden), just use the channel
instead and plug in via this envvar.
 2014-12-16 19:13:15 +01:00
Mathijs Kwik 9a7d425edd dvdauthor: fix building against glibc 2.20 
and 2 other patches from redhat
 2014-12-13 21:17:27 +01:00
Mathijs Kwik 752554cdcb mkvtoolnix: fix to find boost lib 2014-12-13 21:17:20 +01:00
Mathijs Kwik 04f73ed2e4 ghc-head: upgrade to 2014-12-10 2014-12-13 21:17:14 +01:00
Mathijs Kwik 4a3510ae2b xulrunner: use gold linker 2014-12-10 13:56:04 +01:00
Mathijs Kwik a5dafe7746 rethinkdb: upgrade to 1.15.2 2014-11-26 14:30:19 +01:00
Mathijs Kwik d0e0d62e61 add duperemove: btrfs deduplication tool 2014-11-06 00:02:45 +01:00
Mathijs Kwik 8913f14a5f emacs-idris-mode: upgrade to 0.9.15 2014-11-05 18:28:59 +01:00
Mathijs Kwik f356cee747 sudo: allow adding extra configuration options to the bottom of sudoers 
from sudoers (5):
When multiple entries match for a user, they are applied in order.
Where there are multiple matches, the last match is used (which is not necessarily the most specific match).
 2014-11-02 13:27:05 +01:00
Mathijs Kwik 98015ee5ba conkeror: upgrade to 141017 and use firefox for xulrunner 2014-10-22 18:08:46 +02:00
Mathijs Kwik 6af6bd9b51 xulrunner: fix for building on i686 2014-10-22 16:20:43 +02:00
Mathijs Kwik 2140adf11f Revert "Revert "xulrunner: stick to firefox's src attribute"" 
This reverts commit f13b383449.
 2014-10-22 16:20:43 +02:00
Mathijs Kwik eb1ed09b1d neoload: provide fake fontconfig file (fixes chroot builds) 2014-09-23 09:17:02 +02:00
Mathijs Kwik e80cbedbae VM builds: Use default kernel 
(this was set to 3.10 when 3.4 was our default)
See commit d846e97656.
 2014-09-23 09:17:01 +02:00
Mathijs Kwik 04369b6819 xulrunner: stick to firefox's src attribute 2014-09-23 09:16:55 +02:00
Mathijs Kwik 4b058a204d remove obsolete haskell-parsers-0.10 2014-08-25 13:56:53 +02:00
Mathijs Kwik 0e1ed7bbc9 fix js2-mode revision 2014-08-25 13:56:53 +02:00
Mathijs Kwik feeca09ecf eaglemode: upgrade to 0.85.0 2014-08-25 13:56:53 +02:00
Mathijs Kwik fb2449c026 add emacs color-theme solarized 2014-08-25 13:56:53 +02:00
Mathijs Kwik 3be7d4b478 idris-mode: upgrade to 0.9.14 2014-08-25 13:56:52 +02:00
Mathijs Kwik 9ceeb77bd3 agda-stdlib: no need to jailbreak anymore 2014-06-19 13:38:54 +02:00
Mathijs Kwik 0a8455800c idris: fix dependency on older 'parsers' 2014-06-19 13:38:54 +02:00
Mathijs Kwik 46d6fc0c32 agda: fix dependency on more recent 'binary' 2014-06-19 13:38:54 +02:00
Mathijs Kwik 2d92adcc1a agda: change defaults to latest version 2014-06-17 08:25:45 +02:00
Mathijs Kwik 3fd519822f agda-stdlib: upgrade to 0.8 (they keep changing the version scheme) 
Conflicts:
	pkgs/development/compilers/agda/stdlib-0.8.nix
	pkgs/top-level/haskell-packages.nix
 2014-06-17 08:25:44 +02:00
Mathijs Kwik 5bc69209b1 linux-3.15: upgrade to 3.15.1 2014-06-17 08:17:38 +02:00
Mathijs Kwik 464739c391 samba really requires its daemons 2014-06-16 22:44:27 +02:00
Mathijs Kwik 35df71ac1d phpfpm: add option for setting php.ini file 2014-06-16 22:44:18 +02:00
Mathijs Kwik a97bef3e8c nixos/nginx: fix group and stateDir permissions 
furthermore, I don't think adding nginx to systemPackages is of any use.
 2014-06-16 22:43:58 +02:00
Mathijs Kwik 76c2c0c499 nginx: add echo module, fix aio on linux&freebsd 2014-06-16 22:43:58 +02:00
Mathijs Kwik ff995adb0d emacs-idris-mode: upgrade to 0.9.13.1 2014-06-16 22:43:51 +02:00
Mathijs Kwik 8d708ba35a idris: provide boehmgc to compile with llvm backend 2014-06-16 22:43:51 +02:00
Mathijs Kwik b193dd5d77 emacs-org2blog: upgrade to 0.8.1 2014-06-16 22:43:11 +02:00
Mathijs Kwik ab8337e4fc add emacs-metaweblog 2014-06-16 22:43:10 +02:00
Mathijs Kwik 69492796ef conkeror: upgrade to latest snapshot 2014-06-16 22:43:01 +02:00
Mathijs Kwik 06c8438bd8 conkeror: upgrade to latest snapshot 2014-05-10 12:23:45 +02:00
Mathijs Kwik 00a70b454c v8: remove old version 3.14 2014-05-05 07:32:37 +02:00
Mathijs Kwik 1ebd620485 rethinkdb: upgrade to 1.12.4 2014-05-05 07:32:37 +02:00
Mathijs Kwik b6d8955199 mongodb: upgrade to 2.6.0 2014-05-05 07:32:36 +02:00
Mathijs Kwik 9e7c905d98 re2: upgrade to 20140304 2014-05-05 07:32:36 +02:00
Mathijs Kwik 7e7d8d651a v8: upgrade to 3.26.8 2014-05-05 07:32:36 +02:00
Mathijs Kwik 1a877418d4 node-packages: upgrade all generated expressions 2014-04-24 08:05:44 +02:00
Mathijs Kwik d2edc329e1 neoload: upgrade to 4.1.4 and fix mem issues 2014-04-24 08:05:44 +02:00
Mathijs Kwik 925c75c68d node.js - use bundled v8 :14.04-bugfix: 
node needs v8 3.14, which is no longer maintained.
They bundle an in-tree version which does receive backports.
 2014-04-24 08:05:44 +02:00
Mathijs Kwik bf841cd892 Revert "systemd: oneshot units should be allowed to restart on failure/abort" 
This reverts commit c1e638abb6.

As pointed out by wkennington, upstream disallows all cases as of v207
 2014-04-18 21:42:22 +02:00
Mathijs Kwik fb762679e1 Merge pull request #2297 from wkennington/cache.btrfs 
btrfsProgs: 3.12 -> 3.14
 2014-04-17 17:49:42 +02:00
Mathijs Kwik 8ca0bbe1a9 bedup: fix hash 2014-04-17 17:48:43 +02:00
Mathijs Kwik 19060fde7b qrencode: upgrade to 3.4.3 2014-04-17 17:48:43 +02:00
Mathijs Kwik c1e638abb6 systemd: oneshot units should be allowed to restart on failure/abort 2014-04-17 15:20:39 +02:00
Mathijs Kwik 28b3318a04 bedup: fix public github url 2014-04-17 09:08:33 +02:00
Mathijs Kwik 5ab600ab00 add pythonPackages.bedup (btrfs deduplication tool) 2014-04-15 09:22:16 +02:00
Mathijs Kwik 1daddde5dd add pythonPackages.contextlib2 2014-04-15 09:22:16 +02:00
Mathijs Kwik b21853f255 Fix initrd breaking by recent repeatable-builds changes 
See the comments at https://github.com/NixOS/nixpkgs/commit/f67015cae49400eba539b9ec8b9920643581c77c
for more information.

Please note: this makes initrd unrepeatable again, but most people will prefer that above an unbootable system.
 2014-04-12 00:06:30 +02:00
Mathijs Kwik 5a3fa7f88f nvidia-x11: patch for kernel 3.14 support 2014-04-11 23:40:16 +02:00
Mathijs Kwik d87ae02fc1 synergy: upgrade to 1.4.17 2014-04-11 14:09:07 +02:00
Mathijs Kwik 62521d9ec6 openttd: upgrade to 1.4.0 2014-04-11 13:49:19 +02:00
Mathijs Kwik 3ada08785f avidemux: make faacSupport optional 2014-04-10 11:57:20 +02:00
Mathijs Kwik bf929ef73b faac is redistributable, hydra is allowed to build it. 2014-04-10 11:57:20 +02:00
Mathijs Kwik 4219eb430d intel-microcode: upgrade to 20140122 2014-04-10 11:57:20 +02:00
Mathijs Kwik fccf059216 Merge pull request #2159 from lethalman/gst-no-faac 
gst-plugins-bad: disable faac by default because it's unfree
 2014-04-09 06:47:16 +02:00
Mathijs Kwik 593c633aa8 emacs-idris-mode: upgrade to support idris 0.9.12 2014-04-08 08:38:43 +02:00
Mathijs Kwik 6249cc729e add haskell-syntactic-1.11 2014-04-06 11:47:47 +02:00
Mathijs Kwik 773ce7aa32 add haskell-tree-view-0.4 2014-04-06 11:47:46 +02:00
Mathijs Kwik cdc4c7039d add haskell-data-hash-0.2.0.0 2014-04-06 11:47:46 +02:00
Mathijs Kwik b36f6ce3d4 ghc-mod: upgrade to 4.0.1 2014-04-06 11:47:46 +02:00
Mathijs Kwik 7f6a2f81b9 idris: upgrade to 0.9.12 2014-04-06 11:47:46 +02:00
Mathijs Kwik c01cc1a0e4 add haskell-cheapskate-0.1.0.1 (markdown processor) 2014-04-06 11:47:45 +02:00
Mathijs Kwik 5943227a26 neoload: fix for the new jdk/jre location 2014-03-27 11:29:26 +01:00
Mathijs Kwik 64e7ee4142 libarchive: patch checksum failure 
Probably github changed some headers in their patch output.
I verified other sources for CVE2013-0211 and the patch seems the
same.
 2014-03-24 10:35:52 +01:00
Mathijs Kwik 231f6c5460 psmisc: the tarball got updated upstream 
looking at our git history, I think it is very peculiar that we
managed to have this version (22.21) 2 months before release :)

So I think we were using some beta/rc that accidentally got called
22.21
 2014-03-24 10:35:52 +01:00
Mathijs Kwik d8d8606da4 unison: upgrade to 2.40.102 2014-03-24 10:35:51 +01:00
Mathijs Kwik 149dcb2113 conkeror: upgrade to more recent snapshot 
needed for scripting Downloads.jsm with Gecko >= 26
 2014-03-24 10:35:51 +01:00
Mathijs Kwik 779a959982 add haskell-lzma-enumerator 2014-03-17 07:30:26 +01:00
Mathijs Kwik 42d7923752 Merge pull request #1911 from offlinehacker/nixos/couchdb/fix 
nixos/couchdb: fix stopping of service, by making it non-forking, a few other improvments
 2014-03-11 09:35:27 +01:00
Mathijs Kwik cba5d36df1 haskell-parsers: remove old versions 2014-03-02 08:41:45 +01:00
Mathijs Kwik 13f8c07b54 haskell-trifecta: remove old versions 2014-03-02 08:41:45 +01:00
Mathijs Kwik 3a7e38eb1a idris: no longer depends on old versions of trifecta and parsers 2014-03-02 08:41:45 +01:00
Mathijs Kwik d2dd22651d idris-mode: upgrade to current version 2014-03-02 08:41:45 +01:00
Mathijs Kwik 68d8f67c04 e17/terminology: upgrade to 0.4.0 2014-02-18 09:44:50 +01:00
Mathijs Kwik 2eedf210d3 celestia: fix install location 2014-02-17 06:49:05 +01:00
Mathijs Kwik 896ae598d1 Merge pull request #1698 from wkennington/master.kernel 
kernel: Upgrade from 3.13.1 -> 3.13.2
 2014-02-07 06:42:53 +01:00
Mathijs Kwik fc30e8e9b5 llvm: remove duplicate ncurses buildInput 2014-02-06 10:01:13 +01:00
Mathijs Kwik 951f37f3da services.xserver.videoDrivers -> services.mesa.videoDrivers 2014-02-06 10:01:08 +01:00
Mathijs Kwik 9878037603 haskell-hasktags: upgrade to 0.68.6 2014-01-19 16:06:18 +01:00
Mathijs Kwik 71dc9ad252 llvm: remove deprecation warning. We prefer using the default version 
unless a package really needs a newer/older one
 2014-01-18 19:30:48 +01:00
Mathijs Kwik 45a3e8580c mesa: keep llvm versioning outside of expression file 2014-01-18 19:21:19 +01:00
Mathijs Kwik 6072a289fc llvm: no-rule-aarch64.patch is only needed on 3.3 
the fix just missed 3.3 but it's in 3.4
see bottom of: http://llvm.org/bugs/show_bug.cgi?id=16625
 2014-01-18 19:13:29 +01:00
Mathijs Kwik 8fad5a72ec add emacs/idris-mode 2014-01-07 07:16:47 +01:00