1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 18:42:15 +00:00
Commit graph

8471 commits

Author SHA1 Message Date
Lluís Batlle i Rossell 031d1ee8c5 Merge branch of 'hatari' 2013-04-23 11:06:17 +04:00
Michael Raskin ad214d8d0c Merge pull request #473 from errge/master
Update ack to 2.02 (and File-Next to 1.12, only used by ack)
2013-04-22 22:38:35 -07:00
Michael Raskin b1ff6273d9 Merge pull request #468 from zefhemel/dartsdk
Added Google Dart M4
2013-04-22 22:34:18 -07:00
Rok Garbas 7b9fc733dd python-deform: unittest2 needed on python 26 2013-04-22 22:57:58 +02:00
Florian Friesdorf b67cf97f5c Revert "let hydra also build python26Packages"
This reverts commit a2ddd3643e.

@peti pointed out that python2.6 packages are now prefered over
python2.7. In a local test it was the other way round. seems to be
arbitrary or I messed up the test.
2013-04-22 22:49:40 +02:00
Jordi 019472eaa3 Add hatari Atari St emulator. 2013-04-22 22:10:15 +02:00
viric 4311ba66e0 Merge pull request #474 from logann2019/autocutsel
Autocutsel
2013-04-22 10:32:37 -07:00
Eelco Dolstra 4539668937 php: Add 5.4
We'll keep 5.3 around for a while.
2013-04-22 19:17:35 +02:00
Lluís Batlle i Rossell 078ddf4746 Adding doodle. 2013-04-22 20:57:14 +04:00
Rickard Nilsson 51bf1ae795 munge 0.5.10: New package, a credentials handler for clusters 2013-04-22 16:04:41 +02:00
Peter Simons 56b504a1cd Merge pull request #476 from coroa/emacs-jedi-deps
Add python packages necessary for emacs-jedi
2013-04-22 05:21:48 -07:00
Peter Simons 6626810adb haskell-hashable: update to version 1.2.x
Except for Agda, which still needs old version.
2013-04-22 14:14:39 +02:00
Peter Simons 9faf34d0a8 pkgs/top-level/release-haskell.nix: cosmetic 2013-04-22 14:14:39 +02:00
Peter Simons 1cc5307410 haskell-haskeline: drop obsolete version 0.6.4.7 2013-04-22 14:14:39 +02:00
Peter Simons 5a28754957 haskell-hashable: add version 1.2.0.6 2013-04-22 14:14:39 +02:00
Florian Friesdorf a2ddd3643e let hydra also build python26Packages
for `nix-env -i` the later defined python27Packages seems to win.
Another solution might be to have python26 oder python27 either in the
name or the version. Let's have a look at haskelPackages for that.
2013-04-22 13:56:29 +02:00
Jonas Hoersch ea3dc7a6ea Add python-epc-0.0.3: EPC implementation in Python 2013-04-22 11:30:32 +02:00
Jonas Hoersch 85d2971a2e Add python-sexpdata-0.0.2: S-expression parser for Python 2013-04-22 11:30:17 +02:00
Jonas Hoersch dbe6dcd8af python-argparse: update to 1.2.1 2013-04-22 11:25:37 +02:00
Florian Friesdorf b6c87f9f29 python-packages: python2.6 fixes 2013-04-22 11:17:23 +02:00
Florian Friesdorf 3c1b5246ad python-requests-1.2.0 2013-04-22 11:16:42 +02:00
Peter Simons 3e523751cd GHC 7.6.3 is the new 7.6.2. 2013-04-21 23:05:09 +02:00
Peter Simons c9182f112a ledger: update 3.x version to the latest Git snapshot 2013-04-21 20:37:53 +02:00
Peter Simons 2340c84a00 all-packages.nix: strip trailing whitespace 2013-04-21 20:10:40 +02:00
Peter Simons fdf1d45a38 ghc: add version 7.6.3 (and a corresponding package set) 2013-04-21 20:10:27 +02:00
Jordi e140b6a454 Add autocutsel to all-packages 2013-04-21 18:46:16 +02:00
Gergely Risko 5c29fcc427 Update ack to 2.02 (and File-Next to 1.12, only used by ack) 2013-04-21 13:10:44 +02:00
Evgeny Egorochkin e83c2fa4a0 Add KDE 4.10.2. Not ready for production yet, but does compile. 2013-04-21 05:46:18 +03:00
Patrick John Wheeler 3bf0d2b960 ghc-wrapper: install the GHC documentation into the user's profile
The freaky implementation was done that way in order to avoid unnecessary
re-builds of all Haskell packages by changing the wrapper script used
internally in those builds.

