3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

124508 commits

Author SHA1 Message Date
Jan Malakhovski ecd3990cd4 stdenv: provide meta.evaluates
This gives a way to see the result of `check-meta` without triggering any assertions.
2018-01-14 13:24:29 +00:00
Jan Malakhovski 9956687151 stdenv: change some indent 2018-01-14 13:24:22 +00:00
Jan Malakhovski d1d5ecb3bf stdenv: perform checks only when evaluating .drv and .out
This pushes check-meta evaluation to derivation evaluation step, leaving all other
attributes accessible.

Before this commit:

> $ HOME=/homeless-shelter NIX_PATH=nixpkgs=$(pwd) nix-instantiate --eval --strict ./default.nix -A xen --argstr system aarch64-linux
> Package ‘xen-4.5.5’ in pkgs/applications/virtualization/xen/generic.nix:226 is not supported on ‘aarch64-linux’, refusing to evaluate.

as expected

> $ HOME=/homeless-shelter NIX_PATH=nixpkgs=$(pwd) nix-instantiate --eval --strict ./default.nix -A xen.name --argstr system aarch64-linux
> Package ‘xen-4.5.5’ in pkgs/applications/virtualization/xen/generic.nix:226 is not supported on ‘aarch64-linux’, refusing to evaluate.

> $ HOME=/homeless-shelter NIX_PATH=nixpkgs=$(pwd) nix-instantiate --eval --strict ./default.nix -A xen.meta.description --argstr system aarch64-linux
> Package ‘xen-4.5.5’ in pkgs/applications/virtualization/xen/generic.nix:226 is not supported on ‘aarch64-linux’, refusing to evaluate.

which is unfortunate since its impossible to use packages in autogenerated
documentation on all platforms.

After this commit:

> $ HOME=/homeless-shelter NIX_PATH=nixpkgs=$(pwd) nix-instantiate --eval --strict ./default.nix -A xen --argstr system aarch64-linux

still fails

> $ HOME=/homeless-shelter NIX_PATH=nixpkgs=$(pwd) nix-instantiate --eval --strict ./default.nix -A xen.name --argstr system aarch64-linux
> "xen-4.5.5"

