Commit Graph

106395 Commits

Author SHA1 Message Date
Benno Fünfstück
731e0fa742 haskell: preserve overrideScope on override
We want code such as `(pkg.override {}).overrideScope (self: super: {})` to
work. This didn't work before, since `override` will call the original package
again, and the attribute `overideScope`, which `callPackageWithScope` added,
wasn't added again. The fix for this is to modify the package function itself
to include the `callPackageWithScope` attribute, so it'll be re-added whenever
the function is overriden for with arguments.

There is a small problem here though: since callPackage uses some magic
(`builtins.functionArgs`) to determine the auto-arguments of a function, we
can't just write `callPackageWith scope drvScope`, since
`builtins.functionArgs drvScope` will be `{}`. To fix this, we implement our own
`callPackageWith`.

Fixes https://github.com/NixOS/nixpkgs/issues/7953.
Closes https://github.com/NixOS/nixpkgs/pull/9336.
2017-04-25 16:08:43 +02:00
Michael Alan Dorman
9b74549c0b purescript: remove overrides
It now supports recent versions of various dependencies.
2017-04-25 16:08:43 +02:00
Peter Simons
92844240c2 halvm: set proper meta.platforms
64-bit Linux is the only platform that has Xen in Nixpkgs.
2017-04-25 16:08:43 +02:00
Peter Simons
9fa927f106 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.1.1-8-g19ebdb9 from Hackage revision
14048552ae.
2017-04-25 16:08:38 +02:00
Peter Simons
2a34188f2c hackage2nix: update list of broken packages 2017-04-25 16:08:37 +02:00
Peter Simons
0f104177ad LTS Haskell 8.12 2017-04-25 16:08:00 +02:00
Thomas Tuegel
346fd9e844 Merge pull request #25151 from zraexy/zraexy-kile
kile: build with okular for embedded viewer
2017-04-25 09:07:25 -05:00
Chris Hodapp
244b575a1d ezdxf (Python package): init at 0.8.1 2017-04-25 10:07:15 -04:00
Maximilian Bosch
baa3b3efff
programs.zsh.syntax-highlighting: refactor highlighters option for proper validation
Right now the `programs.zsh.syntax-highlighting.highlighters` option
lacks appropriate validation which can cause confusing things when
mistyping a higlighter for zsh-syntax-highlighting.
2017-04-25 16:00:26 +02:00
Dan Peebles
9046e54f6d qt5: fix to work on LLVM 4
(this is reapplying 6b1957d17a, which got
lost in a merge)

