mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 15:11:35 +00:00
Code Issues Wiki Activity
141608 commits 249 branches 124 tags 7.1 GiB
Commit graph

141608 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Ericson e5175fbf20 Merge remote-tracking branch 'upstream/master' into ios-mini-staging 2018-05-23 16:01:05 -04:00
John Ericson d7144e708b Merge remote-tracking branch 'upstream/master' into staging 2018-05-23 16:00:04 -04:00
John Ericson 78319bd948
Merge pull request #40999 from obsidiansystems/llvm-sieve 
llvm: Separate tools and libraries for clarity
 2018-05-23 15:57:36 -04:00
Joachim Fasting 1c14927d69
tor: 0.3.2.10 -> 0.3.3.6 
First stable release in the 0.3.3.x series
 2018-05-23 21:49:14 +02:00
Alexandre Esteves 3ab9caa3fa
Use requireFile for impure Xcode dependency 2018-05-23 20:32:15 +01:00
John Ericson 58fd684c76 llvm: Separate tools and libraries for clarity 
Especially provides clarity with respect to cross.
 2018-05-23 14:42:06 -04:00
adisbladis c75975434e
Merge pull request #40998 from ankhers/update_elixir 
elixir: 1.6.4 -> 1.6.5
 2018-05-24 02:38:49 +08:00
adisbladis 51c039bad1
Merge pull request #40950 from r-ryantm/auto-update/stunnel 
stunnel: 5.44 -> 5.45
 2018-05-24 02:37:49 +08:00
Matthew Justin Bauer d5af1da3cd
Merge pull request #40812 from baracoder/update-jetbrains 
Update jetbrains IDEs
 2018-05-23 13:32:32 -05:00
Matthew Justin Bauer 89e196d971
libiconv: fix setup hook 
Fixes issue from PR #40139.
 2018-05-23 13:09:45 -05:00
Johannes Frankenau b6b8cdd43f
libgudev: add gobjectIntrospection to nativeBuildInputs 2018-05-23 19:46:12 +02:00
Jan Tojnar a8d43946e7
Merge pull request #26090 from edwtjo/feedreader-2.0 
FeedReader 2.0
 2018-05-23 19:34:12 +02:00
Frederik Rietdijk 427689ec3c
Merge pull request #40988 from lsix/django-1.11.13 
pythonPackages.django: 1.11.12 -> 1.11.13
 2018-05-23 18:36:13 +02:00
Peter Simons 9c2b4e53fa hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
9866f7be16.
 2018-05-23 18:21:13 +02:00
Peter Simons f9524a48f3 LTS Haskell 11.10 2018-05-23 18:21:13 +02:00
Peter Simons ba47d40db9 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
4e1741ad6f.
 2018-05-23 18:21:13 +02:00
