public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
151,939 Commits 1 Branch 0 Tags
2bec98ae06d21932872a4e9d80fa22bce09db91f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Bauer 4120a9dda7 Merge pull request #42295 from avnik/libprefixed-to-multioutput/heimdal 
Libprefixed to multioutput/heimdal
 2018-09-05 13:50:13 -05:00
Matthew Bauer 7974e45689 firefox: readd --disable-xcode-checks 
Only works on version 61 apparently, but it is needed.
 2018-08-23 13:09:16 -05:00
Matthew Bauer e2d67d2bf5 Merge pull request #45453 from uri-canva/node-10-node-gyp 
nodePackages_10_x: add node-gyp
 2018-08-22 15:01:59 -05:00
Matthew Bauer f7bc33abf0 Revert "treewide: fixup breakage due to absolute compiler path" 
This reverts commit d0888d1503.
 2018-08-22 01:14:53 +02:00
Matthew Bauer 5a012fdbb3 Revert "openjdk: fixup build after #44767" 
This reverts commit 38eea804e6.
 2018-08-22 01:14:53 +02:00
Matthew Bauer 13c8acc3db Revert "Merge pull request #44767 from obsidiansystems/wrapper-env-var-path" 
This reverts commit 89efc27f57, reversing
changes made to d0f11020ca.
 2018-08-22 01:14:53 +02:00
Matthew Bauer 379fc894de Merge remote-tracking branch 'origin/master' into staging 2018-08-21 15:41:53 -05:00
Matthew Bauer 4826f9b828 qtwebengine: remove old darwin patch 
file apparently doesn’t exist anymore
 2018-08-20 20:49:25 -05:00
Matthew Bauer b300dddae1 xcbuild: only override version with 1 arg 
sometimes we want the "SDK" version from xcbuild so we do something
like:

$ xcbuild -version -sdk MacOSX10.10
SDKSettings.plist - MacOSX10.10 (MacOSX10.10)
SDKVersion: 10.10
Path: /nix/store/6k7crm1n4drf09ga0dwvbmb59x4zl2i2-SDKs/MacOSX10.10.sdk
PlatformPath: /nix/store/vhfwb1znfy65s2xs27j8xribk6mp6lbw-Platforms/MacOSX.platform
ProductName: Mac OS X
ProductVersion: 10.10

This was previously overriden by the current xcode version so you
would get:

Xcode 9.4.1
Build version 17E189

This should fix the other usage of -version in nodejs 6.x.
 2018-08-20 13:16:37 -05:00
Matthew Bauer 4ff7702082 Merge pull request #45183 from matthewbauer/macdevelop 
Assorted darwin/macOS fixes
 2018-08-17 10:29:12 -05:00
