Commit graph

395 commits

Author SHA1 Message Date
Peter Simons
c86a90c4e9 Updating Haskell packages.
- Agda-executable: updated to version 2.3.0.1
 - Agda: updated to version 2.3.0.1
 - gio: added version 0.12.3
 - hamlet: updated to version 0.10.9.1
 - leksah-server: updated to version 0.12.0.4
 - leksah: updated to version 0.12.0.3
 - ltk: updated to version 0.12.0.0
 - packages.nix: cosmetic change
 - pandoc: updated to version 1.9.1.2
 - polyparse: added version 1.8
 - shakespeare-css: updated to version 0.10.8
 - shakespeare-i18n: updated to version 0.0.2.1
 - shakespeare-js: updated to version 0.11.2
 - shakespeare-text: updated to version 0.11
 - shakespeare: updated to version 0.11
 - tls: updated to version 0.9.1
 - unordered-containers: updated to version 0.2.0.1
 - uuagc: updated to version 0.9.40.3
 - yesod-core: updated to version 0.10.2.2
 - yesod-form: updated to version 0.4.2.1
 - yesod: updated to version 0.10.1.4

svn path=/nixpkgs/trunk/; revision=33015
2012-03-12 14:06:18 +00:00
Florian Friesdorf
7b47dea7b0 emacs-24.0.94 (pretest)
svn path=/nixpkgs/trunk/; revision=32997
2012-03-11 20:45:49 +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
6e8c9ea906 ocaml-mode for emacs.
There seem to exist multiple (very old) versions.
I'm taking the one shipped with the ocaml compiler, which is hopefully the "most appropriate".

svn path=/nixpkgs/trunk/; revision=32688
2012-02-29 12:53:13 +00:00
Yury G. Kudryashov
e5027e5b36 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32330
2012-02-16 15:02:26 +00:00
Peter Simons
ac69747aa8 Regenerated all Haskell packages with the latest version of cabal2nix.
svn path=/nixpkgs/trunk/; revision=32292
2012-02-14 17:00:37 +00:00
Yury G. Kudryashov
5144a19987 svn merge ^/nixpkgs/trunk
There were a few merge conflicts due to ensureDir->mkdir -p migration

svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
Peter Simons
4afaf0be23 emacs-w3m: updated the SHA256 hash
Thanks Ludo!

svn path=/nixpkgs/trunk/; revision=32124
2012-02-07 17:45:47 +00:00
Florian Friesdorf
2f7102afc0 emacs 24.0.93
svn path=/nixpkgs/trunk/; revision=32123
2012-02-07 17:40:05 +00:00
Florian Friesdorf
df12f0bd01 emacs js2-mode
svn path=/nixpkgs/trunk/; revision=32122
2012-02-07 17:40:02 +00:00
Florian Friesdorf
f3b60febd3 calfw-1.3-5-ga9b6615 for fix in combination with org-mode
svn path=/nixpkgs/trunk/; revision=32119
2012-02-07 17:39:54 +00:00
Florian Friesdorf
4e3afe1b8d emacs mode calfw-1.3
svn path=/nixpkgs/trunk/; revision=32118
2012-02-07 17:39:51 +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
ace1095639 upgraded emacs-w3m
svn path=/nixpkgs/trunk/; revision=32080
2012-02-06 19:08: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
Arie Middelkoop
d6f60f7135 emacs htmlize: fix of broken source url.
svn path=/nixpkgs/trunk/; revision=31827
2012-01-24 22:06:35 +00:00
Florian Friesdorf
5c05e3f866 emacs-24 alsaLib and imagemagickBig
svn path=/nixpkgs/trunk/; revision=31788
2012-01-23 00:55:48 +00:00
Peter Simons
e926d8d9f2 emacs: updated 23.3 to 23.3b
svn path=/nixpkgs/trunk/; revision=31771
2012-01-21 18:46:37 +00:00
Peter Simons
e86daecce9 emacs: strip trailing whitespace from expression for 23.x
svn path=/nixpkgs/trunk/; revision=31770
2012-01-21 18:46:28 +00:00
Florian Friesdorf
c554168536 org-7.8.03
svn path=/nixpkgs/trunk/; revision=31765
2012-01-21 18:29:06 +00:00
Florian Friesdorf
57733bae5d remove emacsSnapshot in favour of emacs24
svn path=/nixpkgs/trunk/; revision=31764
2012-01-21 18:29:02 +00:00
Florian Friesdorf
0d2d1dd139 emacs-24.0.92
svn path=/nixpkgs/trunk/; revision=31763
2012-01-21 18:28:57 +00:00
Florian Friesdorf
aa277f7d06 emacs-23 as base for emacs-24
svn path=/nixpkgs/trunk/; revision=31762
2012-01-21 18:28:54 +00:00
Yury G. Kudryashov
84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
2012-01-19 21:31:51 +00:00
Ludovic Courtès
449c5b537d GNU Zile 2.4.3.
svn path=/nixpkgs/trunk/; revision=31664
2012-01-18 20:51:58 +00:00
Peter Simons
db009e0eb8 emacs org-mode: upgraded to latest version
svn path=/nixpkgs/trunk/; revision=31645
2012-01-18 20:32:10 +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
Eelco Dolstra
48ee2523da * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31633
2012-01-18 15:53:12 +00:00
Arie Middelkoop
b02bc1ef59 Update of the 'jedit' package.
svn path=/nixpkgs/trunk/; revision=31614
2012-01-17 22:40:05 +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
Karn Kallio
ec8e23cc97 In Emacs site-start.el check that NIX_PROFILES is set.
In the stdenv this is not set, which causes an elisp error
which in turn makes builds depending on Emacs (eg gnuplot) fail.

