Commit Graph
100 Commits
Author SHA1 Message Date
Daniel Peebles d46bf208b6 Merge pull request #58461 from DzmitrySudnik/tf
terraform-providers: bump versions
2019-03-28 15:40:05 -04:00
Daniel Peebles cc8545fa5e Merge pull request #55784 from LnL7/darwin-architecture
darwin.architecture: fix sandbox build
2019-02-16 14:47:18 -05:00
Daniel Peebles ccc02c5d82 Merge pull request #55350 from homich1991/master
chromedriver: 2.43 -> 2.46
2019-02-12 08:55:26 -05:00
Daniel Peebles 9b7c57cdc8 Merge pull request #50348 from DzmitrySudnik/exhibitor-service-fix
exhibitor: fix paths for zookeeper shell scripts
2018-11-14 09:32:14 -05:00
Daniel Peebles 8070a6333f Merge pull request #48538 from r-ryantm/auto-update/commons-compress
commonsCompress: 1.17 -> 1.18
2018-10-16 08:04:16 -04:00
Daniel Peebles 218aceb5fb Merge pull request #48533 from r-ryantm/auto-update/commons-math
commonsMath: 3.3 -> 3.6.1
2018-10-16 08:03:58 -04:00
Daniel Peebles f9396010a5 Merge pull request #46810 from copumpkin/bump-bootstrap-tools
stdenv/darwin: bump bootstrap tools
2018-09-18 09:13:17 -04:00
Daniel Peebles bb6506561d Merge pull request #46756 from copumpkin/patch-shebangs-test
top-level/release.nix: add patchShebangs test
2018-09-17 14:20:25 -04:00
Daniel Peebles 481dd45e61 Merge pull request #46730 from copumpkin/add-darwin-lto
cctools: support LTO on Darwin
2018-09-17 00:59:22 -04:00
Daniel Peebles b91ad0e54f Merge pull request #46704 from copumpkin/new-cf-staging
stdenv/darwin: integrate a new CoreFoundation
2018-09-15 16:42:49 -04:00
Daniel Peebles 794cfa7d3b Merge pull request #45360 from copumpkin/krb5-keyring
krb5: add linux keyring support
2018-08-21 07:43:48 -04:00
Daniel Peebles fe036ea2be Merge pull request #41908 from nicknovitski/dockertools-darwin
fix dockertools.pullImage on darwin
2018-07-27 23:42:56 -04:00
Daniel Peebles 363363298c Merge pull request #17757 from copumpkin/fetchurl-user-agent
fetchurl: add user agent
2018-06-11 12:49:06 -04:00
Daniel Peebles 0598652303 Stop requiring the nixpkgs symlink in NixOS channel tarballs
Ideally I'd like the whole `nixos`/`nixpkgs` channel distinction to disappear, but this is a step along that path. After a while being in this state, we can stop creating the magic `nixpkgs -> .` symlink inside our `nixos` channel tarballs and simplify that whole mess a bit.
2018-05-21 16:41:03 -04:00
Daniel Peebles 9a63471b3a Merge pull request #39828 from wchresta/souffle-1.2
souffle: 1.0.0 -> 1.2.0
2018-05-01 16:03:40 -04:00
Daniel Peebles ec569fc482 Merge pull request #39164 from ngortheone/master
Fix root volume resizing on EC2 KVM instances (M5, C5, etc)
2018-04-20 09:04:38 -04:00
Daniel Peebles fcbe4afe18 Merge pull request #36441 from LnL7/darwin-cleanup-frameworks
darwin-frameworks: cleanup
2018-04-04 09:38:27 -04:00
Daniel Peebles 7577356119 Merge pull request #37585 from copumpkin/hologram-server-module
hologram-server module: add cache timeout option
2018-03-21 13:09:46 -04:00
Daniel Peebles c7b3373851 Merge pull request #36902 from mpickering/qgis-darwin
Build QGIS and dependencies on darwin
2018-03-21 08:59:10 -04:00
Daniel Peebles 2c01884286 Merge pull request #37051 from ryantm/auto-update/libsolv
libsolv: 0.6.32 -> 0.6.33
2018-03-15 15:16:29 -04:00
Daniel Peebles 51954f1997 Merge pull request #36534 from codyleyu/master
Upgrade Nuget version from 2.8.5 to 3.4.3
2018-03-08 13:31:51 -05:00
Daniel Peebles d21a31f15c Merge pull request #34750 from copumpkin/fix-pkgs-fedoraproject-org
treewide: s/pkgs.fedoraproject.org/src.fedoraproject.org/
2018-02-08 17:11:48 -05:00
Daniel Peebles 30d031b5d8 Merge pull request #34339 from bdarnell/curl-http2-darwin
curlFull: Add http2Support for darwin
2018-02-07 00:28:53 -05:00
Daniel Peebles f6fb8e3c09 Merge pull request #34535 from jammerful/audiofile
audiofile: Update Patch File Location
2018-02-02 13:17:36 -05:00
Daniel Peebles bf9eb10c04 Merge pull request #34398 from joncojonathan/keepass_mono54
keepass: change from mono40 to mono54
2018-01-29 16:42:44 -05:00
Daniel Peebles 970511639b Merge pull request #34193 from NixOS/revert-34178-fix/clang-python3
Revert "clang-{4,5}: prefer python3, much friendlier for cross"
2018-01-23 10:15:25 -05:00
Daniel Peebles d18af2680d Revert "clang-{4,5}: prefer python3, much friendlier for cross" 2018-01-23 10:13:07 -05:00
Daniel Peebles 5fd528d043 amazon-image: use NTP provided by the hypervisor
See http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/set-time.html for more information.

