public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
146,955 Commits 1 Branch 0 Tags
018f503ffe9c8f18252ed366a9166fba9fe8afaa
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Matthew Bauer 6d6b079622 Merge pull request #42789 from twhitehead/lwp-protocol-https 
lwp-protocol-https: honour NIX_SSL_CERT_FILE
 2018-07-05 22:12:51 -04:00
Matthew Bauer af56538c89 Merge pull request #42687 from nh2/nginx-debug-build 
nginx: Flag to build with debugging and parallel builds
 2018-07-05 22:11:51 -04:00
Matthew Bauer 01037e0f35 Merge pull request #42688 from fmenou/update-terraform-providers 
terraform: update all providers
 2018-07-05 22:11:26 -04:00
Matthew Bauer 62f47c56b7 Merge pull request #42723 from thefloweringash/es5-plugin-classpath 
elasticsearch5: Set classpath for elasticsearch-plugin
 2018-07-05 22:10:47 -04:00
Matthew Bauer a92472fae1 Merge pull request #42724 from yshui/libinput-button 
libinput: add button to scrollMethod
 2018-07-05 22:10:26 -04:00
Matthew Bauer 00db477324 Merge pull request #42931 from r-ryantm/auto-update/urh 
urh: 2.1.1 -> 2.2.2
 2018-07-05 21:50:58 -04:00
Matthew Bauer 5809621bbf Merge pull request #42926 from aij/flow-0.75 
flow: 0.72.0 -> 0.75.0
 2018-07-05 21:50:41 -04:00
Matthew Bauer 79602a2f44 Merge pull request #42851 from jmitchell/fix/vm-debian 
vmTools: update Debian minor version to 8.11
 2018-07-05 21:50:17 -04:00
Matthew Bauer 65695f9e0e Merge pull request #42868 from alyssais/patch-2 
bundler: 1.16.1 -> 1.16.2
 2018-07-05 21:49:25 -04:00
Matthew Bauer 0ce00ea660 Merge pull request #42870 from ldesgoui/add-pscircle 
pscircle: init at v1.0.0
 2018-07-05 21:48:25 -04:00
Matthew Bauer 3ea9c607c1 Merge pull request #43092 from ryantm/tls 
treewide: http -> https
 2018-07-05 21:47:36 -04:00
Matthew Bauer 7f50e0a686 xxd: remove directory 
thanks to @grahamc
 2018-07-05 20:21:44 -04:00
Matthew Bauer 9cd122a2c4 Merge pull request #43088 from matthewbauer/misc 
Get rid of 2 unneeded packages
 2018-07-05 20:13:47 -04:00
Matthew Bauer bb0febf575 Merge pull request #43079 from matthewbauer/rework-extra-pkgs 
Rework stage.nix's extraPkgs
 2018-07-05 18:05:57 -04:00
Matthew Bauer 2f523dd9a4 xxd: move to unixtools 
also add manpage to unixtools if provided to give compat with old xxd.
 2018-07-05 17:55:50 -04:00
Matthew Bauer e776d326f6 lessc: get from nodePackages 2018-07-05 17:55:50 -04:00
Matthew Bauer ad20a4a1c3 stage: add Linux checks 
This prevent us evaluation on macOS systems where pkgsMusl &
pkgsi686Linux is unsupported.
 2018-07-05 17:32:54 -04:00
Matthew Bauer aba6a3d7f4 dwarf-fortress: use fetchFromGitHub directly 
This avoids creating a second derivation to copy things from the
original. The new themes are now fixed output.
 2018-07-05 17:25:07 -04:00
Matthew Bauer 69f1045001 treewide: remove forceSystem 2018-07-05 15:47:10 -04:00
Matthew Bauer f513d580b0 Merge pull request #43040 from matthewbauer/darwin-closure-reductions 
Darwin stdenv tweaks
 2018-07-05 14:34:54 -04:00
Matthew Bauer 6202380094 libuv: use fetchpatch for apple patch 2018-07-05 14:28:50 -04:00
Matthew Bauer c491a99362 treewide: remove callPackage_i686 
This has been replaced with pkgsi686Linux.callPackage
 2018-07-05 14:04:52 -04:00
