jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
147,122 Commits 266 Branches 122 Tags 5.3 GiB
2380766faf
Commit Graph

10481 Commits

Author SHA1 Message Date
volth
cc55a3ebcb treewide: fix build with disallowed aliases (#43872) 
fixes build with disallowed aliases
 2018-07-21 22:03:24 -04:00
Jörg Thalheim
e9ff0f9448
Merge pull request #43863 from volth/unused4 
[bot] nixos/*: remove unused arguments in lambdas
 2018-07-21 16:39:08 +01:00
Daiderd Jordan
9d72403814
ssh: fix 3572f89bbe154087d8ad83c36674d0c2499c0967 2018-07-21 13:06:16 +02:00
Daiderd Jordan
3572f89bbe
ssh: don't add empty PubkeyAcceptedKeyTypes/HostKeyAlgorithms 
The options introduced in e2444a433fb would generate a broken
ssh config when set to an empty list.

/etc/ssh/ssh_config line 7: Missing argument.
 2018-07-21 12:29:16 +02:00
Daiderd Jordan
e2444a433f
Merge pull request #40686 from Izorkin/ssh 
ssh: custom config key types
 2018-07-21 11:57:41 +02:00
Izorkin
05bc5fed28 ssh: custom config key types 2018-07-21 12:27:16 +03:00
Frederik Rietdijk
8424ac61a9
Merge pull request #43862 from volth/unused3 
[bot] treewide: remove unused 'args@' in lambdas
 2018-07-21 11:14:44 +02:00
Frederik Rietdijk
251a0a9a86
Merge pull request #43860 from volth/unused2 
treewide: remove unused 'inherit' in let blocks
 2018-07-21 11:13:36 +02:00
volth
2e979e8ceb [bot] nixos/*: remove unused arguments in lambdas 2018-07-20 20:56:59 +00:00
Pascal Wittmann
c271ebdde7
Merge pull request #40768 from CommunicationAnimale/master 
nixos/thinkfan: use non-deprecated keywords in config file.
 2018-07-20 22:27:56 +02:00
volth
dda95bae35 [bot] treewide: remove unused 'args@' in lambdas 2018-07-20 19:54:05 +00:00
volth
6d2857a311 [bot] treewide: remove unused 'inherit' in let blocks 2018-07-20 19:38:19 +00:00
Frederik Rietdijk
1a6af9f88e
Merge pull request #43857 from volth/unused 
[bot] treewide: remove unreferenced code
 2018-07-20 21:06:32 +02:00
volth
87f5930c3f [bot]: remove unreferenced code 2018-07-20 18:48:37 +00:00
Robert Schütz
55a12c9763
nixos/home-assistant: do not always override extraComponents (#43845) 
Fixes #43843.
 2018-07-20 19:28:29 +02:00
Erik Arvstedt
aecf24a0eb openvpn: document how to import an external config 2018-07-20 10:51:52 +02:00
Robert Schütz
e7e5aaa0b9
Merge pull request #43782 from Ma27/fix-simpleldap-python3 
python3Packages.simpleldap: remove
 2018-07-19 17:54:13 +02:00
Maximilian Bosch
0adca53c79
inginious: remove 
Fallout of 9db7f15ea3ce57eee25458daf87cce7a04ea98b2 which removed
simpleldap.

@layus suggests to remove:

* https://github.com/NixOS/nixpkgs/pull/43782#issuecomment-406186881
* https://github.com/NixOS/nixpkgs/pull/31975#issuecomment-346647857
 2018-07-19 17:31:40 +02:00
Matthew Bauer
76999cc40e treewide: remove aliases in nixpkgs 
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
 2018-07-18 23:25:20 -04:00
Silvan Mosberger
810f91f46d
Merge pull request #43308 from Chiiruno/dev/hydron 
hydron: init at 2018-07-11
 2018-07-18 22:10:11 +02:00
Silvan Mosberger
35c069ea02
nixos: systemd.globalEnvironment: fix type 
Follow up fix of fb2a8d66699c96d6a687eb71ebfcca08e3405037

https://github.com/NixOS/nixpkgs/pull/38356
https://github.com/NixOS/nixpkgs/pull/40416
 2018-07-18 22:04:26 +02:00
Okina Matara
38f2a3efbf nixos/hydron: init 2018-07-18 13:16:50 -05:00
Sarah Brofeldt
5672083461
Merge pull request #43728 from srhb/k8srbacfix 
nixos/kubernetes: Don't lose rbac submodule with no explicit options
 2018-07-18 12:37:44 +02:00
Sarah Brofeldt
6dd6f28415 nixos/kubernetes: Don't lose rbac submodule with no explicit options 2018-07-18 12:02:06 +02:00
Johan Thomsen
205b54ed95 nixos/kubernetes: Added missing dependency, awk, to kube-addon-manager path (#43708) 2018-07-18 10:47:27 +02:00
Frederik Rietdijk
1ae2f10642 Merge staging-next into master 2018-07-17 10:04:59 +02:00
Silvan Mosberger
f2632f5c60
Merge pull request #42748 from patternspandemic/neo4j-service 
nixos/neo4j: Update module, make compatible with neo4j 3.4
 2018-07-16 22:31:25 +02:00
Frederik Rietdijk
3c09808160 Merge master into staging-next 2018-07-16 07:43:37 +02:00
Wael M. Nasreddine
fd2448b2e6 aerospike: init at 4.2.0.4 
Co-authored-by: Volth <volth@webmaster.ms>
 2018-07-16 04:21:47 +00:00
Franz Pletz
1cfc4963a9
Merge pull request #43147 from Ma27/fix-nixos-option-evaluation 
nixos/nixos-option: don't abort in case of evaluation errors
 2018-07-16 03:57:37 +00:00
xeji
311f017066
Merge pull request #43494 from jb55/clipmenu-master 
clipmenu: init at 5.4.0
 2018-07-16 00:48:31 +02:00
Franz Pletz
8bda93f0b2
Merge pull request #37096 from jfrankenau/feat-cups-socket 
nixos/cupsd: Add option to start when needed
 2018-07-15 21:39:07 +00:00
Franz Pletz
92c82e0933
nixos/thinkfan: add types & fix formatting 2018-07-15 23:28:14 +02:00
Jan Tojnar
5b1f6b5959
nixos/flatpak: slim down test enviroment a bit 2018-07-15 22:07:08 +02:00
William Casarin
6c1eb15a3b nixos/modules: add clipmenu user service 
add a clipmenud daemon user service
 2018-07-15 12:22:46 -07:00
Matthew Bauer
19fc061a13
Merge pull request #43169 from samueldr/fix/stripDirs 
Fixes `stripDirs` use after signature change
 2018-07-14 19:07:46 -04:00
Johannes Frankenau
d81f819db3 nixos/cupsd: add option to start when needed 2018-07-14 23:39:43 +02:00
Thomas Tuegel
5ea799defc
Merge pull request #43243 from peterhoeg/f/sddmqt 
sddm: use tmpfiles.d to wipe QML cache
 2018-07-14 13:16:18 -05:00
Thomas Tuegel
1301973797
Merge pull request #42910 from bkchr/kde_update_start_menu 
services.plasma5: Update start menu with an activationScript
 2018-07-14 13:13:39 -05:00
Franz Pletz
ea9078b76b
Merge pull request #41745 from rvolosatovs/fix/sshd 
nixos: Add more ssh-keygen params
 2018-07-14 16:29:46 +00:00
Vladimír Čunát
0f01215203
Merge branch 'master' into staging-next 
Hydra: ?compare=1468896
 2018-07-14 18:15:30 +02:00
Peter Hoeg
6e3ee65b44
Merge pull request #43511 from peterhoeg/m/firejail 
firejail: add nixos module
 2018-07-14 21:04:11 +08:00
Peter Hoeg
65eb3a590d firejail: add nixos module 
Also add support for wrapping binaries with firejail.
 2018-07-14 20:21:41 +08:00
patternspandemic
d9d9200496
nixos/neo4j: Update module, make compatible with neo4j 3.4 2018-07-12 19:28:40 -07:00
Silvan Mosberger
b9c95c7d60
httpd: Fix typo 2018-07-13 02:59:00 +02:00
Ben Wolsieffer
7c763118b4 raspberrypiWirelessFirmware: init 2018-07-12 17:02:32 +03:00
Andrew Dunham
d7bfd04301 sdImage: make partition ID/UUID configurable 2018-07-12 17:02:03 +03:00
volth
88939a1949 nixos: remove option services.xserver.desktopManager.xfce.screenLock 2018-07-12 01:45:41 +00:00
aszlig
7b87554ca1
nixos/tests/letsencrypt: Hardcode certs and keys 
In 0c7c1660f78e4f6befe0a210e1a9efae783a1733 I have set allowSubstitutes
to false, which avoided the substitution of the certificates.

Unfortunately substitution may still happen later when the certificate
is merged with the CA bundle. So the merged CA bundle might be
substituted from a binary cache but the certificate itself is built
locally, which could result in a different certificate in the bundle.

So instead of adding just yet another workaround, I've now hardcoded all
the certificates and keys in a separate file. This also moves
letsencrypt.nix into its own directory so we don't mess up
nixos/tests/common too much.

This was long overdue and should finally make the dependency graph for
the ACME test more deterministic.

Signed-off-by: aszlig <aszlig@nix.build>
 2018-07-12 02:32:46 +02:00
aszlig
c21b1ede95
nixos/tests/letsencrypt: Fix go source install 
Since e95f17e2720e67e2eabd59d7754c814d3e27a0b2, Go packages no longer
contain the source tree, however Boulder seems to need that as it
generates a few files during build.

Ideally we would only pick the files that are needed and put it into a
separate output, but I currently don't have time for this so I'm marking
this with XXX to get back to it later.

Signed-off-by: aszlig <aszlig@nix.build>
 2018-07-12 02:32:44 +02:00