mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 08:31:59 +00:00
Code Issues Wiki Activity
40440 commits 244 branches 124 tags 7.5 GiB
Commit graph

249 commits

Author SHA1 Message Date
Carles Pagès 6c949148b6 Merge remote-tracking branch 'upstream/x-updates' into wayland 
Conflicts:
	pkgs/development/libraries/mesa/default.nix
	pkgs/top-level/all-packages.nix
 2013-03-10 18:19:49 +01:00
Carles Pagès 728116ec3e weston: don't depend on pixman explicitly. 
Weston depends on cairo and pixman, but cairo uses a special version of pixman.
In the previous commit I solved a linking problem by specifying the same pixman
version for weston, but it's easier to rely on cairo propagating it. Thanks
viric for the tip!
 2013-03-06 22:59:59 +01:00
Carles Pagès 8de5d77e3c Merge branch 'master' into wayland 
Conflicts:
	pkgs/top-level/all-packages.nix
 2013-03-03 11:58:28 +01:00
Vladimír Čunát 26af997d41 Merge branch 'master' into stdenv-updates 
Conflicts (simple):
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/development/libraries/libsoup/default.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
	pkgs/os-specific/linux/qemu-kvm/default.nix
 2013-03-02 10:41:53 +01:00
Lluís Batlle i Rossell 089fd0a769 fvwm: updating license to gplv2+ 
I looked at some src, and it mentions "or later".
 2013-03-01 20:38:23 +01:00
Song Wenwu f5bd4f720a add fvwm-2.6.5 2013-03-01 13:48:33 +08:00
Vladimír Čunát 4ebcc87f6b compiz: fix build and update 2013-02-23 15:10:01 +01:00
Carles Pagès 7255ac3a13 Forgot mesa90x references in the previous commit. 2013-02-18 20:43:10 +01:00
Carles Pagès d09f2424ed mesa: add support for wayland to default version. 
Remove duplicated versions now that mesa and libdrm are updated.
 2013-02-18 20:32:47 +01:00
Carles Pagès d32a973fc9 Merge remote-tracking branch 'upstream/x-updates' into wayland 
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/wayland/default.nix
 2013-02-18 20:15:59 +01:00
Carles Pagès bd8428efa1 wayland: update to 1.0.5. 
Also updated weston to 1.0.5, and got rid of the patch that's no longer needed.
They fixed it upstream even if it was actually caused by our pkg-config patch.
 2013-02-18 19:57:27 +01:00
Peter Simons 801237ceb2 xmonad: install man page into the proper location 2013-02-11 23:26:06 +01:00
Carles Pagès bc9a291779 wayland: update to 1.0.4. 
Also updated weston to 1.0.4, which now fails to build. Doh!
 2013-01-28 19:45:07 +01:00
Carles Pagès 29150b43a3 Merge branch 'master' into wayland 2013-01-26 11:13:20 +01:00
Peter Simons d80bf38daf haskell-xmonad-extras: update to version 0.11 2013-01-09 16:54:29 +01:00
Carles Pagès a53a7bc0e4 Update wayland and weston to 1.0.3. 
I also removed the screenshooter-client-protocol patch as this was fixed
upstream.
 2013-01-08 23:21:36 +01:00
Carles Pagès 7d591c23b3 Merge branch 'master' into wayland 2013-01-08 22:28:13 +01:00
Peter Simons 7a92fde4f0 xmonad-extras: jailbreak to support recent versions of xmonad 2013-01-04 19:24:18 +01:00
Peter Simons 84eef6ea21 haskell-xmonad-contrib: update to version 0.11 2013-01-04 19:09:51 +01:00
Peter Simons 1c3182ccdf haskell-xmonad: update to version 0.11 2013-01-04 19:09:51 +01:00
Michael Raskin c7a8d9f98d Merge pull request #221 from Eelis/master 
Ion3 update to 20090110
 2012-12-27 05:31:22 -08:00