Including apple_sdk.sdk is generally a recipe for a bad time on LLVM 3.8
and above, since you end up with bad headers in the wrong place that hurt
the new libc++ in 3.8 and above. In this case, qt only wanted the super-
generic SDK for CUPS headers, which we can just depend on directly now.
2017-04-25 09:37:36 -04:00
Peter Simons
a502e327d3 Merge pull request #25201 from ebzzry/fix-typo
Fix typo in trivial.nix
2017-04-25 14:55:52 +02:00
Armijn Hemel
b5530755a5 bc: 1.06 -> 1.07.1 2017-04-25 15:08:36 +03:00
Edward Tjörnhammar
45470c65f5
nixos: static ids for jackett, radarr, sonarr 2017-04-25 12:08:21 +02:00
Marius Bergmann
d25f7c9eed yarn: 0.22.0 -> 0.23.2 (#25189) 2017-04-25 11:05:35 +01:00
Matthias Beyer
c772ecdf48 bean-add: 2017-01-20 -> 2017-04-06 2017-04-25 11:30:34 +02:00
Gabriel Ebner
9ff08d24ef perlPackages.version: 0.9912 -> 0.9918 2017-04-25 11:11:22 +02:00
Gabriel Ebner
10b95d7623 emscripten: 1.37.9 -> 1.37.10 2017-04-25 11:08:20 +02:00
Yann Hodique
e514114811 hugo: 0.20.2 -> 0.20.5 2017-04-25 01:27:14 -07:00
aszlig
72f2b506c7
nixos/grub: Add another example for extraEntries
Someone on IRC wanted to boot Fedora from another disk. While I'm not
too familiar with UEFI booting in conjunction with GRUB2 it took some
time to get it to work.

So in order to safe others from frustration I'm adding this as another
example to the extraEntries option.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-04-25 08:50:43 +02:00
Rommel Martinez
a8fc60745f Fix typo in trivial.nix 2017-04-25 14:36:22 +08:00
Jörg Thalheim
bd47d04294 Merge pull request #25146 from zx2c4/remove-old-chromiumos
linux-chromiumos: remove 3.14
2017-04-25 07:32:51 +02:00
Daniel Peebles
3ae7f249da Merge pull request #25187 from obsidiansystems/remove-stray-kernel-headers
linux-headers: Remove stray linux headers 3.18 nix file
2017-04-24 23:07:58 -04:00
Dan Peebles
ee2cffbdb4 azure-image: switch to use the common make-disk-image.nix 2017-04-25 02:59:13 +00:00
Eric Litak
81122d3beb factorio: 0.14.21 -> 0.15.1 2017-04-24 19:03:12 -07:00
Eric Litak
3a083218b9 factorio: add name as arg to authenticatedFetch 2017-04-24 19:03:12 -07:00
Graham Christensen
3ab98d0971 Merge pull request #24999 from grahamc/qemu
qemu module: add virtualisation.cores option
2017-04-24 21:30:39 -04:00
John Ericson
75441dd64a Merge pull request #25194 from obsidiansystems/host-target-unconfuse
stdenv.cross is a silly attribute that needs to go leaving the well-defined hostPlatform and targetPlatform. This PR doesn't remove it, but changes its definition: before it tracked the target platform which is sometimes more useful for compilers, and now it tracks the host platform which is more useful for everything else. Most usages are libraries, falling in the "everything else" category, so changing the definition makes sense to appease the majority. The few compiler (gcc in particular) uses that exist I remove to use targetPlatform --- preserving correctness and becoming more explicit in the process.

I would also update the documentation aside mentioning stdenv.cross as deprecated, but the definition given actually erroneously assumes this PR is already merged!
2017-04-24 19:07:48 -04:00
Daniel Peebles
f2d1aa05de Merge pull request #25165 from copumpkin/google-image-common
google-compute-image: switch to use the common make-disk-image.nix
2017-04-24 18:30:26 -04:00
Jörg Thalheim
331efb3d74 Merge pull request #25155 from PanAeon/feature-skypeforlinux
add skypeforlinux beta (new)
2017-04-24 23:21:41 +02:00
Jörg Thalheim
5793e97e6e Merge pull request #25161 from armijnhemel/ucommon
ucommon: 6.3.1 -> 7.0.0
2017-04-24 23:09:26 +02:00
John Ericson
af6e4c5b0d Merge pull request #25190 from obsidiansystems/ios-stdenv-tiny-refactor
crossStdenv on iphone: Just get info from `targetPlatform`
2017-04-24 16:57:54 -04:00
John Ericson
49c99b70cf cross-stdenv: Only prune most overrides in the final stage
Before all overrides were also pruned in the previous stage, now
only gcc and binutils are, because they alone care about about the
target platform. The rest of the overrides don't, so it's better to
preserve them in order to avoid spurious rebuilds.
2017-04-24 16:31:53 -04:00
John Ericson
a7068ace35 Rewrite a few stdenv.cross uses that *should* be targetPlatform
The previous commit redefines `stdenv.cross` for the sake of normal
libaries, the most common use-case of that attribute. Some compilers
however relied on the old definition so we have them use
`targetPlatform` instead. This special casing is fine because we
eventually want to remove `stdenv.cross` and use either `hostPlatform`
or `targetPlatform` instead.
2017-04-24 16:31:45 -04:00
Данило Глинський (Danylo Hlynskyi)
84b1c0c481 Fix imperative container code examples
Since some time Nixos has firewall enabled by default, so update example.
Also, remove newline escaping (it isn't needed).

Closes https://github.com/NixOS/nixpkgs/issues/25174
2017-04-24 22:31:02 +02:00
John Ericson
db5a921945 crossStdenv on iphone: Just get info from targetPlatform 2017-04-24 16:12:26 -04:00
John Ericson
a7d89139ea top-level: stdenv.cross is now only defined with host != build
In practice, this is a strictly stronger condition than target != build
as we never have build = target != host. Really, the attribute should
be removed altogether, but for now we make it work for plain libraries,
which do not care about the target platform. In the few cases where the
compilers use this and actually care about the target platform, I'll
manually change them to use `targetPlatform` instead.
2017-04-24 16:12:26 -04:00
panaeon
18de0c3ae5 skypeforlinux: init at 5.1.0.1; added myself as maintainer 2017-04-24 22:55:43 +03:00
Vladimír Čunát
d965e119f2
Merge #24749: amdgpu-pro: 16.60 -> 17.10 2017-04-24 21:53:50 +02:00
John Ericson
d4fb8cfc09 linux-headers: Remove stray linux headers 3.18 nix file
In dced724c00 this derivation was
unexposed along (in all-packages.nix) with the removal of linux 3.18[1].
I think this file was left behind by mistake.

[1]: dced724c00 (diff-036410e9211b4336186fc613f7200b12L11174)
2017-04-24 15:25:52 -04:00
Graham Christensen
4585fdb9d4
qemu module: add virtualisation.cores option
QEMU can allow guests to access more than one host core at a time.
Previously, this had to be done via ad-hoc arguments:

    virtualisation.qemu.options = ["-smp 12"];

Now you can simply specify:

    virtualisation.cores = 12;
2017-04-24 15:23:46 -04:00
Graham Christensen
385844d5e9 Merge pull request #24998 from grahamc/percona
percona-server56: init at 5.6.35-80.0
2017-04-24 15:21:58 -04:00
Graham Christensen
2165b48e4a
percona-server56: init at 5.6.35-80.0 2017-04-24 15:21:08 -04:00
Franz Pletz
07cc3eb0d0
claws-mail: 3.14.1 -> 3.15.0 2017-04-24 21:06:53 +02:00
Franz Pletz
bede043070
libytnef: init at 1.9.2 2017-04-24 21:06:52 +02:00
Franz Pletz
fee8d87d48
atlassian-jira: 7.3.0 -> 7.3.4 2017-04-24 21:06:42 +02:00
Franz Pletz
e68c3f0b33
atlassian-confluence: 6.0.3 -> 6.1.1 2017-04-24 21:06:42 +02:00
Franz Pletz
e74ea4282a
avahi service: add reflector option 2017-04-24 21:06:42 +02:00
Franz Pletz
afcf15bc80
pythonPackages.pygit2: 0.24.0 -> 0.25.0
cc #24807
2017-04-24 21:06:42 +02:00
John Ericson
ee2d787cc3 Merge pull request #25186 from obsidiansystems/ccwrapper-cse
top-level: common subexpression elimination for cc-wrapper usage
2017-04-24 14:59:01 -04:00
Edward Tjörnhammar
0277345265
nixos, i2pd: remove, no longer needed, extip hack 2017-04-24 20:49:13 +02:00