philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

678 commits

Author SHA1 Message Date
Peter Simons 47e93cd27e rcs: update to version 5.8.2 
It's profoundly satisfying to know that we have the very latest version of RCS.
RCS users, you see, live on the bleeding edge.
 2013-04-05 08:56:40 +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
Bjørn Forsman e21c53c211 tig: enable bash completion 
Copy the bash completion script that comes with tig to
$out/etc/bash_completion.d/.

Note: to enable bash completion in NixOS, set
environment.enableBashCompletion = true;
 2013-04-01 18:37:52 +02:00
Peter Simons ab98d72fad git: fix build on FreeBSD 
Our hard-linking code depended on md5sum, which FreeBSD doesn't have in its
system environment. To avoid that impure dependency, the hard-linking is now
done with the 'hardlink' utility from Nixpkgs.
 2013-03-25 12:47:39 +01:00
Peter Simons 73c610e1d6 git: update to version 1.8.2 2013-03-22 02:11:38 +01:00
Peter Simons d28d3f37a8 topgit: fix build on FreeBSD 
The BSD unices have a version of install(1) that doesn't support the -D flag. Grr.
 2013-03-20 11:43:43 +01:00
Peter Simons 51e64392ea git-annex: update to version 4.20130314 2013-03-20 10:15:06 +01:00
Peter Simons a1a7448e5b topgit: update to version 0.9 2013-03-20 09:50:06 +01:00
Vladimír Čunát b1eeae8cac Merge branch 'master' into x-updates 
Conflicts (easy):
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/pango/default.nix
 2013-03-17 11:28:28 +01:00
Sander van der Burg 23c78e41db git: Adding -lgcc_s on darwin causes the build to fail, so we disable it for that platform 2013-03-14 14:57:40 +01:00
Peter Simons 4c9ebb62d4 git: link binaries with libgcc_s.so to ensure pthread_cancel() works 2013-03-09 23:57:57 +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
Peter Simons 4f697db7dd haskell-github-backup: update to version 1.20120314 2013-03-02 17:07:43 +01:00
Vladimír Čunát 26af997d41 Merge branch 'master' into stdenv-updates 
Conflicts (simple):
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/development/libraries/libsoup/default.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
	pkgs/os-specific/linux/qemu-kvm/default.nix
 2013-03-02 10:41:53 +01:00
Peter Simons 329b33c59c git-annex: clean up build expression 2013-02-28 13:04:15 +01:00
Peter Simons e23be1b2ef git-annex: update to version 4.20130227 2013-02-28 11:31:44 +01:00
Peter Simons 80dc8df25d haskell-github-backup: update to version 1.20120314 2013-02-27 12:00:52 +01:00
Peter Simons 8f1c029e33 haskell-github-backup: add version 1.20120627 2013-02-25 15:25:54 +01:00
Peter Simons 8f1756e2d4 git: update to version 1.8.1.3 2013-02-25 02:12:42 +01:00
Peter Simons 1420012eca darcs: disable test suite to avoid 127 exit code 2013-02-25 00:37:11 +01:00
Peter Simons dd9ff9adb7 darcs: disable test suite to avoid 127 exit code 2013-02-25 00:03:34 +01:00
Peter Simons 5f32207dfc Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-24 19:27:08 +01:00
Vladimír Čunát 37bae3193d monotone: fix 2013-02-24 00:31:20 +01:00
Peter Simons eb5ebb6063 network-protocol-xmpp: fix spelling of the attribute name 2013-02-22 16:14:27 +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
Peter Simons 9e68734d61 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-18 11:54:56 +01:00
Peter Simons b076ab94d6 git-annex: update to version 3.20130216 2013-02-18 11:20:46 +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 684f215b4f fix the problem of missing expat in a few packages 2013-02-11 18:34:40 +01:00
Peter Simons 2191cbb0a1 haskell-darcs: update to version 2.8.4 2013-02-09 18:24:50 +01:00
Lluís Batlle i Rossell 7bfd3fd5c8 git: adding an option not to build the manual 
asciidoc+xsltproc take hours to run
 2013-01-29 20:17:34 +01:00
Lluís Batlle i Rossell 8a9ba8c382 git: adding an option not to build the manual 
asciidoc+xsltproc take hours to run
 2013-01-28 21:24:52 +01:00
Eelco Dolstra b0cb17257b rcs: Update to 5.8.1 and fix build 
http://hydra.nixos.org/build/3895835
 2013-01-28 17:19:02 +01:00
