1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 08:31:59 +00:00
Commit graph

79616 commits

Author SHA1 Message Date
zimbatm f2e051b29e quassel: 0.12.2 -> 0.12.3 2016-03-20 19:33:53 +00:00
Nicolas B. Pierron aa7f0fc214 Move stdenvOverrides under pkgsWithOverrides. 2016-03-20 19:26:57 +00:00
Thomas Tuegel f8ab300767 Merge pull request #14080 from zimbatm/quassel-0.12.3
quassel: 0.12.2 -> 0.12.3
2016-03-20 14:23:31 -05:00
Nicolas B. Pierron 5ae7356d42 Replace the merge operators by the fix' and extends functions. 2016-03-20 19:23:08 +00:00
Nicolas B. Pierron 1bcefcdf5c Under pkgsWithOverrides, replace the last uses of pkgs by the corresponding argument. 2016-03-20 19:18:33 +00:00
Nicolas B. Pierron 800766fb0b Change the customOverrides to use the stdenvOverrides instead of the original package set. 2016-03-20 19:10:48 +00:00
Nicolas B. Pierron 21b8007bcf Move the customOverrides after the stdenvOverrides.
This change is not backward compatible, in the sense that this allow you to
override the packages which used to be overriden by the last stage of
stdenv.  Note, this does not mean that these packages would be used by
stdenv.
2016-03-20 19:04:15 +00:00
Nicolas B. Pierron 9e8c5208a1 Add bootStdenv condition around the overrider.
This condition used to be implicit in the sense that the stdenvOverrides
uses pkgs_6, instead of pkgs_7 as its super set, and also that each stage of
the compiler is build again the bootstrap packages of the previous stage,
thus overriden by the stdenv.override function.
2016-03-20 19:03:37 +00:00
Arseniy Seroka 84ba149e79 Merge pull request #14065 from zimbatm/htop-crossplatform
htop: merge both implementations
2016-03-20 21:55:00 +03:00
Arseniy Seroka 2d1893899b Merge pull request #14081 from simonvandel/patch-1
kodiPlusings.pvr-hts: fix loading of plugin
2016-03-20 21:53:30 +03:00
Marius Bakke 23befca742 yubikey-personalization-gui: 3.1.21 -> 3.1.24 2016-03-20 18:49:05 +00:00
Marius Bakke 451a7ec4a9 yubikey-personalization: 1.17.2 -> 1.17.3 2016-03-20 18:48:49 +00:00
Marius Bakke 1489af2153 yubico-piv-tool: 1.0.2 -> 1.3.0 2016-03-20 18:42:23 +00:00
Marius Bakke 54f6695928 libykneomgr: 0.1.7 -> 0.1.8 2016-03-20 18:39:30 +00:00
Marius Bakke fdf8c73f15 goPackages.oh: 2016-02-23 -> 2016-03-02 2016-03-20 18:32:21 +00:00
Nicolas B. Pierron 598ed874df Add extra argument to better identity with the extend function later. 2016-03-20 18:23:29 +00:00
Nicolas B. Pierron a190baa479 In top-level/default.nix, rename self to allPackages. 2016-03-20 18:18:39 +00:00
Nicolas B. Pierron 5783f66bc8 Internalize the recursion over the set of all packages. 2016-03-20 18:17:35 +00:00
Nicolas B. Pierron f8dedbb101 Build aliases based on the previous set including all-packages, instead of only using all-packages. 2016-03-20 18:02:28 +00:00
Matt McHenry 447c97f929 crashplan: 3.6.4 -> 4.6.0
* the major change is to set TARGETDIR=${vardir}, and symlink from
  ${vardir} back to ${out} instead of the other way around.  this
  gives CP more liberty to write to more directories -- in particular
  it seems to want to write some configuration files outside of conf?

* run.conf does not need 'export'

* minor tweaks to CrashPlanDesktop.patch
2016-03-20 13:56:54 -04:00
Nicolas B. Pierron 01693ac154 Move stdenvAdapaters attribute from all-packages.nix into the stdenvAdapters of the top-level. 2016-03-20 17:50:06 +00:00
aszlig 1f497204f7
chromium: Show status about precompiling .py files
Only a aesthetics thingy, but also corrects the comment, because we're
essentially precompiling .py files, NOT the .pyc files (the latter are
the results).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-20 18:44:56 +01:00
Nicolas B. Pierron ff72cf185e Split helperFunctions to simplify the identification with the extend function. 2016-03-20 17:37:40 +00:00
Joachim Fasting 0e05d552f8 electrum: 2.6.2 -> 2.6.3 2016-03-20 18:09:27 +01:00
aszlig 4f981b4f84
chromium: Move source/default.nix into common.nix
This addresses #12794 so that we now have only a single tarball where we
base our build on instead of splitting the source into different outputs
first and then reference the outputs.

The reason I did this in the first place is that we previously built the
sandbox as a different derivation and unpacking the whole source tree
just for building the sandbox was a bit too much.

