summary refs log tree commit diff
path: root/pkgs/misc
Commit message (Collapse)AuthorAge
...
* | Update WineMichael Raskin2013-06-07
| |
* | ReRevert Merge x-updates into masterVladimír Čunát2013-05-29
|/ | | | | | | | | This reverts commit ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde. Conflicts (taken x-updates): pkgs/development/libraries/libgcrypt/default.nix pkgs/development/libraries/libgpg-error/default.nix pkgs/development/libraries/poppler/default.nix
* lilypond: Update to 2.16.2, fix guile.Petr Rockai2013-05-18
|
* Fixing 'my-env', when without cleanup.Lluís Batlle i Rossell2013-05-14
|
* Revert Merge x-updates into master due to mesa bloatVladimír Čunát2013-05-09
| | | | | | | | | | | See #490 discussion. This reverts commit 1278859d3167b9f84bfab680d9c8c463adf64a60, reversing changes made to 0c020c98f9d4f49d5c9907db5f4b35aac7df959b. Conflicts: pkgs/desktops/xfce/core/xfce4-session.nix (take master) pkgs/lib/misc.nix (auto)
* add versionedDerivationMarc Weber2013-05-08
|
* Merge branch 'master' into x-updatesVladimír Čunát2013-05-08
|\ | | | | | | | | Conflicts (just splitting version from name): pkgs/os-specific/linux/systemd/default.nix
| * Updates: Wine, SBCL, XBoardMichael Raskin2013-05-08
| |
| * Merge pull request #464 from the-kenny/my-env-exit-commandsPhreedom2013-05-05
| |\ | | | | | | Add cleanupCmds option to pkgs.myEnvFun. The downside is that /bin/sh remains in memory to be able to execute cleanup commands.
| | * Add cleanupCmds option to pkgs.myEnvFunMoritz Ulrich2013-04-13
| | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge branch 'master' into x-updatesVladimír Čunát2013-04-24
|\| | | | | | | | | | | | | | Conflicts (just taken x-updates): pkgs/servers/x11/xorg/overrides.nix
| * | Merge branch of 'hatari'Lluís Batlle i Rossell2013-04-23
| |\ \
| | * | hatari: fix pthread_cancel+gcc_s thing, and some spacingLluís Batlle i Rossell2013-04-23
| | | |
| | * | Add hatari Atari St emulator.Jordi2013-04-22
| | |/
| * / Auto-update some packages; no early build failures (SBCL and Wine not yet ↵Michael Raskin2013-04-23
| |/ | | | | | | fully built)
* | cups: fix reference to dbus.libsVladimír Čunát2013-04-11
| |
* | Merge branch 'master' into x-updatesVladimír Čunát2013-04-04
|\| | | | | | | | | | | | | | | | | 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
| * Add sha256 hash to winetricks.Moritz Ulrich2013-03-30
| | | | | | | | Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
| * Adding back the 1.5 expression of mupen64plusLluís Batlle i Rossell2013-03-28
| | | | | | | | It has a GUI, for example.
| * Updating mupen64plus, and adding a GUI for it.Lluís Batlle i Rossell2013-03-28
| | | | | | | | | | I can't say the GUI works very well... it doesn't find the core properly, but I couldn't find why.
* | Merge pull request #411 from ocharles/gnome-themes-standardVladimír Čunát2013-04-03
|\ \ | | | | | | gnome-themes-standard: Initial expression
| * | gnome-themes-standard: Initial expressionOliver Charles2013-03-25
| | |
* | | Fix Wine libDRM referenceMichael Raskin2013-03-29
|/ /
* | Merge branch 'master' into x-updatesVladimír Čunát2013-03-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge remote-tracking branch 'origin/master' into stdenv-updatesEelco Dolstra2013-03-07
| |\
| | * Wine: update to 1.5.25Michael Raskin2013-03-07
| | |
| * | Merge branch 'master' into stdenv-updates.Peter Simons2013-02-25
| |\|
| | * Merge pull request #333 from bjornfor/fix-typoviric2013-02-24
| | |\ | | | | | | | | my-env/default.nix: fix "sdl-env" vs "env-sdl" typo
| | | * my-env/default.nix: fix "sdl-env" vs "env-sdl" typoBjørn Forsman2013-02-24
| | | | | | | | | | | | | | | | | | | | | | | | 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".
| * | | Merge remote-tracking branch 'origin/master' into stdenv-updates.Peter Simons2013-02-24
| |\| |
| | * | oxygen-gtk: upgrade gtk2 version to 1.3.2.1Cillian de Róiste2013-02-24
| | |/
* | | Merge branch stdenv-updates into x-updatesVladimír Čunát2013-02-21
|\| | | | | | | | | | | | | | | | | | | | | | | 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)
| * | Merge remote-tracking branch 'origin/master' into stdenv-updatesEelco Dolstra2013-02-15
| |\|
| * | Merge remote-tracking branch 'origin/master' into stdenv-updatesEelco Dolstra2013-01-17
| |\ \
| * \ \ Merge branch 'master' into stdenv-updates.Peter Simons2013-01-11
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'eelco/master' into stdenv-updatesLluís Batlle i Rossell2012-12-28
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pkgs/development/compilers/gcc/4.7/default.nix Trivial solution.
| * | | | | Remove unnecessary parentheses around if conditionsEelco Dolstra2012-12-28
| | | | | | | | | | | | | | | | | | | | | | | | Pet peeve...
| * | | | | Rename buildNativeInputs -> nativeBuildInputsEelco Dolstra2012-12-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Likewise for propagatedBuildNativeInputs, etc. "buildNativeInputs" sounds like an imperative rather than a noun phrase.
* | | | | | Merge remote-tracking branch 'central/master' into x-updatesLluís Batlle i Rossell2013-02-18
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | add winetricks, modified by vcunat@gmail.comCorey O'Connor2013-02-10
| | | | | | | | | | | | | | | | | | | | | | | | Originally from #89.
| * | | | | hplip: make pyqt4 dependency conditional on qtSupportAristid Breitkreuz2013-02-08
| | | | | |
| * | | | | enable networking support for hplip, net_snmp is available nowAristid Breitkreuz2013-02-06
| | | | | |
| * | | | | hplip: now hp-setup actually shows a dialogAristid Breitkreuz2013-02-06
| | | | | |
| * | | | | hplip: start work on making python programs workAristid Breitkreuz2013-02-06
| | | | | |
| * | | | | jackaudio/default.nix: Update to 1.9.9.5.Александр Цамутали2013-02-03
| | | | | |
* | | | | | Merge branch 'master' into x-updatesVladimír Čunát2013-02-02
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts (both messed with mesa): pkgs/top-level/all-packages.nix
| * | | | | wine: update to 1.5.23, update geckoVladimír Čunát2013-02-02
| | | | | |
| * | | | | cups: Don't build on DarwinEelco Dolstra2013-01-29
| | | | | |
* | | | | | ghostscript: fix infinite recursion in meta (sorry for that)Vladimír Čunát2013-01-31
| | | | | |
* | | | | | ghostscript: minor update, replace more internal libraries by nix onesVladimír Čunát2013-01-29
| | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-21 03:17:11 +0000