3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

139821 commits

Author SHA1 Message Date
John Ericson c17f79ea3b Merge remote-tracking branch 'upstream/master' into lib-platform-simplify 2018-05-10 01:40:44 -04:00
John Ericson feb648ce59 Merge commit '70963b382f3f820ba6d3bc3b3aaf50a2957ec1ff' into lib-platform-simplify 2018-05-10 01:40:38 -04:00
John Ericson a02be2bd85 treewide: Get rid of *Platform.arch
Use `parsed.cpu.name` or `platform.gcc.arch` instead.
2018-05-10 01:37:31 -04:00
Peter Hoeg 0c810eeae1 mc: parallel build 2018-05-10 13:25:48 +08:00
Peter Hoeg 6e62f01912 slang: 2.3.1a -> 2.3.2 2018-05-10 13:25:31 +08:00
Frederik Rietdijk 3390592cfc python.pkgs.traitlets: fix build and don't include .pytest_cache
Fixes build and prevents including `.pytest_cache` file (#40259).
2018-05-10 07:17:37 +02:00
John Ericson 0fd655f355
Merge pull request #40268 from obsidiansystems/uclibc
uclibc: Bump and clean
2018-05-10 00:47:30 -04:00
John Ericson 3bc923bf5f Merge remote-tracking branch 'upstream/master' into uclibc 2018-05-10 00:23:12 -04:00
John Ericson b3ef322770 Merge commit '70963b382f3f820ba6d3bc3b3aaf50a2957ec1ff' into uclibc 2018-05-10 00:18:51 -04:00
John Ericson a31984ecda uclibc: Bump to uclibc-ng 1.0.30 2018-05-10 00:17:44 -04:00
John Ericson d65fe65616 uclibc: Fix eval 2018-05-10 00:17:43 -04:00
John Ericson 83fdfb9837
Merge pull request #40210 from ElvishJerricco/fix-android-prebuilt-ghc
Fix android prebuilt ghc [Fixes #40194]
2018-05-10 00:10:11 -04:00
Peter Hoeg 17b2ef2461 hugo: 0.36.1 -> 0.40.3 2018-05-10 11:54:56 +08:00
Will Fancher 9dadb9e3cb Fix hsc2hs cross compiler build 2018-05-09 23:53:30 -04:00
John Ericson f063a860d6 xbursttools: Cleanup slightly 2018-05-09 23:40:13 -04:00
John Ericson e42a7a5c0b lib/systems: Add uClibc just like MUSL 2018-05-09 23:39:23 -04:00
John Ericson 0b45f0ebf9
Merge pull request #40261 from obsidiansystems/more-arm
lib/systems: Parse more arm cpu types
2018-05-09 20:05:10 -04:00
Thorsten Weber 9485034401 slic3r-prusa3d: 1.39.1 -> 1.39.2 2018-05-10 01:46:51 +02:00
xeji 2954fa55e9
Merge pull request #40244 from bcdarwin/libminc-update
libminc: 2017-09-14 -> 2018-01-17
2018-05-10 01:46:43 +02:00
Yannik Sander 58ab75c639 atom: fix git integration (#40163) 2018-05-09 18:34:57 -05:00
xeji 3d6f752c51
Merge pull request #39099 from teto/qemu_agent
qemu-guest-agent: init module
2018-05-10 01:22:52 +02:00
Matthew Justin Bauer 1682353805
generic-stack-builder: also support nix-build
We need to add the STACK_IN_NIX_EXTRA_ARGS hook in configurePhase also to ensure we get the right args when calling ```nix-build``` (as opposed to nix-shell).
2018-05-09 18:12:13 -05:00
José Romildo Malaquias 2b9db24768 zuki-themes: 3.26-1 -> 3.28-1 2018-05-09 20:03:48 -03:00
John Ericson 3fa0ba9177 lib/systems: Parse more arm cpu types 2018-05-09 18:57:39 -04:00
John Ericson 12ee278a0d
Merge pull request #40248 from matthewbauer/fix-generic-stack-builder
generic-stack-builder: attempt to add propagation
2018-05-09 17:52:00 -04:00
Michael Weiss 038bf4f68b tdesktopPackages.preview: 1.2.17 -> 1.2.19 2018-05-09 23:22:13 +02:00
Bas van Dijk 53d6997e5d haskell: fix build of base-compat-batteries 2018-05-09 22:59:54 +02:00
Ben Darwin 1e50e178ae simpleitk: init at 1.1.0 (note this only builds the C++ libs, not the Python/Lua/... bindings) (#27451)
* conglomerate: init at 2017-09-10

* simpleitk: init at 1.1.0 (note this only builds the C++ libs, not the Python/Lua/... bindings)
2018-05-09 15:50:01 -05:00
Matthew Bauer 527abe59cf generic-stack-builder: attempt to add propagation
Fixes #40039

This adds a shellHook to handle propagated dependencies like that seen
in #40039 where gpgme needed libgpg-error.
2018-05-09 15:46:48 -05:00
Matthew Bauer 8a98cf97e9 lib.makeSearchPath: allow null in search path
This makes things match ‘buildInputs’ where inputs are allowed to be
null.
2018-05-09 15:44:06 -05:00
Matthew Justin Bauer 37cde0036e
Merge pull request #36358 from nicknovitski/init-cloud-sql-proxy
cloud-sql-proxy: init at 1.11
2018-05-09 15:42:32 -05:00
Michael Weiss 7fb1a79b8f androidStudioPackages.{dev,canary}: 3.2.0.12 -> 3.2.0.13 2018-05-09 22:39:16 +02:00
Ben Darwin 6266387bfa libminc: 2017-09-14 -> 2018-01-17 2018-05-09 16:25:22 -04:00
xeji 1d3537ba9d
Merge pull request #40241 from romildo/upd.plano-theme
plano-theme: 3.24-3 -> 3.28-1
2018-05-09 22:11:12 +02:00
Michael Brantley df37647ab2
Fix alphabetization of perl modules 2018-05-09 21:56:27 +02:00
Michael Brantley 9410c39b9a
perlPackages.LinuxACL: init at 0.05 2018-05-09 21:56:27 +02:00
Michael Brantley 7b0b4cd397
perlPackages.NetZooKeeper: init at 0.41 2018-05-09 21:55:32 +02:00
José Romildo Malaquias e745d087c6 plano-theme: 3.24-3 -> 3.28-1 2018-05-09 16:44:28 -03:00
xeji 96c2cad2dd
Merge pull request #39566 from bfortz/owncloud-2.4.1
owncloud-client: 2.3.4 -> 2.4.1
2018-05-09 21:43:03 +02:00
xeji c85d0beca5
Merge pull request #40204 from teto/wireshark_hook
wireshark: run binary from nix-shell
2018-05-09 21:24:27 +02:00
xeji 59e9400071
Merge pull request #40238 from va1entin/master
keepassxc: 2.3.2 -> 2.3.3
2018-05-09 21:20:55 +02:00
Sarah Brofeldt 3befef8279
Merge pull request #39671 from johanot/keepalived-vrrpInstanceTracking
nixos/keepalived: Implemented vrrp-instance track scripts and track interfaces
2018-05-09 20:54:36 +02:00
Valentin Heidelberger 32d8a7d249 keepassxc: 2.3.2 -> 2.3.3 2018-05-09 20:50:06 +02:00
Peter Simons a9577da115 haskell-brick: update override for ghc-8.4.x to the latest version 2018-05-09 20:41:33 +02:00
Peter Simons 77fbd14d85 haskell-gi: apply upstream patch to fix the doctest suite 2018-05-09 20:41:33 +02:00
Peter Simons 5c26dd3195 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
6ab957cb81.
2018-05-09 20:41:28 +02:00
xeji d13108dac6
Merge pull request #40236 from emmanuelrosa/gnucash-release-notes
gnucash: add upgrade instructions to NixOS release notes
2018-05-09 20:31:59 +02:00
Peter Simons 85fc8338bc
Merge pull request #40198 from endgame/dontCheck-blank-canvas_0_6_2
haskellPackages.blank-canvas_0_6_2: dontCheck
2018-05-09 19:57:23 +02:00
Ben Darwin a9492eb70f Merge branch 'master' of github.com:NixOS/nixpkgs 2018-05-09 13:37:33 -04:00
Emmanuel Rosa 0198bcc1eb gnucash: add upgrade instructions to NixOS release notes 2018-05-09 13:21:38 -04:00