Matthew Bauer 5b357d9037 stage: refactor extraPkgs 
I have renamed the overlay to “otherPackageSets” because I think that
is more descriptive.

pkgsLocal has been removed because there were concerns that it would
be confusing. None of the other names seemed very useful so I think it
is best to avoid it altogether. pkgsCross is still included,
hopefully, that will not have as much confusion.

pkgsMusl is now available for building Musl packages. It will give you
packages bulit with the Musl libc.

Also added more documentation.

/cc @dezgeg @Ericson2314 @dtzWill
 2018-07-05 13:59:03 -04:00
Matthew Bauer d6a202f162 Merge pull request #42187 from jameysharp/jdk-without-gnome 
openjdk: fix build for !enableGnome2
 2018-07-05 11:43:35 -04:00
Matthew Bauer a4476912f8 Merge pull request #42722 from thefloweringash/bison2-darwin 
bison2: Fix Darwin runtime crash
 2018-07-05 11:42:39 -04:00
Matthew Bauer 00b44dcb01 Merge pull request #43065 from gnidorah/wine 
wine: build wineWow packages on hydra
 2018-07-05 11:41:36 -04:00
Matthew Bauer a4c9492217 Merge pull request #43057 from Baughn/nix-df 
dwarf-fortress: Run legends-browser with a suitable working directory
 2018-07-05 00:10:13 -04:00
Matthew Bauer 3026a778ba Merge pull request #32408 from mikoim/pkg/arp-scan 
arp-scan: 1.9 -> 1.9.5
 2018-07-05 00:09:58 -04:00
Matthew Bauer ea6b31b496 Merge pull request #43043 from Baughn/nix-df 
dwarf-fortress: Fix themes & package Legends Browser
 2018-07-04 17:41:06 -04:00
Matthew Bauer 75e2aca6ca Merge pull request #42554 from numinit/df 
dwarf-fortress: 0.44.10 -> 0.44.11
 2018-07-04 16:56:20 -04:00
Matthew Bauer c7ab795274 darwin.security_tool: disallow requiring sdk 
As requested by @domenkozar
 2018-07-04 15:08:35 -04:00
Matthew Bauer e8303d2baf libuv: reenable tests on macOS 
I want these tests to run because libuv is very important to lots of
things in Nixpkgs. I have a very large list of tests to disable for
now just to be on the safe side. For the record this is definitely a
libuv issue - their tests should be robust - but this is a safety
precaution for now.
 2018-07-04 15:08:07 -04:00
Matthew Bauer 1dca19f057 libuv: remove frameworks 
It’s not a good idea to rely on apple’s sdk for such a core library in
Nixpkgs. I have made a patch to libuv to make these frameworks
optional. There is also a pull request here:

https://github.com/libuv/libuv/pull/1909
 2018-07-04 15:02:07 -04:00
Matthew Bauer d7591c44f0 apple_sdk.frameworks.Ruby: remove 
This was broken & apparently unused.
 2018-07-04 15:01:00 -04:00
Matthew Bauer f682ff93a2 Merge pull request #41420 from obsidiansystems/haskell-strict-deps 
haskell generic-builder: Use strictDeps always
 2018-07-03 19:29:43 -04:00
Matthew Bauer 157b59736b configuration-ghc-8.4.x.nix: Update hspec versions 
These have changed on master.
 2018-07-03 19:25:26 -04:00
Matthew Bauer 75a1104b27 Merge pull request #42938 from matthewbauer/add-float-to-plist 
lib.generators.toPlist: add floats
 2018-07-03 17:14:31 -04:00
Matthew Bauer dc72e8ac06 lib.generators.toPlist: add floats 
Nix now supports floats & we can pretty easily map them to Plist’s
<real></real> type. Note that I am unsure how this affects older
version of Nix that may or may not have builtins.isFloat available.
Make sure this satisfies minver.nix’s "1.11" requirement.
 2018-07-03 17:14:00 -04:00
Matthew Bauer f7138342cb libiconv: use enableFeature for static/shared 
This makes things more predictable w.r.t. what is actually being built.
 2018-07-03 16:51:30 -04:00
Matthew Bauer 38f907c39d Merge pull request #42892 from sorki/uboot_novena 
uboot: add ubootNovena
 2018-07-02 19:10:50 -04:00
