Commit Graph

2480 Commits

Author SHA1 Message Date
rushmorem
fa24a296be Add jshon package
Jshon is a JSON parser designed for maximum convenience within the
shell (http://kmkeen.com/jshon).
2015-02-20 10:10:43 +02:00
Arseniy Seroka
4c125ceddc Merge pull request #6310 from ikervagyok/usb-modeswitch
Update: usb-modeswitch 2.2.0 -> 2.2.1
2015-02-18 14:20:16 +03:00
Shea Levy
2f061ff16b Merge remote-tracking branch 'origin/staging'
Darwin and haskell fixes.
2015-02-17 13:52:37 -05:00
Rob Vermaas
8495c101dc Fixes #6374. Now for real, dohhh. 2015-02-17 13:10:13 +00:00
Rob Vermaas
1a0e6f0039 Fixes #6374. 2015-02-17 13:07:54 +00:00
Tobias Geerinckx-Rice
607cc808d8 coan: run checks 2015-02-17 05:13:40 +01:00
Lengyel Balázs
c42bcab582 Update: usb-mdeswitch 2.2.0 -> 2.2.1 2015-02-17 01:33:28 +01:00
Vincent Laporte
f31d4b6adb Adds ocaml-top
OCaml-Top is a simple cross-platform OCaml code editor built for
top-level evaluation.

Homepage: http://www.typerex.org/ocaml-top.html
2015-02-16 13:31:13 +01:00
Peter Simons
600135bba5 Merge remote-tracking branch 'master' into staging. 2015-02-13 22:17:12 +01:00
Peter Simons
54ce1a1810 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
      pkgs/development/compilers/ghc/head.nix
      pkgs/top-level/haskell-ng.nix
2015-02-13 22:13:25 +01:00
Vincent Laporte
3a17654b71 ocp-build: update source and website URLs 2015-02-12 06:59:28 +01:00
Shea Levy
127efcd6f6 Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging
Took "ours" for the conflict and changed libiconvOrEmpty to libiconv

Conflicts:
	pkgs/applications/audio/ncmpcpp/default.nix
2015-02-11 19:37:22 -05:00
Tobias Geerinckx-Rice
54397283b0 Add include-what-you-use 3.5: static C/C++ #include analyser 2015-02-11 00:14:16 +01:00
Peter Simons
7b99c149a4 Merge branch 'master' into staging. 2015-02-09 16:51:10 +01:00
Peter Simons
c0a0f90a32 gnulib: update Git repository snapshot 2015-02-09 12:58:19 +01:00
William A. Kennington III
5a1089d024 Merge pull request #6245 from edwtjo/samba-collate-urls
fetchurl: collate samba project urls into a mirror
2015-02-08 13:38:01 -08:00
Edward Tjörnhammar
33a8a51657 fetchurl: collate samba project urls into a mirror 2015-02-08 22:29:27 +01:00
Dan Peebles
f43c324cee Actually build (a newer version of) unifdef from source, so we can use it on non-linux platforms 2015-02-08 01:32:32 -05:00
Dan Peebles
e9e7bfa6ac Move and restructure objconv a bit 2015-02-08 00:15:54 -05:00
Eric Seidel
e08b9ab8d3 kill libiconvOr*
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
2015-02-07 20:29:28 -08:00
lethalman
8b236f2daf Merge pull request #6119 from lethalman/go
Go packages, buildGoPackage
2015-02-07 21:30:30 +01:00
Moritz Ulrich
1bbf15eca1 Leiningen: Fix GnuPG Support. 2015-02-07 18:45:35 +01:00
Jaka Hudoklin
4150a5eaf7 Add sauce-connect, sauce labs secure tunnel 2015-02-06 20:35:06 +01:00
Ambroz Bizjak
ec38dbe64b binutils: Move bison to nativeBuildInputs. 2015-02-05 21:26:24 +01:00
Ambroz Bizjak
d56d92ed6b bison: Update to 3.0.4. 2015-02-05 21:26:16 +01:00
Arseniy Seroka
c477e173de Merge pull request #6179 from k0ral/cppcheck
cppcheck: 1.67 -> 1.68
2015-02-05 21:58:37 +03:00
Luca Bruno
3f718a743d Add dontInstallSrc flag to buildGoPackage 2015-02-05 18:07:28 +01:00
koral
7ccede4aab cppcheck: 1.67 -> 1.68 2015-02-05 16:58:21 +01:00
Georges Dubus
a50e21dcc7 Exercism: update to 1.9.2 2015-02-05 11:54:19 +01:00
Edward Tjörnhammar
d593f9e3ef Merge pull request #6110 from edwtjo/ihaskell-ng-wrapper
ihaskell-with-packages: add environment
2015-02-04 20:43:15 +01:00
Luca Bruno
1c98fc7a9a Port go-repo-root to buildGoPackage 2015-02-04 14:00:26 +01:00
Luca Bruno
0e94ed144d Port etcdctl to buildGoPackage 2015-02-04 13:49:49 +01:00
Mike Sperber
93343fbb33 Reduce size of tradcpp derivation.
Generate configure using autoconf instead of including it in the patch.
2015-02-04 13:34:13 +01:00
Luca Bruno
9896829c49 Port gocode to buildGoPackage 2015-02-04 13:30:08 +01:00
Luca Bruno
67f34cbd0d Port gotags to buildGoPackage 2015-02-04 11:41:45 +01:00
Luca Bruno
9c6420580a Port golint to buildGoPackage 2015-02-04 11:37:17 +01:00
Mike Sperber
b611e3fb61 Add tradcpp package, needed for making imake work.
(cherry picked from commit e0c197b2f4fa53ebd7896940e6e14170664de8e7)
2015-02-04 09:29:34 +00:00
Eric Seidel
dbf3d31727 make llvm-3.5 the default and remove references to gccApple
make perl be less dumb

revert change to release.nix
2015-02-03 14:31:04 -08:00
lethalman
e1a8755b96 Merge pull request #6115 from benley/packer-0.7.5
Update Packer to 0.7.5
2015-02-03 13:28:41 +01:00
Pascal Wittmann
a1ce00d81e checkstyle: update from 6.2 to 6.3 2015-02-03 10:43:41 +01:00
Pascal Wittmann
92f1590893 help2man: update from 1.46.4 to 1.46.5 2015-02-03 10:43:41 +01:00
Benjamin Staffin
e6baec8627 Update Packer to 0.7.5
Change-Id: I7822ac036947fb933fb66730f39426e499a097f9
2015-02-02 23:55:17 -08:00
Shea Levy
c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Edward Tjörnhammar
7814b1739b ihaskell-with-packages: add environment 2015-02-02 23:00:46 +01:00
Peter Simons
87c7fb24ed Merge pull request #6027 from offlinehacker/pkgs/godep/add
Add godep, dependency tool for go
2015-02-02 11:42:03 +01:00
Michael Raskin
bd38418e1a Update SlimerJS 2015-02-01 18:41:32 +03:00
Ragnar Dahlén
aaa6d79300 Clojure: boot: Add new derivation for boot build tooling 2015-01-30 09:33:55 +00:00
Pascal Wittmann
3c7e1ef698 Merge pull request #5866 from nckx/maven
maven 3.2.3 -> 3.2.5
2015-01-30 10:17:35 +01:00
Vincent Laporte
db75b5d052 merlin: update from 2.1 to 2.1.1 2015-01-29 08:43:15 +01:00
Vincent Laporte
54c8a82818 utop: wrap all installed programs 2015-01-29 08:43:15 +01:00