alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
132612 commits 217 branches 121 tags 4.5 GiB
Commit graph

8160 commits

Author SHA1 Message Date
Corey O'Connor 241160aacc jenkins: Include Deja-Vu fonts in system environment to silence jenkins warning. 2018-03-17 22:16:26 -07:00
Vladimír Čunát 03cf538ef2
18.09: Jackrabbit -> Jellyfish 
See eb0fa09232 and github discussion on that.
My misgiving about the t-shirts was refuted.
I don't think this flip may negatively affect anyone.
 2018-03-16 12:26:03 +01:00
Tuomas Tynkkynen ef64208eba Merge commit '3ab2949' from staging into master 
Conflicts:
	pkgs/development/compilers/llvm/6/llvm.nix
	pkgs/servers/home-assistant/component-packages.nix
 2018-03-15 22:30:56 +02:00
Samuel Leathers 5931f463ad
Merge pull request #36924 from etu/gitea-postgres-autocreate-database 
Gitea postgres autocreate database
 2018-03-15 14:01:01 -04:00
Elis Hirwing 1ad75d0c50
gitea: enable and configure postgres service if selected as database 2018-03-15 18:34:54 +01:00
Jan Malakhovski 8bbd48e40f nixos: fix install-grub.pl dependencies 
fallback from updates to perl
 2018-03-15 04:51:12 +00:00
Tuomas Tynkkynen 9e78baf5c7 nixos/qemu-vm: Add virtualized display + HID devices on AArch64 2018-03-14 21:18:20 +02:00
Vladimír Čunát eb0fa09232
18.09: let's call it "Jackrabbit" 
I was mainly considering Jellyfish and Jaguar (and Jackrabbit).
Originally I was inclined for Jellyfish, but then I thought of the
release T-shirts someone makes and it didn't seem suitable...
Jaguar would keep the name referring to a car as well, but as a
not-too-old (Mac) OS version is codenamed that way, I didn't go for it.
 2018-03-14 15:13:34 +01:00
lewo 65e5bc713b
Merge pull request #36845 from jbedo/singularity 
singularity: 2.4 -> 2.4.2
 2018-03-14 10:19:10 +01:00
Tuomas Tynkkynen 2fec9c6e29 Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
	pkgs/development/tools/build-managers/conan/default.nix
 2018-03-13 23:04:18 +02:00
Michael Raskin bfbc4951a6
Merge pull request #36850 from teto/virtualisation 
Virtualisation
 2018-03-13 13:40:33 +00:00
Jörg Thalheim 9881934b57
Merge pull request #36783 from Infinisil/desciption/update/resilio 
resilio: Adjust option description to 3d17573
 2018-03-12 11:04:51 +00:00
Matthieu Coudron c476d2f592 grub-install.pl: more details on blkid failure 2018-03-12 17:32:59 +09:00
Matthieu Coudron 7b7860ff89 build-vm: remove trailing dot from script path 
Allow to double click/middle click paste path a bit quicker.
 2018-03-12 17:31:24 +09:00
Matthieu Coudron b7a2333ebe qemu-vm: removes warning when running build-vm 
get rid of deprecated qemu commands
 2018-03-12 17:29:55 +09:00
Justin Bedo 5c1e42276d
singularity: 2.4 -> 2.4.2 2018-03-12 15:13:31 +11:00
Silvan Mosberger 86ca617948
resilio: Adjust option description to 3d17573 2018-03-11 01:18:34 +01:00
Jan Malakhovski 7079e744d4 Merge branch 'master' into staging 
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
 2018-03-10 20:38:13 +00:00
Silvan Mosberger 08704aa2f7
nixos/network-interfaces: Fix 2 small typos 2018-03-10 16:16:56 +01:00
Jörg Thalheim 558949f2c0
Merge pull request #36357 from matthewbauer/vbox-usable 
demo: make virtualbox more usable
 2018-03-09 11:36:13 +00:00
Daiderd Jordan db6fb869fb
Merge pull request #30418 from LnL7/inline-set-environment 
nixos: inline set-environment for bash and zsh
 2018-03-08 21:07:15 +01:00
Jörg Thalheim 196e21a160 nixos/tomcat: add types + proper systemd integration 
fixes #35443
 2018-03-08 09:09:42 +00:00
Benjamin Smith 024220bd7f nixos/tomcat: add serverXml, environment files and log directories 
* add serverXml verbatim override
* add environment file
* add log directory creation
 2018-03-08 09:09:42 +00:00
