3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1153 commits

Author SHA1 Message Date
Peter Simons 56aa2ce960 Un-maintain wine. 2014-01-13 17:15:53 +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
Vladimír Čunát a00e382e23 wineStable: maintenance update 1.6.1 -> .2, use lcms2
lcms2 is now supported according to the announcement, so I switched to it.
Tested on a steam game ;-)
2014-01-11 19:58:16 +01:00
Domen Kožar 094947ba73 gnome_themes_standard: bump to 3.10.0 and move into gnome3 attrset 2014-01-10 01:45:32 +01:00
Mathijs Kwik 10c15d5861 zsnes: manual header magic is no longer needed with the gcc-4.8 patch 2014-01-05 18:53:52 +01:00
Vladimír Čunát 9443129b08 Merge master into stdenv-updates
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
2014-01-04 18:34:53 +01:00
Michael Raskin e89aa035b9 Update Wine 2014-01-04 14:55:42 +04:00
Lluís Batlle i Rossell ab7069eec4 zsnes seems to work better, without stripping.
I can't understand why. Without disabling stripping, it segfaults
saving state.
2014-01-03 00:54:59 +01:00
Thomas Tuegel 36b7499885 add qtcurve-1.8.17 2014-01-01 12:36:45 -06:00
Michael Raskin 9817df5715 Update Winetricks 2014-01-01 14:25:17 +04:00
Michael Raskin 26b3d0ab50 Update unstable Wine to 1.7.9 2013-12-30 02:32:19 +04: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
Song Wenwu 88b9e1f191 retroarch: update to 0.9.9.7 2013-12-26 18:55:17 +01:00
Vladimír Čunát 50ac037864 Merge master into x-updates 2013-12-23 19:27:14 +01:00
Nixpkgs Monitor 3f20e8f44e oxygen_gtk: update from 1.3.4 to 1.4.1 2013-12-23 05:26:09 +02:00
Domen Kožar fc9c17caf0 Merge pull request #1385 from lovek323/vim-golang
vimPlugins.golang: add expression
2013-12-22 03:47:49 -08:00
Vladimír Čunát 2b24f1349a Merge master into x-updates 2013-12-21 10:20:55 +01:00
Nixpkgs Monitor 3ed05c26e4 xscreensaver: update from 5.19 to 5.26 2013-12-21 02:28:26 +02:00
Vladimír Čunát 4c5a71f777 Merge master into x-updates
Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix
2013-12-18 23:21:29 +01:00
Nixpkgs Monitor 6f17df861e wineUnstable: update from 1.7.7 to 1.7.8 2013-12-18 18:18:39 +02:00
Nixpkgs Monitor 231e9cff36 mate-themes: update from 1.6.1 to 1.6.2 2013-12-18 18:18:38 +02:00
Nixpkgs Monitor 50bfd93274 mate-icon-theme: update from 1.6.1 to 1.6.2 2013-12-18 18:18:38 +02:00
Nixpkgs Monitor c47477d06e foomatic_filters: update from 4.0.12 to 4.0.17 2013-12-18 18:18:27 +02:00
Nixpkgs Monitor e4258fe1a7 cupsBjnp: update from 0.5.4 to 1.2.1 2013-12-18 18:18:23 +02:00
Nixpkgs Monitor de91f24803 atari800: update from 2.0.2 to 2.2.1 2013-12-18 18:18:17 +02:00
Jason "Don" O'Conal c95b774f52 vimPlugins.golang: add expression 2013-12-16 01:21:23 +00:00
Vladimír Čunát 1d6c351046 enable osmesa for wine (close #1228) 2013-12-10 16:36:23 +01:00
Peter Simons 486e7736df Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/networking/p2p/amule/default.nix
2013-12-10 00:25:54 +01:00
Moritz Ulrich 2d6c240913 winetricks: Update to rev 1078
And add some missing dependencies to the PATH of the script.
2013-12-09 00:34:35 +00:00
Peter Simons c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
Nixpkgs Monitor 03d64a9041 slock: update from 1.0 to 1.1 2013-12-04 06:23:35 +02:00
Rickard Nilsson 8685278f11 Add nix-run and myEnvRun
This adds nix-run, which is a thin wrapper around nix-build.
nix-run calls nix-build, and then executes the resulting build.
If no executable artifact is built, nix-runs outputs an error
message.

myEnvRun calls myEnvFun and builds a script that directly runs
the load-env-* script.

Together, nix-run and myEnvRun allows you to set up an environment
that can be loaded in this way:

  envs.nix:
    {
      gcc = myEnvRun {
        name = "gcc";
        buildInputs = [ gcc ];
      };
    }

  $ nix-run -A gcc envs.nix

You end up directly in your environment without having to do
nix-env -i. You will always have a fresh environment and you
don't have to pollute you profile with a lot of env packages.
2013-12-01 09:36:55 +01:00
Michael Raskin 435cffee5b Update unstable Wine to 1.7.7 2013-11-25 10:59:38 +04:00
Bjørn Forsman 8347ff8a21 solfege: refactor meta attributes 2013-11-24 13:27:24 +01:00
Bjørn Forsman 2a78fadf33 solfege: update 3.22 -> 3.22.2 (latest stable)
Changes:

Solfege 3.22.2, October 6, 2013
* Updated Esperanto, Portugese and Turkish translations to the users manual
* Updated Spannish and Turkish messages
* distribute solfege/tests/lesson-files/*
* help/C/scales/modes.html are never translated. So we must link to the
  C-locale file in every translation.
* gettext tweaks to make the test suite work both when run as "test.py" and
  "test.py test_lessonfile". There is still something wrong because we have to
  disable the test to run debuild
* distribute solfege/tests/lib/* and solfege/test/include/*

Solfege 3.22.1, September 16, 2013
* Adjust some of the short interval names used when selecting intervals to
  practise: u->P1 4->P4, 5->P5, tt->TT, p11->P11, p12->P12, tt8->d12. Added long
  name for intervals from Eleventh to Double Octave.
* Fix the bug where we could not select the Default profile
* Updated Esperanto, Spannish, Polish, Turkish, Vietnamese, Norwegian bokmål,
  Brazilian Portugese and Vietnamese translations.
2013-11-24 13:23:50 +01:00
Vladimír Čunát b5356f7f27 wine: (stable) bugfix update 1.6 -> 1.6.1
Tested on a couple of apps.
2013-11-16 18:22:16 +01:00
Evgeny Egorochkin 829b29153b clean up git revision handling in several packages 2013-11-13 12:46:55 +02:00
Cillian de Róiste 72aae985ae gutenprint: wrap sbin/cups-genppd.5.2
This is used to generate ppd files for cups:

  $ cups-genppd.5.2 -M | grep p50
  canon-cp500
  escp2-p50
  $ cups-genppd.5.2 -p . escp2-p50

This will create the relevant ppd file in the current directory. This
can then be used by cups after setting services.drivers.drivers =
[pkgs.gutenprint]; and configuring the printer to use this ppd e.g.
via the web interface on http://localhost:631
2013-11-10 16:32:05 +01:00
Cillian de Róiste 80e2706e51 gutenprint: fix the cupsd driver 2013-11-10 00:38:42 +01:00
Cillian de Róiste 78c76daf16 gutenprint: upgrade to 5.2.9 2013-11-10 00:38:42 +01:00
Eelco Dolstra a0e21fd1ca Mark more packages as broken 2013-11-04 21:11:00 +01:00
Mathijs Kwik 609f8dc04b Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/top-level/all-packages.nix
2013-11-01 08:31:54 +01:00
Jason \"Don\" O'Conal db5c6917f3 vimPlugins.ipython: add expression
close #1141
2013-10-29 15:45:46 +02:00
Peter Simons 91f2c362de Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/top-level/all-packages.nix
2013-10-26 18:28:05 +02:00
Jonas Hoersch a917b7b011 my-env: pull --norc shell flag out into shell parameter
As zsh's corresponding flag is called --no-rcs, the build environment
couldn't be configured to use zsh at all.

Even then the custom PS1 won't work on zsh, but it's usable enough.

Close #1040.
2013-10-21 20:58:40 +03:00
Michael Raskin ae39f6c0cb Make 1.6 the default Wine version and call 1.7.4 wineUnstable 2013-10-21 21:27:18 +04:00
Jason "Don" O'Conal 3c3c631a45 vimPlugins.vimshell: add expression
vimPlugins.vimproc: add expression
close #978
2013-10-20 23:35:53 +03:00
Michael Raskin 6f3e7d17d3 Fix Wine source 2013-10-20 22:02:02 +04:00
Michael Raskin c4d78d376a Updating Wine to 1.7.4 2013-10-20 21:08:42 +04:00
Peter Simons 6be8ad3392 Merge branch 'origin/master' into stdenv-updates.
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
2013-10-18 18:57:24 +02:00
Mathijs Kwik ef3cc83d1e zsnes: patches for modern gcc & libpng
builds fine on stdenv-updates now
needs gcc 4.8+, so keep this commit on stdenv-updates until merge
2013-10-11 01:10:41 +02:00
Bjørn Forsman 083d0890f5 More description fixes
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
2013-10-06 12:01:38 +02:00
Bjørn Forsman 48d3c12304 lilypond: add missing ghostscript path to wrapper 2013-09-28 21:07:48 +02:00
Eelco Dolstra fc961af360 ghostscript: Revert to 9.06
The newer version breaks printing to non-Postscript printers (e.g. HP
Deskjets).  This is because the gstoraster and gstopxl filters were
removed.  They are now in a package named "cups-filters" that we don't
have yet.
2013-09-26 18:03:43 +02:00
Jaka Hudoklin fc991159d8 vimPlugins.YouCompleteMe: update to ee12530df0 2013-09-25 20:02:41 +02:00
Vladimír Čunát aa8e8303e1 Merge branch 'x-updates' into master 2013-09-11 08:37:03 +02:00
Jason "Don" O'Conal 575be7dd4b vimPlugins.tagbar: add expression 2013-09-08 21:13:40 +02:00
Jason "Don" O'Conal 499109b7dd vimPlugins.syntastic: update to 3.1.0 2013-09-08 21:09:14 +02:00
Vladimír Čunát b1be46e932 Merge branch 'master' into x-updates 2013-09-07 16:19:46 +02:00
Sander van der Burg f2e4efcf28 Removed obsolete patchelf instruction that was commented out 2013-09-05 10:43:01 +02:00
Sander van der Burg 1642e3a6d7 libX11 is not in vice's rpath. this fixes it 2013-09-04 22:34:08 +02:00
Vladimír Čunát 83c734cf38 ghostscript: maintenance update 2013-09-02 17:14:49 +02:00
Vladimír Čunát 2fda1165da Merge branch 'master' into x-updates 2013-08-28 10:37:41 +02:00
Song Wenwu eb0aafd4c9 add mate-themes 1.6.1 2013-08-27 17:00:03 +02:00
Song Wenwu d80e7b3799 add mate-icon-theme 1.6.1 2013-08-27 17:00:03 +02:00
Song Wenwu 757568b8fe add gtk-engine-murrine 0.98.2 2013-08-27 13:10:11 +02:00
Vladimír Čunát c1e62e7e91 Merge branch 'master' into x-updates 2013-08-22 19:29:09 +02:00
Vladimír Čunát af0e6b6b2b ghostscript: bugfix update (old tarball removed upstream)
There was some incompatibility problem with the last update,
so upstream retracted the previous release.
2013-08-22 12:37:19 +02:00
Jason "Don" O'Conal 77cf3c3e0c vimPlugins.taglist: add expression 2013-08-22 12:26:27 +03:00
Jason "Don" O'Conal ed3b966870 vimPlugin.eighties: add expression 2013-08-22 10:43:59 +10:00
Song Wenwu 6ae213d3ae add gtk-engines 2.20.2 2013-08-18 19:17:19 +02:00
Ludovic Courtès 2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Vladimír Čunát b8d00ac153 ghostscript: minor update, a little refactoring
Builds fine, I tried running some apps depending on it.
2013-08-15 20:48:14 +02:00
Mathijs Kwik f918e06988 wine: upgrade to 1.6 + latest gecko/mono extensions 2013-07-30 14:25:10 +02:00
Cillian de Róiste a321f6f302 Oxygen-gtk: upgrade to 1.3.4 2013-07-22 14:05:39 +02:00
Marc Weber 84ca773f9b use simpleDerivation for all Vim plugins 2013-07-19 20:17:42 +02:00
Jason "Don" O'Conal 1d7d0addcc vim-plugins: add expression command-t
* also fix build of vim on darwin
2013-07-14 11:24:45 +10:00
Mathijs Kwik 04cbaef102 keep lcms versioning in all-packages.nix 2013-07-01 07:52:13 +02:00
Mathijs Kwik fe622f6523 upgrade some packages to libusb1
on my systems, I can now override "libusb = libusb1" in all of nixpkgs
so perhaps we can soon drop libusb 0.1 support?
2013-07-01 07:52:13 +02:00
Domen Kožar 8fb90b71aa Merge pull request #682 from lovek323/vim-debugger
vim-xdebug: add expression
2013-06-29 09:32:03 -07:00
Jason "Don" O'Conal 72afda56d5 vim-xdebug: add expression 2013-06-27 11:21:11 +10:00
Song Wenwu 1e7e9c583d add retroarch 0.9.9 2013-06-26 19:25:09 +08:00
Jason "Don" O'Conal 60fd718856 vim-coffee-script: add expression 2013-06-21 15:11:07 +10:00
Vladimír Čunát c72ed04892 Merge 'master' and 'stdenv-fixes' into x-updates
Final stabilization phase before merging into master.

Conflicts (glibc-2.13):
	pkgs/top-level/all-packages.nix
2013-06-16 10:13:51 +02:00
Jason "Don" O'Conal 4968acde6b Add vim syntastic plugin 2013-06-15 13:22:11 +10:00
Michael Raskin 19530856ed Merge remote-tracking branch 'upstream/master' into x-updates
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/misc/ghostscript/default.nix
	pkgs/top-level/all-packages.nix
2013-06-13 17:12:43 +04:00
Jason "Don" O'Conal b31db11a69 ghostscript: add libiconvOrEmpty to build inputs 2013-06-13 15:52:55 +10:00
Michael Raskin 1a45886454 Merge branch 'master' into x-updates 2013-06-11 15:46:10 +04:00
Michael Raskin 46cd2d0d68 Merge pull request #568 from MarcWeber/submit/vim-multiple-version-and-plugins
vim: supporting multiple sources & complicated plugins
2013-06-10 23:06:56 -07:00
Michael Raskin 8271de6727 Merge remote-tracking branch 'upstream/master' into x-updates
Conflicts:
	pkgs/misc/emulators/wine/default.nix
2013-06-10 10:04:46 +04:00
Evgeny Egorochkin 8a7bd8b200 Wine: a crude fix to issue #542: "libgcc_s.so.1 must be installed for pthread_cancel to work". 2013-06-09 05:37:47 +03:00
Vladimír Čunát 7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates
Conflicts (taken from @7c6f434c):
	pkgs/development/libraries/libgphoto2/default.nix
2013-06-08 15:41:39 +00:00
Michael Raskin 3fe8b9451a Update Wine 2013-06-07 10:27:19 +04:00
Michael Raskin 8615f6ef35 Update Wine 2013-06-07 10:23:48 +04:00
Bjørn Forsman 142fca279b solfege: new package
Solfege is an ear training application.

This patch is based on the work of @mornfall.
2013-06-06 19:30:41 +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
Marc Weber 71628d6e35 vim: supporting multiple sources:
- vim-nox: client-server implementation without X
- latest:  latest mercurial sources (still very stable)
- default: latest release

vim-plugins: Introduce an area to put vim plugins which are worth adding to nix
because they need more effort than just "unpacking". Document that
2013-05-27 22:26:29 +02:00
Petr Rockai dd23b30120 lilypond: Update to 2.16.2, fix guile. 2013-05-18 13:35:14 +02:00
Lluís Batlle i Rossell 44e99f41be Fixing 'my-env', when without cleanup. 2013-05-14 18:59:50 +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
Marc Weber b50b9bf2b7 add versionedDerivation 2013-05-08 15:43:07 +03: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
Michael Raskin 0c020c98f9 Updates: Wine, SBCL, XBoard 2013-05-08 10:52:47 +04:00
Phreedom d7e2acbe97 Merge pull request #464 from the-kenny/my-env-exit-commands
Add cleanupCmds option to pkgs.myEnvFun. The downside is that /bin/sh remains in memory to be able to execute cleanup commands.
2013-05-05 08:14:58 -07: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
Lluís Batlle i Rossell 031d1ee8c5 Merge branch of 'hatari' 2013-04-23 11:06:17 +04:00
Lluís Batlle i Rossell 7ca16e5115 hatari: fix pthread_cancel+gcc_s thing, and some spacing 2013-04-23 11:05:46 +04:00
Michael Raskin b98ece6bc2 Auto-update some packages; no early build failures (SBCL and Wine not yet fully built) 2013-04-23 09:15:48 +04:00
Jordi 019472eaa3 Add hatari Atari St emulator. 2013-04-22 22:10:15 +02:00
Moritz Ulrich d84bfa78e1 Add cleanupCmds option to pkgs.myEnvFun
This option allows the user to specify commands to run when the shell
exits. This can be used to cleanup operations done in `extraCmds'.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-04-13 19:10:50 +02:00
Vladimír Čunát 7e5286db50 cups: fix reference to dbus.libs 2013-04-11 16:02:24 +02: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
Vladimír Čunát 16f4550761 Merge pull request #411 from ocharles/gnome-themes-standard
gnome-themes-standard: Initial expression
2013-04-03 11:59:19 -07:00
Moritz Ulrich 51229692ca Add sha256 hash to winetricks.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-03-30 20:00:05 +01:00
Michael Raskin e9439d7811 Fix Wine libDRM reference 2013-03-29 09:29:19 +04:00
Lluís Batlle i Rossell 5f677039c7 Adding back the 1.5 expression of mupen64plus
It has a GUI, for example.
2013-03-28 18:16:40 +01:00
Lluís Batlle i Rossell 3abc3f4a68 Updating mupen64plus, and adding a GUI for it.
I can't say the GUI works very well... it doesn't find the core properly,
but I couldn't find why.
2013-03-28 18:13:18 +01:00
Oliver Charles 0a947728e2 gnome-themes-standard: Initial expression 2013-03-25 15:23:45 +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
Eelco Dolstra 674c51af3c Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
Michael Raskin c8acc350b9 Wine: update to 1.5.25 2013-03-07 00:28:59 +04:00
Peter Simons 04b2efff19 Merge branch 'master' into stdenv-updates. 2013-02-25 01:26:26 +01:00
viric e2d097c5c0 Merge pull request #333 from bjornfor/fix-typo
my-env/default.nix: fix "sdl-env" vs "env-sdl" typo
2013-02-24 12:39:20 -08:00
Bjørn Forsman 5b9a7fc95a my-env/default.nix: fix "sdl-env" vs "env-sdl" typo
my-env/default.nix lists an example on how to create an SDL environment
that can be installed with "nix-env -i sdl-env". That is actually wrong
and will not work. The correct command is "nix-env -i env-sdl".
2013-02-24 21:35:23 +01:00
Peter Simons 5f32207dfc Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-24 19:27:08 +01:00
Cillian de Róiste b2ad9627d6 oxygen-gtk: upgrade gtk2 version to 1.3.2.1 2013-02-24 02:30:53 +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
Eelco Dolstra 2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Corey O'Connor fde87b3a9b add winetricks, modified by vcunat@gmail.com
Originally from #89.
2013-02-10 16:20:24 +01:00
Aristid Breitkreuz b2afb45b8d hplip: make pyqt4 dependency conditional on qtSupport 2013-02-08 00:27:07 +01:00
Aristid Breitkreuz b73dff89f7 enable networking support for hplip, net_snmp is available now 2013-02-06 14:08:27 +01:00
Aristid Breitkreuz b5e2a027c4 hplip: now hp-setup actually shows a dialog 2013-02-06 13:44:39 +01:00
Aristid Breitkreuz f590891ac2 hplip: start work on making python programs work 2013-02-06 13:44:38 +01:00
Александр Цамутали 5406828d76 jackaudio/default.nix: Update to 1.9.9.5. 2013-02-03 20:22:43 +04:00
Vladimír Čunát 35a927149f Merge branch 'master' into x-updates
Conflicts (both messed with mesa):
	pkgs/top-level/all-packages.nix
2013-02-02 21:11:00 +01:00
Vladimír Čunát 0fa7bc7379 wine: update to 1.5.23, update gecko 2013-02-02 15:03:02 +01:00
Vladimír Čunát 539d9bc1af ghostscript: fix infinite recursion in meta (sorry for that) 2013-01-31 13:21:21 +01:00
Vladimír Čunát a95c85fe94 ghostscript: minor update, replace more internal libraries by nix ones 2013-01-29 17:05:58 +01:00
Vladimír Čunát 570b0f8c54 libtiff: major update to 4.*
Also minor modification of ghostscript to work with it.
2013-01-29 14:07:30 +01:00
Eelco Dolstra 5d6da38d33 cups: Don't build on Darwin 2013-01-29 12:43:53 +01:00
Lluis Batlle 0353c08d38 uboot: updating the default uboot to 2012.07
This is what I use in the sheevplug, with the provided patches.
The old sheevaplug uboot doesn't understand ubifs.
2013-01-27 15:38:39 +01:00
Eelco Dolstra 5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
Evgeny Egorochkin 5dcdcf4af3 Remove Wine-Warcraft because WarCraft 3 works just fine in vanilla Wine now. 2013-01-15 07:43:40 +02:00
Peter Simons b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00
Michael Raskin 029d4fd1db Wine: Update to 1.5.21 2013-01-07 01:35:58 +04: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 84779a6f7d Remove unnecessary parentheses around if conditions
Pet peeve...
2012-12-28 19:54:15 +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 17a4e01c69 Wine: update to 1.5.20 2012-12-22 14:54:22 +04:00
Michael Raskin 50f368c0ec Update Wine 2012-12-08 13:28:15 +04:00
Peter Simons 7d3be6b5f9 dlx: link with gcc instead of g++ -- there is no c++ code here 2012-12-05 16:44:04 +01:00
Peter Simons c4038db19d dlx: install both hp.m and new.m microcode 2012-12-05 16:43:49 +01:00
Evgeny Egorochkin 0eecd67d14 Package Samsung unified printer driver. i686 only but apparently can be improved to support x86_64. Based on patch by James Cook <james.cook[NOSPAM]@utoronto.ca> 2012-12-05 05:43:19 +02:00
Peter Simons 50e7ddbdca Add DLX simulator. Upstream provides no version number. 2012-12-04 14:29:48 +01:00
Evgeny Egorochkin 21379504a4 Wine: add printing(cups) support 2012-12-03 17:02:01 +02:00
Ambrus Kaposi 0fc2fd5bfb Create a symbolic link to cups/lib so that gutenprintBin can be specified as a driver in services.printing.drivers in /etc/nixos/configuration.nix 2012-11-30 12:43:00 +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
Peter Simons a814d0bc90 SANE: switch snapshot version of the backends to git (and general cleanup) 2012-11-26 16:18:05 +01:00
Peter Simons 0bf71add78 sane-backends: update snapshot to version: 1.0.22.git20121123 2012-11-23 21:31:23 +01:00
Lluís Batlle i Rossell 5c09167b67 myEnv: making it not to add -rpath /lib
NIX_LDFLAGS was left with "-rpath /lib", which is annoying on non-nixos.
2012-11-22 10:55:53 +01:00
Michael Raskin 3061db0bb2 Wine: update, add auto-update helper 2012-11-10 14:43:17 +04:00
Rickard Nilsson a25a84ff86 jackaudio: Add extra download URL. Main site seems down. 2012-10-18 14:17:21 +02:00
Eelco Dolstra f7436a9141 Merge remote-tracking branch 'origin/master' into x-updates 2012-10-17 12:07:03 -04:00
Michael Raskin 07f44ad945 Update Wine 2012-10-17 17:22:32 +04:00
Peter Simons 6ff829f19d Merge branch 'master' into x-updates 2012-10-10 18:46:48 +02:00
Rickard Nilsson e74916ed62 xscreensaver: Update to 5.19 2012-10-10 16:05:37 +02:00
Eelco Dolstra a779d2ba18 foomatic-filters: Update to 4.0.12 2012-10-08 14:52:06 -04:00
Eelco Dolstra c961c840f6 cups: Update to 1.5.4 2012-10-08 14:50:19 -04:00
Eelco Dolstra f5e0a05f80 Revert "cups: Update to 1.6.1"
This reverts commit 5046d0628f.
2012-10-08 14:43:49 -04:00
Eelco Dolstra 318202951e Revert "Remove cups-pdf-filter"
This reverts commit 006002d16f.
2012-10-08 14:43:47 -04:00
Eelco Dolstra f32979e2d8 Revert "cups: Drop unused dependencies and add libusb1 dependency"
This reverts commit 6f700142c4.
2012-10-08 14:43:42 -04:00
Eelco Dolstra 41e9f7cfed Merge remote-tracking branch 'origin/master' into x-updates 2012-10-08 13:48:30 -04:00
Michael Raskin 90f1e5b672 Add V4L support to SANE 2012-10-06 22:42:06 +04:00
Eelco Dolstra 31f89ba349 Merge remote-tracking branch 'origin/master' into x-updates 2012-10-03 14:43:10 -04:00
Cillian de Róiste c073071e13 Patch JACK to be compatible with the 2.1.0 release of ffado 2012-10-01 22:28:12 +02:00
Eelco Dolstra 6f700142c4 cups: Drop unused dependencies and add libusb1 dependency 2012-09-28 23:20:59 -04:00
Eelco Dolstra 006002d16f Remove cups-pdf-filter
It has been obsoleted by the cups-filters package.
2012-09-28 15:09:14 -04:00
Eelco Dolstra 5046d0628f cups: Update to 1.6.1 2012-09-26 18:11:23 -04:00
Peter Simons 94da2e30dd ghostscript: cosmetic don't rely on magic URL syntax; URLs are strings 2012-09-06 18:34:18 +02:00
Peter Simons 52e5b8e2c5 ghostscript: cosmetic
Refer to the source code as "src" rather than "data".
2012-09-06 18:32:59 +02:00
Rob Vermaas 77948b7204 Remove old maven versions, aliased maven to maven3. Updated maven 3 to 3.0.4 2012-08-25 19:43:54 +02:00
Michael Raskin 2a2b52201e Wine: update to 1.5.10 2012-08-09 12:55:30 +04:00
Michael Raskin bdb1ccaf80 Lilypond: update to 2.14.2 2012-08-05 23:10:49 +04:00
Eelco Dolstra 0435f39008 wine: Update to 1.5.9 2012-07-22 01:18:02 -04:00
Peter Simons 0a7e280587 xscreensaver: update to version 5.18 2012-07-17 12:48:15 +02:00
Peter Simons f7a95ce194 wine: update to version 1.5.5
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
2012-07-02 16:53:51 +02:00
Eelco Dolstra b5949d2509 busybox: Update to 1.20.1 2012-06-28 14:05:56 -04:00
Lluís Batlle i Rossell 002ffde4a4 trac: Removing the old misc/trac.
There is a much newer trac at python-packages.nix, and it is used
by nixos' trac apache service.
2012-06-27 22:34:27 +02:00
Antono Vasiljev 584ff70a16 Use installPhase instead of builder for BSOD 2012-06-25 18:04:08 +03:00
Antono Vasiljev 182f0dfe5e Added bsod emulator for unix 2012-06-25 17:25:01 +03:00
Peter Simons 7b14de6733 Add package for vlock from Debian mirror.
This is mainly because the original upstream URL is not available anymore.

svn path=/nixpkgs/trunk/; revision=34442
2012-06-11 07:16:11 +00:00
Yury G. Kudryashov 70dbdd0e5b cups-bjnp: fix FTBFS
svn path=/nixpkgs/trunk/; revision=34410
2012-06-09 20:10:40 +00:00
Yury G. Kudryashov 94726d19e7 gutenprint-5.2.7, fix FTBFS
svn path=/nixpkgs/trunk/; revision=34409
2012-06-09 20:10:35 +00:00
Lluís Batlle i Rossell f5cb1ecaf4 Updating the sheevaplug uboot. I've not tried it, but the old one disappeared from the server.
svn path=/nixpkgs/trunk/; revision=34394
2012-06-09 07:27:40 +00:00
Lluís Batlle i Rossell 6934b46182 Making a trick on myEnv so I can put the cross gcc and some 'propagatedBuildInputs',
to have myEnv with cross-builders and cross-built libs.

(I'm trying by now to mingw64 + librsync.hostDrv)


svn path=/nixpkgs/trunk/; revision=34249
2012-05-25 17:53:37 +00:00
Eelco Dolstra 1a22e9761d * By default, build a dynamically linked Busybox. In the initrd we
need Glibc anyway, so there is no point in static linking.  This
  saves about a megabyte from the initrd.

svn path=/nixpkgs/trunk/; revision=34197
2012-05-21 17:51:40 +00:00
Karn Kallio cccc48263f Sane backends URL seems to have changed.
Also advance version to 1.0.22

svn path=/nixpkgs/trunk/; revision=33803
2012-04-16 15:14:19 +00:00
Lluís Batlle i Rossell 9595946c73 Fixing details of debugVersion, and adding a 'symbolsVersion'.
I could merge both into one, but I'll do that later.


svn path=/nixpkgs/trunk/; revision=33715
2012-04-10 07:13:52 +00:00
Cillian de Roiste 11040732bd It seems to get stuck on the line break so I'm putting it all on one line now
svn path=/nixpkgs/trunk/; revision=33672
2012-04-08 12:03:15 +00:00
Cillian de Roiste d989f361ac Updating to 0.121.3, adding optional FireWire support and replacing composableDerivation with mkDerivation
svn path=/nixpkgs/trunk/; revision=33666
2012-04-08 00:16:59 +00:00
Cillian de Roiste bce9de06bd Adding firewire support
svn path=/nixpkgs/trunk/; revision=33665
2012-04-08 00:00:03 +00:00
Peter Simons b73fb52648 Oops, fixed typo from previous commit.
svn path=/nixpkgs/trunk/; revision=33656
2012-04-06 19:39:43 +00:00
Peter Simons 8beb891d52 xscreensaver: updated to version 5.15 (and moved to pkgs/misc/screensavers hierarchy)
svn path=/nixpkgs/trunk/; revision=33655
2012-04-06 19:30:30 +00:00
Peter Simons 44b6ab6d32 slock: updated to version 1.0
svn path=/nixpkgs/trunk/; revision=33653
2012-04-06 18:56:05 +00:00
Peter Simons f04ca020f3 xlockmore: updated to version 5.38
svn path=/nixpkgs/trunk/; revision=33652
2012-04-06 18:56:00 +00:00
Lluís Batlle i Rossell 6d23fe4501 Adding meta to busybox, and setting me as maintainer, and asking hydra to build it.
svn path=/nixpkgs/trunk/; revision=33446
2012-03-27 22:05:03 +00:00
Joachim Schiele 9f73f39527 renamed load-sdl-env to load-env-sdl so that 'nix-env -i env-sdl' and 'load-env-sdl' have a common naming scheme
svn path=/nixpkgs/trunk/; revision=33421
2012-03-26 10:20:32 +00:00
Lluís Batlle i Rossell fc3ac31540 Updating the script of loading myEnv environments, for something close to what I was using.
It sets a fixed PS1, maybe breaking someone's taste, though. But I find it easier to use.


svn path=/nixpkgs/trunk/; revision=33304
2012-03-20 18:49:44 +00:00
Joachim Schiele fc152de1c2 rewrote the text to make virics and my edits seem like from one author
svn path=/nixpkgs/trunk/; revision=33298
2012-03-20 14:51:18 +00:00
Cillian de Roiste ec78373642 Update jackdbus to 1.9.8
svn path=/nixpkgs/trunk/; revision=33218
2012-03-17 22:03:15 +00:00
Shea Levy 5f6bb1fce6 Ghostscript: Fix darwin build
svn path=/nixpkgs/trunk/; revision=33160
2012-03-16 14:27:58 +00:00
Joachim Schiele f108651e9f fixed forgotten bracket.... maybe this is not my-env at all
svn path=/nixpkgs/trunk/; revision=33095
2012-03-14 23:38:28 +00:00
Lluís Batlle i Rossell 914a042d7d Fixing some details about the myEnv documentation.
I thought load-xxx-eenv worked like my own private 'loadenv' script, but looks like not.


svn path=/nixpkgs/trunk/; revision=33093
2012-03-14 23:07:59 +00:00
Yury G. Kudryashov 68fe867e19 Get rid of most references to gtkLibs
svn path=/nixpkgs/trunk/; revision=33088
2012-03-14 21:57:32 +00:00
Lluís Batlle i Rossell 635d1d9bec I try to improve the documentation on my-env
svn path=/nixpkgs/trunk/; revision=33075
2012-03-14 18:59:09 +00:00
Joachim Schiele 7bf2d4966e some more comments and examples
svn path=/nixpkgs/trunk/; revision=33073
2012-03-14 18:46:18 +00:00
Joachim Schiele 0416bc1ddb added a few fixes from the discussion on irc with marc weber
svn path=/nixpkgs/trunk/; revision=33072
2012-03-14 18:18:49 +00:00
Lluís Batlle i Rossell 5ada5e0712 Updating busybox and fixing its configurator.
svn path=/nixpkgs/trunk/; revision=32998
2012-03-11 21:23:15 +00:00
Lluís Batlle i Rossell 6bb466ed9b Making GPL Ghostscript use the system libraries (libjpeg, libpng, ...) so
the previous troubles with a mixture of libpng versions fade away.

I also enable back GPL Ghostscript as the default.

I checked that 'awesome' builds fine (it calls imagemagick for some pictures in
its build script), as a proof that imagemagick does not crash anymore.


svn path=/nixpkgs/trunk/; revision=32958
2012-03-09 17:15:11 +00:00
Peter Simons a98e6bdc29 pdf-filter.nix: strip trailing whitespace
svn path=/nixpkgs/trunk/; revision=32950
2012-03-09 10:22:34 +00:00
Peter Simons 70fca00b78 cups-pdf-filter: register MIME conversions from PDF to PS
CUPS 1.5.x doesn't do that automatically anymore.

svn path=/nixpkgs/trunk/; revision=32949
2012-03-09 10:22:30 +00:00
Lluís Batlle i Rossell e277e44e34 Updating GPL Ghostscript.
svn path=/nixpkgs/trunk/; revision=32914
2012-03-08 22:28:26 +00:00
Lluís Batlle i Rossell 02ac39aef8 Setting myself as maintainer for xsane and cdecl, and telling hydra to build them.
svn path=/nixpkgs/trunk/; revision=32868
2012-03-07 22:20:23 +00:00
Lluís Batlle i Rossell 65f45ef322 Updating xsane, and making it build with the old libpng. The previous url is gone.
svn path=/nixpkgs/trunk/; revision=32862
2012-03-07 21:59:48 +00:00
Peter Simons 0be4183bd5 cups: updated to version 1.5.2
svn path=/nixpkgs/trunk/; revision=32829
2012-03-06 16:02:04 +00:00
Michael Raskin ef3a71007a Forgotten part of xsane: Use libpng specified, not the one propagated
svn path=/nixpkgs/trunk/; revision=32822
2012-03-06 12:21:09 +00:00
Yury G. Kudryashov 57fd764a39 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
2012-03-05 10:00:23 +00:00
Yury G. Kudryashov 84fb9ca331 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32719
2012-03-01 15:05:27 +00:00
Yury G. Kudryashov 0210e20b5a svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
2012-03-01 07:04:39 +00:00
Arie Middelkoop 298f4df4af Changed 'myEnvFun' to in addition put a script in 'bin' so that you can run '. load-<name>-env' to load your environment.
svn path=/nixpkgs/trunk/; revision=32690
2012-02-29 12:55:51 +00:00
Yury G. Kudryashov c615cbae70 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32099
2012-02-07 09:38:20 +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
Peter Simons b69d6bf7e0 Moved all LaTeX expressions into tools/typesetting hierarchy.
svn path=/nixpkgs/trunk/; revision=32028
2012-02-04 09:31:07 +00:00
Yury G. Kudryashov df037ddafd svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31987
2012-02-02 20:36:11 +00:00
Yury G. Kudryashov 9d67ff2a48 Remove glib-1.x and its reverse dependencies
Nobody told me that he uses generator or xmms, so I'm removing this old stuff.

svn path=/nixpkgs/trunk/; revision=31907
2012-01-28 13:06:07 +00:00
Yury G. Kudryashov e155073b2c svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31888
2012-01-27 17:49:20 +00:00
Yury G. Kudryashov b31c67e24d svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31887
2012-01-27 16:43:39 +00:00
Ludovic Courtès 41445f89c3 TeXLive/ModernCV: Fix source hash.
svn path=/nixpkgs/trunk/; revision=31881
2012-01-27 14:40:58 +00:00
Yury G. Kudryashov 5b132f6e96 svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00
Yury G. Kudryashov 2ced89b7f1 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31846
2012-01-26 08:45:19 +00:00
Eelco Dolstra f878980c8b * Fix building Dosbox with GCC 4.6.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31796
2012-01-23 17:21:37 +00:00
Peter Simons 33cfa26445 cups: don't build with dbus support on non-Linux platforms
svn path=/nixpkgs/trunk/; revision=31769
2012-01-21 18:46:09 +00:00
Peter Simons 9c55349494 cups: cosmetic, no functional change
svn path=/nixpkgs/trunk/; revision=31746
2012-01-20 18:08:54 +00:00
Peter Simons c99249d0c2 cups: blind attempt to fix the CUPS build for non-Linux platforms, particularly Darwin
svn path=/nixpkgs/trunk/; revision=31745
2012-01-20 18:08:50 +00:00
Eelco Dolstra bafc4ff59d * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31739
2012-01-20 15:29:04 +00:00
Yury G. Kudryashov 734de478a6 svn merge ^/nixpkgs/trunk, no conflicts
svn path=/nixpkgs/branches/libpng15/; revision=31731
2012-01-20 00:50:16 +00:00
Peter Simons bf71d12fd4 texlive-moderncv: updated to version 2012.01.16
svn path=/nixpkgs/trunk/; revision=31725
2012-01-19 22:10:41 +00:00
Eelco Dolstra 6208059079 * The postHook substitution is not used anywhere, so get rid of it.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31702
2012-01-19 15:39:12 +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
Yury G. Kudryashov 13c81f6c79 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31568
2012-01-14 21:40:24 +00:00
Yury G. Kudryashov 0c79434ccb svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31567
2012-01-14 21:34:37 +00:00
Peter Simons 0d69e2a9d0 ghostscript: cosmetic change to simplify the DLL build and install procedure
svn path=/nixpkgs/trunk/; revision=31488
2012-01-11 23:14:12 +00:00
Peter Simons 1aaf70f4d7 ghostscript: CUPS support is no longer enabled by default in version 9.x
We must explicitly give the "--with-install-cups" option at configure time to
get the gstoraster filter installed.

svn path=/nixpkgs/trunk/; revision=31487
2012-01-11 23:14:07 +00:00
Yury G. Kudryashov 9ee0a9df9b svn merge ^/nixpkgs/trunk
A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
2012-01-08 16:01:12 +00:00
Yury G. Kudryashov ca28f8ce31 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31430
2012-01-07 22:43:23 +00:00
Yury G. Kudryashov 7e320a7043 State qt version (3/4) in packages, not in all-packages.nix
svn path=/nixpkgs/trunk/; revision=31406
2012-01-07 17:06:49 +00:00
Lluís Batlle i Rossell d391d56f97 Setting the nanonote uboot to load 4MiB, and not 2MiB. My last 2.6.37 kernel
has more than 2MiB.


svn path=/nixpkgs/trunk/; revision=31393
2012-01-07 09:20:16 +00:00
Yury G. Kudryashov 3d61c49b42 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31268
2012-01-04 09:54:17 +00:00
Yury G. Kudryashov bdb01cc707 svn merge /path/to/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31266
2012-01-04 09:45:28 +00:00
Karn Kallio 0e1ea067ab Cause ghostscript to build libgs.
This fixes the failed build of libspectre.

svn path=/nixpkgs/trunk/; revision=31260
2012-01-04 00:26:48 +00:00
Yury G. Kudryashov b0f1da6b75 svn merge /path/to/nixpkgstrunk; resolve ghostscript as "theirs-full"
svn path=/nixpkgs/branches/libpng15/; revision=31250
2012-01-03 18:13:10 +00:00
Yury G. Kudryashov ec3f38712a svn merge /path/to/trunk; svn revert path/to/cmake/default.nix
svn path=/nixpkgs/branches/stdenv-updates/; revision=31249
2012-01-03 18:04:57 +00:00
Peter Simons b916544651 Updated GNU ghostscript to version 9.04.1.
- Merged the builder.sh file into the expression itself.

 - Need to force "-lz" flag to fix linker errors. This is probably a bug
   in the build system, so further updates may not need that hack.

 - Need to force "-rpath=${freetype}/lib" flag to fix run-time errors
   because gs can't find the libfreetype.so.6 library. I don't quite
   understand why that path isn't hard-coded to begin with.

svn path=/nixpkgs/trunk/; revision=31247
2012-01-03 17:50:10 +00:00
Yury G. Kudryashov 08761e83fc Merge trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31207
2012-01-02 14:12:40 +00:00
Yury G. Kudryashov 455d1e934b Merge trunk
svn path=/nixpkgs/branches/libpng15/; revision=31205
2012-01-02 13:43:54 +00:00
Lluís Batlle i Rossell be12dae1ec Fixing the busybox installation. All symlinks were pointing wrong.
svn path=/nixpkgs/trunk/; revision=31191
2012-01-01 20:14:50 +00:00
Yury G. Kudryashov 571365c5bd Merge trunk into branches/libpng15. No conflicts.
svn path=/nixpkgs/branches/libpng15/; revision=30917
2011-12-15 20:14:55 +00:00
Eelco Dolstra eda3fd1730 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
2011-12-12 16:54:35 +00:00
Eelco Dolstra 3ea1c30846 * Remove the NIX_STRIP_DEBUG flag. It was undocumented and confusing
in its interaction with the ‘dontStrip’ attribute.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30848
2011-12-12 14:02:12 +00:00
Michael Raskin c09dbda83e Rebuild-checked: does not break boot
svn path=/nixpkgs/trunk/; revision=30817
2011-12-10 05:05:15 +00:00
Shea Levy 1be13f458f Apply mornfall's SANE patches
Fix sane-backends to generate udev rules, add a snapshot of sane-backends's unstable repo, and add a SANE nixos module

svn path=/nixpkgs/trunk/; revision=30764
2011-12-05 17:32:45 +00:00
Eelco Dolstra 050ea14022 * DBLaTeX updated to 0.3.2.
svn path=/nixpkgs/trunk/; revision=30523
2011-11-22 12:59:22 +00:00
Michael Raskin 279e5fb324 Update Wine
svn path=/nixpkgs/trunk/; revision=30366
2011-11-10 04:31:52 +00:00
Peter Simons f68e44a602 cups: updated to version 1.5.0
svn path=/nixpkgs/branches/stdenv-updates/; revision=29681
2011-10-06 09:57:32 +00:00
Peter Simons 1abdc56a12 Synchronized stdenv-updates branch with trunk.
There were conflicting patches of pkgs/os-specific/linux/module-init-tools.
Apparently, the expression was updated independently in both branches. I've
resolved the conflict by preferring the patches from stdenv-updates, because
those patches appeared to be more sophisticated, i.e. they build the manual,
etc.

svn path=/nixpkgs/branches/stdenv-updates/; revision=29680
2011-10-06 09:37:22 +00:00
Yury G. Kudryashov 8b511df7b9 Fix visualboyadvance compilation with libpng-1.5; patch from gentoo
svn path=/nixpkgs/branches/libpng15/; revision=29651
2011-10-05 06:33:10 +00:00
Yury G. Kudryashov 85fc2de83e svn merge trunk
svn path=/nixpkgs/branches/libpng15/; revision=29627
2011-10-04 13:12:45 +00:00
Peter Simons f74e361e45 added myself as maintainer
svn path=/nixpkgs/branches/stdenv-updates/; revision=29618
2011-10-03 20:50:08 +00:00
Eelco Dolstra fc77db6d21 * Wine 1.3.29.
svn path=/nixpkgs/trunk/; revision=29617
2011-10-03 20:42:45 +00:00
Yury G. Kudryashov d0654efc84 ghostscript: build with libpng-1.5
svn path=/nixpkgs/branches/libpng15/; revision=29599
2011-10-03 15:30:10 +00:00
Peter Simons 0be69080e8 pkgs/misc/cups/drivers/splix: added myself as a maintainer
svn path=/nixpkgs/trunk/; revision=29400
2011-09-20 20:25:26 +00:00
Alexander Tsamutali f7567f8717 misc/screensavers/slock: New nixpkg.
svn path=/nixpkgs/trunk/; revision=29326
2011-09-17 17:40:07 +00:00
Russell O'Connor eaa3e31695 Reverting CUPS update.
svn path=/nixpkgs/trunk/; revision=29282
2011-09-14 17:57:49 +00:00
Russell O'Connor 15293fa398 Upgrading cups to 1.5.0
(this fixes http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634325)


svn path=/nixpkgs/trunk/; revision=29237
2011-09-13 13:57:46 +00:00
Michael Raskin f00f3ef88d Fix disser build
svn path=/nixpkgs/trunk/; revision=29230
2011-09-12 20:50:07 +00:00
Michael Raskin ce77d02c9e Update Wine
svn path=/nixpkgs/trunk/; revision=28844
2011-08-27 07:22:17 +00:00
Lluís Batlle i Rossell b58016b007 Updating the nongnu ghostscript
svn path=/nixpkgs/trunk/; revision=28790
2011-08-24 15:44:54 +00:00
Yury G. Kudryashov 385ae7d2c4 Let cups-pdf-filter use cups.src
svn path=/nixpkgs/trunk/; revision=28652
2011-08-18 12:52:22 +00:00
Peter Simons 01d9831f4b pkgs/misc/misc.nix: removed the warning I added earlier
What I did was to add two versions of the same package into the same
collection, i.e. ghc-7.0.4 and ghc-7.2.1. I was surprised to see the
build succeed, because there are file collisions between these two. So I
(wrongly) assumed that the collection function was to blame, but in fact
this is a "feature" of nix-env. Apparently, file collision detection
doesn't take place when the user installs two versions of the same
package simultaneously. File collisions are detected only between
different packages!

For example, the command

  nix-env -i ghc-7.0.4 ghc-7.2.1-wrapper

is going to fail, but

  nix-env -i ghc-7.0.4-wrapper ghc-7.2.1-wrapper

is going to succeed. Maybe I just didn't read the documentation
thoroughly enough, but this behavior sure is unexpected to me.

svn path=/nixpkgs/trunk/; revision=28638
2011-08-16 23:42:29 +00:00
Peter Simons 1e7f572683 pkgs/misc/misc.nix: document the fact that 'collection' does not detect file collisions
svn path=/nixpkgs/trunk/; revision=28610
2011-08-16 13:03:46 +00:00
Shea Levy 3afb3eba27 busybox: Bump to 1.19.0
svn path=/nixpkgs/trunk/; revision=28548
2011-08-13 20:41:49 +00:00
Shea Levy 03b53d595d busybox: Move $out/usr/{s,}bin to $out/{s,}bin
svn path=/nixpkgs/trunk/; revision=28547
2011-08-13 20:41:40 +00:00
Eelco Dolstra ae6fa8071f * Wine updated to 1.3.26.
svn path=/nixpkgs/trunk/; revision=28209
2011-08-06 23:26:38 +00:00
Cillian de Roiste a751ada1ce Updating oxygen-gtk to 1.1.1
svn path=/nixpkgs/trunk/; revision=28191
2011-08-06 10:33:52 +00:00
Eelco Dolstra fcce78c0f4 * Sync with the trunk.
svn path=/nixpkgs/branches/kde-4.7/; revision=28144
2011-08-03 22:00:49 +00:00
Michael Raskin 6e2572440a Update Wine
svn path=/nixpkgs/trunk/; revision=28126
2011-08-02 18:58:42 +00:00
Eelco Dolstra 1b427fe052 * Sync with the trunc.
* Fixed the hash in PulseAudio: I updated the name/version, but forgot
  to update the hash.  So secretly it was still building the old
  version.  Also, now that we've realised that the PulseAudio server
  and library don't need to be the same build, disable some
  dependencies by default (avahi and bluez).

svn path=/nixpkgs/branches/kde-4.7/; revision=28023
2011-07-31 19:44:58 +00:00
Sander van der Burg 14be409d8f Removed hardcoded paths to /bin and /usr/bin
svn path=/nixpkgs/trunk/; revision=27906
2011-07-22 20:09:00 +00:00
Sander van der Burg f635aceb5b Updated some meta information for the emulators I've tried recently. They all seem to work fine :-)
svn path=/nixpkgs/trunk/; revision=27905
2011-07-22 19:25:31 +00:00
Sander van der Burg 6ac699ba97 Added VisualBoy advance; a gameboy/gameboy color/gameboy advance emulator
svn path=/nixpkgs/trunk/; revision=27904
2011-07-22 18:31:42 +00:00
Sander van der Burg cb8409612c Added Mupen64 Plus, a nintendo 64 emulator
svn path=/nixpkgs/trunk/; revision=27902
2011-07-22 14:03:23 +00:00
Eelco Dolstra f4ac1126ff * Sync with the trunk.
svn path=/nixpkgs/branches/kde-4.7/; revision=27796
2011-07-15 10:02:22 +00:00
Peter Simons aa8cea3e4d moderncv: updated description
svn path=/nixpkgs/trunk/; revision=27766
2011-07-13 16:49:33 +00:00
Peter Simons db9fc16b70 moderncv: cleanup the build instructions
Just add this package to texLiveAggregationFun to install it.

svn path=/nixpkgs/trunk/; revision=27765
2011-07-13 16:23:48 +00:00
Peter Simons a16e01fe19 Added moderncv package to texlive.
svn path=/nixpkgs/trunk/; revision=27762
2011-07-13 15:00:59 +00:00
Peter Simons 758e85cfac texlive: fixed erroneous forwarder scripts
- Generate a forwarder scripts only for executable files. This change
   removes the broken 'man' script, for example.

 - Run the real binaries with 'exec'.

 - Use $SHELL to interpret the forwarder scripts rather than /bin/sh.

 - Indent consistently with blanks.

 - Removed some debug output from the build expression.

svn path=/nixpkgs/trunk/; revision=27679
2011-07-08 22:45:23 +00:00
Eelco Dolstra 5caed864e5 * CUPS updated to 1.4.7.
svn path=/nixpkgs/branches/kde-4.7/; revision=27620
2011-07-07 13:11:51 +00:00
Sander van der Burg b2548922bf Added UAE: Ultimate Amiga Emulator
svn path=/nixpkgs/trunk/; revision=27541
2011-06-26 19:49:51 +00:00
Sander van der Burg e4126afa44 Added ZSNES emulator package
svn path=/nixpkgs/trunk/; revision=27539
2011-06-25 22:25:50 +00:00
Eelco Dolstra 614e5a525c * Clean up foomatic-filters.
svn path=/nixpkgs/trunk/; revision=27470
2011-06-15 12:40:58 +00:00
Michael Raskin db4fdfec67 Update Wine
svn path=/nixpkgs/trunk/; revision=27416
2011-06-11 07:26:37 +00:00
Lluís Batlle i Rossell c6d377eadf Adding mainline ghostscript as an option.
svn path=/nixpkgs/trunk/; revision=27297
2011-05-24 15:35:38 +00:00
Rob Vermaas 77db753065 update maven3
svn path=/nixpkgs/trunk/; revision=27233
2011-05-12 08:39:09 +00:00
Cillian de Roiste 3fb9e2214b Replacing JACK1 with JACK2 (also jackdbus instead of jackd), this works much better for me
svn path=/nixpkgs/trunk/; revision=27205
2011-05-09 20:49:51 +00:00
Shea Levy 5acb2cbb1e Fix typo in pkgs/misc/misc.nix
svn path=/nixpkgs/trunk/; revision=27152
2011-05-04 18:55:22 +00:00
Michael Raskin 9926941bf2 Fixing forgotten hash for Wine update
svn path=/nixpkgs/trunk/; revision=27065
2011-04-30 19:42:48 +00:00
Michael Raskin bb809bb2c3 Update Wine
svn path=/nixpkgs/trunk/; revision=27063
2011-04-30 16:32:53 +00:00
Cillian de Roiste 59f16bc779 Fixing the url for jack
svn path=/nixpkgs/trunk/; revision=26934
2011-04-23 13:16:33 +00:00
Cillian de Roiste 55bbbbaf84 Updating jack to version 0.120.1 (some newer applications e.g. Yoshimi require a more recent version)
svn path=/nixpkgs/trunk/; revision=26932
2011-04-23 12:50:03 +00:00
Nicolas Pierron f40afa1ade tex4ht: Fix package location.
svn path=/nixpkgs/trunk/; revision=26863
2011-04-17 08:27:16 +00:00
Nicolas Pierron 0069aa0637 texlive Aggregate:
- Add bouncer to binaries stored in /bin directory.
- Avoid manipulation of patterns as a match.

svn path=/nixpkgs/trunk/; revision=26862
2011-04-17 08:27:09 +00:00
Lluís Batlle i Rossell a602209a6b Fixing the name of darcnes.
svn path=/nixpkgs/trunk/; revision=26552
2011-03-27 20:14:42 +00:00
Lluís Batlle i Rossell bd3f5e7340 Adding a key 'exit 0' to myenv. Otherwise it fails to build if pkgconfig is one of the build inputs.
svn path=/nixpkgs/trunk/; revision=26547
2011-03-27 14:08:13 +00:00
Eelco Dolstra 20912b654b * runLaTeX: detect the existence of a pre-generated .bbl file and use
it.  Useful if you're supposed to stick a \balancecolumns in the
  middle of the file.

svn path=/nixpkgs/trunk/; revision=26522
2011-03-26 00:14:28 +00:00
Lluís Batlle i Rossell ef57b57b92 Adding two NES emulators.
Because of them, I made allegro build the allegrogl library.
I also added the HawkNL library.


svn path=/nixpkgs/trunk/; revision=26517
2011-03-25 22:15:48 +00:00
Yury G. Kudryashov ba3c547f6d Fixing hardcoded paths in foo2zjs. Still no firmware
svn path=/nixpkgs/trunk/; revision=26332
2011-03-15 23:08:59 +00:00
Eelco Dolstra 37a95e0084 * Fix the gens-gs build (http://hydra.nixos.org/build/955354).
svn path=/nixpkgs/branches/x-updates/; revision=26297
2011-03-14 10:54:10 +00:00
Eelco Dolstra f16a2dc2f6 * Sync with the trunk. Remove glib_2_28 because the branch already
has it.

svn path=/nixpkgs/branches/x-updates/; revision=26189
2011-03-07 12:17:12 +00:00
Yury G. Kudryashov da4447afd7 foo2zjs: less hardcoded paths
svn path=/nixpkgs/trunk/; revision=26179
2011-03-06 16:07:53 +00:00
Yury G. Kudryashov 513ee9fc4f hplip-3.11.1, enable polkit support
svn path=/nixpkgs/trunk/; revision=26178
2011-03-06 16:07:47 +00:00
Yury G. Kudryashov d1d9da2ff3 Trying to fix foo2zjs
There are still some hardcoded paths

svn path=/nixpkgs/trunk/; revision=26177
2011-03-06 16:07:43 +00:00
Eelco Dolstra d6c6f9f0e0 * Sync with the trunk.
svn path=/nixpkgs/branches/x-updates/; revision=26018
2011-02-17 16:33:39 +00:00
Cillian de Roiste da00930257 Adding version, fixing the mirror path and the license and adding myself as maintainer
svn path=/nixpkgs/trunk/; revision=26005
2011-02-16 23:52:14 +00:00
Cillian de Roiste e80dc8eb7f Applying a patch for pstoraster, without this the cups test page was printing solid black, as described in the bug report: http://bugs.ghostscript.com/show_bug.cgi?id=691108 The patch was kindly taken from https://bugs.archlinux.org/task/18339
svn path=/nixpkgs/trunk/; revision=26003
2011-02-16 23:34:19 +00:00
Eelco Dolstra a08d99715d * Sync with the trunk.
svn path=/nixpkgs/branches/x-updates/; revision=25900
2011-02-11 13:08:45 +00:00
Cillian de Roiste 42f818969d Bumping to version 5.2.6 and fixing the url
svn path=/nixpkgs/trunk/; revision=25858
2011-02-09 20:34:52 +00:00
Eelco Dolstra b8e7238254 * CUPS updated to 1.4.6.
svn path=/nixpkgs/branches/x-updates/; revision=25823
2011-02-09 10:45:45 +00:00
Michael Raskin c6ee103fc3 Update paths - does not fix all the problems, apparently
svn path=/nixpkgs/trunk/; revision=25714
2011-01-28 10:22:30 +00:00
Michael Raskin 2990b8fb5a Install PPD files, too
svn path=/nixpkgs/trunk/; revision=25713
2011-01-28 09:06:21 +00:00
Michael Raskin 1cd5efa338 Trying to add foomatic-filters and foo2zjs
svn path=/nixpkgs/trunk/; revision=25712
2011-01-28 08:44:31 +00:00
Peter Simons edfedf6736 pkgs/misc/emulators/wine: enable Hydra builds on x86_64-linux
Wine is supposed to compile on both 32 and 64-bit Linux. When I try to build
it in a 64 bit environment, however, the build fails while compiling libgmp,
saying that the C compiler in bootstrap-tools doesn't support C++. I'm not
sure why that happens. Hopefully, the builds in Hydra give me some clue
about this phenomenon.

svn path=/nixpkgs/trunk/; revision=25693
2011-01-26 15:39:40 +00:00
Cillian de Roiste 5f3455dde5 Adding the Oxygen-GTK theme
svn path=/nixpkgs/trunk/; revision=25676
2011-01-23 21:04:12 +00:00
Michael Raskin c54320c307 Adding Rosegarden music editor; builds succesfully, starts, but frequently segfaults. I temporarily give up
svn path=/nixpkgs/trunk/; revision=25527
2011-01-12 19:01:26 +00:00
Michael Raskin c05a95f8f6 Update Lilypond - this also fixes its build
svn path=/nixpkgs/trunk/; revision=25525
2011-01-12 18:19:43 +00:00
Yury G. Kudryashov 35fe5dadb1 splix-2.0.0: fix compilation with gcc-4.5
svn path=/nixpkgs/branches/stdenv-updates/; revision=25312
2010-12-28 18:47: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
Karn Kallio 4bbb72da2f Add tex macro lkproof for making proof figures.
svn path=/nixpkgs/trunk/; revision=25277
2010-12-25 18:06:36 +00:00
Lluís Batlle i Rossell b48b2a7bb4 Merging from trunk. I solved some trivial merge conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25188
2010-12-17 20:39:58 +00:00
Yury G. Kudryashov d1781e4b41 Add pdftops CUPS filter
I've packaged this as a separate expression because it depends on poppler (why
don't they look for pdftops on runtime?..).

svn path=/nixpkgs/trunk/; revision=25124
2010-12-14 13:30:17 +00:00