Vladimír Čunát
2cacf77c13
Merge branch 'master' into staging
2015-07-22 22:33:55 +02:00
Vladimír Čunát
3064b6a0cc
remove gcc49 overrides from various places
...
An interesting thing is that: stdenv != overrideCC stdenv gcc49;
I'm not sure why that is, but it doesn't seem important.
/cc maintainers: @nckx, @garbas, @abbradar, @cstrahan, @grwlf.
2015-07-22 19:40:12 +02:00
Ricardo M. Correia
205a6b894d
cargo: workaround frequent hash mismatches due to #8567
...
For now, let's remove `leaveDotGit`. The only visible effect I could see
was that `cargo --version` won't report the git commit anymore, but
that's only a minor issue compared to the build breaking often.
Fixes #8566 and closes #8862 .
2015-07-21 21:26:02 +02:00
lethalman
b5fcbb9041
Merge pull request #8923 from retrry/vagrant-update
...
Vagrant: 1.7.3 -> 1.7.4 (ZHF)
2015-07-21 18:17:03 +02:00
Tadas Barzdzius
148dcf4d1c
Vagrant: 1.7.3 -> 1.7.4 (ZHF)
2015-07-21 19:08:15 +03:00
Luca Bruno
bfa5df6a5e
pahole: fix build (ZHF)
2015-07-21 16:01:20 +02:00
Austin Seipp
f07d5a244f
nixpkgs: ninja 1.5.3 -> 1.6.0
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-20 13:52:34 -05:00
Austin Seipp
8d7dd4cf53
nixpkgs: re2c 0.14.2 -> 0.14.3
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-20 13:52:33 -05:00
William A. Kennington III
2ad250f4fa
Merge branch 'staging.next' into staging.upstream
2015-07-19 02:21:28 -07:00
Vladimír Čunát
9a80550cc4
Merge branch 'staging', discussion #8844
2015-07-19 08:09:29 +02:00
Stewart Mackenzie
f46bbbce49
boot: correct sha256
2015-07-19 02:33:43 +08:00
William A. Kennington III
de8e6f6021
Merge branch 'staging.upstream' into staging.next
2015-07-17 14:34:37 -07:00
William A. Kennington III
f74c74ec40
swig3: 3.0.2 -> 3.0.6
2015-07-17 14:15:36 -07:00
William A. Kennington III
038d29121e
swig2: 2.0.11 -> 2.0.12
2015-07-17 14:15:23 -07:00
Vladimír Čunát
9f37e91ec5
Merge master into staging
...
There are larger-rebuild changes: gnutls and samba.
2015-07-17 06:38:04 +02:00
William A. Kennington III
1e2718ed51
lsof: 4.88 -> 4.89
2015-07-15 12:25:21 -07:00
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