Vladimír Čunát
0a58b512cb
Merge master into stdenv-updates
...
Conflicts (simple):
pkgs/development/compilers/gcc/4.8/default.nix
pkgs/development/compilers/llvm/default.nix
pkgs/development/libraries/gmp/5.1.1.nix
pkgs/development/libraries/gmp/5.1.3.nix
pkgs/development/libraries/gmp/5.1.x.nix
pkgs/top-level/all-packages.nix
2014-01-18 14:46:20 +01:00
Eelco Dolstra
6fb27abf33
Merge branch 'java'
2014-01-13 13:16:17 +01:00
Vladimír Čunát
a2c316288c
Merge master into stdenv-updates
...
Conflicts:
pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
pkgs/top-level/all-packages.nix (trivial)
2014-01-12 12:29:24 +01:00
Song Wenwu
4262c4bb9d
vala: update to 0.23.1, remove old versions
...
set license to lgpl2Plus
add myself to maintainers
and some cleanup
2014-01-07 17:31:52 +08:00
Eelco Dolstra
4728ec3f99
Fix some references to apacheAntOpenJDK
2014-01-06 14:36:13 +01:00
Eelco Dolstra
c180be8cf5
icedtea: Remove
...
It has apparently never worked. Also drop xerces and xalan, which
were only used by icedtea.
2014-01-06 14:36:13 +01:00
Eelco Dolstra
cd5a9f4980
clooj: Update to 0.4.4
...
Also, merge the wrapper into the main package.
2014-01-06 14:36:13 +01:00
Shea Levy
a589bfae17
Update and fix kernel packages to new kernel build
...
In most cases, this just meant changing kernelDev (now removed from
linuxPackagesFor) to kernel.dev. Some packages needed more work (though
whether that was because of my changes or because they were already
broken, I'm not sure). Specifics:
* psmouse-alps builds on 3.4 but not 3.10, as noted in the comments that
were already there
* blcr builds on 3.4 but not 3.10, as noted in comments that were
already there
* open-iscsi, ati-drivers, wis-go7007, and openafsClient don't build on
3.4 or 3.10 on this branch or on master, so they're marked broken
* A version-specific kernelHeaders package was added
The following packages were removed:
* atheros/madwifi is superceded by official ath*k modules
* aufs is no longer used by any of our kernels
* broadcom-sta v6 (which was already packaged) replaces broadcom-sta
* exmap has not been updated since 2011 and doesn't build
* iscis-target has not been updated since 2010 and doesn't build
* iwlwifi is part of mainline now and doesn't build
* nivida-x11-legacy-96 hasn't been updated since 2008 and doesn't build
Everything not specifically mentioned above builds successfully on 3.10.
I haven't yet tested on 3.4, but will before opening a pull request.
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-04 21:17:04 -05:00
Eelco Dolstra
8398b23e10
clojure: Update to 1.5.1
...
Also, merge the wrapper into the main package, and get rid of the
binary variant.
2014-01-03 14:48:21 +01:00
Eelco Dolstra
ec685e30de
kaffe: Remove
...
It no longer builds and doesn't seem very maintained.
2014-01-03 13:51:23 +01:00
Vladimír Čunát
e740b565cf
Merge master into stdenv-updates
...
Conflicts (easy):
pkgs/development/compilers/llvm/default.nix
pkgs/development/compilers/openjdk/default.nix
pkgs/development/libraries/icu/default.nix
pkgs/development/libraries/libssh/default.nix
pkgs/development/libraries/libxslt/default.nix
pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
Mathijs Kwik
d2ccef5140
ffmpeg: order and cleanup versions
2013-12-23 11:03:09 +01:00
Eelco Dolstra
06f4398b46
Remove broken and obsolete versions of gcj and ghdl
2013-11-04 21:11:00 +01:00
Vladimír Čunát
b60d44a00a
release: remove gcjXX references to fix tarball
2013-10-30 22:04:34 +01:00
Eelco Dolstra
7d2364def4
mountall: Remove
...
It's no longer used since we switched to systemd.
2013-09-18 13:05:23 +02:00
Bjørn Forsman
edd2d907a0
Remove jing_tools expression (now contained in jing expression itself)
...
The jing expression now creates its own "jing" wrapper script, so there
is no need for jing_tools anymore.
jing hasn't been updated in years, so I assume (or hope) that not many
(if any) have jing_tools in their configuration.nix. If you do, just
change it to jing and it should behave the same.
2013-08-22 23:20:10 +02:00
Eelco Dolstra
b509c78ea3
webkitSVN: Remove
...
It hasn't been updated in a long time.
2013-07-30 16:52:11 +02:00
Florian Friesdorf
595937318f
update release-python.nix from python branch
2013-07-27 12:08:36 +02:00
Bjørn Forsman
181dc4032d
Remove the old KQEMU accelerator module
...
KQEMU was a linux kernel module for accelerating the QEMU virtual
machine on x86 hardware. Since QEMU 0.11 (and up), there is no support
for KQEMU any more, the focus is now on KVM.
http://wiki.qemu.org/KQemu/Doc
2013-07-18 10:57:32 +02:00
Peter Simons
400d4a03b0
Update references to 'rLang' to the new name 'R'.
2013-07-04 23:41:22 +02:00
Vladimír Čunát
b770365574
ReRevert Merge x-updates into master
...
This reverts commit ec3965d8d0
.
Conflicts (taken x-updates):
pkgs/development/libraries/libgcrypt/default.nix
pkgs/development/libraries/libgpg-error/default.nix
pkgs/development/libraries/poppler/default.nix
2013-05-29 23:25:02 +02:00
Eelco Dolstra
e3c641b39a
mercurial: Update to 2.6.1
...
Also, set a default for web.cacerts so that the system certificates on
NixOS are used.
2013-05-15 13:15:53 +02:00
Vladimír Čunát
ec3965d8d0
Revert Merge x-updates into master due to mesa bloat
...
See #490 discussion.
This reverts commit 1278859d31
, reversing
changes made to 0c020c98f9
.
Conflicts:
pkgs/desktops/xfce/core/xfce4-session.nix (take master)
pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Vladimír Čunát
1278859d31
Merge branch 'master' into x-updates
...
Conflicts (just splitting version from name):
pkgs/os-specific/linux/systemd/default.nix
2013-05-08 13:46:46 +02:00
Eelco Dolstra
14169da6f5
vdrift: Remove from the channel
...
It's 564 MiB compressed.
2013-05-02 13:26:15 +02:00
Eelco Dolstra
7846ad9a90
alienarena: Remove from the channel
...
387 MiB compressed, 898 uncompressed.
2013-05-02 13:26:01 +02:00
Eelco Dolstra
40cd4a8a9d
xonotic: Remove from the channel
...
It's 878 MiB compressed.
2013-05-02 13:25:57 +02:00
Eelco Dolstra
a1bc05bb55
ufoai: Remove from the channel
...
It's 898 MiB compressed.
2013-05-02 13:25:52 +02:00
Vladimír Čunát
49f12fe878
remove old references to xorgserver_1_13_0
2013-04-24 06:44:43 +00:00
Vladimír Čunát
bde20f3e88
Merge branch 'master' into x-updates
...
Conflicts (just taken x-updates):
pkgs/servers/x11/xorg/overrides.nix
2013-04-24 06:29:09 +00:00
Vladimír Čunát
979f2b0110
xfce: ./support/ not needed anymore
2013-04-04 12:02:53 +04:00
Vladimír Čunát
86639d9bb9
Merge branch 'master' into x-updates
...
Conflicts (taken master versions):
pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
pkgs/desktops/xfce/applications/gigolo.nix
pkgs/desktops/xfce/applications/mousepad.nix
pkgs/desktops/xfce/applications/ristretto.nix
pkgs/desktops/xfce/applications/terminal.nix
pkgs/desktops/xfce/applications/xfce4-mixer.nix
pkgs/desktops/xfce/applications/xfce4-notifyd.nix
pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
pkgs/desktops/xfce/art/xfce4-icon-theme.nix
pkgs/desktops/xfce/core/exo.nix
pkgs/desktops/xfce/core/garcon.nix
pkgs/desktops/xfce/core/gtk-xfce-engine.nix
pkgs/desktops/xfce/core/libxfce4ui.nix
pkgs/desktops/xfce/core/libxfce4util.nix
pkgs/desktops/xfce/core/libxfcegui4.nix
pkgs/desktops/xfce/core/thunar-volman.nix
pkgs/desktops/xfce/core/thunar.nix
pkgs/desktops/xfce/core/tumbler.nix
pkgs/desktops/xfce/core/xfce4-appfinder.nix
pkgs/desktops/xfce/core/xfce4-panel.nix
pkgs/desktops/xfce/core/xfce4-power-manager.nix
pkgs/desktops/xfce/core/xfce4-session.nix
pkgs/desktops/xfce/core/xfce4-settings.nix
pkgs/desktops/xfce/core/xfconf.nix
pkgs/desktops/xfce/core/xfdesktop.nix
pkgs/desktops/xfce/core/xfwm4.nix
pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
pkgs/development/libraries/webkit/default.nix
pkgs/top-level/all-packages.nix
2013-03-09 17:55:37 +01:00
Shea Levy
f2c79c4542
Remove some references to non-existent packages
2013-03-08 16:36:59 -05:00
Eelco Dolstra
674c51af3c
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-03-07 19:33:52 +01:00
Mathijs Kwik
4d4b045d95
ffmpeg: remove unused 1.0 version
2013-03-04 22:26:13 +01:00
Vladimír Čunát
4e5fe00a1f
gnome3.libgweather: update
2013-02-21 21:26:19 +01:00
Vladimír Čunát
99bc034a04
gnome3.gconf: migrate
2013-02-21 20:09:10 +01:00
Eelco Dolstra
2aa6f262cb
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-02-15 13:36:34 +01:00
Vladimír Čunát
d65e07d679
qt47: remove, no longer used
2013-02-14 14:38:24 +01:00
Eelco Dolstra
6dba65b51f
openoffice: Remove
...
It's superseded by LibreOffice and doesn't build anymore.
2013-01-29 12:43:53 +01:00
Eelco Dolstra
8cc94dc652
ov511: Remove
...
This is very obsolete (last updated for Linux 2.6.0-test4).
2013-01-28 18:31:18 +01:00
Eelco Dolstra
f7cc884de4
gwt: Remove obsolete version
2013-01-28 18:31:17 +01:00
Eelco Dolstra
1b7c5d3717
Remove some unused Boost versions
2013-01-28 17:19:02 +01:00
Eelco Dolstra
ecee1be7f1
RealPlayer: Remove
...
This package hasn't built in ages, is unfree, and is not needed
anymore.
2013-01-28 16:31:23 +01:00
Florian Friesdorf
9a41e3630a
remove some packages also broken in master
2013-01-10 13:10:47 +01:00
Florian Friesdorf
9f66bf678e
release-python: derive python27Package from python27Packages
2013-01-09 22:23:41 +01:00
Florian Friesdorf
1b110436bf
release-python: remove two non-existing attrs
2013-01-09 20:45:01 +01:00
Florian Friesdorf
dabb876c9b
release-python: create list of python packages from pythonPackages attrset
2013-01-09 10:39:09 +01:00
Florian Friesdorf
b19162f88b
release-python.nix used by hydra python-rework jobset
...
define full job attributes (not just systems) so we can define
schedulingPriority without touching release-lib.nix.
There is definitely a more elegant way to recursively walk attributes
and fill in missing values (job and schedulingPriority).
2012-12-22 01:26:27 +01:00