As we now have namespaces sandbox built in by default we no longer have
that derivation anymore. It still might come up however if we want to
build NaCl as a separate derivation (see #8560), but splitting the
source code into things only NaCl might require is already too much work
and doesn't weight out the benefits.

Another issue with the source splitup is that Hydra now has an output
limit for non-fixed-output derivations which we're already hitting.

Tested the build against the stable channel and it went well, but I
haven't tested running the browser.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-20 17:50:17 +01:00
Nicolas B. Pierron 5cdaa7b907 Remove all-packages.nix helperFunctions dependency. 2016-03-20 16:41:20 +00:00
Nicolas B. Pierron ae0471b737 Split consecutive merge operators to simplify the identification of extend functions. 2016-03-20 16:40:36 +00:00
Nicolas B. Pierron 335a969d45 Inline pkgsFun in pkgsWithOverrides. 2016-03-20 16:33:46 +00:00
Nicolas B. Pierron ad31783405 Extract the top-level logic out of all-packages.nix into pkgs/top-level/default.nix 2016-03-20 16:28:18 +00:00
aszlig 37dbd62a83
chromium: Move fetchurl calls to getChannel
We always do something like "fetchurl channelProduct", so let's move it
to getChannel directly so we can avoid those fetchurl calls all over the
place.

Also, we can still access subattributes from the fetchurl call if we
need to, so there really is no need to expose the product's attributes
directly.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-20 17:13:44 +01:00
Nicolas B. Pierron a543a57ab5 Reformat pkgsWithOverrides to later facilitate the identitication with the extend functions. 2016-03-20 16:11:52 +00:00
Nicolas B. Pierron 07e549ee5b Rename applyGlobalOverrides to pkgsWithOverrides 2016-03-20 16:11:51 +00:00
Nicolas B. Pierron 32e96bbb8b Within applyGlobalOverrides, alias pkgsFun calls. 2016-03-20 16:11:51 +00:00
Nicolas B. Pierron 5e3ce6334c Remove applyGlobalOverrides's pkgsOrig argument.
This patch change the behaviour or overridePackages:

 - Before, overridePackages was based on top of the set of packages
   overriden by `~/.nixpkgs/config.nix` file.

 - After, overridePackages should when given a function f, behave almost¹
   the same as-if the packageOverrides attribute of `~/.nixpkgs/config.nix`
   file attribute was set to f, assuming that we ignore the extra `self`
   argument.

¹ It is not yet exactly the same because we have many paths which are
re-entering nixpkgs while taking the default attributes, such as the
bootstrap phase of stdenv.  Thus if the nixpkgs configuration overrides any
of the dependencies need for the bootstrap, then we might get different sha.
2016-03-20 16:11:51 +00:00
Nicolas B. Pierron 007500f2ec Move the merge of the overrides from pkgsFun to applyGlobalOverrides. 2016-03-20 16:11:51 +00:00
Nicolas B. Pierron 054327729c Move stdenvDefault into its own file. 2016-03-20 16:11:51 +00:00
Tuomas Tynkkynen ffae496db6 Merge pull request #14070 from ericsagnes/fix/im-engines
im-engines: use recurseIntoAttrs
2016-03-20 18:08:08 +02:00
aszlig 4984a2bf76
chromium/plugins: Break long line
Yes, I know I'm a bit nitpicky, but lines >80 chars are very ugly if you
have two windows side-by-side.

Thus no feature changes here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-20 17:07:28 +01:00
Simon Vandel Sillesen 76ce988c50 kodiPlusings.pvr-hts: fix loading of plugin
The plugin was looking for pvr.hts.so.2.2.13, so as only pvr.hts.so was copied, the plugin would not load. This symlinks all variants of the name to the addons folder.
2016-03-20 17:03:12 +01:00
aszlig 985df3900d
chromium/common.nix: Remove unreferenced attrs
We're going to refactor things anyway, so let's first get rid of
everything that's not used anymore.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-20 17:01:58 +01:00
zimbatm f48cde5b74 quassel: 0.12.2 -> 0.12.3 2016-03-20 15:55:17 +00:00
aszlig 6041cfe2af
chromium/source: Move update.nix to parent dir
We now should have only the default.nix left in the source directory and
we can start to factor out the pieces into the Chromium main derivation
attributes.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-20 16:53:08 +01:00
Joachim Fasting f59998055b ldm: fix build
There were two problems:
- because buildPhase is specified directly, preBuild ends up never being
  executed; and
- the source is missing a header, resulting in an undefined reference error
2016-03-20 16:49:09 +01:00
aszlig 2d9a604907
chromium: Rename sources.nix to upstream-info.nix
The "sources.nix" also contains information about where to get binary
packages, so calling it "upstream-info.nix" fits better in terms of
naming.

Also, we're moving it away from the sources dir, because the latter will
soon vanish.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-20 16:48:54 +01:00
aszlig d6b11ed722
chromium/source: Move patches into its own subdir
We're going to reference the patches in the Chromium main build rather
than applying it to the sources. So as a first step, this should keep
the patches away from the "source" subdirectory so we can make it flat.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-20 16:44:34 +01:00
joachifm 3273605aef Merge pull request #14033 from joachifm/clfswm-broken
Mark clfswm as broken
2016-03-20 15:27:41 +00:00
Peter Simons f3a068f8d6 Merge pull request #14078 from peterhoeg/bash_collision
bash-completion: remove collision
2016-03-20 16:26:27 +01:00
Sander van der Burg 7ed3dc6cfc dysnomia: bump to version 0.5.1 2016-03-20 15:21:42 +00:00
Nicolas B. Pierron f043ffcea4 Move the set of aliases after 'self', such that we can later use the extend function. 2016-03-20 14:52:28 +00:00
Nicolas B. Pierron a09683ed29 Remove unused 'ncat' alias, as a package with the same name already exists. 2016-03-20 14:51:20 +00:00