Commit Graph

61278 Commits

Author SHA1 Message Date
Ricardo M. Correia
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
Ricardo M. Correia
b993c2113c buildRustPackage: Add a mechanism to patch registry deps
... in a more generic way.

With this commit, if you need to patch a registry package to make it
work with Nix, you just need to add a script to patch-registry-deps
in the same style as the `pkg-config` script.
2015-04-23 16:41:52 +02:00
Ricardo M. Correia
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
Ricardo M. Correia
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
Ricardo M. Correia
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
Ricardo M. Correia
5e8a447739 cargo: Build optimized binary 2015-04-21 20:44:41 +02:00
Georges Dubus
7d67efa3f2 Add support for building cargo'ed Rust programs 2015-04-21 19:46:29 +02:00
Ricardo M. Correia
c55c7e1c1e fetchgit: Add support for specifying branch name
This is useful when `leaveDotGit = true` and some other derivation
expects some branch name to exist.

Previously, `nix-prefetch-git` always created a branch with a
hard-coded name (`fetchgit`).
2015-04-21 19:46:29 +02:00
Ricardo M. Correia
b1b4092ad5 rustcMaster: Update from 2015-04-13 -> 2015-04-15 2015-04-21 19:46:28 +02:00
Eelco Dolstra
1d8590afe4 nss: Update to 3.18.1 2015-04-21 16:53:43 +02:00
Eelco Dolstra
9f3370a9c9 firefox: Update to 37.0.2 2015-04-21 16:48:46 +02:00
Peter Simons
32c0d3bd4f hackage-packages.nix: re-generate from Hackage state 12d6257d3e 2015-04-21 14:16:20 +02:00
Pascal Wittmann
183271560b Merge pull request #7393 from pjones/pkg/sassc
New package: SassC (front-end for libsass)
2015-04-21 09:52:50 +02:00
Rok Garbas
314d146c8c pythonPackages.pyenchant: point to enchant lib via PYENCHANT_LIBRARY_PATH 2015-04-21 09:42:55 +02:00
Domen Kožar
f39b1ead2a manual: re-add running nixos tests sections 2015-04-21 02:28:59 -04:00
William A. Kennington III
dbaeb7c428 kernel: 3.14.38 -> 3.14.39 2015-04-20 22:41:47 -07:00
William A. Kennington III
2c35a4aa39 kernel: 3.19.4 -> 3.19.5 2015-04-20 22:40:31 -07:00
William A. Kennington III
d82fa84357 kernel: 3.10.74 -> 3.10.75 2015-04-20 22:37:40 -07:00
Tobias Geerinckx-Rice
ff6be09c2e Merge pull request #7437 from AndersonTorres/atari800
Atari800: no more ROM install
2015-04-21 03:39:37 +02:00
Tobias Geerinckx-Rice
e5e2de874e zfstools 0.3.1 -> 0.3.2 2015-04-21 02:40:50 +02:00
Arseniy Seroka
a9eedc31cd Merge pull request #7485 from oxij/fix-drbd
drbd: hash changed
2015-04-21 03:38:07 +03:00
Tobias Geerinckx-Rice
13749c5e92 geolite-legacy 2015-04-16 -> 2015-04-21 2015-04-21 01:48:28 +02:00
Tobias Geerinckx-Rice
5e359ffbd0 foremost: add missing makefile.patch 2015-04-21 01:30:02 +02:00
Tobias Geerinckx-Rice
29e07d0e6e Add foremost 1.5.7: recover some files based on contents 2015-04-21 00:53:21 +02:00
Nicolas B. Pierron
7585d42d2b Fix #7354 - Accept _module attributes added to every submodule. 2015-04-20 23:58:32 +02:00
Peter Simons
169efee101 haskell-hruby: test suite has been fixed upstream 2015-04-20 22:07:30 +02:00
Peter Simons
26941230b5 hackage-packages.nix: re-generate from Hackage state e1a69962dc 2015-04-20 22:05:33 +02:00
Pascal Wittmann
413d124e68 Merge pull request #7483 from joelmo/patch-2
xournal: add license info
2015-04-20 20:40:12 +02:00
Pascal Wittmann
06d1da0948 Merge pull request #7487 from oxij/fix-update-stepmania
stepmania: revive and update to 5.0.7
2015-04-20 20:39:33 +02:00
Joel Moberg
49f4dba4c7 xournal: add license info 2015-04-20 18:22:37 +02:00
Arseniy Seroka
c8f9a2d76c Merge pull request #7468 from Balletie/master
Bump SFML to version 2.2, and update MARS game
2015-04-20 19:18:27 +03:00
Jan Malakhovski
ba53021d92 stepmania: revive and update to 5.0.7 2015-04-20 16:09:07 +00:00
Jan Malakhovski
9f9959599f drbd: hash changed 2015-04-20 15:59:13 +00:00
Nikolay Amiantov
0f5d5f9d12 lambdabot: add named pipe for incoming commands 2015-04-20 18:56:48 +03:00
Nikolay Amiantov
91f3912b5d lambdabot: add configuration 2015-04-20 18:56:43 +03:00
Peter Simons
82f22dd5a1 hackage-packages.nix: disable approx. 1,000 Hydra build that are known to fail with GHC 7.10.1 2015-04-20 17:40:16 +02:00
Peter Simons
cba0f43304 haskell-diagrams-lib: build has been fixed upstream 2015-04-20 17:40:14 +02:00
Peter Simons
ee90f707a6 haskell-configuration-ghc-7.10.x.nix: fix Hydra evaluation errors 2015-04-20 17:40:14 +02:00
Peter Simons
2799cf5e1b hackage-packages.nix: re-generate from Hackage state ea1b618ac7 2015-04-20 17:40:14 +02:00
Peter Simons
e313cd711e r-modules: disable broken builds on Hydra 2015-04-20 17:38:46 +02:00
Tobias Geerinckx-Rice
604ac701f3 netsniff-ng v0.5.9-rc4-62-g47a7037 -> v0.5.9-rc4-63-gf43bbe9
Bug fix: mac80211: Check existence of generated monX device

Fix the case when netsniff-ng fails if there is already an existing
monX device while generating one.
2015-04-20 17:17:40 +02:00
Tobias Geerinckx-Rice
2454b943d7 eid-mw: fix and improve eid-nssdb helper script
Now works. Good to know no-one else is using this :-)
2015-04-20 17:17:39 +02:00
Balletie
d03e6162dc Update SFML to version 2.2, remove sfml_git, and update MARS (depended on sfml_git) 2015-04-20 16:49:39 +02:00
Thomas Tuegel
8eef55b0e0 Merge pull request #7415 from bendlas/dropbox
dropbox[-cli]: update to latest versions
2015-04-20 09:33:48 -05:00
Eelco Dolstra
d5f187de03 Typo 2015-04-20 16:12:28 +02:00
Tobias Geerinckx-Rice
2ae207718c man-pages 3.82 -> 3.83 2015-04-20 15:00:39 +02:00
Tobias Geerinckx-Rice
f1d030cf7d debian_devscripts 2.12.4 -> 2.15.3
Was touched by 55edae1 but tarball had vanished.
2015-04-20 15:00:39 +02:00
Cillian de Róiste
e74e572331 yoshimi: update from 1.3.3 to 1.3.4 2015-04-20 14:51:55 +02:00
Cillian de Róiste
001ea3b455 xf86_input_wacom: update from 0.28.0 to 0.29.0 2015-04-20 14:51:38 +02:00
Cillian de Róiste
7207486497 synthv1: update from 0.6.0 to 0.6.1 2015-04-20 14:51:19 +02:00