Commit Graph

2902 Commits

Author SHA1 Message Date
William A. Kennington III
333f145d76 Merge branch 'master.upstream' into staging.upstream 2015-07-13 15:11:31 -07:00
Matthias Beyer
7e3c95a0b8 sqlitebrowser: init at 3.7.0
[Bjørn: add name=... to fetchzip.]
2015-07-13 22:11:30 +02:00
lethalman
54f308c740 Merge pull request #8746 from bosu/add-pahole
pahole: init at 1decb1b
2015-07-13 16:37:47 +02:00
Boris Sukholitko
c59818f630 pahole: init at 1decb1b 2015-07-13 17:31:06 +03:00
Arseniy Seroka
5d9f0e60f5 Merge pull request #8772 from retrry/vagrant-update
vagrant: 1.7.2 -> 1.7.3
2015-07-12 22:13:51 +03:00
Tadas Barzdzius
4338031c59 vagrant: 1.7.2 -> 1.7.3 2015-07-12 14:27:17 +03:00
Jude Taylor
43c72cb6af add security-tool 2015-07-10 10:41:07 -07:00
Robert Irelan
51972d427e cargo: 2015-05-13 -> 0.3.0
Rename cargo to use a version number rather than a date because Cargo
has started releasing packages using version numbers.
2015-07-09 22:56:51 -07:00
Robert Irelan
e6ee86b941 cargoSnapshot: 2015-04-02 -> 2015-06-17, hide from nix-env
Update snapshot to avoid rust-lang/cargo#976, which otherwise breaks the
build.

