JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,451 Commits 2 Branches 0 Tags 12 GiB
4495bfe138
Commit Graph

112451 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin Gloster
4495bfe138
python.buildEnv: only wrap executables 2017-08-09 15:07:03 +02:00
Robin Gloster
f4ca99166a
serf: fix build 2017-08-09 14:46:38 +02:00
Frederik Rietdijk
0ff782e141 makeWrapper: fix regression introduced in #24944 
In some cases wrappers could not be made. See e.g.
https://github.com/NixOS/nixpkgs/pull/24944#issuecomment-321175692
 2017-08-09 12:18:47 +02:00
Frederik Rietdijk
7a6d4f4710 Merge remote-tracking branch 'upstream/master' into HEAD 2017-08-09 11:22:40 +02:00
Frederik Rietdijk
345b35c48a Python: add buildPythonPackage.overridePythonPackage method. 
This allows one to always override the call to `buildPythonPackage`.

In the following example we create an environment where we have the `blaze` package using an older version of `pandas`. We override first the Python interpreter and pass `packageOverrides` which contains the overrides for packages in
the package set.

```
with import <nixpkgs> {};

(let
  python = let
    packageOverrides = self: super: {
      pandas = super.pandas.overridePythonPackage(old: rec {
        version = "0.19.1";
        name = "pandas-${version}";
        src =  super.fetchPypi {
          pname = "pandas";
          inherit version;
          sha256 = "08blshqj9zj1wyjhhw3kl2vas75vhhicvv72flvf1z3jvapgw295";
        };
      });
    };
  in pkgs.python3.override {inherit packageOverrides;};

in python.withPackages(ps: [ps.blaze])).env
```
 2017-08-09 11:10:54 +02:00
Lancelot SIX
90282d95bd Merge pull request #27832 from lsix/update_wireshark 
wireshark: 2.2.7 -> 2.4.0
 2017-08-09 09:59:44 +02:00
Lancelot SIX
b725e40865 Merge pull request #27865 from lsix/update_django 
pythonPackages.django: 1.11.3 -> 1.11.4
 2017-08-09 09:55:42 +02:00
Frederik Rietdijk
616fb95356 python34: 3.4.6 -> 3.4.7 2017-08-09 09:41:59 +02:00
Jörg Thalheim
fcea56ddfd Merge pull request #28031 from falsifian/rftg 
rftg: init at 0.9.4
 2017-08-09 08:21:32 +01:00
Jörg Thalheim
f6bfee9f45 Merge pull request #28060 from mt-caret/json-refs 
json-refs: init at 3.0.0
 2017-08-09 07:57:29 +01:00
Frederik Rietdijk
973f740894 Merge pull request #28052 from jtojnar/fix/faker-py2 
faker: add ipaddress dependency for Python 2
 2017-08-09 08:41:47 +02:00
Joe Hermaszewski
531a5b1afe git-fame: init at 2.5.2 2017-08-09 07:32:21 +01:00
Masayuki Takeda
c877e8d66d json-refs: init at 3.0.0 2017-08-09 14:46:45 +09:00
Cray Elliott
3bda92175a discord: minor clean up, add self to maintainers 2017-08-08 22:29:45 -07:00
Cray Elliott
6616b9a225 discord: 0.0.1 -> 0.0.2 2017-08-08 20:36:17 -07:00
Jan Tojnar
bd498ebeec
faker: add ipaddress dependency for Python 2 
Faker requires ipaddress package on Python < 3.3:

https://github.com/joke2k/faker/blob/v0.7.18/setup.py#L66-L76
 2017-08-09 00:52:14 +02:00
Dan Peebles
b48ffa332b services.fluentd: add plugins option 
This allows us to pass in additional ad-hoc fluentd plugins for custom
output formats and other goodness.
 2017-08-08 22:02:56 +00:00
Jude Taylor
7e3e790675 add override for html-entities 2017-08-08 14:29:33 -07:00
Jörg Thalheim
615d301098 Merge pull request #28041 from womfoo/bump/powerstat-forkstat 
Update {fork,power}stat to latest upstream
 2017-08-08 22:13:33 +01:00
Joachim Fasting
1b77c29507
tor-browser-bundle-bin: 7.0.3 -> 7.0.4 
- Update Firefox to 52.3.0esr
- Update Tor to 0.3.0.10
 2017-08-08 22:12:03 +02:00
Robin Gloster
c00a95be63
nix-prefetch-git: fix wrapProgram call 2017-08-08 21:45:46 +02:00
Jude Taylor
eeeead21c5 add override for digestive-functors-blaze 2017-08-08 11:56:31 -07:00
Daiderd Jordan
8c86ce707e Merge pull request #28034 from kiloreux/libopencore 
opencore-amr init at 0.1.5
 2017-08-08 19:25:53 +02:00
