Commit graph

43467 commits

Author SHA1 Message Date
Russell O'Connor
46ccebe413 Allow for later binding in ghcPrefs
Now that both self and super are available to prefFun, we can use self, where appropriate to access late bound versions of most
packages.

When extensions are not used, there is no difference between self and super.
2014-05-08 22:01:36 -04:00
Eelco Dolstra
c06786759c /var/run -> /run 2014-05-09 00:52:02 +02:00
Eelco Dolstra
61bdad6775 nixos-install: Don't bind-mount all of /etc
We only need a copy of /etc/resolv.conf for networking, and
/etc/{passwd,group} for building.
2014-05-09 00:52:02 +02:00
Eelco Dolstra
3ef8d6ad5c nixos-install: Add operation --chroot
"nixos-install --chroot" runs a command (by default a login shell) in
a chroot inside the NixOS installation in /mnt. This might useful for
poking around a new installation.
2014-05-09 00:52:02 +02:00
Eelco Dolstra
4fc151b5a3 nixos-install: Ask the user to set a root password
This removes the need to have an initially empty root password.
2014-05-09 00:52:02 +02:00
Eelco Dolstra
8919d736a0 nixos-install: Don't copy the bootstrap Nix if it's already there
This makes re-running nixos-install a bit faster.
2014-05-09 00:52:02 +02:00
Eelco Dolstra
22f102cbdc nixos-install: Assume the build user group is "nixbld"
The build user group is always "nixbld", so no need to detect it.
2014-05-09 00:52:02 +02:00
Eelco Dolstra
171d43ba4f nixos-install: Run in a private mount namespace
This ensures that all mounts are automatically cleaned up.
2014-05-09 00:52:02 +02:00
Eelco Dolstra
e0e656ef46 nixos-install: Don't pass --show-trace by default 2014-05-09 00:51:48 +02:00
Eelco Dolstra
4b7c606589 nixos-generator-config: Don't emit a double / in bind mounts 2014-05-09 00:51:48 +02:00
Eelco Dolstra
dc78ae327c nixos-generate-config: Don't include /var/setuid-wrappers 2014-05-09 00:51:48 +02:00
Eelco Dolstra
91afe9eb8d nixos-generate-config: Use stable device paths (e.g. /dev/disk/by-uuid/X) 2014-05-09 00:51:48 +02:00
Eelco Dolstra
1bd8ced9c0 Don't enable the NVIDIA driver by default because it's unfree 2014-05-09 00:51:48 +02:00
Vladimír Čunát
08834b061c pidgin-sipe: fix build by updating
Also add platforms (linux).
2014-05-08 23:59:42 +02:00
Benjamin Podszun
0008a4b6c4 sylpheed: 3.2 (2012) -> 3.4.1 (2014) (close #2558)
vcunat fixed eval and tested it runs.
2014-05-08 23:35:51 +02:00
Benjamin Podszun
07a5187063 taskwarrior: bump to 2.3.0 (close #2567)
vcunat fixed the evaluation
2014-05-08 23:17:08 +02:00
Benjamin Podszun
08aba1d669 nixpkgs: Bump spice-gtk to 0.24 (close #2571) 2014-05-08 22:56:15 +02:00
Benjamin Podszun
ae6a65e811 nixpkgs: Bump filezilla to 3.8.0 (close #2578) 2014-05-08 22:46:32 +02:00
Ricky Elrod
db98ce61d2 httpie: Update -> 0.8.0
Signed-off-by: Ricky Elrod <ricky@elrod.me>
2014-05-08 16:39:24 -04:00
Thomas Tuegel
3a9917bf18 zotero: version bump 4.0.19 -> 4.0.20 (close #2581) 2014-05-08 22:31:56 +02:00
Rob Vermaas
14eebb54df Merge pull request #2564 from darklajid/bump_tmux
nixpkgs: bump tmux to 1.9
2014-05-08 21:42:06 +02:00
Rob Vermaas
4169bda163 Merge pull request #2579 from darklajid/bump_lftp
nixpkgs: Bump lftp to 4.4.16
2014-05-08 21:40:36 +02:00
Rob Vermaas
99c46b7eb3 Merge pull request #2562 from offlinehacker/pkgs/nginx/syslog_fix
nginx: fix syslog module
2014-05-08 21:39:50 +02:00
Thomas Tuegel
119414ddcd qtcurve: add toolbar alpha patch 2014-05-08 14:05:09 -05:00
Thomas Tuegel
e5fcc04632 qtcurve version bump 1.8.17 -> 1.8.18 2014-05-08 14:04:59 -05:00
Benjamin Podszun
69188e87c3 nixpkgs: Bump lftp to 4.4.16 2014-05-08 20:55:03 +02:00
Russell O'Connor
d4bd4650d6 Rework the knot-tying code for defining Haskell packages.
The existing knot-tying code I felt was a bit incoherent with result, finalReturn, self, refering to different various forms of the "haskellPackages" value and often
different forms in the same place.

This commit instills some object-oriented discipline to the construction of hasekllPackages using a small number of fundamental OO concepts:

* An class is a open recursive function of the form (self : fooBody) where fooBody is a set.
* An instance of a class is the fixed point of the class.
  This value is sometimes refered to as an object and the values in the resulting set are sometimes refered to as methods.
* A class, foo = self : fooBody, can be extended by an extension which is a function bar = (self : super : barBody) where barBody a set of overrides for fooBody.
  The result of a class extension is a new class whose value is self : foo self // bar self (foo self).
  The super parameter gives access to the original methods that barBody may be overriding.

This commit turns the haskell-packages value into a "class".

The knot-tying, a.k.a the object instanitation, is moved into haskells-defaults.  The "finalReturn" is no longer needed and is eliminated from the body of
haskell-packages. All the work done by prefFun is moved to haskell-defaults, so that parameter is eliminated form haskell-packages.  Notice that the old prefFun took
two pameters named "self" and "super", but both parameters got passed the same value "result".  There seems to have been some confusion in the old code.

Inside haskell-defaults, the haskell-packages class is extended twice before instantiation.  The first extension is done using prefFun argument.
The second extension is done the extension argument, which is a renamed version of extraPrefs.

This two stage approach means that extension's super gets access to the post "perfFun" object while previously the extraPrefs only had access to the pre "prefFun"
object.  Also the extension function has access to both the super (post "perfFun") object and to self, the final object.  With extraPrefs, one needed to use the
"finalReturn" of the haskell packages to get access to the final object.  Due to significant changes in semantics, I thought it best to replace extraPrefs with
extension so that people using extraPrefs know to update thier cod.

Lastly, all the Prefs functions have renamed the "self" parameter to "super".  This is because "self" was never actually a self-reference in the object oriented sense
of the word.  For example

    Cabal_1_18_1_3 = self.Cabal_1_18_1_3.override { deepseq = self.deepseq_1_3_0_2; };

doesn't actually make sense from an object oriented standpoint because, barring further method overriding, the value of Cabal_1_18_1_3 would be trying to override it's
own value which simply causes a loop exception.  Thankfully all these uses of self were really uses of super:

    Cabal_1_18_1_3 = super.Cabal_1_18_1_3.override { deepseq = super.deepseq_1_3_0_2; };

In this notation the overriden Cabal_1_18_1_3 method calls the Cabal_1_18_1_3 of the super-class, which is a well-founded notion.

Below is an example use of using "extension" parameter

{
  packageOverrides = pkgs : {
    testHaskellPackages = pkgs.haskellPackages.override {
      extension = self : super : {
        transformers_0_4_1_0 = self.cabal.mkDerivation (pkgs: {
        pname = "transformers";
        version = "0.4.1.0";
        sha256 = "0jlnz86f87jndv4sifg1zpv5b2g2cxy1x2575x727az6vyaarwwg";
        meta = {
          description = "Concrete functor and monad transformers";
          license = pkgs.stdenv.lib.licenses.bsd3;
          platforms = pkgs.ghc.meta.platforms;
          maintainers = [ pkgs.stdenv.lib.maintainers.andres ];
        };
       });

      transformers = self.transformers_0_4_1_0;

      lensFamilyCore = super.lensFamilyCore.override { transformers = self.transformers_0_3_0_0; };
     };
   };
 };
}

Notice the use of self in the body of the override of the transformers method which references the newly defined transformers_0_4_1_0 method.

With the previous code, one would have to instead akwardly write

      transformers = super.finalReturn.transformers_0_4_1_0;

or use a rec clause, which would prevent futher overriding of transformers_0_4_1_0.
2014-05-08 12:01:45 -04:00
Vladimír Čunát
84031981a5 dropbox-cli: use stable URL, version 1.6.2
Thanks to @darklajid for reporting and testing on IRC.
2014-05-08 17:00:16 +02:00
aszlig
c833d7ce16
chromium: Allow config.chromium for PPAPI plugins.
This should make it easier to enable proprietary pepper API plugins
though nixpkgs config, so it can be easily installed using something
like:

nix-env -i chromium-stable

With something like:

{ chromium.enablePepperFlash = true; }

In ~/.nixpkgs/config.nix to enable pepper API based Flash and to avoid
the browser wrapper from Firefox entirely.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-05-08 16:41:38 +02:00
Benjamin Podszun
141d1a1253 nixpkgs: Bump screen to 4.2.1 2014-05-08 16:25:27 +02:00
Eelco Dolstra
6aeb59bbe0 Rename fetchGitHub -> fetchFromGitHub
We're not fetching all of GitHub, after all.
2014-05-08 15:49:39 +02:00
Eelco Dolstra
ebd8573046 Add a utility function "fetchGitHub"
This is a small wrapper around fetchzip. It allows you to say:

  src = fetchGitHub {
    owner = "NixOS";
    repo = "nix";
    rev = "924e19341a5ee488634bc9ce1ea9758ac496afc3"; # or a tag
    sha256 = "1ld1jc26wy0smkg63chvdzsppfw6zy1ykf3mmc50hkx397wcbl09";
  };
2014-05-08 15:30:18 +02:00
Eelco Dolstra
c8df888858 Add a function "fetchzip"
This function downloads and unpacks a file in one fixed-output
derivation. This is primarily useful for dynamically generated zip
files, such as GitHub's /archive URLs, where the unpacked content of
the zip file doesn't change, but the zip file itself may (e.g. due to
minor changes in the compression algorithm, or changes in timestamps).

Fetchzip is implemented by extending fetchurl with a "postFetch" hook
that is executed after the file has been downloaded. This hook can
thus perform arbitrary checks or transformations on the downloaded
file.
2014-05-08 15:30:17 +02:00
Eelco Dolstra
2a43a4163a Fix indentation 2014-05-08 15:30:17 +02:00
Eelco Dolstra
46b77d3bb4 fetchurl_gnome -> fetchurlGnome 2014-05-08 15:30:17 +02:00
Vladimír Čunát
2aa3580a5e nixos-generate-config.pl: add new PCI IDs for broadcom_sta
The last ID wasn't in official README,
but it was reported by third3ye on IRC.
2014-05-08 15:24:41 +02:00
aszlig
709ccd520b
patchutils: Update to new upstream version 0.3.3.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-05-08 15:01:55 +02:00
Benjamin Podszun
313900d819 nixpkgs: Bump feh to 2.11 2014-05-08 13:15:09 +02:00
Eelco Dolstra
30180e8a24 Fix incorrect comment 2014-05-08 12:29:59 +02:00
Rickard Nilsson
5a0c8ff040 Merge pull request #2548 from proger/sysdig-0.1.81
sysdig: update to 0.1.81
2014-05-08 10:45:18 +02:00
Benjamin Podszun
719bcde6cc nixpkgs: bump tmux to 1.9 2014-05-08 08:59:32 +02:00
Cillian de Róiste
aa5c229223 androidsdk: upgrade 22.3 -> 22.6.2 2014-05-08 00:49:19 +02:00
Jaka Hudoklin
eabfc509ef nginx: fix syslog module 2014-05-07 23:54:57 +02:00
Austin Seipp
130cb5d005 criu: upgrade, hopefully fix Hydra build
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-07 16:43:48 -05:00
Peter Simons
c61d607340 tkgate: rewrite expressions to get along without the broken 'libiconvOrLibc' attribute 2014-05-07 23:11:51 +02:00
Peter Simons
8c75363c71 The logic behind 'libiconvOrLibc' is flawed and that attribute should be removed.
See https://github.com/NixOS/nixpkgs/pull/2532 for further details.
2014-05-07 23:11:51 +02:00
Austin Seipp
3b873648b3 coprthr: ensure we use the right perl
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-07 15:34:21 -05:00
Austin Seipp
ba085ee318 libevent: fix event_rpcgen.py
This should help fix the COPRTHR build. Although a Python dependency was
added, it was broken anyway...

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-07 15:34:21 -05:00
Rob Vermaas
31428612c2 Upgrade rtmpdump and get_iplayer 2014-05-07 20:56:37 +02:00
Peter Simons
366e3bd7a1 ghc-7.0.1: fix download URL 2014-05-07 20:33:32 +02:00