3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

133010 commits

Author SHA1 Message Date
John Ericson 2ce3df3f5d Merge commit '543210751f46a4787fd0a5ef4c3bfa9a4b789e3c' into greppable 2018-03-20 12:37:11 -04:00
John Ericson 175d4ab1db lib: Make platform predicates greppable
Should have commited on here and on merged master to begin with, but I
didn't, so instead I cherry-pick.

(cherry picked from commit 88c04a8b6b)
2018-03-20 12:35:20 -04:00
John Ericson 543210751f
Merge pull request #37398 from obsidiansystems/greppable
lib: Make platform predicates greppable
2018-03-19 22:43:58 -04:00
Tim Steinbach 73d101af00
linux-copperhead: 4.15.10.a -> 4.15.11.a 2018-03-19 22:32:47 -04:00
John Ericson 18fa42d8a1
Merge pull request #37399 from obsidiansystems/release-lib-typo
lib: Messed up `or` operator precedence
2018-03-19 22:31:15 -04:00
John Ericson ec2aff0be6 lib: Messed up or operator precedence
Github broke oddly on my previous PR, so I tested and merged by hand.
Otherwise ofborg would have caught this.
2018-03-19 22:25:49 -04:00
John Ericson 88c04a8b6b lib: Make platform predicates greppable 2018-03-19 22:20:48 -04:00
John Ericson 5bb50fb9f6 Merge pull request #37397 from obsidiansystems/nixpkgs 2018-03-19 21:53:48 -04:00
John Ericson b9a720c524 Merge remote-tracking branch 'upstream/master' into fix-cross-jobs 2018-03-19 21:47:56 -04:00
John Ericson 192f4144b2 release-lib: Filter supportedSystems with meta.platforms-style patterns
Instead of intersecting system strings, we filter with the sort of
patterns used in `meta.platforms`.

Indicating this change `forTheseSystems` has been renamed to
`forMatchingSystems`, since the given list is now patterns to match, and
not the systems themselves. [Just as with `meta.platforms`, systems
strings are also supported for backwards compatibility.]