Fixes #32187
2017-11-29 22:48:00 -05:00
Daniel Peebles 81cc9bb41d Merge pull request #31701 from matthewbauer/wesnoth-mac
Wesnoth MacOS
2017-11-20 22:42:59 -05:00
Daniel Peebles cee3fa9946 Merge pull request #31681 from awakesecurity/parnell/add-maintainer
maintainers: Add ixmatus to the maintainers set
2017-11-14 21:54:18 -05:00
Daniel Peebles 267be2ba62 Merge pull request #31676 from grahamc/sharutils
sharutils: simplify substituteInPlace syntax to be Nix 1.11.8 compatible
2017-11-14 19:38:24 -05:00
Daniel Peebles 881e41f0ac Merge pull request #31639 from matthewbauer/dosbox-on-darwin
Dosbox on darwin
2017-11-13 23:00:40 -05:00
Daniel Peebles 6f13844bfd Merge pull request #31535 from orivej/compress-qcow2
make-disk-image: add compressed option to compress qcow2 images
2017-11-12 19:17:08 -05:00
Daniel Peebles dc1ef6ce8c Merge pull request #31013 from NixOS/darwin-parallel
darwin: build applle stuff in parallel
2017-10-31 11:16:38 +01:00
Daniel Peebles c5dadc7f32 Merge pull request #30973 from nixos-docs/feat-remove-fetch-adc
fetchadc: removed
2017-10-30 16:53:44 +01:00
Daniel Peebles c3760f664e Merge pull request #30811 from puffnfresh/package/sbt-extras
sbt-extras: init at 77686b3
2017-10-26 08:51:38 -04:00
Daniel Peebles 5541a9c26f Merge pull request #30640 from matthewbauer/cmake-frameworks
cmake: setup CMAKE_FRAMEWORK_PATH
2017-10-25 09:59:40 -04:00
Daniel Peebles 4bf221932e Merge pull request #30750 from kuznero/pr/dotnet-sdk
dotnet-sdk: init at 2.0.3
2017-10-24 19:10:03 -04:00
Daniel Peebles 74ef9c60e9 Merge pull request #30692 from jonafato/keepassx-community-2.2.2
keepassx-community: 2.2.1 -> 2.2.2
2017-10-23 15:36:04 -04:00
Daniel Peebles 261bd27e42 Merge pull request #30661 from c0bw3b/pkg/librepo
librepo: 1.7.20 -> 1.8.1
2017-10-21 17:13:04 -04:00
Daniel Peebles 84f7f97add Merge pull request #30338 from copumpkin/xcbuild-fixes
darwin: fix assorted xcbuild builds
2017-10-12 07:22:10 -04:00
Daniel Peebles dd53e65e2e Merge pull request #30306 from copumpkin/xcbuild-update
xcbuild: 0.1.1 -> 0.1.2-pre
2017-10-11 18:54:38 -04:00
Daniel Peebles 71e0dbdf0c Merge pull request #30299 from copumpkin/xcbuild-sdk
xcbuild: add SDKROOT by default to the wrappers
2017-10-10 20:29:07 -04:00
Daniel Peebles 416979f3f7 Merge pull request #30150 from copumpkin/no-rpath-nonsense
Get rid of most @rpath nonsense on Darwin
2017-10-08 16:21:27 -04:00
Daniel Peebles acedcc9a83 Merge pull request #30063 from copumpkin/fetchpatch-fix
fetchpatch: allow callers to specify postFetch sensibly
2017-10-03 21:41:01 -04:00
Daniel Peebles 79d8ccf4f0 Merge pull request #28777 from copumpkin/installer-chroot
nixos-install: re-enable --chroot option
2017-09-26 12:23:19 -07:00
Daniel Peebles f0982ba4be Merge pull request #29594 from NeQuissimus/minikube_0_22_2
minikube: 0.22.1 -> 0.22.2
2017-09-20 10:51:57 -04:00
Daniel Peebles 22b79aecc6 Merge pull request #28980 from copumpkin/fix-coreutils-staging
coreutils: fix on Darwin
2017-09-04 14:05:42 -04:00
Daniel Peebles b291ead4aa Merge pull request #28729 from copumpkin/terraform-plugins
terraform: provide plugins for 0.10
2017-08-30 18:37:57 -04:00
Daniel Peebles 8c09e207ef Merge pull request #28767 from LnL7/darwin-cleanup
darwin attribute cleanup
2017-08-30 18:09:05 -04:00
Daniel Peebles ec75a30b66 Merge pull request #28722 from copumpkin/filterSource-cleanup
Deduplicate some filterSource invocations
2017-08-29 21:19:28 -04:00
Daniel Peebles 4f7f48fb1a Merge pull request #28521 from obsidiansystems/cc-wrapper-dead-code
cc-wrapper: Remove dead code
2017-08-24 16:05:51 -04:00
Daniel Peebles 7242500cc1 Merge pull request #27728 from konimex/ostree
ostree: 2016.11 -> 2017.9
2017-08-21 09:33:42 -04:00
Daniel Peebles de1110b52a Merge pull request #27960 from LnL7/clang-libgcrypt
libgcrypt: fix clang build
2017-08-07 16:52:59 -04:00
Daniel Peebles 8d8eae163f Merge pull request #27700 from joelthompson/exhibitor
exhibitor: Fix bug with automatic instance management
2017-07-28 15:58:43 -04:00
Daniel Peebles ac56eba704 Merge pull request #27552 from joelthompson/exhibitor
exhibitor: Fix bugs in previous package
2017-07-21 17:05:38 -04:00
Daniel Peebles 1698bda6b3 Merge pull request #27508 from joelthompson/exhibitor
exhibitor: init at 3.4.9
2017-07-21 10:49:20 -04:00
Daniel Peebles bd2e91e3a2 Merge pull request #27318 from copumpkin/darwin-high-sierra
Support High Sierra on Darwin
2017-07-18 17:06:06 -04:00
Daniel Peebles 9ee892cac7 Merge pull request #27372 from adisbladis/node_security_release
Node security releases
2017-07-14 00:37:18 -04:00
Daniel Peebles 598d79ae7d Merge pull request #27341 from lheckemann/installer-fixes
nixos-install: quote nixos-prepare-root arguments
2017-07-13 00:31:44 -04:00
Daniel Peebles ca1089a4f4 Merge pull request #27230 from robx/go16
go_1_6: Fix darwin (sierra) compile, backport systime syscall fix
2017-07-08 12:44:35 -04:00
Daniel Peebles 09194cafa8 Merge pull request #26937 from joachifm/lkl-4_11
lkl: 2017-03-24 -> 2017-06-27
2017-06-28 14:35:36 -04:00
Daniel Peebles 2dc0eaf0f1 Merge pull request #26797 from LnL7/erlang-versions
erlang: remove erlangR16 and all versioned variants from all-packages
2017-06-26 16:04:28 -04:00
Daniel Peebles 454041a557 Merge pull request #26040 from joachifm/lkl
lkl: d747073 -> 2017-03-24
2017-05-23 23:17:52 -04:00
Daniel Peebles ec117f761f Merge pull request #26034 from veprbl/nixpatches
nixStable: remove old patches
2017-05-23 17:33:31 -04:00
Daniel Peebles eb3eddad26 Merge pull request #25995 from bhmiller/master
pants13-pre: 1.3.0.dev19 -> 1.3.0rc2
2017-05-22 12:48:08 -04:00
Daniel Peebles 8f71273a2c Merge pull request #25491 from vaibhavsagar/remove-nginx-syslog
nginx: remove syslog module
2017-05-03 22:46:59 -04:00
Daniel Peebles 2e51d27787 Merge pull request #25473 from aneeshusa/update-capnproto-to-0.6.0
capnproto: 0.5.3 -> 0.6.0
2017-05-03 21:20:52 -04:00
Daniel Peebles a91813023b Merge pull request #25467 from jammerful/shibservice
shibboleth-sp module: Set Config File Path for FastCGI Units
2017-05-02 21:14:57 -04:00
Daniel Peebles 436ece25b6 Merge pull request #25422 from jammerful/shibservice
Add Shibboleth Service Provider Module
2017-05-02 11:47:41 -04:00
Daniel Peebles 1de27d461c Merge pull request #25402 from bhmiller/master
pants13-pre: 1.3.0.dev13 -> 1.3.0.dev19
2017-05-01 14:14:06 -04:00
Daniel Peebles daf16b5679 Merge pull request #25391 from Mic92/nixos-prepare-root
nixos-prepare-root: force symlink at /run
2017-05-01 10:15:36 -04:00
Daniel Peebles 76137a801d Merge pull request #25304 from copumpkin/check-meta
stdenv-generic: add meta attribute checking
2017-04-28 21:55:30 -04:00
Daniel Peebles 14adea9156 Merge pull request #25269 from awakenetworks/parnell/terraform-bump
terraform: 0.9.3 -> 0.9.4
2017-04-27 14:32:08 -04:00
Daniel Peebles b3b6b2e38c Merge pull request #25255 from jammerful/shibboleth
Add Shibboleth Service Provider
2017-04-27 11:03:22 -04:00
Daniel Peebles 1ec8afdfdc Merge pull request #25197 from copumpkin/azure-image-common
azure-image: switch to use the common make-disk-image.nix
2017-04-25 17:18:08 -04:00
Daniel Peebles 3ae7f249da Merge pull request #25187 from obsidiansystems/remove-stray-kernel-headers
linux-headers: Remove stray linux headers 3.18 nix file
2017-04-24 23:07:58 -04:00
Daniel Peebles f2d1aa05de Merge pull request #25165 from copumpkin/google-image-common
google-compute-image: switch to use the common make-disk-image.nix
2017-04-24 18:30:26 -04:00
Daniel Peebles 7025fc6d06 Merge pull request #24964 from copumpkin/make-disk-image-refactor
make-disk-image: change to be less VM-centric
2017-04-23 22:31:22 -04:00
Daniel Peebles e9f1d8693a Merge pull request #23026 from copumpkin/nixos-install-wip
Refactor nixos-install to separate out filesystem build logic
2017-04-17 09:50:35 -04:00
Daniel Peebles 09a9a472ee Merge pull request #24830 from mayflower/refactor/boolToString
treewide: use boolToString function
2017-04-13 09:45:31 -04:00
Daniel Peebles f21a6940da Merge pull request #24838 from matthewbauer/ibtool
pinentry_mac: use xcbuild
2017-04-12 22:20:57 -04:00
Daniel Peebles da79d1f01f Merge pull request #24428 from acowley/libdc1394-darwin
libdc1394: patch bugs on darwin
2017-03-28 21:54:32 -04:00
Daniel Peebles f33e19aa2c Merge pull request #24411 from NeQuissimus/kubernetes_1_5_6
kubernetes: 1.5.4 -> 1.5.6
2017-03-28 21:47:22 -04:00
Daniel Peebles cea6bfac1c Merge pull request #22098 from dtzWill/feature/swift
swift: init at 3.1
2017-03-28 21:21:30 -04:00
Daniel Peebles 903fc1d6c9 Merge pull request #24418 from LnL7/darwin-rust
rustc: use llvm_39
2017-03-28 20:34:07 -04:00
Daniel Peebles eab30996bd Merge pull request #24355 from LnL7/libcxx-4-pthreadmach
libcxx-4: add pthread_mach_thread_np patch
2017-03-26 17:30:02 -04:00
Daniel Peebles 826ae5ff21 Merge pull request #24058 from LnL7/go-cacert
go: use NIX_SSL_CERT_FILE for crypto/x509
2017-03-26 11:11:05 -04:00
Daniel Peebles a9644fb1f0 Merge pull request #24239 from spacekitteh/fetchFromGitRepo
Added fetchRepoProject
2017-03-23 23:30:07 -04:00
Daniel Peebles f5aebcd465 Merge pull request #24216 from LnL7/fox-llvm-4
fox: fix build with clang >=4 and possibly other versions
2017-03-22 22:16:00 -04:00
Daniel Peebles 9e95fb05c5 Fix typo
I should learn to type properly 🙃
2017-03-22 12:33:37 -04:00
Daniel Peebles 16a0c38324 Merge pull request #24185 from LnL7/atomicparsley-clang
atomicparsley: fix build with llvm 4
2017-03-21 20:24:59 -04:00
Daniel Peebles 555a37e5bc Merge pull request #24152 from copumpkin/gcc-simplify
gfortran/gcc: simplify & clean up on Darwin
2017-03-21 09:04:55 -04:00
Daniel Peebles 0c1b600346 Merge pull request #24122 from mdaiter/master
yaws: erlang R17 -> R18
2017-03-20 09:50:04 -04:00
Daniel Peebles 67b32d2c89 Merge pull request #24107 from calvertvl/update-src
Update src
2017-03-20 01:01:41 -04:00
Daniel Peebles 5148be4866 Merge pull request #24018 from copumpkin/llvm-39-improvements
LLVM 3.9 improvements
2017-03-19 20:53:46 -04:00
Daniel Peebles e965d6d5f5 Merge pull request #24014 from copumpkin/llvm-4-improvements
llvm-4: small improvements on Darwin and elsewhere
2017-03-18 14:58:18 -04:00
Daniel Peebles 2eb48daa94 Merge pull request #23974 from cleverca22/qtmultimedia
qtmultimedia-5.7: disable alsa on darwin
2017-03-16 22:28:19 -04:00
Daniel Peebles 38a03817b0 Merge pull request #22571 from LnL7/darwin-frameworks-hook
add setup-hook to fix darwin frameworks
2017-03-15 11:33:23 -04:00
Daniel Peebles d78f3de21b Merge pull request #23907 from copumpkin/update-frameworks
Update macOS frameworks from 10.9 to 10.10
2017-03-15 11:22:55 -04:00