Rok Garbas c90c96572f i3: update to 4.4 2012-12-22 17:21:17 +01:00
Eelis van der Weegen 01adc95b13 Ion3 update to 20090110 2012-12-18 21:12:17 +01:00
Carles Pagès c2189c49c6 Weston: prevent install to chown root weston-launch. 
This operation fails with permission denied, and since this launcher is only
needed when not running under X, I leave it disabled for the moment.
 2012-12-07 12:28:35 +01:00
Carles Pagès ec99d9603c Weston: add patches to fix the build. 
The patches fix two issues:
 - screenshooter-client-protocol.h missing from tarball
 - missing flags for include paths and definitions
I had to add auto* as inputs to be able to call autoreconf, as one patch
modifies a Makefile.am. Both issues are already reported upstream.
 2012-12-07 12:10:14 +01:00
Carles Pagès b60d016a0a Add Weston 1.0.2. 
Currently doesn't build. I have to further investigate but there seems to be a
missing file from the tarball.
 2012-12-02 12:42:55 +01:00
Eelco Dolstra 5553546c21 Remove a bunch of unreferenced files 
Plus a small number of obsolete packages (like old versions of qemu).
 2012-11-29 13:43:37 +01:00
Michael Raskin f995cf6548 Fix at least obvious failures with python path 2012-11-26 01:43:30 +04:00
Michael Raskin 7333c01dba Update Compiz 2012-11-25 23:58:04 +04:00
Rok Garbas fc16fb3e28 i3status: update to 2.6 2012-11-17 02:10:21 +01:00
Peter Simons 0bd2f95a31 haskell-xmonad-extras: update to version 0.10.1.2 2012-10-23 18:29:58 +02:00
Eelco Dolstra 31f89ba349 Merge remote-tracking branch 'origin/master' into x-updates 2012-10-03 14:43:10 -04:00
aszlig 7e439ea13c
i3: Update to version 4.3. 
Though upstream clearly recommends to not deactivate Pango, we currently can't
use Pango right now, as we are stuck at cairo-1.10.2. This version only has
experimental support for XCB which became stable in 1.12.x.

So we need to wait for 21bf5ef509 to be merged
into master before we can enable Pango.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2012-10-02 03:46:41 +02:00
Eelco Dolstra 0446a79473 Fix icewm build on libX11-1.5.0 2012-09-26 17:00:55 -04:00
Eelco Dolstra d5758c99a3 Merge remote-tracking branch 'origin/master' into x-updates 
Conflicts:
	pkgs/misc/maven/maven-1.0.nix
	pkgs/os-specific/linux/xf86-input-wacom/default.nix
 2012-09-26 14:51:51 -04:00
Peter Simons 9a6c3c8f60 xmonad-extras: patch to allow building with split 0.2.x 2012-09-17 15:50:11 +02:00
Peter Simons 7596ce3dbb Remove myself as maintainer of these packages. 2012-09-11 18:22:31 +02:00
Carles Pagès dabc583abb awesome: update to 3.4.13 
I removed some patches that were no longer needed. Russian manpages still fail.
 2012-08-06 17:43:30 +02:00
Rickard Nilsson 1786bef686 trayer: Update to 1.1.5 2012-07-26 17:02:36 +02:00
Shea Levy 4497344e49 Merge branch 'master' into x-updates 2012-07-18 23:24:10 -04:00
Peter Simons 7e2979b56f i3: fix build some more 
The build process depends on a script that relies on /usr/bin/env to find Perl.
Running 'patchShebangs' early fixes that script.
 2012-07-17 14:44:23 +02:00
Shea Levy 15f765cc6a awesome: update to 3.4.13 2012-07-15 09:55:41 -04:00
Peter Simons 293027453f i3: fixed build 
- The make variable PREFIX must be at build time because common.mk uses it to
   decide where to expect $SYSCONFDIR.

 - The make target "all" is run by default and needn't be set explicitly.

 - Shebang paths in scripts are patched automatically be the default builder,
   we don't have to do that manually.
 2012-07-12 11:28:15 +02:00