Shea Levy a183563cf0
Revert "Merge branch 'setuid-wrapper-readlink'" 
Kernel symlinks don't have st_size. Really thought I tested this, guess I ran the
wrong NixOS test :(

This reverts commit 6dab907ebe, reversing
changes made to eab479a5f0.
 2018-03-07 17:09:05 -05:00
Michael Raskin 5a95fe2939
Merge pull request #36292 from xeji/xen-4-10 
xen: add v 4.10
 2018-03-07 22:07:14 +00:00
xeji 08894b4d8a xen 4.10: link /etc/xen/oxenstored.conf 
this is required for oxenstored to start
 2018-03-07 22:39:19 +01:00
xeji fbc0b8282e xen: fix broken version comparisons 
string compare breaks with xen 4.10 (because "4.10" < "4.8")
 2018-03-07 22:37:40 +01:00
Shea Levy 6dab907ebe
Merge branch 'setuid-wrapper-readlink' 2018-03-07 12:44:21 -05:00
Shea Levy dffa3d2b1f
nixos: setuid-wrapper: simplify readlink logic 2018-03-07 11:57:43 -05:00
Yegor Timoshenko 5905fe069b
tt-rss: use proper user and package for MySQL 2018-03-06 03:10:24 +00:00
Jörg Thalheim 5fe1be88a5
Merge pull request #36350 from volth/nix-serve 
nix-serve: nix 2.0 fixes
 2018-03-05 23:18:27 +00:00
Matthew Bauer 1e621ff423 demo: autologin through xserver 
also disable upower on virtualbox
Fixes #36348
 2018-03-05 14:48:01 -06:00
volth 30877b1ed8 nix-serve: nix 2.0 fixes 2018-03-05 19:32:42 +00:00
Frederik Rietdijk 8bcdb39a27
Merge pull request #27678 from volth/restore-bridge-slaves-dynamically-added-by-libvirt 
nixos/networking-scripted: restore bridge slaves dynamically added by…
 2018-03-05 17:31:22 +00:00
Dino Dai Zovi ddf13e6646 nixos/initrd-network: add udhcpc.extraArgs option (#36305) 
This can be used to fix issues where udhcpc times out before
acquiring a lease. For example of these issues, see:

https://bugs.alpinelinux.org/issues/3105#note-8

Signed-off-by: Dino A. Dai Zovi <ddz@theta44.org>
 2018-03-05 15:53:59 +00:00
Franz Pletz 17ba8bb3e0
Merge pull request #30416 from symphorien/luksnokey 
nixos/luksroot.nix: fallback to interactive password entry when no keyfile found
 2018-03-05 10:02:39 +00:00
Will Fancher 6b9a99e55d LightDM: Set default user session when possible. 2018-03-04 23:54:09 +00:00
Vladimír Čunát 498374a8bd
Merge #35554: nixos/opengl: unhide and document 2018-03-04 17:33:01 +01:00
obadz 9dc62dd915
Merge pull request #36272 from obadz/nixos-lustrate-doc 
nixos doc: document the installation process from other distros as well as NIXOS_LUSTRATE
 2018-03-04 16:21:54 +00:00
obadz 80ea345494 nixos-enter: specify absolute path to bash 
Not doing so makes it impossible to use nixos-enter from a non-NixOS
distro
 2018-03-04 16:19:52 +00:00
Vladimír Čunát 2069a2a002
Merge #35454: nixos/pump.io: remove 2018-03-04 10:49:25 +01:00
Vladimír Čunát a2b8d8fbe2
nixos/pump.io: also comment-out the uid 2018-03-04 10:48:29 +01:00
Jörg Thalheim a5dcde1a6f Revert "networkd: also load builtin modules" 
This reverts commit d514dc220e.

breaks unpredicable network interfaces: https://github.com/NixOS/nixpkgs/pull/29768#issuecomment-370172863
 2018-03-04 06:29:08 +00:00
Tuomas Tynkkynen 1e107443ad Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into staging 2018-03-03 22:40:32 +02:00
Jörg Thalheim 6749f6e26e
Merge pull request #36249 from Ekleog/openldap-module-declarative-contents 
Openldap module declarative contents
 2018-03-03 19:00:13 +00:00
aszlig 0811e7f60e
nixos/netboot: Fix evaluation error 
The function arguments for make-squashfs.nix have changed in
df117acab7, so we need to change them here
as well.

The boot.netboot NixOS VM test now succeeds again.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @edolstra
 2018-03-03 19:31:19 +01:00
Jörg Thalheim 5d0d140f74
Merge pull request #34070 from lukeadams/prl-improve 
Improve parallels-tools
 2018-03-03 17:34:57 +00:00
Vladimír Čunát b70c93f211
Merge branch 'master' into nix-2.0 2018-03-03 18:02:35 +01:00
Jörg Thalheim 9936ed4920
Merge pull request #31019 from teto/strongswan_rebased 
[RFC/RDY] make l2tp work with Strongswan
 2018-03-03 15:56:05 +00:00
Léo Gaspard aeef7c91f1
openldap module: allow defining contents declaratively 2018-03-03 15:33:23 +01:00