See <https://github.com/NixOS/nixpkgs/pull/466> for further details.
2013-04-20 22:14:44 +02:00
Peter Simons 65b95b159e haskell-checkers: add version 0.3.1 2013-04-20 20:36:57 +02:00
Peter Simons 7dd399abc1 haskell-wai-handler-launch: add version 1.3.1.4 2013-04-20 20:21:38 +02:00
Peter Simons 916aa90491 haskell-pretty-show: add old version 1.2, which still builds fine with GHC 7.0.4 2013-04-20 20:16:27 +02:00
cillianderoiste 96e8703be0 Merge pull request #460 from cillianderoiste/plymouth
It works enough to display bootsplash animations in an xorg session and a VT.

I haven't figured out how to run it successfully from the initrd yet and I'm also not happy with the postInstall mess, but I'd rather merge it now than let it get lost. It seems like it should be possible for a user to activate it by using boot.initrd.extraUtilsCommands and boot.initrd.postMountCommands
2013-04-20 08:07:30 -07:00
Vladimír Čunát 7a25aa94cd gphoto*: update for changed libgphoto version 2013-04-20 12:44:05 +02:00
Vladimír Čunát e8823c9e5e Merge pull request #441 from ierton/udisks2-xfce
udisks2 for xfce
2013-04-20 01:37:14 -07:00
Peter Simons 00ed85ec25 release-haskell.nix: optparse-applicative won't build with ghc 6.10.4 because it needs a newer version of Cabal 2013-04-19 10:46:18 +02:00
Peter Simons 98130c0b35 release-haskell.nix: build jailbreakCabal with all available compilers 2013-04-19 10:46:18 +02:00
Peter Simons 6f1cec9acb haskell-packages.nix: fix the implementation of 'cabalNoTest'
The previous implementation used the following tying-the-knot trickery to
override 'doCheck' to false for the given build:

  cabalNoTest = {
    mkDerivation = x: rec {
      final = self.cabal.mkDerivation (self: (x final) // { doCheck = false; });
    }.final;
  };

That seemed to work, but for some reason it caused trouble with some builds --
not all -- that use jailbreakCabal. The problem was the 'stdenv' attribute
couldn't be evaluated properly anymore:

  $ nix-build ~/pkgs/top-level/release-haskell.nix -A optparseApplicative.ghc6104.x86_64-linux --show-trace
  error: while evaluating the attribute `drvPath' at `/nix/store/qkj5cxknwspz8ak0ganm97zfr2bhksgn-nix-1.5.2pre3082_2398417/share/nix/corepkgs/derivation.nix:19:9':
  while evaluating the builtin function `derivationStrict':
  while instantiating the derivation named `haskell-optparse-applicative-ghc6.10.4-0.5.2.1' at `/home/simons/.nix-defexpr/pkgs/build-support/cabal/default.nix:40:13':
  while evaluating the derivation attribute `configurePhase' at `/home/simons/.nix-defexpr/pkgs/build-support/cabal/default.nix:107:13':
  while evaluating the function at `/home/simons/.nix-defexpr/pkgs/lib/strings.nix:55:26':
  while evaluating the attribute `outPath' at `/nix/store/qkj5cxknwspz8ak0ganm97zfr2bhksgn-nix-1.5.2pre3082_2398417/share/nix/corepkgs/derivation.nix:18:9':
  while evaluating the builtin function `getAttr':
  while evaluating the builtin function `derivationStrict':
  while instantiating the derivation named `jailbreak-cabal-1.1' at `/home/simons/.nix-defexpr/pkgs/build-support/cabal/default.nix:40:13':
  while evaluating the derivation attribute `nativeBuildInputs' at `/home/simons/.nix-defexpr/pkgs/stdenv/generic/default.nix:76:17':
  while evaluating the function at `/home/simons/.nix-defexpr/pkgs/lib/lists.nix:135:21':
  while evaluating the attribute `buildInputs' at `/home/simons/.nix-defexpr/pkgs/build-support/cabal/default.nix:22:17':
  while evaluating the builtin function `filter':
  while evaluating the function at `/home/simons/.nix-defexpr/pkgs/build-support/cabal/default.nix:22:60':
  while evaluating the function at `/home/simons/.nix-defexpr/pkgs/top-level/haskell-packages.nix:119:17':
  while evaluating the function at `/home/simons/.nix-defexpr/pkgs/lib/customisation.nix:61:22':
  while evaluating the function at `/home/simons/.nix-defexpr/pkgs/lib/customisation.nix:56:24':
  while evaluating the builtin function `isAttrs':
  while evaluating the function at `/home/simons/.nix-defexpr/pkgs/development/libraries/haskell/Cabal/1.14.0.nix:1:1':
  while evaluating the function at `/home/simons/.nix-defexpr/pkgs/top-level/haskell-packages.nix:113:20':
  while evaluating the attribute `final' at `/home/simons/.nix-defexpr/pkgs/top-level/haskell-packages.nix:114:7':
  while evaluating the function at `/home/simons/.nix-defexpr/pkgs/build-support/cabal/default.nix:9:5':
  while evaluating the function at `/home/simons/.nix-defexpr/pkgs/stdenv/generic/default.nix:51:24':
  while evaluating the attribute `meta.license' at `/home/simons/.nix-defexpr/pkgs/development/libraries/haskell/Cabal/1.14.0.nix:17:5':
  infinite recursion encountered

I tried to figure out why this happens, but eventually gave up. The new
implementation passes an argument called 'enableCheckPhase' to the Cabal
builder, which determines whether the user-specified doCheck value has any
effect or not. Now, a normal override can be used to disable unit testing.
2013-04-19 10:46:18 +02:00
Peter Simons 67acbf8f37 release-haskell.nix: generate properly nested attribute sets to fix evaluation with nix-build 2013-04-19 10:46:18 +02:00
Peter Simons 49cbf42556 release-haskell.nix: build optparse-applicative with all available GHC versions 2013-04-19 10:46:18 +02:00
Rickard Nilsson 6e8404a7cb New Haskell library: haskell-acid-state 2013-04-19 07:09:12 +02:00
Rickard Nilsson 8a3f6e8e76 New Haskell library: haskell-safecopy 2013-04-19 07:07:44 +02:00
Rickard Nilsson 40ac613f85 obnam: Update to 1.4 2013-04-18 16:09:35 +02:00
Peter Simons 4a8492884c pkgs/top-level/release-haskell.nix: re-structure Hydra job set
The new job set has the following structure:

  pkg.ghc762.x86_64-linux  = pkgs_x86_64_linux.haskellPackages_ghc762.pkg;
  pkg.ghc762.i686-linux    = pkgs_i686_linux.haskellPackages_ghc762.pkg;
  pkg.ghc6123.x86_64-linux = pkgs_x86_64_linux.haskellPackages_ghc6123.pkg;
  pkg.ghc6123.i686-linux   = pkgs_i686_linux.haskellPackages_ghc6123.pkg;

This gives us (in theory) the ability to generate a Hydra page that displays
the build status of a package across all versions of GHC and all systems. Right
now, Hydra is not up to it, but Eelco says the feature is "on the todo list".

This file doesn't specify the supported build systems explicitly. Instead, that
information is taken from the respective pkg.meta.platforms attribute.
2013-04-18 12:53:06 +02:00
Evgeny Egorochkin 70ba1888a2 Make kde 4.8 default. Shouldn't cause too many problems. 2013-04-18 03:12:12 +03:00
Zef Hemel a5e11c08bb Now using callPackage. 2013-04-17 19:38:02 +02:00
Vladimír Čunát c122eb61fb kopete: fix build by using libotr_3_2 again 2013-04-17 19:32:44 +02:00
Zef Hemel 6464f450d5 Added Dart SDK M4 2013-04-17 16:54:03 +02:00
Rok Garbas 8ea9b3fbac plone: adding version 4.2.5 and 4.1.6 2013-04-17 02:28:45 +02:00
Rok Garbas 0416e77d82 plone: some versions got pinned wrong 2013-04-17 01:57:40 +02:00