Matthew Bauer 096fbb33e9 Merge pull request #42891 from sorki/option_float 
lib: add float option type
 2018-07-02 19:07:35 -04:00
Matthew Bauer e8e26becac Merge pull request #42887 from matthewbauer/libsecurity-closure-reductions 
Libsecurity closure reductions
 2018-07-02 18:34:53 -04:00
Matthew Bauer d568d5016a libsecurity: set NDEBUG 
This prevents debugging stuff from coming into play. This avoids some
headers from accidentally winding up in the .dylib file.
 2018-07-02 17:51:38 -04:00
Matthew Bauer db414a2f5e xpc: copy instead of linking to sdk 
This prevents the apple sdk from coming into security tool

Fixes #42836
 2018-07-02 17:51:38 -04:00
Matthew Bauer 907d7518d8 darwin.libsecurity: switch to multiple outputs 2018-07-02 17:51:38 -04:00
Matthew Bauer 526103a82d darwin: fix syntax in makeFlagsArray 
the double ’ should only be needed when using the braces. Otherwise
this will mess up some syntax highlighting, unfortunately, including nix-mode.
 2018-07-02 17:51:38 -04:00
Matthew Bauer 1a668f79b2 yesod-persistent: add hspec-discover for 1.4.3 2018-07-02 16:37:20 -04:00
Matthew Bauer 4590a3702a haskell-modules: Add more overrides 2018-07-02 15:55:00 -04:00
Matthew Bauer 2cb563374f haskell-modules: Add more test tool depends 2018-07-02 15:55:53 -04:00
Matthew Bauer fb94cd9b51 haskell-modules: Add pandoc for heist 2018-07-02 15:55:48 -04:00
Matthew Bauer c4431d301a haskell-modules: Add test tool depend for modern-uri 2018-07-02 15:55:43 -04:00
Matthew Bauer 10f10638d8 haskell-modules: Add many more overrides for hspec-discover 
This is needed for picking up hspec-discover in strictDeps generic-builder.nix.
 2018-07-02 15:55:20 -04:00
Matthew Bauer 42bd49d72b haskell-modules: Fix mockery in macos 
Weird errors otherwise - seems to need this to know it can skip the
bad test.
 2018-07-02 15:55:01 -04:00
Matthew Bauer fea9a71ff4 haskell: add more test tool depend for hspec-discover 
Needed for new ‘strictDeps = true;’ handling.

Including-

- slim
- string-conversions
- skeletal-test
- catamorphism
- unliftio
- logging-facade
- distributive
- doctest
- http-types
- interpolate
- mockery
- mime-mail
- http2
 2018-07-02 15:52:47 -04:00
Matthew Bauer 160894db35 text-conversions: add hspec-discover 2018-07-02 15:52:22 -04:00
Matthew Bauer 9ef816e776 with-location: add hspec-discover 2018-07-02 15:52:22 -04:00
Matthew Bauer dcea211084 dwarf-fortress: cleanup 2018-07-02 11:59:36 -04:00
Matthew Bauer b2b68862f5 Merge pull request #42832 from uri-canva/bazel-hydra-darwin 
bazel: fix darwin build on hydra
 2018-07-02 11:34:49 -04:00
Matthew Bauer 4a97d3f6e4 Merge pull request #42865 from ookhoi/github-gentoo-compromized_cannot-download_boehm-gc-7.6.0-sys_select.patch-from-any-mirror 
github-gentoo-compromized_cannot-download_boehm-gc-7.6.0-sys_select.p…
 2018-07-02 11:23:23 -04:00
Matthew Bauer 18af089de7 stage: remove nixpkgsFun 
also inherit forceSystem for some GNU Hurd stuff
 2018-07-02 11:20:34 -04:00
Matthew Bauer d1bd9faf61 stage: move old stuff to stage.nix 2018-07-02 11:07:53 -04:00
Matthew Bauer b6b1950594 top-level: add extraPkgs to stage.nix 2018-07-02 11:07:53 -04:00
Matthew Bauer d665e80450 top-level: move cross pkgs to overlay 2018-07-02 11:07:53 -04:00