Also move the `cargoSnapshot` derivation inside a set in
pkgs/top-level/all-packages.nix in order to hide the `cargo-snapshot`
packages from `nix-env -qa`, since it's only used to build the `cargo`
package.
2015-07-09 21:14:55 -07:00
Edward Tjörnhammar
2c327ca48e activator: 1.3.2 -> 1.3.5 2015-07-10 00:23:48 +02:00
Pascal Wittmann
ad41a600e5 oprofile: update from 0.9.9 to 1.0.0 (ZHF)
fixes the build with recent versions of binutils
2015-07-09 13:18:21 +02:00
William A. Kennington III
7cda24c01e Merge branch 'master.upstream' into staging.upstream 2015-07-08 14:11:16 -07:00
Jaka Hudoklin
4b1cfd17a8 Merge pull request #8680 from offlinehacker/pkgs/compass/add
Add compass, stylesheet authoring environment
2015-07-08 12:17:19 +02:00
Austin Seipp
afb7655c68 nixpkgs: arcanist 20150525 -> 20150707
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-07 09:37:50 -05:00
Jaka Hudoklin
acc995cf41 Add compass, stylesheet authoring environment 2015-07-07 12:11:58 +02:00
William A. Kennington III
d605663ae2 Merge branch 'master.upstream' into staging.upstream 2015-07-05 13:06:02 -07:00
Michael Raskin
b280d6cbc7 scons: update 2.3.4 -> 2.3.5 2015-07-05 00:32:53 +03:00
Vincent Laporte
06efb2e937 chefdk: fix build 2015-07-04 00:39:44 +02:00
Arseniy Seroka
afa1f5ba22 Merge pull request #8586 from vbgl/ocaml-updates
Ocaml package updates
2015-07-02 12:06:29 +03:00
Tobias Geerinckx-Rice
4023da6237 ccache: drop unnecessary perl dependency
Backport a one-line patch to remove the test suite's dependency on
perl, which, while not exactly heavy, is unnecessary.
2015-07-02 03:35:35 +02:00
William A. Kennington III
7eae48871f Merge branch 'master.upstream' into staging.upstream 2015-07-01 13:38:17 -07:00
Vincent Laporte
2663f24a48 ocp-index: 1.1.1 -> 1.1.2 2015-07-01 20:23:19 +02:00
Pascal Wittmann
f5c91c445f checkstyle: update from 6.8 to 6.8.1 2015-07-01 20:21:33 +02:00
William A. Kennington III
612f0bdd67 Merge branch 'master.upstream' into staging.upstream 2015-06-30 23:58:07 -07:00
Pascal Wittmann
439ce0d07d checkstyle: update from 6.7 to 6.8 2015-06-29 12:50:34 +02:00
William A. Kennington III
ef253212f4 Merge branch 'master.upstream' into staging.upstream 2015-06-26 17:25:49 -07:00
Pascal Wittmann
8c4fcc87f8 autobuild: 3.5 -> 5.3 2015-06-26 17:40:09 +02:00
Thomas Tuegel
a8c52d0958 Merge branch 'master' into staging 2015-06-25 09:15:05 -05:00
Vincent Laporte
2727ecec37 js_of_ocaml: propagate camlp4 dependency 2015-06-25 08:55:30 +02:00
Jascha Geerds
ee2c3058fc Merge pull request #8489 from ktosiek/d-feet-0.3.10
d-feet: 0.3.9 -> 0.3.10
2015-06-24 21:28:04 +02:00
Tomasz Kontusz
5c4a6b59c3 d-feet: 0.3.9 -> 0.3.10
Also added license. This is based on COPYING inside the archive.
2015-06-24 20:57:03 +02:00
Pascal Wittmann
c8e66bb9ac autoconf-archive: update from 2014.10.15 to 2015.02.25
and use mirror://
2015-06-23 23:49:33 +02:00
Arseniy Seroka
266531b5b0 Merge pull request #8422 from travisbhartwell/update/atom-shell-to-electron
atom-shell: renamed to electron and updated 0.19.1 -> 0.28.2
2015-06-23 18:54:22 +03:00
William A. Kennington III
282d03befa Merge branch 'master.upstream' into staging.upstream 2015-06-22 10:57:36 -07:00
Michael Raitza
7907a8bcba dialog: init at 1.2-20150225, closes #8457
Generate ncurses dialogs from shell scripts.
2015-06-22 18:11:05 +02:00
Jascha Geerds
3f66bb7ff2 Add myself as maintainer 2015-06-22 08:26:09 +02:00
Travis B. Hartwell
1682bd707a electron: Added myself as maintainer.
Per https://github.com/NixOS/nixpkgs/pull/8422#issuecomment-113695261
2015-06-20 12:43:10 -06:00
Andrew Kelley
55262f98b6 rucksack: init at 3.1.0 2015-06-20 02:06:20 -07:00
Travis B. Hartwell
caa216b640 atom-shell: renamed to electron and updated 0.19.1 -> 0.28.2
Added systemd to buildEnv path because of new libudev dependency.
2015-06-19 15:32:12 -06:00
Jude Taylor
2c79dcd5ce darwin purity: pkgconfig 2015-06-19 12:56:39 -07:00
Vladimír Čunát
61596bf405 Merge #8363: pure-darwin stdenv 2015-06-18 22:38:08 +02:00
Jude Taylor
fa9c81f694 pure darwin stdenv 2015-06-18 12:37:41 -07:00
Austin Seipp
c3fcd5ecb7 nixpkgs: Remove bunk 'infer' expression
This was accidentally committed because I'm a goof - see
1ee742b0ef2904788e1775d73de42c00492e8c4f.

