Vladimír Čunát
95e2332ed1
Merge #55981 : gtk3: 3.24.4 -> 3.24.5 (into staging)
2019-02-19 08:23:01 +01:00
Maximilian Bosch
1cab56e01a
buildEnv: break with a proper error if one path is actually a file
...
I noticed by creating `buildEnv` where I accidentally put a derivation
from `pkgs.writeText` into `paths` and got a broken build with the
following misleading error message:
```
Use of uninitialized value $stat1 in numeric ne (!=) at /nix/store/9g4wc31j7a2xp22xpgwr0qssfxahxdzl-builder.pl line 74.
Use of uninitialized value $stat1 in bitwise and (&) at /nix/store/9g4wc31j7a2xp22xpgwr0qssfxahxdzl-builder.pl line 75.
different permissions in `' and `/nix/store/0vy5ss91laxvwkyvrbld5hv27i88qk5w-noise': 0000 <-> 0444 at /nix/store/9g4wc31j7a2xp22xpgwr0qssfxahxdzl-builder.pl line 75.
```
It can be reproduced with an expression like this:
``` nix
{ pkgs ? import <nixpkgs> { } }:
let
file = pkgs.writeText "test" ''
content
'';
in
pkgs.buildEnv {
name = "test-env";
paths = [ /* ... */ file ];
}
```
2019-02-19 07:56:44 +01:00
Matthew Bauer
b1bbd94bb6
Merge remote-tracking branch 'NixOS/master' into staging
2019-02-18 20:36:48 -05:00
Silvan Mosberger
266315c91d
Merge pull request #53767 from kwohlfahrt/ssh
...
ssh: put custom options before generated options
2019-02-19 01:34:35 +01:00
Vladyslav M
358efb6694
Merge pull request #55799 from r-ryantm/auto-update/wavebox
...
wavebox: 4.5.10 -> 4.7.1
2019-02-19 01:06:23 +02:00
Kai Wohlfahrt
de7abf63b8
nixos/ssh: apply options after extraConfig
...
Otherwise, the standard options (e.g. AddressFamily) cannot be overriden
in extraConfig, as the option is applied on the first (not most
specific) match. Closes #52267
2019-02-18 21:58:46 +00:00
Andreas Rammhold
f7c6e6bbe3
Merge pull request #56006 from mweinelt/slic3r-prusa3d/1.41.3
...
slic3r-prusa3d: 1.41.2 -> 1.41.3
2019-02-18 21:36:02 +00:00
Michael Weiss
b790a74816
sway-beta: 1.0-rc2 -> 1.0-rc3
2019-02-18 22:26:16 +01:00
Sarah Brofeldt
dcdba11ac9
pandoc: Enable distribution to fix master eval
2019-02-18 21:10:28 +01:00
Martin Weinelt
8774ce8233
slic3r-prusa3d: 1.41.2 -> 1.41.3
...
Adds support for the following new printer variants:
- Original Prusa i3 MK3S
- Original Prusa i3 MK3S MMU2S
- Original Prusa i3 MK2.5S
- Original Prusa i3 MK2.5S MMU2S
2019-02-18 19:57:04 +01:00
Alyssa Ross
7226ab9084
kakoune: remove inaccurate "unstable" from name
2019-02-18 16:52:34 +00:00
Linus Heckemann
01dacc84d4
Merge pull request #55859 from nlewo/dockerTools-fix-55290
...
dockerTools.buildImage: preserve layers ordering at image repacking
2019-02-18 17:15:20 +01:00
Florian Klink
107215c1d0
Merge pull request #55691 from dgarzon/node-packages-10-x-angular-cli
...
nodePackages_10_x.@angular/cli: init at 7.3.1
2019-02-18 14:17:08 +01:00
Linus Heckemann
b5516575a9
Merge pull request #54522 from tadeokondrak/wine-update
...
Update wine{stable,unstable,staging,mono}
2019-02-18 13:41:34 +01:00
Jörg Thalheim
cbd6457a88
Merge pull request #55654 from rvolosatovs/update/vim-plugins
...
vimPlugins: Update
2019-02-18 12:10:57 +00:00
Daniel Garzon
117559bcfa
nodePackages_10_x.@angular/cli: init at 7.3.1
2019-02-18 06:01:55 -05:00
Carlos Morera de la Chica
9c406336f1
bazel: fix bash completion
2019-02-18 11:34:35 +01:00
Hlöðver Sigurðsson
c388cecf45
nodePackages_10_x: bump webpack-cli ( #55814 )
2019-02-18 12:13:17 +02:00
Raitis Veinbahs
d8a7a01fec
nix-gitignore: init at v3.0.0 ( #46112 )
...
closes siers/nix-gitignore#6
2019-02-18 09:57:30 +00:00
Peter Simons
1472b9902a
haskell-pandoc-citeproc: update override for the latest version
2019-02-18 10:39:12 +01:00
Peter Simons
acaa5c1f1a
stylish-cabal compiles again. Yay!
...
Thank you, @pikajude.
2019-02-18 10:39:12 +01:00
Peter Simons
cdc4398b71
Disable failing test suites for pandoc and tasty-hedgehog to fix builds.
2019-02-18 10:39:12 +01:00
Peter Simons
f382de263b
pandoc: switch to latest version despite LTS 13.x recommendations
...
The 2.5.x version no longer passes its test suite with recent versions of its
dependencies.
2019-02-18 10:39:12 +01:00
Peter Simons
64334a7b64
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.14.1-5-g0b4d758 from Hackage revision
c3f27250ec
.
2019-02-18 10:39:12 +01:00
Peter Simons
eba4f12a83
LTS Haskell 13.7
2019-02-18 10:39:10 +01:00
Vladimír Čunát
498e79941d
Merge #55345 : luajit_*: avoid double callPackage
2019-02-18 09:57:46 +01:00
Vincent Laporte
4a21043578
coqPackages.mathcomp-analysis: enable for Coq 8.9
2019-02-18 08:54:11 +01:00
Elis Hirwing
925b196c55
Merge pull request #55987 from jethrokuan/update/fish
...
fish: 3.0.0 -> 3.0.1
2019-02-18 07:43:08 +01:00
Ryan Mulligan
b75eab88bd
Merge pull request #53876 from thefloweringash/bitwarden-cli
...
bitwarden-cli: init at 1.7.0
2019-02-17 21:41:45 -08:00
Ryan Mulligan
1849a783ca
Merge pull request #53766 from dasJ/tt-rss-instagram
...
tt-rss-plugin-ff-instagram: Init at git-2019-01-10
2019-02-17 21:19:15 -08:00
Ryan Mulligan
f19ac5ccf5
Merge pull request #53641 from manveru/docker-sync
...
docker-sync: init at 0.5.9
2019-02-17 21:13:28 -08:00
Jethro Kuan
1963f5b70c
fish: 3.0.0 -> 3.0.1
2019-02-18 13:12:56 +08:00
Ryan Mulligan
fdcf9bbd89
Merge pull request #53563 from rbrewer123/feature/pyznap-init
...
pyznap: init at 1.1.2
2019-02-17 21:09:24 -08:00
Ryan Mulligan
3b8ee87c27
Merge pull request #53462 from astro/svd2rust
...
svd2rust: init at 0.14.0
2019-02-17 21:02:28 -08:00
Ryan Mulligan
d7aed7bf30
Merge pull request #54332 from nphilou/master
...
epson-201106w: init at 1.0.1
2019-02-17 19:50:14 -08:00
Ryan Mulligan
174b9386a1
Merge pull request #55954 from worldofpeace/bump-hub
...
gitAndTools.hub: 2.7.0 -> 2.9.0
2019-02-17 19:00:35 -08:00
Will Dietz
f9a62dbace
gtk3: 3.24.4 -> 3.24.5
...
* add fribidi as it's now required.
* fetch patches to fix fribidi linking, autoreconf
2019-02-17 20:49:34 -06:00
Silvan Mosberger
a3f85f0dc0
Merge pull request #55410 from aanderse/apache-defaults
...
nixos/httpd: improve security in configuration file
2019-02-18 03:27:18 +01:00
Ryan Mulligan
96e17d4db9
Merge pull request #54835 from artemist/one_gadget
...
one_gadget: init at 1.6.2
2019-02-17 18:14:25 -08:00
Silvan Mosberger
ac953a4a6b
Merge pull request #55766 from Lucus16/bump-quassel
...
nixos/quassel: Add support for certificate file
2019-02-18 03:04:56 +01:00
Ryan Mulligan
8107a09ebd
Merge pull request #46514 from rembo10/headphones
...
headphones: init at 0.5.19
2019-02-17 17:45:51 -08:00
rembo10
8e151c1e86
Merge branch 'master' into headphones
2019-02-18 09:14:14 +08:00
Jörg Thalheim
fdc9cbb793
Merge pull request #51312 from geistesk/usbutils-lsusbpy
...
usbutils: patch hashbang of lsusb.py
2019-02-17 23:16:40 +00:00
Ryan Mulligan
cea567c783
Merge pull request #48835 from mhaselsteiner/wrf_python
...
add pythonPackage.wrf-python
2019-02-17 14:33:49 -08:00
Ryan Mulligan
a52d280cc4
Merge pull request #55955 from rnhmjoj/diod
...
Fixes for diod
2019-02-17 14:23:26 -08:00
Ryan Mulligan
f2e0856079
Merge pull request #50939 from jbedo/singularity
...
singularity: 2.6.0 -> 3.0.1
2019-02-17 14:20:56 -08:00
Ryan Mulligan
0a0f0b355b
Merge pull request #55714 from mpisanko/leiningen-2.9.0
...
upgrade leiningen to latest (2.9.0)
2019-02-17 14:20:26 -08:00
Ryan Mulligan
cf73f3fe2e
Merge pull request #55970 from tadfisher/ktlint
...
ktlint: init at 0.30.0
2019-02-17 14:17:28 -08:00
Justin Bedő
05ab1a6e5a
Merge branch 'master' into singularity
2019-02-17 21:49:37 +00:00
Tad Fisher
b1eb421c1a
ktlint: init at 0.30.0
2019-02-17 13:44:55 -08:00