3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

881 commits

Author SHA1 Message Date
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