3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

146450 commits

Author SHA1 Message Date
Will Dietz ee57cb3a24
Merge pull request #43422 from dtzWill/experimental/ghc-musl-misc-fixes
haskell-{unix-time,prettyprinter}: dontCheck on musl
2018-07-12 12:06:04 -05:00
Will Dietz ba602b0a5f haskell-{unix-time,prettyprinter}: dontCheck on musl 2018-07-12 11:04:25 -05:00
Will Dietz 78381de859
Merge pull request #43400 from dtzWill/experimental/ghc-musl-nollvm
ghc: don't use LLVM w/musl on non-cross
2018-07-12 10:48:04 -05:00
Izorkin f7d6744cf8 dar: 2.5.14 -> 2.5.15 2018-07-12 17:41:41 +03:00
Tuomas Tynkkynen 6b5c9fc197 linux_rpi: 1.20180417 -> 1.20180619 2018-07-12 17:04:07 +03:00
Tuomas Tynkkynen 7b25471fb1 raspberrypifw: 1.20180417 -> 1.20180619 2018-07-12 17:04:07 +03:00
Tuomas Tynkkynen d0195f0e1d U-Boot: 2018.05 -> 2018.07
- We get to drop a bunch of patches. Yay!
- bison and flex are now needed
2018-07-12 17:03:40 +03: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
Izorkin 4d209dcb15 percona-xtrabackup: 2.4.9 -> 2.4.12 2018-07-12 16:08:13 +03:00
taku0 900617bd30 firefox, firefox-bin: add dependencies for flashplayer 2018-07-12 22:05:52 +09:00
taku0 a19c7135ca flashplayer: fix hashes 2018-07-12 22:05:17 +09:00
Izorkin 99670bbb91 libmodsecurity: 3.0.0 -> 3.0.2 (#43406) 2018-07-12 14:36:38 +02:00
xeji b744eb18a2
Merge pull request #43407 from dotlambda/seafile-6.2.2
seafile-client: 6.2.1 -> 6.2.2
2018-07-12 14:16:14 +02:00
xeji cfc2e6795a
Merge pull request #43396 from volth/xfce-remove-screenLock
nixos: remove option services.xserver.desktopManager.xfce.screenLock
2018-07-12 14:08:14 +02:00
Pascal Wittmann e69876503a
Merge pull request #43205 from r-ryantm/auto-update/engrampa
mate.engrampa: 1.20.1 -> 1.21.0
2018-07-12 14:07:31 +02:00
Pascal Wittmann 420bc232cc
Merge pull request #43213 from r-ryantm/auto-update/caja
mate.caja: 1.21.1 -> 1.21.2
2018-07-12 14:06:40 +02:00
Pascal Wittmann 6a4aaf8965
Merge pull request #43293 from eliasp/add-hetzner-kube-0.3.1
hetzner-kube: init at version 0.3.1
2018-07-12 14:04:26 +02:00
Jörg Thalheim 1973580af2
Merge pull request #43402 from teto/tig
tig: add zsh completion
2018-07-12 07:27:56 -04:00
Jörg Thalheim bc05053631 tig: zsh completion should be named _tig 2018-07-12 07:26:56 -04:00
Jörg Thalheim b19efb6aee
Merge pull request #43404 from Izorkin/shells-zsh-command-time
zsh-command-time: 2017-05-09 -> 2018-04-30
2018-07-12 07:18:31 -04:00
xeji 90380d0fa9
Merge pull request #43394 from volth/flash-30.0.0.113
flash: 30.0.0.113 -> 30.0.0.134
2018-07-12 13:06:27 +02:00
goibhniu c23b4d36be
Flash: Fix the sha256 for linux x86_64 2018-07-12 11:30:05 +01:00
Peter Simons b1e298f7ca
Merge pull request #43408 from iimog/fix-rPackages.haven
rPackages.haven: fix installation
2018-07-12 11:50:53 +02:00
Markus Ankenbrand 775fd4bfba rPackages.haven: fix installation 2018-07-12 11:07:27 +02:00
Peter Simons e65bdb9199 xmonad-extras: jailbreak to build to cope with out patched version of xmonad
Fixes https://github.com/NixOS/nixpkgs/issues/43374.
2018-07-12 10:54:58 +02:00
Joachim F aa34268dc8
Merge pull request #43391 from alyssais/patch-3
tor-browser-bundle: update license to free
2018-07-12 08:22:57 +00:00
Peter Simons 3e3a860c88 multi-ghc-travis: update to latest git version 2018-07-12 10:21:32 +02:00
Robert Schütz 25f4d9c8af seafile-client: 6.2.1 -> 6.2.2 2018-07-12 10:08:40 +02:00
volth c583bfbf80 pythonPackages.cython: run tests in parallel (#43393) 2018-07-12 10:08:06 +02:00
Robert Schütz 2559d6eab6 seafile-shared: 6.2.1 -> 6.2.2 2018-07-12 10:07:32 +02:00
volth 0a18bec139 hspell: fix build when default perl is 5.26+ (#43359) 2018-07-12 09:16:48 +02:00
patternspandemic 6f24f61c8e ponyc: 0.23.0 -> 0.24.0 (#43392) 2018-07-12 09:15:00 +02:00
Alvar 28ca73bc7f geojson: 2.3.0 -> 2.4.0 (#43389) 2018-07-12 09:13:12 +02:00
Izorkin 4585ff1a9a zsh-command-time: 2017-05-09 -> 2018-04-30 2018-07-12 09:45:54 +03:00
Frederik Rietdijk 0d499686c6
Merge pull request #43157 from r-ryantm/auto-update/singularity
singularity: 2.5.1 -> 2.5.2
2018-07-12 07:21:33 +02:00
Matthieu Coudron a66a44186f tig: add zsh completion
along with contrib/vim.tigrc config in case users want to use it.
2018-07-12 12:39:11 +09:00
Will Dietz 2996d29f71 ghc: don't use LLVM w/musl on non-cross
Doesn't appear to be needed on musl-native on x86_64,
and on non-x86(-64) it's included anyway.
2018-07-11 21:34:47 -05:00
Will Dietz fcfd66cea2
Merge pull request #43369 from dtzWill/experimental/ghc-musl-bootstrap
ghc: support musl-native!
2018-07-11 21:31:46 -05:00
volth 88939a1949 nixos: remove option services.xserver.desktopManager.xfce.screenLock 2018-07-12 01:45:41 +00:00
Silvan Mosberger 2ea2cce391
Merge pull request #43372 from r-ryantm/auto-update/chirp-daily
chirp: 20180623 -> 20180707
2018-07-12 02:45:22 +02:00
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 Mosberger 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 Ross 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 Ericson 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
volth 8c3b33ea73 libvirt: 4.4.0 -> 4.5.0 (#43164) 2018-07-11 22:34:13 +02:00