Thanks to ftrvxmtrx on IRC for spotting.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-06-18 11:37:51 -05:00
Vincent Laporte
2583b22573 frama-c: fix hash, closes #8308 2015-06-18 11:47:34 +02:00
Tobias Geerinckx-Rice
98b2d7b727 Separate nativeBuildInputs where maintainers |= nckx 2015-06-17 22:21:32 +02:00
William A. Kennington III
8e19ac8d7c Merge branch 'master.upstream' into staging.upstream 2015-06-17 11:57:40 -07:00
Pascal Wittmann
8437f039e3 help2man: update from 1.46.6 to 1.47.1 2015-06-16 12:02:00 +02:00
Luca Bruno
aa800fa0fe Merge branch 'master' into staging 2015-06-15 09:56:29 +02:00
Eric Merritt
dcffd28527 ocp-build: upgrade to 1.99.9-beta
This also allows ocp-build to build for ocaml 4.02 and greater
2015-06-14 13:33:18 -07:00
Austin Seipp
1ee742b0ef nixpkgs: afl 1.80b -> 1.83b
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-06-14 14:28:00 -05:00
Pascal Wittmann
23393964bb intel-gpu-tools: update from 1.10 to 1.11 2015-06-14 21:24:24 +02:00
Michael Raskin
b32174dcc6 Update SlimerJS 2015-06-14 11:21:36 +03:00
Michael Raskin
2fe7bf8d55 Update CL-Launch 2015-06-14 11:21:27 +03:00
William A. Kennington III
954801a9a8 Merge branch 'master.upstream' into staging.upstream 2015-06-12 13:47:46 -07:00
Rok Garbas
0860826795 cygwin: cmake expression should not change for linux 2015-06-12 12:17:12 +02:00
Rok Garbas
277c263c1e cygwin: update patch for cmake 3.2.2 2015-06-12 12:17:12 +02:00
Rok Garbas
85b7673e92 cygwin: turn off tests for swig since they depend on tcl (which i havent yet figure out how to build) 2015-06-12 12:17:12 +02:00
Peter Simons
4d404fd6a4 ihaskell-wrapper: avoid use of /bin/sh
https://github.com/NixOS/nixpkgs/issues/183
2015-06-12 10:50:40 +02:00
Tobias Geerinckx-Rice
2156937166 include-what-you-use 3.6 -> 0.4 (sic)
Not a downgrade. Upstream's weird.
2015-06-12 02:27:53 +02:00
Rok Garbas
e1683eeff1 lsof: url is behind auth. changed downloaded url for lsof 2015-06-11 14:54:30 +02:00
Domen Kožar
a06bb18ce5 Merge pull request #8274 from k0ral/lsof
lsof: 4.87 -> 4.88
2015-06-11 11:26:18 +02:00
Pascal Wittmann
2700715567 global: update from 6.4 to 6.5 2015-06-11 10:46:57 +02:00
Eelco Dolstra
4970574409 Merge remote-tracking branch 'origin/gcc-4.9' into staging
Conflicts:
	pkgs/development/libraries/wayland/default.nix
2015-06-11 00:23:03 +02:00
Eelco Dolstra
4a57b07653 Merge remote-tracking branch 'origin/master' into staging 2015-06-11 00:18:24 +02:00
koral
0ac1de60e9 lsof: 4.87 -> 4.88 2015-06-10 16:34:45 +00:00
Tomasz Kontusz
bbf0f7e16f Bump d-feet to 0.3.9 2015-06-08 00:10:48 +02:00
William A. Kennington III
9d6555dc0a Merge branch 'master.upstream' into staging.upstream 2015-06-06 12:04:42 -07:00
Vincent Laporte
142400b8d5 ocaml-merlin: update from 2.1.2 to 2.2 2015-06-06 17:42:24 +02:00
Arseniy Seroka
70b5e51456 Merge pull request #8178 from jagajaga/fix/versions
fix: add missing versions
2015-06-06 00:22:10 +03:00
Peter Simons
7acb77ca2b cabal2nix: run "git reset --hard" to clean up the source to avoid the "-dirty" tag 2015-06-05 12:42:34 +02:00
Rok Garbas
9e99a66c24 cygwin: make flex building on cygwin 2015-06-05 00:39:29 +02:00
Arseniy Seroka
daf4ec39a5 fix: add missing versions 2015-06-04 23:34:14 +03:00
Eelco Dolstra
3ede0a64a2 make: Don't segfault if we can't get a tty name
This happened in VM builds:

  make flags: SHELL=/nix/store/dbxpkswwc7rh6g1iy6dwqklzw39hihb1-bash-4.3-p33/bin/bash
  /nix/store/jm26xg0h3jcrg4bbrwiqx3jpirscdk0p-stdenv/setup: line 658:  5957 Segmentation fault      make ${makefile:+-f $makefile} ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} $makeFlags "${makeFlagsArray[@]}" $buildFlags "${buildFlagsArray[@]}"
2015-06-04 19:47:34 +02:00
Peter Simons
c659105ef8 cabal2nix: get rid of the '-dirty' version suffix
The fetchgit builder performs some freak magic in the name of deterministic
hashes that screws up git's idea of a clean directory tree.
2015-06-04 13:33:57 +02:00
lethalman
219b9a63ad Merge pull request #8135 from sofuture/fix-goimports-build
Fix goimports build
2015-06-03 10:47:55 +02:00
jzellner
be03ca9262 fix goimports build, use buildGoPackage 2015-06-02 11:59:40 -06:00
Eelco Dolstra
e7f1038798 Fix typo in last merge 2015-06-01 20:09:31 +02:00
Eelco Dolstra
553abf71ba Merge remote-tracking branch 'origin/staging' into gcc-4.9
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/libraries/wayland/default.nix
	pkgs/development/tools/build-managers/cmake/default.nix
	pkgs/top-level/all-packages.nix
