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
Michael Raskin
e7b491a7e1
Update E prover
2013-04-21 16:30:40 +04:00
Vladimír Čunát
eb2e46aab2
Merge branch 'master' into x-updates
...
Conflicts:
pkgs/applications/graphics/rawtherapee/default.nix
pkgs/applications/misc/blender/default.nix
pkgs/applications/networking/browsers/chromium/sources.nix
pkgs/os-specific/linux/kernel/linux-3.9.nix
pkgs/top-level/all-packages.nix
2013-04-04 21:43:40 +02:00
Michael Ashton
7b01680d87
kicad: upgrade to stable version 20130325, libraries to r220
...
- changed to require wxWidgets 2.9 -- seems to satisfy requirement for
libgtkprint, even with gtk2
2013-03-31 19:17:02 -07:00
Marco Maggesi
fa2d85fded
Update HOL Light to rev 157
2013-03-25 10:56:57 +01:00
Peter Simons
7df21af242
wxmaxima: don't try to build this package on FreeBSD
2013-03-22 12:53:07 +01: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
Michael Raskin
d5288c7e3a
TPTP had a bugfix without version change
2013-03-09 14:24:45 +04:00
Vladimír Čunát
7421ee673c
qucs: minor update and fix for new gcc
2013-02-24 15:11:19 +01:00
Vladimír Čunát
0d72174dbd
Merge branch stdenv-updates into x-updates
...
x-updates is supposed to merge after stdenv-updates, so let's test it
Conflicts:
pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
2013-02-21 12:43:00 +01:00
Lluís Batlle i Rossell
bcbf9472ea
Merge remote-tracking branch 'central/master' into x-updates
2013-02-18 13:49:11 +01:00
Vladimír Čunát
9885d04033
Revert "WIP", sorry, I got confused, somehow
...
This reverts commit 524d9b656e
2013-02-17 11:02:25 +01:00
Vladimír Čunát
524d9b656e
WIP
2013-02-17 11:01:20 +01:00
Vladimír Čunát
c55f5ae19d
tulip: update to fix compilation with libpng-1.6
2013-02-16 16:16:32 +01:00
Eelco Dolstra
2aa6f262cb
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-02-15 13:36:34 +01:00
Marco Maggesi
42a4178c2b
Update HOL Light to revision 155
2013-02-08 15:26:35 +01:00
Marco Maggesi
34411286a6
Update HOL Light to revision 154
2013-02-08 15:20:06 +01:00
Rickard Nilsson
1886d1db6a
Merge remote-tracking branch 'upstream/master' into stdenv-updates
2013-01-20 16:53:21 +01:00
Peter Simons
ff461b0755
maxima: update to version 5.29.1
2013-01-19 02:31:21 +01:00
Peter Simons
c296be5519
stellarium: update to version 0.11.4a
2013-01-19 02:26:03 +01:00
Eelco Dolstra
5bb548d2e4
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-01-17 14:19:14 +01:00
Eelco Dolstra
f286cc65b1
Fix bad URLs lacking a scheme
2013-01-14 18:26:46 +01:00
Peter Simons
b33ad366a1
Merge branch 'master' into stdenv-updates.
2013-01-11 15:46:10 +01:00
Lluís Batlle i Rossell
430957b020
boinc: fix it; the binaries didn't start.
2013-01-08 23:28:39 +01:00
Lluís Batlle i Rossell
8de96cb04d
boinc: updating to 7.0.44
...
now it builds.
I started to use fetchgit instead of fetchsvn, because the upstream
doc pages talk about git more than svn.
2013-01-08 23:28:39 +01:00
Lluís Batlle i Rossell
b58780c43d
Merge remote-tracking branch 'eelco/master' into stdenv-updates
...
Conflicts:
pkgs/development/compilers/gcc/4.7/default.nix
Trivial solution.
2012-12-28 23:28:16 +01:00
Eelco Dolstra
ab3eeabfed
Rename buildNativeInputs -> nativeBuildInputs
...
Likewise for propagatedBuildNativeInputs, etc. "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Michael Raskin
b31e6aa794
Merge pull request #231 from RSzibele/master
...
Added Logisim 2.7.1
2012-12-27 06:32:03 -08:00
RSzibele
fcdf685793
Added Logisim-2.7.1.
2012-12-27 16:25:39 +01:00
Michael Raskin
dd6ef6229e
Merge pull request #226 from maggesi/hol_light_updates
...
Update HOL Light (and fix installation)
2012-12-27 05:33:24 -08:00
Peter Simons
591f85f17e
celestia: add version 1.6.1
2012-12-25 11:26:53 +01:00
Marco Maggesi
49e4824b8a
Update HOL Light (and fix installation)
2012-12-23 18:46:09 +01:00
Michael Raskin
1c3434cc16
Update E prover
2012-12-09 00:36:38 +04:00
Michael Raskin
8a1f312621
Update golly
2012-12-04 10:10:28 +04: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
Peter Simons
614c7501bc
Merge pull request #193 from badi/gromacs
...
Add Gromacs
2012-11-28 01:16:17 -08:00
Shea Levy
3b8796ee9d
Fix tarball
2012-11-26 20:31:45 -05:00
Florian Friesdorf
6a17fe1563
fix xoscope - thx archlinux!
2012-11-26 16:07:51 +01:00
Badi' Abdul-Wahid
06c522f739
remove reference to meta.nix
2012-11-23 15:46:49 +01:00
Badi' Abdul-Wahid
cba15c96f6
fix skipped indentation
2012-11-23 15:45:19 +01:00
Badi' Abdul-Wahid
7bdcb521b2
Update based on comments to pull request
2012-11-23 15:29:17 +01:00
Badi' Abdul-Wahid
85a33507ea
Add GROMACS v4.5.5
2012-11-23 03:38:13 +01:00
Peter Simons
0757af1693
qfsm: add version 0.53.0
2012-11-11 20:32:41 +01:00
Mathijs Kwik
5406e02594
tkgate: limit to i686-linux and x86_64-linux to fix channel build
...
powerpc-linux seems to have a problem
http://hydra.nixos.org/build/3315312
2012-11-11 14:12:42 +01:00
Peter Simons
86fa903f6c
tkgate: add versions 1.8.7 and 2.0-b10
2012-11-08 17:30:50 +01:00
Peter Simons
85145941fa
kicad: update homepage URL
2012-10-28 17:27:30 +01:00
Peter Simons
29035e15a4
ng-spice-rework: update to version 24
2012-10-28 17:27:13 +01:00
Peter Simons
a29717f41f
stellarium: update to version 0.11.4
2012-10-19 10:19:41 +02:00
Peter Simons
24ec840736
wxmaxima: update to version 12.09.0
2012-10-19 10:12:31 +02:00
Peter Simons
5c59edb8f4
maxima: update to version 5.28.0
2012-10-19 10:12:31 +02:00