Peter Simons 172f03517e ratpoison: install ratpoison.el into $out/share/emacs/site-lisp directory where Emacs can find it 
Also, copy the glibc patch into Nixpkgs to avoid errors with changing hashes
from cgit.
 2012-07-09 07:16:07 +02:00
Peter Simons 7a626565df Updated Haskell packages. 
- parsec: added version 3.1.3
 - xmonad-extras: updated to version 0.10.1.1

svn path=/nixpkgs/trunk/; revision=34475
 2012-06-12 08:39:32 +00:00
Peter Simons edb10988b3 xmonad: fixed build with GHC 7.4.1 
svn path=/nixpkgs/trunk/; revision=34457
 2012-06-11 14:55:56 +00:00
Peter Simons 6db9c6f241 update i3status and i3lock 
svn path=/nixpkgs/trunk/; revision=34446
 2012-06-11 07:18:52 +00:00
Arie Middelkoop 3c74283d03 Committing some outstanding modifications that I cannot make into smaller chunks anymore. 
* added briss: a pdf cropper
* added compton, an improved fork of xcompmgr
* added myself to the maintainers list
* minor version bumps: xcompmgr, upower


svn path=/nixpkgs/trunk/; revision=34380
 2012-06-08 10:16:46 +00:00
Rob Vermaas 97cac0a58c Added i3wm. Added newer version of file. (this time tested, I screwed up a patch by garbas) 
svn path=/nixpkgs/trunk/; revision=33952
 2012-04-30 14:34:57 +00:00
Rob Vermaas 0823167b43 Revert my previous 2 commits. 
svn path=/nixpkgs/trunk/; revision=33951
 2012-04-30 14:28:08 +00:00
Rob Vermaas 0362f55a22 add missing files from previous commit 
svn path=/nixpkgs/trunk/; revision=33950
 2012-04-30 13:45:50 +00:00
Peter Simons 7295830f7e Updated Haskell packages. 
- aeson: updated to version 0.6.0.1
 - alex-meta: updated to version 0.3.0.3
 - BNFC-meta: updated to version 0.3.0.1
 - hakyll: updated to version 3.2.7.1
 - happy-meta: updated to version 0.2.0.4
 - http-enumerator: updated to version 0.7.3.2
 - multiarg: updated to version 0.2.0.0

Disabled Haddock documentation for the following packages, because the
input crashes Haddock:

 - BNFC-meta
 - alex-meta

Re-enabled Haddock documentation for the following packages, because
previously occurring errors have been fixed:

 - ConfigFile
 - HDBC-odbc
 - Hipmunk
 - instant-generics
 - RepLib
 - type-equality
 - xmonad
 - xmonad-extras
 - yesod-core

svn path=/nixpkgs/trunk/; revision=33559
 2012-04-03 18:37:58 +00:00
Lluís Batlle i Rossell 0589bffdf4 Typo of semicolon. 
svn path=/nixpkgs/trunk/; revision=33415
 2012-03-25 20:11:32 +00:00
Lluís Batlle i Rossell f389901fd2 Adding 'tabbed'. I think Alexander Foremny wanted to send this patch 
long ago, but I could not find it.


svn path=/nixpkgs/trunk/; revision=33414
 2012-03-25 20:10:25 +00:00
Peter Simons 880dcc2c64 Removed myself as a maintainer from Haskell packages that I don't personally use. 
By now, it happened twice that a commit broke GHC and thus all Haskell packages
we have in Nixpkgs. On such an occasion, I receive well in excess of 3000
notification e-mails from Hydra, and then I receive another 3000 e-mails after
the bug has been fixed. Under these circumstances, subscribing to these
notifications makes no sense for me.

svn path=/nixpkgs/trunk/; revision=33392
 2012-03-24 10:21:28 +00:00
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