2015-06-01 20:08:43 +02:00
codyopel
fcf850c99e sassc: 3.2.1 -> 3.2.4 2015-06-01 01:28:18 -04:00
Pascal Wittmann
ed9455838c checkstyle: update from 6.6 to 6.7 2015-05-31 20:25:33 +02:00
Peter Simons
c55ca3fd0b cabal2nix: update to version 20150531
This update adds support for bash completion.
2015-05-31 18:31:26 +02:00
Tobias Geerinckx-Rice
21015ea82f Add bin_replace_string: edit precompiled binaries 2015-05-30 21:09:26 +02:00
Pascal Wittmann
1d30557516 Fixed meta.license: s/licence/license 2015-05-30 15:19:05 +02:00
Pascal Wittmann
24d2849dba gtk-doc: update from 1.23 to 1.24 2015-05-30 13:48:53 +02:00
Peter Simons
99273a6716 Merge pull request #8047 from nckx/master
Don't use "with licenses;" for single licences
2015-05-28 22:14:53 +02:00
Tobias Geerinckx-Rice
158e1cfdd0 Don't use "with licenses;" for single licences
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
Pascal Wittmann
7822640a18 yodl: update from 3.05.00 to 3.05.01 2015-05-28 19:10:52 +02:00
Pascal Wittmann
f675c4d90d icmake: update from 7.22.00 to 7.22.01 2015-05-28 18:57:32 +02:00
Pascal Wittmann
38bc63c605 help2man: update from 1.46.5 to 1.46.6 2015-05-28 18:56:12 +02:00
Pascal Wittmann
b57097b2fe fswatch: update from 1.4.6 to 1.4.7 2015-05-28 18:54:35 +02:00
Pascal Wittmann
1a3860e95a checkstyle: update from 6.5 to 6.6 2015-05-28 18:49:06 +02:00
Sander van der Burg
3fa15c820f doclifter: add new package 2015-05-28 16:13:47 +00:00
Rok Garbas
ea3748d519 cygwin: help2man patch for cygwin 2015-05-28 14:15:47 +02:00
Florian Friesdorf
90a97d32df cygwin cmake 2015-05-28 10:53:36 +02:00
Florian Friesdorf
f33f2a7e82 cygwin: disable gnumake check because of hanging test 2015-05-28 10:53:35 +02:00
Marko Durkovic
c4efe32d4d cygwin: pkgconfig 2015-05-28 10:53:35 +02:00
Austin Seipp
4793f2c7d3 nixpkgs: arcanist 20150412 -> 20150525
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-05-27 16:36:26 -05:00
Tobias Geerinckx-Rice
b2d7f4b1ba Use common licence attributes from lib/licenses.nix
Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
2015-05-27 22:00:06 +02:00
Arseniy Seroka
6c9ac3f967 Merge pull request #8024 from ragnard/update-boot-version
boot: Update version from 2.0.0-rc14 to 2.0.0.
2015-05-27 22:43:15 +03:00
Ragnar Dahlén
9cb63367dc boot: Update version from 2.0.0-rc14 to 2.0.0. 2015-05-27 20:39:17 +01:00
lethalman
257c05fa82 Merge pull request #7622 from jzellner/master
add goimports package
2015-05-27 10:57:23 +02:00
vbgl
2857d5d7a8 Merge pull request #7823 from ericbmerritt/ocaml-enhancements
Ocaml enhancements
2015-05-26 23:52:32 +02:00
Edward Tjörnhammar
f02284a361 activator: add version 1.3.2 2015-05-26 20:56:43 +02:00
Antoine R. Dumont
a12dd8f6a1 Upgrade to latest stable
Upgraded the dependency to oracle's jdk8.
2015-05-26 19:30:19 +02:00
Alexander Flatter
7d9724057c Update heroku toolbelt to 3.32.0 2015-05-26 13:06:34 +02:00
Alexander Flatter
be71c0871c Add meta information to heroku toolbelt 2015-05-26 13:06:34 +02:00
Alexander Flatter
d2b906c771 Add heroku-client 2015-05-26 13:05:53 +02:00
Peter Simons
d808f5b3e6 cabal2nix: update to version 20150525 2015-05-25 15:00:07 +02:00
Eric Merritt
8751d1ea1a rename ocaml_typeconv to type_conv
The actual name of the package is type_conv
(https://github.com/janestreet/type_conv). Having it named
ocaml_typeconv adds a verbosity that isn't required and actually makes
the package harder to find.
2015-05-24 12:32:45 -07:00
Eric Merritt
56627d5444 ocaml-opam: the sha hash of 1.2.2 changed
This is a bit scary. The sha of 1.2.2 changed, causing a crash on
download of the url. This updates to the current sha. Opam maintainer
why, oh why, do you change a released version without a version bump??
2015-05-24 12:31:44 -07:00
Boris Sukholitko
1da49e714d Upgrade to selenium 2.45
Without the upgrade, firefox driver is unusable, due to:

https://code.google.com/p/selenium/issues/detail?id=8399
2015-05-22 17:40:18 +03:00
Sander van der Burg
e612ea59c0 rman: add expression 2015-05-22 10:04:44 +00:00
Tobias Geerinckx-Rice
5d5044b2ec Use mirror:// URIs for ftp.debian.org
Provide a more robust experience for users with horrible network
hardware (me).
2015-05-22 10:39:27 +02:00
Pascal Wittmann
71aaebc954 thrust: fix build 2015-05-21 15:24:59 +02:00
jz
f2cc21a8b4 Merge branch 'master' of github.com:NixOS/nixpkgs 2015-05-20 15:18:26 -06:00
Ozan Sener
97160a8644 Add Thrust 0.7.6 2015-05-20 20:58:03 +02:00
Ossi Herrala
d2f21ab3fc cfr: Update to version 0_101 and remove platform restrictions
cfr is written in Java, so it should work in every platform supported
by jre. This fix makes cfr usable in Darwin.
2015-05-20 09:02:13 +03:00
Pascal Wittmann
2c8872f191 gtk-doc: update from 1.21 to 1.23 2015-05-19 20:08:15 +02:00
Ricardo M. Correia
2817e74d37 cargo: Add myself to maintainers 2015-05-19 19:02:38 +02:00
Ricardo M. Correia
9b752fd0e1 buildRustPackage: Don't hardcode registry index hash
Instead, discover it automatically when building the package.

This makes `buildRustPackage` more future-proof with respect to changes
in how `cargo` generates the hash.

Also, it fixes broken builds in i686 because apparently, cargo generates
a different registry index hash in this architecture (compared to
x86-64).
2015-05-19 19:02:38 +02:00
Ricardo M. Correia
de322b48b7 cargo: Fix src hash
It seems that when you pass `leaveDotGit = true` to `fetchgit`, sometimes
the output can still change (i.e. it's not completely deterministic).

This could be due to changes in the upstream git repository...
2015-05-19 19:02:38 +02:00
Luca Bruno
9adde87fea More usage of gnome3.defaultIconTheme 2015-05-19 14:44:27 +02:00
Ricardo M. Correia
85c48934bc racerRust: 2015-05-04 -> 2015-05-18
Fixes build failure with rustc 1.0.0.
2015-05-19 03:08:34 +02:00
Peter Simons
61224338ff cabal2nix: update to version 20150518 2015-05-18 18:04:37 +02:00
Joel Taylor
78ef78719f Merge branch 'master' of https://github.com/NixOS/nixpkgs 2015-05-15 14:33:21 -07:00
Joel Taylor
1aef9fc4af cmake: disable building with ncurses if building without ncurses 2015-05-15 14:31:40 -07:00
Vladimír Čunát
b7fe141f6b Revert "remove cmake-2.8"
Some packages fail with the only cmake version we've left.
This reverts commit 67199bda4effafecb977a44c623c2115032dc347.
2015-05-15 23:02:41 +02:00
Pascal Wittmann
4ec3f8e42f intel-gpu-tools: apply patch to fix a compile error
see https://bugs.gentoo.org/show_bug.cgi?id=548318
2015-05-15 22:46:30 +02:00
Eric Seidel
67fe5d46d4 Merge pull request #7817 from gridaphobe/cc-wrapper-isgnu-isclang
Add isGNU and isClang attributes to cc-wrapper
2015-05-14 10:09:07 -07:00
vbgl
d206cd8a26 Merge pull request #7839 from vbgl/opam-122
opam: update from 1.2.1 to 1.2.2
2015-05-14 18:40:17 +02:00
Pascal Wittmann
9c9c586534 Fixed several "package has no version" warnings 2015-05-14 17:19:41 +02:00
Vincent Laporte
1c19f91dd7 opam: update from 1.2.1 to 1.2.2 2015-05-14 09:32:32 +02:00
Eelco Dolstra
26f17ee091 cmake: Get rid of circular dependency
Also, don't install static libraries in jsoncpp.
2015-05-13 18:17:26 +02:00
Shea Levy
90fd9a55d9 binutils: don't build with Werror 2015-05-13 18:17:25 +02:00
Ricardo M. Correia
981ea747b5 cargo: 2015-05-11 -> 2015-05-13 2015-05-13 17:23:18 +02:00
Ricardo M. Correia
755df64ee3 Merge pull request #7501 from wizeman/u/upd-rust
Add support for Rust / Cargo packaging
2015-05-12 17:30:11 +02:00
Ricardo M. Correia
e40a43cd1f rustRacer: 2015-04-12 -> 2015-05-04 2015-05-12 17:28:52 +02:00
Ricardo M. Correia
cbdedca255 cargo: 2015-04-14 -> 2015-05-11 2015-05-12 17:28:50 +02:00
Tobias Geerinckx-Rice
6396c04d9f ccache: enable tests
Let's hope this doesn't break all over the place. Works here.
2015-05-12 07:52:59 +02:00
Tobias Geerinckx-Rice
75ecd2e415 ccache 3.2.1 -> 3.2.2
New features and improvements:
- Added support for "CCACHE_COMPILERCHECK=string:<value>". This is a faster
  alternative to "CCACHE_COMPILERCHECK=<command>" if the command's output
  can be precalculated by the build system.
- Add support for caching code coverage results (compiling for gcov).

Bug fixes:
- Fixed bug which could result in false cache hits when source code contains
  '"' followed by " /*" or " //" (with variations).
- Made hash of cached result created with and without "CCACHE_CPP2"
  different.  This makes it possible to rebuild with "CCACHE_CPP2" set
  without having to clear the cache to get new results.
- Don't try to reset a non-existing stats file. This avoids "No such file or
  directory" messages in the ccache log when the cache directory doesn't
  exist.
- Fixed a bug where ccache deleted clang diagnostics after compiler
  failures.
- Avoid performing an unnecessary copy of the object file on a cache miss.
- Bail out on too hard compiler option "-fmodules".
- Bail out on too hard compiler option "-fplugin=libcc1plugin" (interaction
  with GDB).
- Fixed build error when compiling ccache with recent clang versions.
- Removed signal-unsafe code from signal handler.
- Corrected logic for when to output cached stderr.
- Wipe the whole cached result on failure retrieving a cached file.
- Fixed build error when compiling ccache with recent clang versions.
2015-05-12 07:52:59 +02:00
Eric Seidel
662a6b1ca6 remove all references to stdenv.cc.cc.is{GNU,Clang}
use the new `stdenv.cc.is{GNU,Clang}` instead, which will always be
defined.
2015-05-11 14:44:50 -07:00
Pascal Wittmann
a16cd707bd Merge pull request #7804 from codyopel/global
global: refactor
2015-05-11 21:15:38 +02:00
codyopel
4cba460737 ctags: 804 -> 816 2015-05-11 05:27:53 -04:00
codyopel
b8f1d6c9db global: refactor 2015-05-11 04:22:26 -04:00
Domen Kožar
bb4d658f64 Merge branch 'master' into staging
Conflicts:
	nixos/doc/manual/release-notes/rl-unstable.xml
	nixos/modules/services/printing/cupsd.nix
	pkgs/applications/misc/calibre/default.nix
	pkgs/development/haskell-modules/hackage-packages.nix
	pkgs/development/libraries/libsodium/default.nix
	pkgs/misc/emulators/wine/unstable.nix
	pkgs/top-level/all-packages.nix
2015-05-11 10:05:23 +02:00
codyopel
4b07d16827 intltool: refactor 2015-05-11 03:11:30 -04:00
Michael Raskin
84ffa4d489 Update CL-Launch 2015-05-10 13:46:31 +02:00
Michael Raskin
53f8245494 Update luarocks 2015-05-10 13:46:31 +02:00
Tobias Geerinckx-Rice
4081886d1a alloy: remove left-over no-op 2015-05-10 13:46:02 +02:00
Tobias Geerinckx-Rice
8bba7c5cf1 Add cfr 0_100: another Java decompiler 2015-05-10 13:46:01 +02:00