Commit graph

36763 commits

Author SHA1 Message Date
Ricky Elrod
6e2fe51190 Add minimodem package
Signed-off-by: Ricky Elrod <ricky@elrod.me>
2014-05-11 18:44:38 -04:00
cillianderoiste
c202f6b09d Merge pull request #2606 from linquize/pandoc
pandoc: Update to 1.12.4
2014-05-11 14:47:52 +02:00
cillianderoiste
885a2d9c53 Merge pull request #2410 from pSub/potrace
Add potrace-1.11, a tool for tracing bitmaps
2014-05-11 14:46:12 +02:00
Benno Fünfstück
4b87687a84 cloogppl: patch to use ppl version 1.0 (close #2236) 2014-05-11 14:34:32 +02:00
Vladimír Čunát
ce02e8c1db bedup: add top-level attribute
Currently I see no standard way of having package name
without the "pythonX.Y-" prefix.

This is replacement to #2339.
2014-05-11 14:29:13 +02:00
宋文武
e47172ce38 fcitx: build im modules for gtk2, gtk3 and qt4
Close #2498.
2014-05-11 14:01:53 +02:00
Ricky Elrod
c0a30a4b51 htop: Bump to 1.0.3 (close #2611)
Signed-off-by: Ricky Elrod <ricky@elrod.me>
2014-05-11 13:45:25 +02:00
Cillian de Róiste
68325d8eae setbfree: build the GUI 2014-05-11 12:51:29 +02:00
cillianderoiste
a18757c0a4 Merge pull request #2426 from henrytill/supercollider
supercollider: add Emacs support (aka SCEL)
2014-05-11 10:36:19 +02:00
cillianderoiste
7adc00b8bc Merge pull request #2484 from chexxor/feature/bump-docker-0.10.0
Bump docker version to 0.10.0
2014-05-11 10:33:43 +02:00
cillianderoiste
ca5e65c4bd Merge pull request #2371 from iyzsong/herbstluftwm
herbstluftwm: update to 0.6.2
2014-05-11 10:31:14 +02:00
Linquize
c43003b87c pandoc: Update to 1.12.4 2014-05-11 05:29:11 +02:00
Henry Till
6223cbd7a8 supercollider: added emacs support 2014-05-10 22:18:03 -04:00
Bjørn Forsman
cb7c920e24 virt-manager: add missing gsettings schema
Without this it'll complain and abort when clicking "Take Screenshot" or
"Browse Local" when creating a new VM and looking for an CD-ROM image to boot
from:

GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed
2014-05-11 01:03:27 +02:00
mornfall
7d1d270a7a Merge pull request #2599 from darklajid/bump_libvirt-python
nixpkgs: Bump libvirt-python to 1.2.4 - libvirt is already updated and ...
2014-05-10 19:37:18 +02:00
Benjamin Podszun
8999a7c550 nixpkgs: Bump libvirt-python to 1.2.4 - libvirt is already updated and this package is therefor broken 2014-05-10 14:34:50 +02:00
Mathijs Kwik
06c8438bd8 conkeror: upgrade to latest snapshot 2014-05-10 12:23:45 +02:00
Peter Simons
4ec21f6ecd haskell-Strafunski-StrategyLib: jailbreak to fix build with GHC 7.8.2 2014-05-09 23:48:42 +02:00
Peter Simons
06f9fed0ac Merge pull request #2592 from bennofs/haskell-new-expressions
Add a few haskell expressions
2014-05-09 22:59:40 +02:00
Benno Fünfstück
631e74963f haskell-dynamic-cabal: new expression 2014-05-09 22:50:41 +02:00
Benno Fünfstück
fb2d8ab9aa haskell-th-lift-instances: new expression 2014-05-09 22:50:40 +02:00
Benno Fünfstück
52bd5978a0 haskell-quickcheck-property-monad: new expression 2014-05-09 22:50:39 +02:00
Benno Fünfstück
e61e23b6c7 haskell-hcltest: new expression 2014-05-09 22:50:38 +02:00
Benno Fünfstück
b49de7164e haskell-generate: new expression 2014-05-09 22:50:37 +02:00
Benno Fünfstück
97dde61662 haskell-system-time-monotonic: new expression 2014-05-09 22:50:36 +02:00
Benno Fünfstück
2525aac134 haskell-unix-memory: new expression 2014-05-09 22:50:35 +02:00
cillianderoiste
32a61189dc Merge pull request #2588 from c9/node-0-10-28
Update Node.js to 0.10.28
2014-05-09 18:50:05 +02:00
Peter Simons
0e0e03976c Merge pull request #2576 from NixOS/haskellPackagesFixpoint
Rework the knot-tying code for defining Haskell packages.
2014-05-09 18:11:47 +02:00
Eelco Dolstra
ea36f3b868 fetchFromGitHub: Use .tar.gz instead of .zip
Also clean up the name attribute of fetchzip derivations a bit.
2014-05-09 15:53:44 +02:00
Lennart Kats
3e3e9daafe Update Node.js to 0.10.28 2014-05-09 15:45:21 +02:00
Rob Vermaas
c7b8dd8581 Merge pull request #2506 from ikervagyok/mutt
Updated to mutt-1.5.23
2014-05-09 15:15:02 +02:00
Rob Vermaas
9e2350504f Merge pull request #2583 from CodeBlock/update-httpie
httpie: Update -> 0.8.0
2014-05-09 15:13:24 +02:00
Pascal Wittmann
8b0d0e3601 Add potrace-1.11, a tool for tracing bitmaps 2014-05-09 14:23:00 +02:00
John Wiegley
fcd7d741e2 Make geoip buildable on any Unix 2014-05-09 13:33:42 +02:00
Emery Hemingway
265c489391 rsyncd: default read/write permissions should be nobody:nogroup 2014-05-09 13:31:52 +02:00
Benjamin Podszun
3db83835a8 nixpkgs: Bump libvirt to 1.2.4 2014-05-09 13:29:15 +02:00
Linquize
2d5462e29c jquery-ui: Update to 1.10.4 2014-05-09 13:28:31 +02:00
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
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
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