Commit Graph
149424 Commits
Author SHA1 Message Date
aszlig 7b87554ca1 nixos/tests/letsencrypt: Hardcode certs and keys
In 0c7c1660f7 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 e95f17e272, 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
Silvan Mosberger 4794aa5de2 Revert "lib: Use lib.fixed-points.extends to avoid repetition"
This reverts commit 48ccdf322d.
2018-07-12 02:04:06 +02:00
volth 2dee9d4a80 flash: 30.0.0.113 -> 30.0.0.134 2018-07-11 23:34:16 +00:00
Maximilian Bosch 6f72b63601 nixos/nixos-option: don't abort in case of evaluation errors
When running e.g. `nixos-option boot.kernelPackages` I get an output
like this on the current unstable channel (18.09pre144959.be1461fc0ab):

```
$ nixos-option boot.kernelPackages
Value:
*exit 1*
```

This is fairly counter-intuitive as I have no clue what might went
wrong. `strace` delivers an output like this:

```
read(3, "error: Package \342\200\230cryptodev-linu"..., 128) = 128
read(3, "ux/cryptodev/default.nix:22 is m"..., 128) = 128
read(3, "lowBroken = true; }\nin configura"..., 128) = 128
read(3, "you can add\n  { allowBroken = tr"..., 128) = 128
read(3, "n)\n", 128)                    = 3
read(3, "", 128)                        = 0
```

`nixos-option` evaluates the system config using `nix-instantiate` which
might break when the evaluation fails (e.g. due to broken or unfree
packages that are prohibited to evaluate by default). The script aborts
due to the shebang `@shell@ -e`.

In order to ensure that no unexpected
behavior occurs due to removing `-e` from the interpreter the easiest
way to work around this was to wrap `nix-instantiate` in `evalNix()`
with a `set +e`. The function checks the success of the evaluation with
`$?` in the end. Additionally `evalNix` shouldn't break, if one
evaluation (e.g. the values that contain a package set by default) to
return additional information like a description.

With the change `nixos-option boot.kernelPackages` delivers the
following output for me:

```
Value:
error: Package ‘cryptodev-linux-1.9-4.14.52’ in /nix/store/47z2s8cwppymmgzw6n7pbcashikyk5jk-nixos/nixos/pkgs/os-specific/linux/cryptodev/default.nix:22 is marked as broken, refusing to evaluate.

Default:
{ __unfix__ = <LAMBDA>; acpi_call = <CODE>; amdgpu-pro = <CODE>; ati_drivers_x11 = <CODE>; batman_adv = <CODE>; bbswitch = <CODE>; bcc = <CODE>; beegfs-module = <CODE>; blcr = <CODE>; broadcom_sta = <CODE>; callPackage = <CODE>; cpupower = <CODE>; cryptodev = <CODE>; dpdk = <CODE>; e1000e = <CODE>; ena = <CODE>; evdi = <CODE>; exfat-nofuse = <CODE>; extend = <CODE>; facetimehd = <CODE>; fusionio-vsl = <CODE>; hyperv-daemons = <CODE>; ixgbevf = <CODE>; jool = <CODE>; kernel = <CODE>; lttng-modules = <CODE>; mba6x_bl = <CODE>; mwprocapture = <CODE>; mxu11x0 = <CODE>; ndiswrapper = <CODE>; netatop = <CODE>; nvidiaPackages = <CODE>; nvidia_x11 = <CODE>; nvidia_x11_beta = <CODE>; nvidia_x11_legacy304 = <CODE>; nvidia_x11_legacy340 = <CODE>; nvidiabl = <CODE>; odp-dpdk = <CODE>; openafs = <CODE>; openafs_1_8 = <CODE>; perf = <CODE>; phc-intel = <CODE>; pktgen = <CODE>; ply = <CODE>; prl-tools = <CODE>; recurseForDerivations = true; rtl8192eu = <CODE>; rtl8723bs = <CODE>; rtl8812au = <CODE>; rtl8814au = <CODE>; rtlwifi_new = <CODE>; sch_cake = <CODE>; spl = <CODE>; splLegacyCrypto = <CODE>; splStable = <CODE>; splUnstable = <CODE>; stdenv = <CODE>; sysdig = <CODE>; systemtap = <CODE>; tbs = <CODE>; tmon = <CODE>; tp_smapi = <CODE>; usbip = <CODE>; v4l2loopback = <CODE>; v86d = <CODE>; vhba = <CODE>; virtualbox = <CODE>; virtualboxGuestAdditions = <CODE>; wireguard = <CODE>; x86_energy_perf_policy = <CODE>; zfs = <CODE>; zfsLegacyCrypto = <CODE>; zfsStable = <CODE>; zfsUnstable = <CODE>; }

Example:
{ _type = "literalExample"; text = "pkgs.linuxPackages_2_6_25"; }

Description:

"This option allows you to override the Linux kernel used by\nNixOS. Since things like external kernel module packages are\ntied to the kernel you're using, it also overrides those.\nThis option is a function that takes Nixpkgs as an argument\n(as a convenience), and returns an attribute set containing at\nthe very least an attribute <varname>kernel</varname>.\nAdditional attributes may be needed depending on your\nconfiguration. For instance, if you use the NVIDIA X driver,\nthen it also needs to contain an attribute\n<varname>nvidia_x11</varname>.\n"

Declared by:
  "/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/system/boot/kernel.nix"

Defined by:
  "/home/ma27/Projects/nixos-config/system/boot.nix"
```
2018-07-12 00:37:01 +02:00
Silvan MosbergerandGitHub b84e951f92 Merge pull request #43232 from Infinisil/update/xkeyboardconfig
xorg.xkeyboardconfig: 2.23.1 -> 2.24, Fixes issue with polish symbols syntax
2018-07-12 00:14:50 +02:00
Alyssa RossandGitHub a269e5ab92 tor-browser-bundle: update license to free
The Tor Browser Bundle is free software under various licenses:

> Can I distribute Tor?
> 
> Yes.
> 
> The Tor software is free software. This means we give you the rights
> to redistribute the Tor software, either modified or unmodified,
> either for a fee or gratis. You don't have to ask us for specific
> permission.
> 
> However, if you want to redistribute the Tor software you must follow
> our LICENSE. Essentially this means that you need to include our
> LICENSE file along with whatever part of the Tor software you're
> distributing.
> 
> Most people who ask us this question don't want to distribute just the
> Tor software, though. They want to distribute the Tor Browser. This
> includes Firefox Extended Support Release, and the NoScript and
> HTTPS-Everywhere extensions. You will need to follow the license for
> those programs as well. Both of those Firefox extensions are
> distributed under the GNU General Public License, while Firefox ESR is
> released under the Mozilla Public License. The simplest way to obey
> their licenses is to include the source code for these programs
> everywhere you include the bundles themselves. 

(https://www.torproject.org/docs/faq.html.en#DistributingTor)

tor-browser-bundle-bin is already marked as licenses.free, so it doesn't
really make sense that this one is marked as unfree.
2018-07-11 23:55:58 +02:00
John EricsonandGitHub ee9eeea63a Merge pull request #43367 from dtzWill/fix/haskell-integer-simple-buildPkgs
haskell: fix package sets based on integer-simple
2018-07-11 17:32:38 -04:00
volthandxeji 8c3b33ea73 libvirt: 4.4.0 -> 4.5.0 (#43164) 2018-07-11 22:34:13 +02:00
Timo Kaufmannandxeji c968e02aba pythonPackages.cysignals: 1.7.1 -> 1.7.2 (#43382) 2018-07-11 22:25:08 +02:00
Maximilian Bodeandxeji 0646be557e heptio-ark: 0.7.1 -> 0.9.0 (#43381) 2018-07-11 22:21:05 +02:00
Timo Kaufmann d2f0fc1f41 openblas: backport fix
https://github.com/xianyi/OpenBLAS/issues/1666

Causing test failures in cvxopt and (according to an openblas issue) numpy.
2018-07-11 22:06:32 +02:00
xejiandGitHub 7c37665831 Merge pull request #43377 from mbode/flink_1_5
flink: 1.4.2 -> 1.5.0
2018-07-11 21:45:50 +02:00
Maximilian Bodeandxeji cc179b62b0 terraform-landscape 0.1.17 -> 0.1.18 (#43380) 2018-07-11 21:37:26 +02:00
markuskowaandxeji a36ab79712 rdma-core: 17.1 -> 19 (#43357) 2018-07-11 21:36:30 +02:00
Jaka Hudoklinandxeji 6cc50b144a prometheus-jmx-httpserver: init at 0.10 (#43336)
prometheus-jmx-httpserver: init at 0.10
2018-07-11 21:17:09 +02:00
Jake Waksbaumandxeji 1dd67f1aef trash: f68ad25a -> 0.9.1 (#43361) 2018-07-11 21:07:22 +02:00
bricewgeandxeji 9ae92ee651 vault: 0.9.5 -> 0.10.3 (#43355)
Signed-off-by: Brice Waegeneire <brice.wge@gmail.com>
2018-07-11 21:06:41 +02:00
Maximilian Bode f9d6732ee0 flink_1_3: 1.3.2 -> 1.3.3 2018-07-11 20:42:31 +02:00
Elias Probst 20f096a8a1 hetzner-kube: add myself (eliasp) as maintainer 2018-07-11 20:42:28 +02:00
Elias Probst 0d8fccafef hetzner-kube: init at version 0.3.1 2018-07-11 20:41:55 +02:00
Maximilian Bode 7a9e3b8cba flink: 1.4.2 -> 1.5.0 2018-07-11 20:37:06 +02:00
Dave Laingandxeji 4d5371f373 nixos/virtualbox: Adds more options to virtualbox-image.nix (#42699)
* nixos/virtualbox: Adds more options to virtualbox-image.nix

Previously you could only set the size of the disk.

This change adds the ability to change the amount of memory
that the image gets, along with the name / derivation name /
file name for the VM.

* Incorporates some review feedback
2018-07-11 19:45:10 +02:00
Tim Steinbach b34a147eef linux: 4.17.5 -> 4.17.6 2018-07-11 13:28:54 -04:00
Tim Steinbach ed9578b7b1 linux: 4.14.54 -> 4.14.55 2018-07-11 13:28:42 -04:00
Tim Steinbach 62b1759719 linux: 4.9.111 -> 4.9.112 2018-07-11 13:28:32 -04:00
Tim Steinbach f8daa11d41 linux: 4.4.139 -> 4.4.140 2018-07-11 13:28:21 -04:00
R. RyanTM 47b2be65df chirp: 20180623 -> 20180707
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/chirp-daily/versions.
2018-07-11 10:27:33 -07:00
R. RyanTM f891715b00 aws-sdk-cpp: 1.4.78 -> 1.4.82
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/aws-sdk-cpp/versions.
2018-07-11 10:16:04 -07:00
Yuriy Taradayandxeji e5217c3ccd IPMIView: 2.13.0 -> 2.14.0 (#43356) 2018-07-11 19:11:12 +02:00
Frederik RietdijkandGitHub 629c9011b4 Merge pull request #43353 from r-ryantm/auto-update/debootstrap
debootstrap: 1.0.105 -> 1.0.106
2018-07-11 19:02:28 +02:00
Frederik RietdijkandGitHub d28dd0eeda Merge pull request #43321 from r-ryantm/auto-update/wsjtx
wsjtx: 1.9.0 -> 1.9.1
2018-07-11 19:01:52 +02:00
Frederik RietdijkandGitHub 04cae0e5fb Merge pull request #43333 from r-ryantm/auto-update/libpoly
libpoly: 0.1.4 -> 0.1.5
2018-07-11 19:01:02 +02:00
Frederik RietdijkandGitHub 7d21b2208e Merge pull request #43345 from r-ryantm/auto-update/s3fs-fuse
s3fs: 1.83 -> 1.84
2018-07-11 19:00:43 +02:00
Frederik RietdijkandGitHub ed5ec5c04d Merge pull request #43349 from r-ryantm/auto-update/containerd
containerd: 1.1.0 -> 1.1.1
2018-07-11 19:00:25 +02:00
Jan Tojnar ddf156ffa9 bamf: various improvements
Fix systemd user unit directory, add test dependencies,
split package into multiple outputs, and clean up a bit.
2018-07-11 18:58:02 +02:00
Jan Tojnar bf09bb5ef0 nixos/bamf: init 2018-07-11 18:58:02 +02:00
R. RyanTMandxeji b4d9f481f5 conan: 1.5.1 -> 1.5.2 (#43354)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/conan/versions.
2018-07-11 18:34:17 +02:00
R. RyanTMandxeji 064ce0056e fanficfare: 2.26.0 -> 2.27.0 (#43346)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fanficfare/versions.
2018-07-11 18:30:28 +02:00
R. RyanTMandxeji 6750cb525f frostwire-bin: 6.6.7 -> 6.7.0 (#43344)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/frostwire/versions.
2018-07-11 18:29:57 +02:00
Robert SchützandGitHub 9564b16fc0 qutebrowser: 1.4.0 -> 1.4.1 (#43365)
Release notes: https://github.com/qutebrowser/qutebrowser/releases/tag/v1.4.1
Fixes CVE-2018-10895.
2018-07-11 18:25:01 +02:00
Will Dietz e065779af1 ghc821-binary: avoid mass-rebuild by using old dynamic linker string 2018-07-11 11:16:13 -05:00
Will Dietz b4c91a3e1a ghc821-binary: disable ld override w/musl
Fixes conftest failure that I believe ends up
using the wrong dynamic linker.
2018-07-11 11:14:18 -05:00
Will Dietz 4a1d311c49 ghc821-binary: use glibc on musl
These prebuilt binaries need to be used with glibc,
it doesn't matter what we're using otherwise.

This may seem a bit strange but has the huge advantage
of not needing to create/host/download musl-specific variants,
and instead continue to use the official ones from upstream.
2018-07-11 11:06:20 -05:00
Frederik Rietdijk 497679725e fltk: get rid of composableDerivation 2018-07-11 18:02:49 +02:00
Will Dietz da1e98d04b haskell: fix package sets based on integer-simple
Fixes mass build failures in these package sets,
due to "unknown pacakge: integer-simple".

Attributes that demonstrate this (see before/after):

* haskell.packages.integer-simple.ghc843.hello
* haskell.packages.integer-simple.ghc802.scientific

The second one is from the NixOS manual, FWIW.
2018-07-11 11:01:35 -05:00
R. RyanTMandRobert Schütz 2d1d17032b dovecot: 2.3.2 -> 2.3.2.1 (#43351)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/dovecot/versions.
2018-07-11 17:51:32 +02:00
Eelco DolstraandGitHub c93123afb6 Merge pull request #42937 from gavinrogers/init_holochain
holochain-go: init at 0.1.0-alpha
2018-07-11 17:46:30 +02:00
Franz Pletz 3f324aa0cd xsecurelock: init at 2018-07-10 2018-07-11 17:39:22 +02:00
Franz Pletz 8aaf71f9e0 s-tui: 0.6.2 -> 0.7.5 2018-07-11 17:35:20 +02:00