Peter Simons e7abee1939 hackage2nix: disable failing builds on Hydra 2018-05-23 18:21:12 +02:00
Yegor Timoshenko e28a586f94
sqlite{,-analyzer}: use the same src (#40945) 2018-05-23 19:06:46 +03:00
Mitsuhiro Nakamura 5efdf73832 sc-im: available on the other Unix-like platforms (#40986) 2018-05-23 17:49:02 +02:00
John Ericson 11fe14b2aa Merge branch 'ios-mini-staging' into staging 2018-05-23 11:46:49 -04:00
Matthew Justin Bauer 895fef2b19 clang3.4: still needs libedit 
https://hydra.nixos.org/build/72965931/nixlog/1
(cherry picked from commit 2d90138b3b)
 2018-05-23 11:46:40 -04:00
John Ericson ee9dc37e04
Merge pull request #40933 from obsidiansystems/linux-to-darwin 
stdenv, binutils: Build cctools targeting macOS on Linux without pointless rebuilds
 2018-05-23 11:37:43 -04:00
Jörg Thalheim 273c882f53
Merge pull request #39214 from seppeljordan/add-nix-prefetch-github 
Add nix-prefetch-github
 2018-05-23 16:33:03 +01:00
Sarah Brofeldt 6ea941d3fd gmsh: gfortran -> nativeBuildInputs (fix #40976) (#40984) 2018-05-23 17:32:43 +02:00
Justin Wood be7b42f49f elixir: 1.6.4 -> 1.6.5 2018-05-23 11:27:41 -04:00
Lancelot SIX b86aa55408 pythonPackages.pylibconfig2: 0.2.4 -> 0.2.5 (#40985) 2018-05-23 17:25:44 +02:00
markuskowa 96c81d2fdd beegfs/module: Fix a typo in meta.conf generation (#40979) 
This typo places mgtmd.extraConf in meta.conf
leading to meta.extraConf being ignored.
 2018-05-23 17:23:58 +02:00
Will Dietz 4bf6889876 strace: fix libunwind detection by fixing use of lib.optional (#40994) 2018-05-23 17:15:05 +02:00
Jörg Thalheim d6b9e625d5
Merge pull request #40977 from Mic92/radare2 
radare2: 2.5.0 -> 2.6.0
 2018-05-23 16:12:35 +01:00
Matthew Bauer 9416f29800 llvm: remove libedit from clang 
clang should never need libedit. From what I understand this is only
needed by LLDB.

https://github.com/llvm-mirror/clang/search?q=libedit
(cherry picked from commit 9ee69c27c9)
 2018-05-23 11:09:12 -04:00
Matthew Bauer d417ada9a6 clang: only link if LLVMgold exists 
buildEnv now errors with broken symlinks. Lots of things like this
still exist.

Discussion in #39038.

(cherry picked from commit 7b73c7f49a)
 2018-05-23 11:09:05 -04:00
John Ericson 63df0613d6 Merge branch 'ios-mini-staging' into staging 2018-05-23 10:58:54 -04:00
John Ericson aac8be76f5
Merge pull request #40992 from obsidiansystems/stdenv-darwin-persist 
darwin stdenv: Properly compose overrides
 2018-05-23 10:56:11 -04:00
Jörg Thalheim e87bfe08b6 radare2: 2.5.0 -> 2.6.0 2018-05-23 15:45:56 +01:00
Sebastian Jordan 2009c76a66 nixos/ipfs: Improve behavior of localDiscovery option 
It is no longer required to change the config your ipfs repo manually if you change
localDiscovery option in nixos configuration after ipfs repository initialization.
 2018-05-23 16:44:31 +02:00
Moritz Angermann fe1eec9e24 ghc 8.4.2, head: Drop libiconv on windows. 
nixpkgs#37012 and  nixpkgs#37707 introduces the setup-hooks for libiconv, which inject `-liconv` into the `NIX_LDFLAGS`. This breaks horribly on windows where the linker end up having no idea how to linke `-liconv`. The configure.ac file specifically ignores libiconv on windows.
 2018-05-23 10:41:17 -04:00
John Ericson c7458ded5c ghc 8.4.2, head: Adjust enableShared enableTerminfo for windows 2018-05-23 10:41:17 -04:00
Moritz Angermann 10b76a4cab ghc: paxmark all unwraped executables across the board 
Shell glob works even as the exact set of executable (filenames) varries
beween configuations. Need to skip non ELFs (e.g. shell scripts),
however.
 2018-05-23 10:41:15 -04:00
Peter Simons 1e225e6481
Merge pull request #40993 from obsidiansystems/tiny-haskell-builder 
haskell generic-builder: Tiny changes that preserve hases
 2018-05-23 16:32:49 +02:00
John Ericson 1978115c3b ghc: Handle flavors better 2018-05-23 10:27:42 -04:00
John Ericson 9ce15ea60c ghc: Normalize derivations 2018-05-23 10:27:42 -04:00
Moritz Angermann 63e5b3ce71 used stdenv.targetPlatform.isDarwin and not stdenv.isDarwin. 2018-05-23 10:27:42 -04:00
Moritz Angermann 87afa66a63 haskell infra: Adds buildFlags logic 2018-05-23 10:27:42 -04:00
Moritz Angermann affeb0cb80 haskell generic builder: Do the links dance only if shared is enabled. 2018-05-23 10:27:41 -04:00
Moritz Angermann a4d5dbd45d haskell generic builder: Disable static libs on Windows because no -staticlib 
The reason why this does not work is not that we can't built static
objects, we can, but we can't use `-staticlib` on GHC on windows.
`-staticlib` rolls all dependencies into a combined archive. While this
would work on windows if we used gnu ar and MRI script, GHC can't rely
on GNU ar, and as such has a quick archive concatenation module for GNU
and BSD archives only.
 2018-05-23 10:27:41 -04:00
Moritz Angermann 38fbdcc726 haskell generic builder: Use setup package database for setup-depends 
Adapted from b69f420121 by @Ericson2314
 2018-05-23 10:27:41 -04:00
John Ericson e1b9419dec haskell generic builder: setupHaskellDepends should be `nativeBuildInputs 
This is because they are just for Setup.hs, so they are just used at build time
and completely isolated from the normal components' dependencies.

This was previous implemented in 8a8f0408cd, but
reverted in e69c7f5641 because it broken
setup-depends non-cross in haskell shell environments (custom Setup.hs in cross
shell environments has never worked). This version adds a special native
exception to avoid that breakage.
 2018-05-23 10:27:39 -04:00
John Ericson 513cd3de0e haskell-generic-builder: Add extra framework dirs 
Just like with the other `--extra-*` flags, cc/ld-wrapper already handles
this, but we need to make Cabal aware so that the haskell builds have
the correct metadata.
 2018-05-23 10:26:57 -04:00
John Ericson 3394c96655 haskell generic-builder: Tiny changes that preserve hases 
These bring us closer to staging at no cost
 2018-05-23 10:23:06 -04:00
John Ericson 446cb32ea1 haskell generic-builder: Remove merge conflict 
I forgot this in 17316643fd
 2018-05-23 10:11:03 -04:00