This is more flexible, and makes the `forMatchingSystems` and
packagePlatforms` cases more analogous.
2018-03-19 21:32:28 -04:00
Will Dietz 47d3f10ecd
Merge pull request #37054 from dtzWill/update/aws-sdk-cpp-1.4.15
aws-sdk-cpp: 1.4.10 -> 1.4.15
2018-03-19 20:14:30 -05:00
Will Dietz 48c3e60061 aws-sdk-cpp: 1.4.10 -> 1.4.15 2018-03-19 20:05:53 -05:00
Tuomas Tynkkynen a2d8a9aad7 armTrustedFirmware: Remove targetPlatforms like was done in U-Boot
Should also fix Hydra attempting to build this stuff on x86, like
https://hydra.nixos.org/build/71533289
2018-03-20 02:33:40 +02:00
Jörg Thalheim f71a636d3f
Merge pull request #37385 from coreyoconnor/google-drive-ocamlfuse-update
google-drive-ocamlfuse and gapi-ocaml update
2018-03-20 00:17:43 +00:00
Jörg Thalheim 1f50e84197
Merge pull request #37394 from jlesquembre/kitty
kitty: 0.8.0 -> 0.8.2
2018-03-20 00:17:19 +00:00
John Ericson 3c331bff5b
Merge pull request #37395 from obsidiansystems/lib-meta-platform
lib: Factor in tiny bit of `meta.platform` checking
2018-03-19 20:12:50 -04:00
Michael Weiss e8fe2e1548 tdesktopPackages.preview: init at 1.2.12
Start tracking the pre-releases. I'll have to refactor/improve the
patching soon.
2018-03-20 00:42:33 +01:00
Jörg Thalheim d31f6167ed
Merge pull request #37387 from tadfisher/bump/browserpass
browserpass: 2.0.11 -> 2.0.13
2018-03-19 23:29:51 +00:00
John Ericson e547bd0dc4 lib: Factor in tiny bit of meta.platform checking
I need it in stdenv and release-lib, so that seems motivation enough.
2018-03-19 19:29:16 -04:00
Jörg Thalheim e509181f05
Merge pull request #37384 from gnidorah/cgit
cgit: wrap python scripts
2018-03-19 23:23:44 +00:00
Daiderd Jordan 3539ca2179
Merge pull request #37354 from knedlsepp/fix-pythonPackages.notebook-on-darwin
pythonPackages.notebook: fix darwin build
2018-03-20 00:04:58 +01:00
Daiderd Jordan 3f964978d8
libftdi: mark linux only 2018-03-20 00:01:52 +01:00
Daiderd Jordan 031492cbfe
kore: fix clang build
/cc ZHF #36454
2018-03-20 00:00:42 +01:00
Daiderd Jordan 5873a3418b
iniparser: fix darwin build
/cc ZHF #36454
2018-03-19 23:41:50 +01:00
José Luis Lafuente 176b9ae095
kitty: 0.8.0 -> 0.8.2 2018-03-19 23:41:49 +01:00
Daiderd Jordan e616725ba0
imatix_gsl: fix clang build
/cc ZHF #36454
2018-03-19 23:41:49 +01:00
Daiderd Jordan d7856d3c2a
ii: fix darwin build
/cc ZHF #36454
2018-03-19 23:41:49 +01:00
Jörg Thalheim 34624ecca2
Merge pull request #37392 from xeji/p/altermime
altermime: fix build
2018-03-19 22:35:43 +00:00
Robert Schütz 4686259904
Merge pull request #37391 from lsix/svg-path-2.2
pythonPackages.svg-path: 2.0b1 -> 2.2
2018-03-19 23:28:51 +01:00
Jörg Thalheim a6f966e289
Merge pull request #37389 from tadfisher/bump/gmailieer
gmailieer: 0.5 -> 0.6
2018-03-19 22:27:08 +00:00
Andrew Childs 3928fd9081 Chromium: fix skia build on aarch64
Patch imported from Arch Linux ARM
2018-03-20 00:20:42 +02:00
Daiderd Jordan bca15c5331
Merge pull request #37347 from knedlsepp/fix-pycurl-on-darwin
python3Packages.pycurl: fix darwin build
2018-03-19 23:16:42 +01:00
xeji f9ed23d271 altermime: fix build 2018-03-19 22:59:59 +01:00
Lancelot SIX de63ff83a7
pythonPackages.svg-path: 2.0b1 -> 2.2 2018-03-19 22:39:56 +01:00
Matthew Justin Bauer 5675f17b0e
Merge pull request #35590 from TomSmeets/android-studio-ndk-fix
android-studio: Depend on ncurses5
2018-03-19 15:31:39 -05:00
Matthew Justin Bauer 7452996ac6
Merge pull request #36381 from bgamari/bump-kicad
kicad-unstable: Bump git commit
2018-03-19 15:28:58 -05:00
schneefux e2b8dfa867 metabase: init at 0.28.1 (#33460) 2018-03-19 15:27:18 -05:00
Matthew Justin Bauer 7382ae8acf
Merge pull request #35480 from erictapen/osrm-bump
osrm-backend: 5.15.0 -> 5.16.0
2018-03-19 15:24:58 -05:00
Tad Fisher 4cb10bf329 gmailieer: 0.5 -> 0.6 2018-03-19 12:31:11 -07:00
Robert Schütz c484079ac7
Merge pull request #36927 from dotlambda/borg-module
nixos/borgbackup: init
2018-03-19 20:30:32 +01:00
John Ericson c22e2f86c7
Merge pull request #37359 from obsidiansystems/lib-darwin-reorg
lib: Split Darwin into macOS and iOS
2018-03-19 15:08:06 -04:00
Tad Fisher 82f2c19d98 browserpass: 2.0.11 -> 2.0.13 2018-03-19 12:01:08 -07:00
WilliButz ca7b29050f grafana: 5.0.2 -> 5.0.3, fix headless phantomjs 2018-03-19 19:59:10 +01:00
Corey O'Connor a140fe83f5 google-drive-ocamlfuse: 0.6.21 -> 0.6.25.
Also change to use jbuilder for build per upstream instructions. In this case, the build needs to be
driven by jbuilder but opam still needs to be in PATH.
2018-03-19 11:47:18 -07:00
Corey O'Connor 26fac59c32 gapi-ocaml: 0.3.4 -> 0.3.6. Also change to use opam/jbuilder for build. 2018-03-19 11:47:12 -07:00
gnidorah 55f1bbe623 cgit: wrap python scripts 2018-03-19 21:42:25 +03:00
Thomas Tuegel 6f04eec460
Merge pull request #36870 from bkchr/plasma_5_12_3
plasma5: 5.12.2 -> 5.12.3
2018-03-19 13:39:08 -05:00
Sarah Brofeldt 7112a393fd
Merge pull request #37376 from tazjin/feat/init-mq-cli
mq-cli: init at 1.0.0
2018-03-19 19:37:40 +01:00
Sarah Brofeldt c23f14a6d7
Merge pull request #37258 from eonpatapon/nextcloud
nextcloud: 13.0.0 -> 13.0.1
2018-03-19 19:31:51 +01:00
Tim Steinbach 242abf396f
linux: 4.16-rc5 -> 4.16-rc6 2018-03-19 14:09:10 -04:00