Vincent Laporte
e60ffe642e ocamlPackages.ocamlnet: 4.1.2 -> 4.1.3 2017-08-08 16:49:19 +00:00
kiloreux
c74d0d460f
Implement other required changes 2017-08-08 17:36:15 +01:00
kiloreux
66e5a9f43f
Fix typo 2017-08-08 17:09:19 +01:00
Frederik Rietdijk
d6c5109276 python35: 3.5.3 -> 3.5.4 2017-08-08 18:06:29 +02:00
James Cook
f6aa2df335 rftg: init at 0.9.4 
An implementation of the card game Race for the Galaxy, including an AI
 2017-08-08 08:56:29 -07:00
Peter Simons
67f37b70e8 Merge pull request #24944 from ahmedtd/make-makewrapper-picky 
makeWrapper: Fail loudly when misused
 2017-08-08 17:26:38 +02:00
Vincent Laporte
82a4c5e38b ImageMagick: fix Magick-config 2017-08-08 17:07:54 +02:00
kiloreux
49fd201ea3
Fix typo 2017-08-08 15:44:05 +01:00
Kranium Gikos Mendoza
725089bb2d powerstat: 0.02.11 -> 0.02.12 2017-08-08 23:46:01 +10:00
Kranium Gikos Mendoza
c943cf7c26 forkstat: 0.01.17 -> 0.02.00 2017-08-08 23:44:25 +10:00
Charles Strahan
7379d68016 Merge pull request #28039 from nonsequitur/patch-3 
ruby docs: simplify example
 2017-08-08 07:57:31 -04:00
Thomas Tuegel
ca6f1591ba Merge pull request #27013 from expipiplus1/qt-charts 
qt5: Add qtcharts submodule
 2017-08-08 06:48:25 -05:00
Tim Steinbach
39b5cd5f6d Merge pull request #28023 from volth/zookeeper-3.4.10 
zookeeper: 3.4.9 -> 3.4.10
 2017-08-08 07:20:22 -04:00
nonsequitur
460a485368 ruby docs: simplify example 
The 'phases' attribute is unneeded and misleading
 2017-08-08 12:49:52 +02:00
Michael Raskin
29c3ea0cf0 Merge pull request #27925 from adisbladis/networkmanager_unbound 
networkmanager service: use unbound if enabled
 2017-08-08 12:13:42 +02:00
kiloreux
6a279ec77a
Fix typo 2017-08-08 10:27:41 +01:00
kiloreux
2ff9f969a1
Added libopencore to all-packages.nix 2017-08-08 10:09:17 +01:00
Orivej Desh
a6e7dffd1f cc-wrapper: Fix standalone ld 2017-08-08 11:03:51 +02:00
Orivej Desh
c8e9dcc8a4 cc-wrapper: Fix standalone gcc 
This ensures that all salted variables are defined even if the wrapped program
is invoked outside nix-build environment.
 2017-08-08 11:03:51 +02:00
Orivej Desh
c8f7f18e69 cc-wrapper: Fix adding directories to rpath 
This fixes a bug introduced in #27831: `for path in "$dir"/lib*.so` assumed that
all libs match `lib*.so`, but 07674788d6 started
adding libs that match `*.so` and `*.so.*`.
 2017-08-08 11:03:51 +02:00
Domen Kožar
a082215df5
hydra: 2017-07-24 -> 2017-07-27 2017-08-08 10:50:50 +02:00
Taahir Ahmed
e1d46c0c4d makeWrapper: Only wrap normal executable files 
`makeWrapper` and `wrapProgram` are being invoked on all kinds of
wacky things (usually with the help of bash globs or other machine
assistance).

So far, I have come across `wrapProgram` being invoked on a directory,
as well as on the empty string.

As far as I can tell, it's only valid to invoke these utilities on a
normal (non-directory, non-device) executable file.  This commit
enforces that precondition.
 2017-08-08 03:46:47 -05:00
kiloreux
6f7f06375c
Implement required changes 2017-08-08 09:43:23 +01:00
Robin Gloster
3e981b9e33
Revert "cc-wrapper: fix set -u errors" 
This reverts commit 67a41eafe9.

see #28021 for discussion
 2017-08-08 10:20:00 +02:00
Robin Gloster
67a41eafe9
cc-wrapper: fix set -u errors 
cc @Ericson2314
 2017-08-08 10:15:34 +02:00
Peter Simons
550373b000 cabal-install: fix build after updating to version 2.x 2017-08-08 10:09:56 +02:00
Peter Simons
35dd36a027 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.4.1 from Hackage revision
d913f9a17b.
 2017-08-08 10:09:46 +02:00