Eelco Dolstra 5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
Eelco Dolstra 4c9cfd87aa bazaar: Update to 2.5.1 2013-01-15 18:53:12 +01:00
Eelco Dolstra 58e9406f4b subversion: Update to 1.7.8 2013-01-14 14:38:23 +01:00
Peter Simons b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00
Peter Simons 490085a811 git-annex: update to version 3.20130107 2013-01-09 16:54:31 +01:00
Peter Simons 9e9cd7b529 Merge branch 'master' into stdenv-updates. 2013-01-04 21:00:53 +01:00
Peter Simons 70b6b15215 git-annex: update to version 3.20130102 2013-01-04 19:24:09 +01:00
Peter Simons cb329d1cd2 git: update to version 1.8.1 2013-01-04 19:24:04 +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
Peter Simons 918b26a59e git-annex: update to version 3.20121211 2012-12-15 11:44:13 +01:00
aszlig f1c80cf20c
git-and-tools/hub: New package, version 1.10.3. 
This is a small wrapper of Git, which integrates some GitHub specific features,
especially stuff like merging or sending pull requests or attaching commits to
an issue.

I'm not quite familiar with the Nix integration of Ruby, so let's hope that I'm
not doing something horrible here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2012-12-12 12:36:18 +01:00
cillianderoiste 5b0cd954f1 Merge pull request #206 from chaoflow/python-merge 
python pureness, cleanup, and enable pth loaders (setuptoolsSite, recursivePthLoader)
 2012-12-05 14:28:09 -08:00
Michael Raskin 56f1c1ec24 Update veracity 2012-12-04 10:12:38 +04:00
Peter Simons 3261d1d4aa git-annex: update to version 3.20121127 2012-12-03 16:12:04 +01:00
Florian Friesdorf 1adc9b1b1f python module cleanup, enable a couple of tests, add comments for failing 2012-12-03 06:38:11 +01:00
Florian Friesdorf 5436356733 a package does not need to include setuptools manually 
this breaks for now
 2012-12-03 04:40:38 +01:00
Florian Friesdorf 3438681d80 Merge branch 'channel-nixos' into python-merge 2012-11-29 21:40:33 +01:00
Florian Friesdorf 471a4b583f Merge branch 'channel-nixos' into python-merge 2012-11-29 15:36:17 +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 8effc542b4 git-annex: update to 3.20121126 2012-11-27 13:46:27 +01:00
Peter Simons 62f8d24e56 git: update to 1.8.0.1 2012-11-27 13:46:12 +01:00
Florian Friesdorf 9208fb1edb fix mercurial -extra PYTHONPATH +setuptools 
- PYTHONPATH is already set correctly
- setuptools is needed to see docutils
 2012-11-24 23:24:34 +01:00
Eelco Dolstra 2da2e5137f subversion: Update to 1.7.7 2012-11-22 16:56:03 +01:00
Peter Simons 03abf1abbc git-annex: switch build to GHC 7.4.2 2012-11-21 17:40:56 +01:00
Peter Simons 9ada368ef8 git-annex: update to version 3.20121112-161-gb27d9eb to fix build errors with current version of yesod 2012-11-21 12:30:54 +01:00
Rok Garbas d999c3f6ec tig: typo 2012-11-17 02:20:07 +01:00
Rok Garbas a64b34a43e tig: update to 1.1 2012-11-17 02:13:25 +01:00
Peter Simons 84c6f6f88e git-annex: update to version 3.20121112 2012-11-15 12:50:17 +01:00
Michael Raskin 48ad0f7443 Update Fossil to a still present version 2012-11-08 23:15:33 +04:00
Peter Simons 4ab06e5c24 Fix git-annex build. 
git-annex depends on 'testpack', which doesn't compile with Haskell
Platform 2012.4.0.0. The testpack library appears to be unmaintained, so
there is probably no quick solution for this issue. For the time being,
we compile git-annex with GHC 7.4.1.
 2012-11-06 18:34:54 +01:00
Peter Simons 321ee97b4c haskell-darcs: update to version 2.8.3 2012-11-05 16:25:26 +01:00
Paolo Capriotti 6ac427d391 Update git-annex to 3.20121017 2012-11-05 13:59:08 +00:00
David Guibert b963624867 update git to 1.8.0 2012-10-24 16:33:42 +02:00
Peter Simons 58f3e47166 git: update to version 1.7.12.4 2012-10-19 10:08:07 +02:00
Peter Simons c90a15a604 git-annex: update to version 3.20121010 2012-10-15 20:17:33 +02:00
Eelco Dolstra 7dd3236c81 git: Update to 1.7.12.2 2012-10-02 12:34:38 -04:00
Peter Simons b5416d6ed6 darcs: install bash completion instructions 2012-09-25 15:15:38 +02:00
Peter Simons 625e2e45f7 git: update to version 1.7.12.1 2012-09-24 13:28:31 +02:00
aszlig 9ff9d85ef6
darcs-to-git: Remove propagatedBuildInputs. 
I missed this while checking the commit diffs before my last push. And it really
doesn't make sense to propagate ruby all the way up to whatever in the universe
may depend on this package.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2012-09-17 06:35:49 +02:00
aszlig 98b7228c06
darcs-to-git: New package from upstream Git. 
This consists of just one single ruby script, which runs shell commands assuming
that the current PATH has all dependencies set up correctly. Unfortunately, this
somewhat breaks functional purity as the command won't work correctly in
environments that do not contain git, darcs or diffutils.

