9a80550cc4
Merge branch 'staging', discussion #8844
2015-07-19 08:09:29 +02:00
f46bbbce49
boot: correct sha256
2015-07-19 02:33:43 +08:00
333f145d76
Merge branch 'master.upstream' into staging.upstream
2015-07-13 15:11:31 -07:00
43c72cb6af
add security-tool
2015-07-10 10:41:07 -07:00
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
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
d605663ae2
Merge branch 'master.upstream' into staging.upstream
2015-07-05 13:06:02 -07:00
b280d6cbc7
scons: update 2.3.4 -> 2.3.5
2015-07-05 00:32:53 +03:00
954801a9a8
Merge branch 'master.upstream' into staging.upstream
2015-06-12 13:47:46 -07:00
0860826795
cygwin: cmake expression should not change for linux
2015-06-12 12:17:12 +02:00
277c263c1e
cygwin: update patch for cmake 3.2.2
2015-06-12 12:17:12 +02:00
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
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
e7f1038798
Fix typo in last merge
2015-06-01 20:09:31 +02:00
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
f675c4d90d
icmake: update from 7.22.00 to 7.22.01
2015-05-28 18:57:32 +02:00
90a97d32df
cygwin cmake
2015-05-28 10:53:36 +02:00
f33f2a7e82
cygwin: disable gnumake check because of hanging test
2015-05-28 10:53:35 +02:00
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
9cb63367dc
boot: Update version from 2.0.0-rc14 to 2.0.0.
2015-05-27 20:39:17 +01:00
2817e74d37
cargo: Add myself to maintainers
2015-05-19 19:02:38 +02:00
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
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
78ef78719f
Merge branch 'master' of https://github.com/NixOS/nixpkgs
2015-05-15 14:33:21 -07:00
1aef9fc4af
cmake: disable building with ncurses if building without ncurses
2015-05-15 14:31:40 -07:00
b7fe141f6b
Revert "remove cmake-2.8"
...
Some packages fail with the only cmake version we've left.
This reverts commit 67199bda4e
2015-05-15 23:02:41 +02:00
26f17ee091
cmake: Get rid of circular dependency
...
Also, don't install static libraries in jsoncpp.
2015-05-13 18:17:26 +02:00
981ea747b5
cargo: 2015-05-11 -> 2015-05-13
2015-05-13 17:23:18 +02:00
755df64ee3
Merge pull request #7501 from wizeman/u/upd-rust
...
Add support for Rust / Cargo packaging
2015-05-12 17:30:11 +02:00
cbdedca255
cargo: 2015-04-14 -> 2015-05-11
2015-05-12 17:28:50 +02:00
64c68c5413
cmake: 3.2.1 -> 3.2.2
2015-05-01 22:27:14 -07:00
1fe28a1132
Merge remote-tracking branch 'upstream/master' into staging
2015-04-29 11:33:28 -05:00
6b4aec742d
Merge pull request #7628 from ragnard/bump-boot
...
boot: bump from rc8 to rc14
2015-04-29 10:55:16 +02:00
543ec3cf46
boot: bump from rc8 to rc14
2015-04-29 08:50:48 +01:00
30f31c9afc
Merge 'master' into staging
...
(relatively simple conflicts)
2015-04-26 22:52:08 +02:00
d6093505cc
buildRustPackage: Get rid of /proc/self/cwd hack
...
This makes buildRustPackage portable to non-Linux platforms.
Additionally, now we also save the `Cargo.lock` file into the fetch output, so
that we don't have to run $cargoUpdateHook again just before building.
2015-04-23 20:22:19 +02:00
0cde1dc524
cargo: Remove setupHook
...
Instead, move that code into buildRustPackage.
The setup hook was only doing part of the work anyway, and having it in
a separate place was obscuring what was really going on.
2015-04-23 15:26:23 +02:00
e42c17ee97
buildRustPackage: Fix Cargo.lock being ignored
...
It turns out that `cargo`, with respect to registry dependencies, was
ignoring the package versions locked in `Cargo.lock` because we changed
the registry index URL.
Therefore, every time `rustRegistry` would be updated, we'd always try
to use the latest version available for every dependency and as a result
the deps' SHA256 hashes would almost always have to be changed.
To fix this, now we do a string substitution in `Cargo.lock` of the
`crates.io` registry URL with our URL. This should be safe because our
registry is just a copy of the `crates.io` registry at a certain point
in time.
Since now we don't always use the latest version of every dependency,
the build of `cargo` actually started to fail because two of the
dependencies specified in its `Cargo.lock` file have build failures.
To fix the latter problem, I've added a `cargoUpdateHook` variable that
gets ran both when fetching dependencies and just before building the
program. The purpose of `cargoUpdateHook` is to do any ad-hoc updating
of dependencies necessary to get the package to build. The use of the
'--precise' flag is needed so that cargo doesn't try to fetch an even
newer version whenever `rustRegistry` is updated (and therefore have to
change depsSha256 as a consequence).
2015-04-23 02:58:07 +02:00
d648be6724
buildRustPackage: Add check phase and enable it by default
...
Also disable check phase in cargo as there are lots of failures (some
probably due to trying to access the network).
2015-04-21 20:45:05 +02:00
5e8a447739
cargo: Build optimized binary
2015-04-21 20:44:41 +02:00
7d67efa3f2
Add support for building cargo'ed Rust programs
2015-04-21 19:46:29 +02:00
d56e9b4f05
Merge pull request #7330 from RumataEstor/rust-beta
...
Provide rustc-1.0.0-beta as the default rust package
2015-04-16 13:05:40 +03:00
ba206b550a
dub update to v0.9.23
2015-04-14 10:46:16 -07:00
871d11c176
Update cargoSnapshot to rustc-1.0.0-beta release
2015-04-13 15:55:39 +10:00
c94b24fa4a
fix fallout from merge of master
2015-04-06 19:48:44 -07:00
d628247bdf
Merge pull request #7095 from giogadi/cmake-full-install-name-staging
...
Make cmake install shared libraries with full install names by default
2015-03-30 21:47:27 -05:00
ff35c4a5e2
Make cmake install libraries with full install names by default so that executables can find cmake-installed shared libraries at runtime on Darwin. Addresses #6821 .
2015-03-30 21:25:44 -04:00
22018c40d1
cmake: Remove obsolete openssl patch
2015-03-27 11:30:39 -07:00
767c179a94
Merge branch 'master' into staging
2015-03-26 14:44:05 -07:00
62d4564de4
fix the cmake 2.8.x detection of OpenSSL version broken in openssl 1.0.1m
...
this is a follow up to security update for openssl: 1.0.1l -> 1.0.1m,
references:
- http://public.kitware.com/Bug/bug_relationship_graph.php?bug_id=15386
- http://www.cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5d9a8283cfac15b4a5a07f18d5eb10c1f388505#patch1
(cherry picked from commit 30dd174520827c58f7d58408029f8845878dd021)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-03-26 11:42:02 +01:00
46eedd9de5
Dohh
2015-03-26 09:48:27 +00:00
ac35d15bcc
bazel: Upstream pushed patch, removing patch.
2015-03-26 09:46:31 +00:00
7721ff4ccb
bazel: add patch suggested by upstream
2015-03-26 06:30:21 +00:00
f5eed7e14e
Add initial version for bazel.io build manager.
2015-03-25 15:12:02 +00:00
8fd5dd89ac
Merge branch 'master' into staging
2015-03-24 17:49:30 -05:00
f47af9b2c8
remove cmake-3.0
2015-03-22 17:03:57 -05:00
3628370127
remove cmake-2.6.4
2015-03-22 17:02:32 -05:00
67199bda4e
remove cmake-2.8
2015-03-22 17:01:45 -05:00
a910301e18
make cmake-3.2 the default version
2015-03-22 17:00:46 -05:00
de9e7bc5f1
sbt: bump to 0.13.8
2015-03-22 19:58:01 +01:00
7e21c519ba
add cmake-3.2.1
...
Earlier versions of CMake have a bug in their OpenSSL version detection code.
2015-03-21 12:32:38 -05:00
70528e9f8e
nixpkgs: ninja 1.5.1 -> 1.5.3
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-03-17 20:29:46 -05:00
e6561c5fb1
cargo: Install man page
...
... as well as other artifacts.
2015-03-04 18:08:52 +01:00
5821e91bd1
Restructure rustc derivations for ease of updating.
...
Update racerRust to use new rustcMaster and upgrade cargoSnapshot so racer builds.
2015-03-02 12:40:55 -07:00
fc966aead0
gradle: don't hardcode gradle-launcher-VERSION.jar
...
Instead, figure out VERSION at build-time. This simplifies using
overrideDerivation (no need to copy and modify installPhase).
Also add a check that the file exists (catch potential failure early).
2015-02-27 12:08:03 +01:00
1bbf15eca1
Leiningen: Fix GnuPG Support.
2015-02-07 18:45:35 +01:00
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
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
aaa6d79300
Clojure: boot: Add new derivation for boot build tooling
2015-01-30 09:33:55 +00:00
3c7e1ef698
Merge pull request #5866 from nckx/maven
...
maven 3.2.3 -> 3.2.5
2015-01-30 10:17:35 +01:00
2ee7809ac9
cargoSnapshot: Update from 2014-12-30 -> 2015-01-24
2015-01-27 04:36:37 +01:00
fe6944e5bc
maven: 3.2.3 -> 3.2.5
2015-01-21 22:01:15 +01:00
c6845151f1
icmake: update from 7.21.01 to 7.22.00
2015-01-21 13:21:59 +01:00
51b4ce18f4
dub: Add dub to interact with the D package registry
2015-01-18 18:32:46 +01:00
f3c6827373
rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc
2015-01-14 20:27:55 -08:00
0351b7a710
Add tup
...
Closes #5720
2015-01-14 01:37:44 -05:00
41b53577a8
unmaintain a bunch of packages
2015-01-13 22:33:49 +01:00
85dc90565f
leiningen: Update to 2.5.1.
2015-01-10 14:38:45 +01:00
8d96df76b9
cargo: common.nix now only contains version-agnostic bits
2015-01-08 08:38:20 +00:00
9ad3f0ed7e
cargoSnapshot: Update from 2014-12-21 -> 2014-12-30
2015-01-07 05:50:17 +01:00
ac55bb22be
gnumake: add version 4.1
2015-01-01 20:36:58 +01:00
fdb785f4d1
Merge pull request #5453 from pmahoney/skarnet-2.0
...
Update skarnet.org software for 2.0 release.
2015-01-01 16:14:17 +03:00
c64257b8e5
Fix user-facing typos (mainly in descriptions)
2014-12-30 03:31:03 +01:00
28b6fb61e6
Change occurrences of gcc to the more general cc
...
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
26e74d8a3e
Update skarnet.org software for 2.0 release.
...
New build system using configure script and GNU Make 4.0, and new
releases of the following using the new build system:
execline 2.0.0.0
s6 2.0.0.0
s6-dns 2.0.0.0
s6-linux-utils 2.0.0.0
s6-networking 2.0.0.0
s6-portable-utils 2.0.0.0
skalibs 2.0.0.0
2014-12-23 15:24:30 -06:00
66ca0b6163
cargoSnapshot: Update from 2014-11-22 -> 2014-12-21
2014-12-22 23:40:30 +01:00
2682c01f29
keeping gradle updated
2014-12-11 04:19:14 +01:00
99eab9f1e2
buildbot{,-slave}: update 0.8.8 -> 0.8.10
...
Build tested. Source distribution is now on pypi instead of googlecode.
2014-12-09 19:14:03 +01:00
a61293e659
skarnet: Invoke compile as 'cc' for wider support.
...
Darwin stdenv uses clang, which can be invoked as 'cc' but not 'gcc'.
2014-11-28 13:11:36 -06:00
cf5f282940
Consolidate conf-compile steps for skarnet.org pkgs.
2014-11-28 13:10:37 -06:00
ca6d86b7fb
cargoSnapshot: Update from 2014-09-19 -> 2014-11-22
2014-11-25 01:07:10 +01:00
fc0b1e4bae
sbt: update to version 0.13.7
2014-11-19 18:50:59 +01:00
38022c9938
add icmake, a program maintenance utility
2014-11-13 17:48:06 +01:00
064f10ba3c
Allow leiningen to build on darwin
2014-11-11 15:44:45 +01:00
ffbd1d011b
Add CMake 3.0 — Fixes #4363 — mostly-merging a PR by bbenoist
2014-11-09 18:31:46 +03:00
007f80c1d0
Turn more licenses into lib.licenses style
...
Should eval cleanly, as far as -A tarball tells me.
Relevant: issue #2999 , issue #739
2014-11-06 00:48:16 +00:00
c8ab037257
Merge pull request #4774 from henrytill/leiningen
...
leiningen: remove clojure dependency
2014-11-03 16:04:50 +03:00
129cde946b
sbt: update to version 0.13.6
2014-11-02 20:03:57 +01:00
4feafd7953
leiningen: remove clojure dependency
2014-11-01 19:47:52 -04:00
f1935d8eb8
gradle: update to 2.1
2014-10-26 22:10:20 +08:00
Vladimír Čunát
Stewart Mackenzie
William A. Kennington III
Jude Taylor
Robert Irelan
Michael Raskin
Rok Garbas
Eelco Dolstra
Pascal Wittmann
Florian Friesdorf
Arseniy Seroka
Ragnar Dahlén
Ricardo M. Correia
Joel Taylor
Thomas Tuegel
Pascal Wittmann
Georges Dubus
Charles Cooper
Dmitry Belyaev
Eric Seidel
John Wiegley
Luis G. Torres
goodwillcoding
Rob Vermaas
j-keck
Austin Seipp
Jordan Woehr
Bjørn Forsman
Moritz Ulrich
Shea Levy
Tobias Geerinckx-Rice
Johannes Bornhold
Benjamin Saunders
Ludovic Courtès
John Ericson
Peter Simons
Patrick Mahoney
bbarker
Alexander Flatter
Mateusz Kowalczyk
Henry Till
宋文武