philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

144 commits

Author SHA1 Message Date
Yury G. Kudryashov 215a07c1a9 svn merge ^/nixpkgs/trunk 
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
 2012-02-06 23:03:12 +00:00
Eelco Dolstra f7626c1ddd * Unbreak icewm. Without -lfontconfig, it barfs with 
icewm: error while loading shared libraries: libfontconfig.so.1:
    cannot open shared object file: No such file or directory

  This causes various NixOS tests to fail
  (e.g. http://hydra.nixos.org/build/1952097).

svn path=/nixpkgs/trunk/; revision=31945
 2012-01-31 14:55:43 +00:00
Yury G. Kudryashov ed92080b8d icewm-1.3.7 
svn path=/nixpkgs/trunk/; revision=31890
 2012-01-27 18:56:31 +00:00
Eelco Dolstra d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
 2012-01-18 20:53:01 +00:00
Eelco Dolstra c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
 2012-01-18 20:16:00 +00:00
Lluís Batlle i Rossell d0321537d9 Updating dwm to 6.0. 
svn path=/nixpkgs/trunk/; revision=31301
 2012-01-04 22:05:26 +00:00
Florian Friesdorf 90dda8a07f adjusted awesome to generated names of xcbutil-* 
svn path=/nixpkgs/trunk/; revision=31186
 2011-12-31 06:14:31 +00:00
Florian Friesdorf 8dd443c8df awesome-3.4.11 - ru manpages disabled because of build failure 
svn path=/nixpkgs/trunk/; revision=31173
 2011-12-31 04:06:02 +00:00
Peter Simons 438305146e haskell-xmonad-extras: updated to version 0.10.1 
svn path=/nixpkgs/trunk/; revision=30586
 2011-11-28 18:11:27 +00:00
Peter Simons d471371bd0 haskell-xmonad-extras: enable mpd and hlist extras 
svn path=/nixpkgs/trunk/; revision=30516
 2011-11-21 18:02:24 +00:00
Peter Simons 80dc05cc9a haskell-xmonad-extras: updated to version 0.10 
svn path=/nixpkgs/trunk/; revision=30513
 2011-11-21 17:54:29 +00:00
Peter Simons 59fa8fc940 xmonad: patch source code to refer to xmessage(1) using its complete path 
svn path=/nixpkgs/trunk/; revision=30488
 2011-11-20 10:21:38 +00:00
Peter Simons 589be8e754 haskell-xmonad-contrib: updated to version 0.10 
svn path=/nixpkgs/trunk/; revision=30486
 2011-11-20 10:13:43 +00:00
Peter Simons 32f1cfcd26 haskell-xmonad: updated to version 0.10 
svn path=/nixpkgs/trunk/; revision=30485
 2011-11-20 10:13:34 +00:00
Peter Simons 9d1bee3245 haskell-xmonad-extras: updated build expression 
svn path=/nixpkgs/trunk/; revision=29034
 2011-09-05 18:25:59 +00:00
Peter Simons 21b26aef25 Updated Haskell package meta sections. 
svn path=/nixpkgs/trunk/; revision=28583
 2011-08-15 11:27:02 +00:00
Peter Simons 3e10ee5c92 Updated Haskell expressions with the latest version of cabal2nix. 
* haskell-dataenc: updated to version 0.14.0.2
 * haskell-fclabels: updated to version 1.0.1

svn path=/nixpkgs/trunk/; revision=28574
 2011-08-14 22:52:05 +00:00
Shea Levy 20e64a52b9 Add trayer 
svn path=/nixpkgs/trunk/; revision=28558
 2011-08-14 05:03:54 +00:00
Peter Simons 468c5dbc5c The 'random' library is no longer a core library in GHC 7.2.1. For older 
versions of the compiler, haskell-packages.nix provides a null attribute.

svn path=/nixpkgs/trunk/; revision=28500
 2011-08-12 00:18:56 +00:00
Peter Simons b1ef3e6e36 Last batch of Haskell expression updates. 
* haskell-mkcabal: updated to version 1.0.0
 * haskell-ghc-syb-utils: updated to version 0.2.1.0
 * haskell-darcs: updated to version 2.5.2

svn path=/nixpkgs/trunk/; revision=28449
 2011-08-10 00:35:08 +00:00
Lluís Batlle i Rossell 8ec17cf0a0 Updating dwm. 
svn path=/nixpkgs/trunk/; revision=28137
 2011-08-03 09:46:56 +00:00
Andres Löh 7a53f9fdbb Added extra deps to xmonad-extras to enable some modules. 
svn path=/nixpkgs/trunk/; revision=27537
 2011-06-24 08:29:36 +00:00
Andres Löh a0982e02fd Added xmonads-extra (thanks to chaoflow). 
svn path=/nixpkgs/trunk/; revision=27534
 2011-06-23 18:35:24 +00:00
Michael Raskin 39dc794d4a Fix JWM build 
svn path=/nixpkgs/trunk/; revision=26404
 2011-03-17 19:21:26 +00:00
Eelco Dolstra 3e3eac2e30 * Sync with the trunk. 
svn path=/nixpkgs/branches/x-updates/; revision=26303
 2011-03-14 18:26:46 +00:00
Eelco Dolstra 440c82b96f * Fix the ratpoison build (http://hydra.nixos.org/build/915825). 
svn path=/nixpkgs/branches/x-updates/; revision=26296
 2011-03-14 10:25:26 +00:00
Eelco Dolstra aaecb6430b * Fix Compiz build failure with recent GTK+ 
(http://hydra.nixos.org/build/955799).

svn path=/nixpkgs/branches/x-updates/; revision=26295
 2011-03-14 10:07:33 +00:00
Andres Löh 3e0ac9b040 Major Haskell packages overhaul. 
Several changes, some highlights:

  * Structure of haskell-packages.nix updated. It's now easier to
    select different default versions of packages for different
    versions of GHC.

  * GHC 7.0.2 is now default.

  * Haskell Platform 2011.2.0.0 has been added and is now default.

  * Several packages have been updated
    (gtk2hs, gitit, xmonad, darcs, ...).

  * Some old packages have been removed.

svn path=/nixpkgs/trunk/; revision=26288
 2011-03-12 17:28:15 +00:00
Eelco Dolstra cc3d1e1c09 * Sync with trunk. 
svn path=/nixpkgs/branches/x-updates/; revision=26243
 2011-03-10 08:48:14 +00:00
Lluís Batlle i Rossell 134c00b471 Fixing the build of awesome with cmake 2.8.4. 
svn path=/nixpkgs/trunk/; revision=26207
 2011-03-08 14:07:11 +00:00
Eelco Dolstra 7d44982534 * icewm: explicitly link against fontconfig. 
svn path=/nixpkgs/branches/x-updates/; revision=26008
 2011-02-17 11:51:29 +00:00
Peter Simons 7689a5d7a7 pkgs/applications/window-managers/ratpoison: added dependency on perl, which is required by rpws 
svn path=/nixpkgs/trunk/; revision=25761
 2011-02-02 13:58:18 +00:00
Lluís Batlle i Rossell 53ceebc3d3 Updating awesome (patch by Carles Pagès) 
svn path=/nixpkgs/trunk/; revision=25652
 2011-01-21 08:24:41 +00:00
Eelco Dolstra aa6f43149a * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25308
 2010-12-28 16:42:00 +00:00
Alexander Tsamutali b2ac724cd6 xmonad-contrib: Now depends on X11Xft. 
svn path=/nixpkgs/trunk/; revision=25299
 2010-12-27 20:50:27 +00:00
Lluís Batlle i Rossell ee04ffcb55 Updating from trunk. I resolved simple conflicts. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
 2010-12-11 12:47:00 +00:00
Evgeny Egorochkin 51492e5533 openbox: packaged. Patch by rixed@happyleptic.org. 
svn path=/nixpkgs/trunk/; revision=24902
 2010-11-28 10:07:49 +00:00
Lluís Batlle i Rossell 8746de3ae8 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24674
 2010-11-11 22:18:14 +00:00
Michael Raskin eb2a953bc3 Fix missing descriptions 
svn path=/nixpkgs/trunk/; revision=24596
 2010-11-04 10:47:24 +00:00
Michael Raskin 2db7a9dfbd Add stalonetray 
svn path=/nixpkgs/trunk/; revision=24595
 2010-11-04 08:28:24 +00:00
Michael Raskin 11616a2213 Update fbpanel 
svn path=/nixpkgs/trunk/; revision=24589
 2010-11-03 21:57:42 +00:00
Lluís Batlle i Rossell 6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
 2010-10-23 14:52:21 +00:00
Eelco Dolstra 2677562f8c * Remove Compiz Fusion (obsolete). 
svn path=/nixpkgs/trunk/; revision=24414
 2010-10-22 11:00:02 +00:00
Eelco Dolstra 3ac4025945 * Add some packages to the channel. 
svn path=/nixpkgs/trunk/; revision=24397
 2010-10-21 11:18:30 +00:00
Eelco Dolstra 23914238d1 * compiz-plugins-extra: Wrote a patch to add "centered maxpect" 
scaling mode for background images (as in KDE), i.e., scale the
  image to the maximum size while preserving its aspect ratio.

svn path=/nixpkgs/trunk/; revision=24394
 2010-10-20 23:16:51 +00:00
Eelco Dolstra f58a799695 * Updated Compiz to 0.8.6 (replacing the old Compiz and Compiz Fusion 
expressions).  Also added patches to allow Compiz and ccsm to find
  plugins installed outside of its prefix.

svn path=/nixpkgs/trunk/; revision=24373
 2010-10-19 23:22:24 +00:00
Lluís Batlle i Rossell fca582bff0 Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
 2010-10-07 21:21:31 +00:00
Lluís Batlle i Rossell 3b018566d6 Update awesome (patch by Carles Pagès) 
svn path=/nixpkgs/trunk/; revision=24108
 2010-10-06 11:02:18 +00:00
Lluís Batlle i Rossell cd4b54748a Updating from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24038
 2010-10-03 09:25:34 +00:00
Yury G. Kudryashov 76b211a81f More homepages 
svn path=/nixpkgs/trunk/; revision=23973
 2010-09-27 18:41:59 +00:00