Matthew Bauer 6cb6ea1fed release: use jobs.firefox-unwrapped 
`firefox' is not built on hydra, only firefox-unwrapped is.
 2018-08-17 10:27:48 -05:00
Matthew Bauer ee92ab07ba chuck: cleanup 2018-08-16 22:54:32 -05:00
Matthew Bauer 030760a994 doomseeker: fix on darwin 2018-08-16 22:44:08 -05:00
Matthew Bauer aba9f67d7d qca: fix on darwin 2018-08-16 22:44:07 -05:00
Matthew Bauer 2d63877fa4 wireshark: fix on darwin 
Need CMP0025 to be set. No way to do it from the command
line (overrode by the cmake_minimimum_version policy).

Fixes #44878
 2018-08-16 22:44:07 -05:00
Matthew Bauer bca8144274 treewide: disable some tests broken on darwin 
disable checks for:

- cython
- ldap
- tqdm
 2018-08-16 22:44:07 -05:00
Matthew Bauer 3d6448250f Merge pull request #43550 from IvanMalison/add_rofi-systemd 
rofi-systemd: init at 0.1.0
 2018-08-15 19:56:16 -05:00
Matthew Bauer bbb0e5332b Merge pull request #44879 from jasoncarr0/add-jake-madoko 
nodePackages.jake init, nodePackages.madoko init
 2018-08-15 19:41:44 -05:00
Matthew Bauer 6e094cb4bf Merge pull request #44699 from yrashk/tiddlywiki 
nodePackages.tiddlywiki: init at 5.1.17
 2018-08-15 19:41:22 -05:00
Matthew Bauer 7a39b0c43b libglvnd: build on darwin 2018-08-15 17:37:00 -05:00
Matthew Bauer b421a7d0a6 nodejs: remove ‘no-xcode’ patches 
now provided by xcbuild
 2018-08-15 17:35:56 -05:00
Matthew Bauer d4b453d2c1 v8: remove xcodebuild patch 
Add xcodebuild commands from xcbuild.
 2018-08-15 17:27:56 -05:00
Matthew Bauer 0c633ccf26 firefox: add default for execdir 
not all of the browsers have this set
 2018-08-14 22:34:46 -05:00
Matthew Bauer 4c1d5a8dac Merge pull request #44899 from bhipple/fix/antlr-license 
antlr: fix license
 2018-08-12 09:00:26 -05:00
Matthew Bauer 98df4f6351 Merge pull request #44186 from matthewbauer/firefox 
Firefox on Darwin
 2018-08-11 22:56:04 -05:00
Matthew Bauer 08655b16f2 firefox: fix darwin wrapper 
- add execdir passthru
  usually this is /bin on macOS it is different.
 2018-08-11 22:54:48 -05:00
Matthew Bauer c391bd3dd3 xcbuild: cleanup 
fix shell shebang
 2018-08-11 22:54:48 -05:00
Matthew Bauer 8fba05403a firefox: build on darwin 
Fixes #30285

Some things done:

- Add macOS frameworks needed
- Fix RUST_BINDGEN handling. We need to pass all of NIX_CFLAGS_COMPILE
  to rust bindgen
- Add custom install phase for darwin
 2018-08-11 22:54:48 -05:00
Matthew Bauer 4b71fe6d86 firefox: cleanup expression 
- Add a few more macOS frameworks needed
- Fix RUST_BINDGEN handling. We need to pass all of NIX_CFLAGS_COMPILE
  to rust bindgen
 2018-08-11 22:54:48 -05:00
Matthew Bauer 72a1bc9a28 release18.09: add darwin target jobs 
These are some parts of the release that I want to get working before
we release 18.09. There have been lots of improvements since 18.03 (as
well as some regressions). To make sure the release is well-tested we
need to add these apps in the jobset. Most of these are UI apps that
are now available.

List of new apps added to the release:

- wireshark
- firefox
- qtmultimedia (already in unstable)
- inkscape (already in unstable)
- gimp
- wireshark
- transmission

Also add ‘stack’. This is one of the Haskell packages hitting the
ARG_MAX limit on macOS (getconf ARG_MAX == 262144). This has not been
solved yet but it will need to be resolved by 18.09. Making it block
here will prevent this regression in the future.

[squashed] release: remove broken from darwin-tested

removes:

- gimp
- qtmultimedia
 2018-08-11 22:54:48 -05:00
Matthew Bauer b5d529d52f xcbuild: cleanup 2018-08-11 22:54:48 -05:00
Matthew Bauer 0edb441a0e firefox: build on darwin 
Fixes #30285
 2018-08-11 22:54:48 -05:00
Matthew Bauer fca6cdc362 Merge pull request #44632 from matthewbauer/putty 
Support building putty for windows
 2018-08-10 12:41:36 -04:00
Matthew Bauer f0fcbafa98 Merge pull request #44558 from oxij/stdenv/symlink-propagated-docs 
stdenv: symlink propagated docs
 2018-08-07 10:56:26 -04:00
Matthew Bauer 0590b3106b Merge pull request #44520 from oxij/pkg/appimagekit 
appimagekit: init at 20180727
 2018-08-06 11:14:59 -04:00
Matthew Bauer ec34a91706 Merge pull request #44308 from matthewbauer/fix-cross-ensureUnaffected-test 
Fix androidndk "ensure unaffected test"
 2018-08-02 16:54:10 -04:00
Matthew Bauer 117680b0e9 Merge pull request #44126 from eadwu/opencollada/resolve-pcre-declarations 
opencollada: include pcre.h (KhronosGroup/OpenCOLLADA#570)
 2018-08-02 16:44:08 -04:00
Matthew Bauer eb1afe452a Merge pull request #44332 from jerith666/restic-s3-default 
restic: add missing default for s3CredentialsFile
 2018-08-01 22:56:12 -04:00
Matthew Bauer 8fe1620513 Merge pull request #43080 from mnacamura/cdda 
cataclysm-dda{,-git}: move common attributes to common.nix
 2018-08-01 21:45:26 -04:00
Matthew Bauer 7ee610fd6c Merge pull request #43604 from udono/update_tryton_4_8 
Minor upstream update Tryton 4 8
 2018-08-01 21:29:40 -04:00
Matthew Bauer 65c43b4468 python.futures: disable tests on darwin 
https://hydra.nixos.org/build/78788633
 2018-07-31 22:11:32 -04:00
Matthew Bauer f3fc04bfd2 llvm6: disable tests on cross compiler 
This seems to be broken currently.

https://hydra.nixos.org/build/77597880/nixlog/1

/cc @ericson2314 @dtzWill
 2018-07-31 21:46:07 -04:00
Matthew Bauer c7d77c90c6 llvm5: disable tests on cross compilers 
This appears to be broken currently.

https://hydra.nixos.org/build/77597880

/cc @Ericson2314
 2018-07-31 21:44:58 -04:00
Matthew Bauer a89857b812 Merge pull request #44133 from nicknovitski/patch-3 
yarn: add yarnpkg bin alias output
 2018-07-31 19:18:51 -04:00
Matthew Bauer 034c9816d5 Merge pull request #44221 from eddyb/cxxstdlib-var 
Use the default for NIX_CXXSTDLIB_COMPILE even if defined (but empty).
 2018-07-30 18:12:55 -04:00
Matthew Bauer 5afe87ed7a Merge pull request #44089 from lheckemann/netboot-channel-v2 
nixos/release: use real paths of netboot files
 2018-07-30 17:56:37 -04:00
Matthew Bauer c5f1717a19 Merge pull request #43702 from oxij/pkg/checked-glib 
glib: use tested version when `doCheckByDefault` is set
 2018-07-29 15:19:44 -04:00
Matthew Bauer 465166fb1a libuv: disable tty_pty test on darwin 2018-07-29 12:04:29 -04:00
Matthew Bauer 52681db9a3 darwin.objc4: install Object.h header 2018-07-29 12:02:04 -04:00
Matthew Bauer 060f53e0d4 Merge pull request #44109 from NixOS/ryantrinkle/remove-empty-file 
azure-cli: delete empty nix file
 2018-07-25 17:28:17 -04:00
Matthew Bauer 7b7396271c Merge pull request #44071 from eqyiel/eot_utilities-darwin 
eot_utilities: change platforms to unix
 2018-07-25 15:32:06 -04:00
Matthew Bauer a79d917d68 Merge pull request #44073 from lukeadams/pyserial-darwin-fix 
pyserial: fix build on Darwin
 2018-07-25 14:38:20 -04:00
Matthew Bauer 444857b15c Merge pull request #43048 from Nadrieril/passff-host 
passff-host: init at 1.0.2
 2018-07-25 13:27:02 -04:00
Matthew Bauer 0aa2a93d12 Merge pull request #43810 from yesbox/bfs 
bfs: enable the test_fstype test
 2018-07-25 13:22:46 -04:00
Matthew Bauer 4639d55562 Merge pull request #43870 from nh2/static-krb5-openssl-flags 
Optional static libraries for krb5 and openssl
 2018-07-23 17:31:24 -04:00
Matthew Bauer f03238525c Merge pull request #43596 from Kmeakin/runelite 
runelite: init at 1.6.0
 2018-07-23 12:25:38 -04:00
Matthew Bauer ca766205ff Merge pull request #31849 from elitak/tidySupport 
php: tidySupport option
 2018-07-23 12:25:15 -04:00
Matthew Bauer 6d880d2d5b Merge pull request #42149 from timjrd/openspace-rebase 
openspace: init at 0.11.1
 2018-07-23 11:38:06 -04:00
Matthew Bauer 1b40dda8a7 Merge pull request #42834 from Synthetica9/patch-1 
security.sudo.extraRules: documentation fix
 2018-07-23 11:29:18 -04:00
Matthew Bauer ca0522a842 Merge pull request #41970 from aneeshusa/enable-building-systemd-without-libmicrohttpd 
nixos/systemd: Allow building systemd without libmicrohttpd
 2018-07-23 11:24:14 -04:00
Matthew Bauer 856743f117 Merge pull request #43700 from oxij/tree/more-test-fixes 
treewide: more fixes to tests
 2018-07-23 11:05:09 -04:00
Matthew Bauer 406914934d Merge pull request #43711 from angerman/feature/ghc-gmp 
Feature/ghc gmp
 2018-07-23 11:01:56 -04:00
Matthew Bauer d02e9fa00d Merge pull request #43990 from volth/aliases-again 
fix build with allowAliases=false
 2018-07-22 21:27:14 -04:00
Matthew Bauer dc9018dfa2 libffi: don't check on darwin 
libffi usages in stdenv broken darwin. We need to disable doCheck for that case.
 2018-07-21 17:36:22 -04:00
Matthew Bauer 916f096911 Merge pull request #43890 from matthewbauer/mingw-fixes 
Mingw fixes
 2018-07-21 17:04:20 -04:00
Matthew Bauer 37273afd27 Merge pull request #43224 from volth/patch-179 
[staging] substitute(): --subst-var was silently coercing to "" if the variable does not exist.
 2018-07-21 15:48:14 -04:00
Matthew Bauer fddd90e9ea Merge pull request #43538 from timokau/fetchpatch-fix 
fetchpatch: quote excludes
 2018-07-19 00:35:09 -04:00
Matthew Bauer 26cd7bb90b Merge pull request #43558 from herberteuler/nethack-qt 
nethack: add qt support on linux
 2018-07-19 00:34:24 -04:00
Matthew Bauer dc6912fa9e Merge pull request #43692 from matthewbauer/disallow-aliases-in-release 
Avoid using aliases, disallow aliases in release
 2018-07-19 00:30:49 -04:00
Matthew Bauer 84a5808e65 Merge pull request #43669 from matthewbauer/readd-forceSystem 
aliases: (re)add forceSystem
 2018-07-18 18:50:26 -04:00
Matthew Bauer c0beb48fa7 Merge pull request #43627 from oxij/tree/simplify-depcycles 
treewide: simplify some dependency cycles
 2018-07-17 21:54:43 -04:00
Matthew Bauer 920ad8b3d8 Merge pull request #43161 from volth/skipAliases2 
config.skipAliases: also disable vim, git, xfce and gnome3 aliases
 2018-07-17 13:57:53 -04:00
Matthew Bauer 19fc061a13 Merge pull request #43169 from samueldr/fix/stripDirs 
Fixes `stripDirs` use after signature change
 2018-07-14 19:07:46 -04:00
Matthew Bauer aee5b1ac94 Merge pull request #43149 from tadfisher/zoom-us 
zoom-us: set qt plugin paths in wrapper
 2018-07-11 02:34:23 -04:00
Matthew Bauer 11e8ecf581 Merge pull request #43274 from bkchr/android_ndk_callpackage 
androidndk: Use `callPackage` to support overriding the `fullNdk` option
 2018-07-10 10:32:50 -04:00
Matthew Bauer 2bb4088f51 Merge pull request #43081 into master 
Closes #43081
 2018-07-09 17:46:10 -04:00
Matthew Bauer 97605d3e57 Merge pull request #43085 from matthewbauer/dwarf-fortress 
Dwarf Fortress refactors
 2018-07-09 17:40:16 -04:00
Matthew Bauer c7e7cd7b9c Merge pull request #43259 from matthewbauer/unixtools-refactor 
unixtools refactor
 2018-07-09 17:20:39 -04:00
Matthew Bauer 81f78e6d3d Merge pull request #43256 from matthewbauer/xcbuild-refactor 
xcbuild refactor
 2018-07-09 17:16:50 -04:00
Matthew Bauer 2621171e58 xcbuild: add alias 
You can now refer to it as xcodebuild. This is meant to be more
discoverable for not familiar with xcbuild. xcodebuild should work in
the same way as the xcodebuild that comes with Xcode.app, but it is
built entirely with free software.
 2018-07-09 17:13:58 -04:00
Matthew Bauer 0534ceac81 xcbuild: move setup hook to xcbuildHook 
Not every package that needs xcbuild will want to use its build phase.
I have moved the xcbuild setup hook to the new attribute xcbuildHook.
This means that dontUseXcbuild is no longer needed. If you just need
to call xcbuild on its own you can just refer to xcbuild.
 2018-07-09 17:13:58 -04:00
Matthew Bauer 35b2c0edf2 xcbuild: refactor 
This reworks some of xcbuild logic to make it more compatible with
Apple’s SDK.

- Add a fake version of xcrun & xcode-select
- Cleanup platform generation. Clang does not like having 20 char
  hashes in sysroot so it is much easier to just build the parent
  directory for each runCommand. This is a little awkward but I have
  renamed everything with an added ‘s’ to make the distinction more clear.
- Cleaned up wrapper.nix in some different ways
- Reuse some versioning logic so that we don’t end up with two
  different versions of Xcode or SDK reported.
 2018-07-09 17:10:20 -04:00
Matthew Bauer 3108f1eeaf Merge remote-tracking branch 'Baughn/nix-df' into dwarf-fortress 2018-07-09 16:24:21 -04:00
Matthew Bauer 812b0ec62e dwarf-fortress: recurse into themes 
Now the output of “nix-env” should be:

$ nix-env -qa -f . -A dwarf-fortress-packages
afro-graphics-44.10
autoreiv-44.03
cla-44.xx-v25
dwarf-fortress-0.43.05
dwarf-fortress-0.44.05
dwarf-fortress-0.44.09
dwarf-fortress-0.44.10
dwarf-fortress-0.44.11
dwarf-fortress-0.44.12
dwarf-therapist-40.1.0
gemset-44.10a
ironhand-44.10
jolly-bastion-44.10
legends-browser-1.17.1
mayday-44.10
obsidian-44.10
phoebus-44.10
rally-ho-44.10
soundsense-2016-1_196
spacefox-44.10a
taffer-44.10a
tergel-44.03
wanderlust-44.10
 2018-07-09 16:18:17 -04:00
Matthew Bauer 530427c7ab dwarf-fortress: refactors 
This will make it easier for people to access old versions.

You can now access attributes like:

- dwarf-fortress_0_44_11
- dwarf-fortress_0_43_05
- etc.
 2018-07-09 16:13:52 -04:00
Matthew Bauer cdd0ac7e54 dwarf-fortress: support older versions as well 
game.json now contains a dictionary of old game hashes. I have added
them for the last 3 releases.

- add script to generate hashes

  Makes it much easier to update game.json file.

- add updateScript meta

  This adds some info on the ./update.sh updateScript now available.

- cleanup updateScript

  - Add some more systems
  - Correctly detect source extensions (.zip or .tar.bz2)
  - Proper bash quoting

- fix update.sh

  - correctly detect latest df version
  - append to game.json instead of overwriting it

- update hashes for 44.12
 2018-07-09 16:13:53 -04:00
Matthew Bauer f1a14f9844 unixtools: link instead of copying 
This is better for disk space.
 2018-07-09 12:00:32 -04:00
Matthew Bauer 7e4ce2cfcb unixtools: refactor 2018-07-09 12:00:31 -04:00
Matthew Bauer b802570fc2 procps: clarify compatibility 2018-07-09 11:59:56 -04:00
Matthew Bauer 8ab5cc3202 unixtools: add watch command 2018-07-09 11:59:55 -04:00
Matthew Bauer f4c4a4cc1b watch: remove 
This can be built in the procps-ng/default.nix expression.
 2018-07-09 11:59:32 -04:00
Matthew Bauer 6eb508a3e8 Merge remote-tracking branch 'upstream/master' into staging 2018-07-09 11:58:38 -04:00
Matthew Bauer fec309aee4 .dir-locals.el: init 
This adds some initial values for .dir-locals.el. Mainly this is
useful for using bug-reference-mode.

So if you have bug-reference-mode enabled -

> M-x bug-reference-mode

You will see as clickable text like this:

  Fixes #15

  (#12)

  Closed #1252

  issue #1
 2018-07-06 12:48:43 -04:00
Matthew Bauer 6df7a8b34c dunst: fix building without dunstify 
Fixes https://hydra.nixos.org/build/77046987/
 2018-07-06 11:12:16 -04:00
Matthew Bauer b29440fd10 Merge pull request #42467 from mkaito/update-mesa 
mesa: 18.0.3 -> 18.1.2
 2018-07-05 22:18:21 -04:00
Matthew Bauer e67fb11d4c Merge pull request #42473 from roosemberth/lua53-pkgconfig 
lua5.3/pkgconfig: add lua5.3.pc
 2018-07-05 22:17:50 -04:00
Matthew Bauer 4bbca076ea Merge pull request #42529 from mkaito/mesa-pkgconfig 
mesa: point pkgconfig at $drivers
 2018-07-05 22:17:14 -04:00
Matthew Bauer 2b4d7221a9 Merge pull request #42569 from spacefrogg/nscd-fix 
resolvconf.conf: Remove forced NSCD service restart
 2018-07-05 22:16:02 -04:00
Matthew Bauer ce2f8bfda8 Merge pull request #42579 from dasJ/dunstify 
dunst: Also install dunstify
 2018-07-05 22:14:55 -04:00
Matthew Bauer 81686434bf Merge pull request #42817 from Hodapp87/fix_mesa_glu 
appleseed, structure-synth, luxcorerender: libGLU instead of mesa_glu
 2018-07-05 22:14:08 -04:00