> $ HOME=/homeless-shelter NIX_PATH=nixpkgs=$(pwd) nix-instantiate --eval --strict ./default.nix -A xen.meta.description --argstr system aarch64-linux
> "Xen hypervisor and related components (vanilla)"
2018-01-03 12:20:25 +00:00
Jan Malakhovski b1ca8517ee lib: generalize addPassthru to extendDerivation 2018-01-03 12:20:24 +00:00
Peter Simons eb6db32d01
Merge pull request #33358 from obsidiansystems/cross-haskell-samehash
haskell infra, ghc: Start to fix cross compilation without changing hashes
2018-01-03 11:49:49 +01:00
Jörg Thalheim f2fd4a5219
Merge pull request #33314 from jtojnar/gnome-mplayer
gnome_mplayer: 1.0.4 → 1.0.9
2018-01-03 11:10:29 +01:00
Jörg Thalheim a2ca2b535c
Merge pull request #33364 from orivej/sc-controller
sc-controller: init at 0.4.0.1
2018-01-03 10:49:35 +01:00
John Ericson 5e31e828f8 ghcWithPackages: Fix cross, and avoid needless C compiler 2018-01-03 01:24:57 -05:00
Franz Pletz abcb639df1
Merge pull request #33300 from adisbladis/postgresql
Postgresql security updates
2018-01-03 05:44:45 +00:00
Orivej Desh 24d61a48b3 sc-controller: init at 0.4.0.1 2018-01-03 03:27:34 +00:00
John Ericson bc066466fb haskell generic-builder: Don't use absolute path to tools, and also track strip 2018-01-02 21:04:14 -05:00
John Ericson faa4b45a1e ghc 8.2.2, head: Inline common* bindings
Cross case purposely changed as it will be rewritten anyways. But no
native hashes should be changed.
2018-01-02 21:00:23 -05:00
John Ericson a224dfc253 haskell infra: Fix cross as much as possible without changing hashes 2018-01-02 21:00:13 -05:00
Léo Gaspard aa241aed14 nixos/dkimproxy-out: init (#33229) 2018-01-03 01:23:02 +00:00
Joachim F 55dbaba66a
Merge pull request #33336 from dtzWill/fix/lxterminal-nativebuildinputs
lxterminal: use nativeBuildInputs for compile-time-only deps
2018-01-03 01:20:02 +00:00
Joachim F 7e0b155c0e
Merge pull request #33354 from romildo/upd.deepin-gtk-theme
deepin-gtk-theme: 17.10.4 -> 17.10.5
2018-01-03 01:19:16 +00:00
Joachim F 845cbb141b
Merge pull request #33361 from mdorman/emacs-updates
Semi-automated Emacs package updates
2018-01-03 01:18:57 +00:00
Orivej Desh 2a85919079 python.pkgs.evdev: 0.6.4 -> 0.7.0 2018-01-03 01:12:23 +00:00
Orivej Desh d831604a78 python.pkgs.evdev: move to python-modules 2018-01-03 01:12:23 +00:00
John Ericson a5cc983c45 ghc: Clean up, and add passthru.targetPrefix, in preparation for cross
No hashes should be changed.
2018-01-02 19:50:38 -05:00
John Ericson e3993464d9 Merge commit 'db475df127f8c82853181c46501c142ff020c3d8' into ericson2314-cross-base 2018-01-02 19:50:28 -05:00
Jan Tojnar 608daaa649
gnome_mplayer: 1.0.4 → 1.0.9 2018-01-03 01:46:13 +01:00
Jan Tojnar ef3a5865d1
gmtk: init 1.0.9 2018-01-03 01:46:13 +01:00
John Ericson f3bb3de213
Merge pull request #33359 from bnikolic/boostnumpy
boost: Do not force numpy support from 1.65
2018-01-02 19:41:42 -05:00
Tim Steinbach b720e9c23a
linux-copperhead: 4.14.10.a -> 4.14.11.a 2018-01-02 19:38:01 -05:00
Tim Steinbach 1e129a3f99
linux: 4.14.10 -> 4.14.11 2018-01-02 19:31:31 -05:00
Bojan Nikolic 00b038a3f8 boost: Do not force numpy support from 1.65
The reason is that if cross compiling (or for other reasons) python
bindings as a whole are turned off. Those two lines then trigger
assertion errors unless manually overridden for cross compilation.

This way:

 1. The `enableNumpy` default respects the `enablePython deafult.
 2. Cross works by default
 3. Absurd manual overrides still break as they should
 4. The `>= 1.65` logic is direct and not a maintaince gotcha.
2018-01-02 19:31:25 -05:00
Tim Steinbach 56f91dcb7b
linux: 4.9.73 -> 4.9.74 2018-01-02 19:31:14 -05:00
Tim Steinbach 1eb53a3830
linux: 4.4.108 -> 4.4.109 2018-01-02 19:30:58 -05:00
John Ericson 0e3be421e3
Merge pull request #33357 from bnikolic/mingw64-pthreads
Correct derivation of pthreads on mingw64
2018-01-02 19:10:59 -05:00
Bojan Nikolic db475df127 mingw-w64-pthreads: The C compiler is needed
It was a copy and paste error from the headers derivation. Also test in
release-cross.
2018-01-02 19:01:18 -05:00
Michael Alan Dorman 8229306369 melpa-packages: 2018-01-02 2018-01-02 19:00:40 -05:00
Michael Alan Dorman b3203b9302 melpa-stable-packages: 2018-01-02 2018-01-02 19:00:40 -05:00
Michael Alan Dorman 9cc47a6c23 org-packages: 2018-01-02 2018-01-02 19:00:40 -05:00
Michael Alan Dorman c261b32aa2 elpa-packages: 2018-01-02 2018-01-02 19:00:40 -05:00
John Ericson cb8349f59f Merge branch 'pharo' into ericson2314-cross-base 2018-01-02 18:59:21 -05:00
John Ericson 2b4502c78e Merge @LnL7's pharo-vm darwin eval fix from staging
Not a mass-rebuild
2018-01-02 18:54:35 -05:00
John Ericson 0bc1642fb8
Merge pull request #26883 from obsidiansystems/linux-make-bootstrap-tools
linux bootstrap tools: Use same derivation whether cross compiling or not
2018-01-02 18:31:37 -05:00
adisbladis 74ac6b5fe6
Merge pull request #33351 from jluttine/update-rssguard-3.5.5
rssguard: 3.4.2 -> 3.5.5
2018-01-02 23:52:05 +01:00
José Romildo Malaquias b33b4a76de xkbmon: init at 0.1 2018-01-02 23:42:02 +01:00
José Romildo Malaquias 63c850768f deepin-gtk-theme: 17.10.4 -> 17.10.5 2018-01-02 19:59:28 -02:00
Will Dietz d8141bc059 irker: cleanup manual setting of XML_CATALOG_FILES, no longer needed 2018-01-02 22:40:39 +01:00
Jörg Thalheim cb92075daf
Merge pull request #33339 from romildo/upd.pnmixer
pnmixer: 0.7.1 -> 0.7.2
2018-01-02 21:40:21 +01:00
Jaakko Luttinen b68156006a
rssguard: 3.4.2 -> 3.5.5 2018-01-02 22:16:22 +02:00
Ryan Trinkle f1a6fa6eec
Merge pull request #32258 from ryantrinkle/add-nat-extraCommands
nat: add extraCommands option
2018-01-02 14:32:42 -05:00
John Ericson ab651d2c9b linux bootstrap tools: Use same derivation whether cross compiling or not 2018-01-02 13:52:41 -05:00
José Romildo Malaquias e80b27f383 pnmixer: 0.7.1 -> 0.7.2 2018-01-02 16:29:16 -02:00
Daiderd Jordan 1531fd7351
pharo: disable on darwin 2018-01-02 19:19:37 +01:00
Frederik Rietdijk 58f9fd64ef
Merge pull request #33338 from matthiasbeyer/update-toot
toot: 0.15.0 -> 0.16.2
2018-01-02 19:19:16 +01:00
Frederik Rietdijk 804285f589 Merge remote-tracking branch 'upstream/staging' into HEAD 2018-01-02 19:10:45 +01:00