During the patchPhase we replace all those dependencies directly in the ruby
source code, rather than creating a wrapper. Afterwards we run a checkPhase
which not only checks whether we caught all the dependencies (PATH=) but also
checks if the conversion has been done correctly.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2012-09-17 06:08:04 +02:00
Peter Simons ac751dc753 haskell-darcs: update to version 2.8.2 2012-09-10 15:08:21 +02:00
Peter Simons 14da2bf31b git: update to version 1.7.12 2012-09-06 18:13:45 +02:00
Peter Simons 33bf9644cf git-annex: update to version 3.20120825 2012-09-06 18:13:44 +02:00
Yury G. Kudryashov c2ad9f873d mr-1.13, more verbose install 2012-08-31 12:07:22 +04:00
Antono Vasiljev 61f7853e43 Merge pull request #92 from dmalikov/b125ef36b67f2a0aedabc34eb4dac12e61ae9828 
gitAndTools: bump tig from 0.16 to 1.0
 2012-08-16 06:03:54 -07:00
Michael Raskin 938d86b16b Veracity: update to version 2.0 
Still no permission support or commit signing, though.
 2012-08-09 11:05:43 +04:00
Dmitry Malikov b125ef36b6 Bump gitAndTools/tig from 0.16 to 1.0 2012-08-08 00:51:25 +02:00
Eelco Dolstra f901b6d38d git: Update to 1.7.11.4 2012-08-06 15:27:28 -04:00
Eelco Dolstra bd8d7a8d15 Add some packages to the channel 2012-07-31 19:26:35 -04:00
Shea Levy c3c68b6510 Mercurial: Install hgweb.wsgi as well 2012-07-28 20:25:41 -04:00
Shea Levy deb09fd9de Mercurial: Bump 2012-07-27 19:44:01 -04:00
Antono Vasiljev 631a59e449 Added mr - Multiple Repository management tool 2012-07-07 17:12:18 +02:00
David Guibert 3b0d9374a4 git-annex: update to 3.20120629 2012-06-29 21:09:52 +02:00
David Guibert a97e27fc82 git-annex: update to 3.20120624 2012-06-29 21:09:52 +02:00
Eelco Dolstra 94812c9dd3 git: Fix the "notSupported" scripts for "git send-email" and "git gui" 2012-06-21 15:25:02 -04:00
Eelco Dolstra 9365981409 git: Updated to 1.7.11 2012-06-21 15:23:29 -04:00
Peter Simons a3224ededc git-and-tools: fixed build in the presence of QuickCheck 2.5 
svn path=/nixpkgs/trunk/; revision=34553
 2012-06-18 18:16:23 +00:00
Peter Simons 2a60c221d1 git-annex: updated to version 3.20120614 
svn path=/nixpkgs/trunk/; revision=34518
 2012-06-15 15:33:47 +00:00
Peter Simons 330ea0887f git-annex: added openssh to build inputs so that the configure phase enables support for SSH connection caching 
svn path=/nixpkgs/trunk/; revision=34386
 2012-06-08 14:02:28 +00:00
Peter Simons 87d25896c1 git-annex: updated to version 3.20120605 
svn path=/nixpkgs/trunk/; revision=34385
 2012-06-08 14:02:21 +00:00
Eelco Dolstra 104bd01e1d * Git 1.7.10.4. 
svn path=/nixpkgs/trunk/; revision=34349
 2012-06-04 15:54:57 +00:00
Eelco Dolstra ce10ebebac * Subversion 1.7.5. 
svn path=/nixpkgs/trunk/; revision=34348
 2012-06-04 15:40:25 +00:00
Peter Simons ac64ba04bd git-annex: updated to version 3.20120522 
svn path=/nixpkgs/trunk/; revision=34213
 2012-05-22 19:46:37 +00:00
Eelco Dolstra 5e7f049fc9 * svn2git-kde 1.0.5. 
svn path=/nixpkgs/trunk/; revision=34169
 2012-05-18 15:01:54 +00:00