svn path=/nixpkgs/trunk/; revision=31261
2012-01-04 05:48:38 +00:00
Florian Friesdorf
5a78287adf added myself to maintainers
svn path=/nixpkgs/trunk/; revision=31254
2012-01-03 20:59:00 +00:00
Florian Friesdorf
f051f29fbd load-path also for emacs-22 and emacs-snapshot
svn path=/nixpkgs/trunk/; revision=31253
2012-01-03 20:58:57 +00:00
Florian Friesdorf
195ff32a63 set emacs load-path according to NIX_PROFILES via site-start.el
svn path=/nixpkgs/trunk/; revision=31252
2012-01-03 20:58:54 +00:00
Yury G. Kudryashov
08761e83fc Merge trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31207
2012-01-02 14:12:40 +00:00
Peter Simons
1d7bc50e9a emacs-modes/magit: updated to 1.1.0.0
svn path=/nixpkgs/trunk/; revision=31106
2011-12-26 20:24:59 +00:00
Yury G. Kudryashov
b077940b3b svn merge https://nixos.org/repos/nix/nixpkgs/trunk
No conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=30916
2011-12-15 19:16:38 +00:00
Karn Kallio
135fe9059f ProofGeneral 4.1
svn path=/nixpkgs/trunk/; revision=30863
2011-12-13 01:13:46 +00:00
Eelco Dolstra
39c8bfdcc4 * New version of ‘ed’. W00t!
svn path=/nixpkgs/branches/stdenv-updates/; revision=30862
2011-12-12 23:44:49 +00:00
Ludovic Courtès
db1b4e2edc GNU Zile: Fix cross-compilation.
svn path=/nixpkgs/trunk/; revision=30414
2011-11-13 21:28:29 +00:00
Ludovic Courtès
e26fc2311a GNU Zile 2.4.2.
svn path=/nixpkgs/trunk/; revision=30110
2011-10-30 00:00:25 +00:00
Yury G. Kudryashov
c35c6ec9fa Drop 'gnomevfs = gnome_vfs;' alias
s/gnomevfs/gnome_vfs/ in packages

svn path=/nixpkgs/trunk/; revision=29718
2011-10-08 12:06:03 +00:00
Yury G. Kudryashov
c7d6b60287 Drop kde3.kile
Use kde4.kile instead

svn path=/nixpkgs/trunk/; revision=29715
2011-10-07 20:46:29 +00:00
Yury G. Kudryashov
dd19f22e7e Add kde4.kile
svn path=/nixpkgs/trunk/; revision=29622
2011-10-04 11:12:11 +00:00
Yury G. Kudryashov
371cd8bc51 kde3: use meta.platforms
svn path=/nixpkgs/trunk/; revision=29596
2011-10-02 21:15:36 +00:00
Ludovic Courtès
2af4615ea8 GNU TeXmacs 1.0.7.11.
svn path=/nixpkgs/trunk/; revision=29012
2011-09-04 23:05:57 +00:00
David Guibert
11e9d58bcf eclipse 3.7 (java and cpp)
svn path=/nixpkgs/trunk/; revision=28619
2011-08-16 18:17:31 +00:00
Yury G. Kudryashov
31ab846d05 Upgrade kdevelop and kdevplatform
svn path=/nixpkgs/trunk/; revision=28604
2011-08-15 23:39:20 +00:00
Peter Simons
493e36669c haskell-leksah: updated build expression for recent versions of cabal.nix
svn path=/nixpkgs/trunk/; revision=28512
2011-08-12 11:02:44 +00:00
Peter Simons
d0e60c7130 leksah: disable Darwin builds
The expression needs more attention before it can be built on platforms
other than Linux:

  at `haskellPackages.leksahServer' [system = "i686-darwin"]:
  assertion failed at `/nix/store/jbcbv6lf44wiy5afsk99sv3vzd1zhg9f-nixpkgs-r28407/pkgs/os-specific/linux/kernel-headers/2.6.32.nix:3:1'

  at `haskellPackages.leksah' [system = "i686-darwin"]:
  assertion failed at `/nix/store/jbcbv6lf44wiy5afsk99sv3vzd1zhg9f-nixpkgs-r28407/pkgs/os-specific/linux/kernel-headers/2.6.32.nix:3:1'

svn path=/nixpkgs/trunk/; revision=28412
2011-08-09 07:49:41 +00:00