3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

201541 commits

Author SHA1 Message Date
Florian Klink 18f9cfa1c0 nixos/samba: update module to use tmpfiles, remove samba-setup service 2019-11-08 23:25:55 +01:00
Niklas Hambüchen 57908c1624 SDL2: Keep .a files on dontDisableStatic; don't move them to $dev; prune .la.
Most other packages don't move `.a` files to "$dev", and that is because
it makes the pkg-config `.pc` file wrong (the `libdir` is the non-dev one).

Keeping them in the main output makes static linking of SDL2 work.

See added comment about pruning of `.la` files.
2019-11-08 23:12:59 +01:00
Florian Klink 3928e7f6b1
Merge pull request #73063 from minijackson/shiori-things
shiori: update modSha256, update test to python, do more tests
2019-11-08 23:06:06 +01:00
Ryan Mulligan 54b0476618
Merge pull request #73067 from yurkobb/fix-mu-stable
Fix mu version from unreleased to stable (revert to 1.2)
2019-11-08 13:26:42 -08:00
Christine Koppelt 60fade5c03 sablotron: remove 2019-11-08 22:25:08 +01:00
Florian Klink cced569cac
Merge pull request #73049 from flokli/fix-redis-merge
nixos/redis: fix merging
2019-11-08 22:13:54 +01:00
worldofpeace 1d3da3befc
Merge pull request #73060 from flokli/nixos-test-port-powerdns
nixos/powerdns: port test to python
2019-11-08 20:48:34 +00:00
worldofpeace 9cc610c576
Merge pull request #73057 from flokli/nixos-test-port-smokeping
nixos/smokeping: port test to python
2019-11-08 20:47:40 +00:00
worldofpeace 0c6853c727
Merge pull request #73056 from flokli/nixos-test-port-pppd
nixos/pppd: port test to python
2019-11-08 20:47:05 +00:00
worldofpeace b859c85ada
Merge pull request #72998 from worldofpeace/client-tests-geary
gnome3.geary: add patch for longer client test timeout
2019-11-08 20:41:50 +00:00
John Ericson 5132cc822a
Merge pull request #72812 from NixOS/bash-no-undef-vars
cc-wrapper, bintools-wrapper: Remove now unneeded `set {+,-}u`
2019-11-08 15:26:14 -05:00
Matthew Bauer 85a94a2578
Merge pull request #73020 from lodi/libco
libco-canonical: fix pkgconfig includedir
2019-11-08 15:04:29 -05:00
Daiderd Jordan 7fb0d95ca1
Merge pull request #71318 from tricktron/fixOpenConnectOnCatalina
openconnect: Add darwin support
2019-11-08 20:36:48 +01:00
John Ericson f7fdc997bf Merge commit 'afa48f16f265fd3e88073bca7929e1e103bd3dc3' into bash-no-undef-vars 2019-11-08 13:58:27 -05:00
John Ericson 784c3dc0f9 qt5 qmake setup hook: qmakeFlags may be undefined 2019-11-08 13:28:59 -05:00
John Ericson ca782498a9 emacs package setup hook: Fix
1. Make the test more robust

2. EMACSLOADPATH may be initially undefined.

3. did `targetOffset` twice when meant `hostOffset` too
2019-11-08 13:28:59 -05:00
John Ericson f1481f2c90 apple-sdk setup hooks: NIX_CFLAGS_COMPILE may be undefined 2019-11-08 13:28:59 -05:00
John Ericson 6fb526b32c findlib setup hook: createFindlibDestdir may not be defined 2019-11-08 13:28:59 -05:00
John Ericson 908b143e51 gstreamer: GST_PLUGIN_SYSTEM_PATH.* may be undefined 2019-11-08 13:28:59 -05:00
John Ericson 12a85a7046 SDL, SDL2: SDL{,2}_PATH may be undefined 2019-11-08 13:28:58 -05:00
John Ericson beda0365a6 darwin private frameworks setup hook: NIX_CFLAGS_COMPILE may be undefined 2019-11-08 13:24:20 -05:00
John Ericson b78e84097f gdk-pixbuf setup hook: GDK_PIXBUF_MODULE_FILE might not be defined
Also switch to [[ ... ]] because it is more robust w.r.t. empty
arguments.
2019-11-08 13:24:20 -05:00
John Ericson aaf0fd2c44 lua-5 setup hook: LUA_PATH and LUA_CPATH can be undefined 2019-11-08 13:24:20 -05:00
John Ericson 0b90a7f67f lispPackages.clwrapper: NIX_LISP_LD_LIBRARY_PATH might be undefined 2019-11-08 13:24:20 -05:00
John Ericson 67cc85ec67 OCaml findlib: OCAMLPATH could be undefined 2019-11-08 13:24:20 -05:00
John Ericson 9167482d12 opensp: sgmlHookDone can be undefined 2019-11-08 13:24:20 -05:00
John Ericson 42ffaf5290 cmake: NIX_CFLAGS_COMPILE NIX_LDFLAG could be undefined 2019-11-08 13:24:20 -05:00
John Ericson 770a4c7946 glib: Fix setup hook
It was not robust against multiple matching directories, as the called
function takes exactly 3 arguments.
2019-11-08 13:24:18 -05:00
Alexey Shmalko 8a7b4ccd1f
Merge pull request #73036 from marius851000/faudio
faudio: 19.10 -> 19.11
2019-11-08 19:58:34 +02:00
Yury Bulka b220d3e0df Revert "mu: 1.2 -> 1.3.3"
This reverts commits 53a536c698
and af931c172d.

The repology.org info was incorrect, pulling in a development version
of mu as a release. The current (stable) release of mu is still 1.2:
https://github.com/djcb/mu/releases
2019-11-08 19:55:11 +02:00
Peter Simons f6e975a5c5 haskell-polysemy-plugin: drop obsolete patches
Upstream has merged our changes and released a new version 0.2.4.0.
2019-11-08 18:52:37 +01:00
Peter Simons 0c0d11bc33 hoogle: update override for dependency to provide haskell-src-exts-1.22.x 2019-11-08 18:52:37 +01:00
Peter Simons 1439dcee0b haskell-configuration-common: cosmetic 2019-11-08 18:52:37 +01:00
Peter Simons fa66e35df4 haskell-github-rest: disable failing test suite to fix the build 2019-11-08 18:52:37 +01:00
Peter Simons 857d39a5a3 git-annex: update sha256 hash for new version 7.20191106 2019-11-08 18:52:37 +01:00
Peter Simons a83ece64ca all-cabal-hashes: update to Hackage at 2019-11-08T16:49:51Z 2019-11-08 18:52:37 +01:00
Peter Simons bf54855e3c hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.15.0-7-gbb66e86 from Hackage revision
477d50a859.
2019-11-08 18:52:37 +01:00
(cdep)illabout 915b22e400 haskellPackages.purescript: unbreak 2019-11-08 18:52:37 +01:00
(cdep)illabout 6a236bbfce haskellPackages.happy_1_19_9: generate this package 2019-11-08 18:52:37 +01:00
(cdep)illabout ec878fffd5 haskell: add cdepillabout as maintainer for some pretty-simple, purescript, and termonad 2019-11-08 18:52:37 +01:00
Peter Simons b2ca3b457c hackage2nix: disable builds that break evaluation on Hydra 2019-11-08 18:52:37 +01:00
William R. Arellano aff8660932 hapistrano: addBuildTool -> addBuildTools 2019-11-08 18:52:37 +01:00
William R. Arellano 140fa48b0f hapistrano: remove package from broken 2019-11-08 18:52:36 +01:00
William R. Arellano 71446091a8 hapistrano: fix broken package 2019-11-08 18:52:36 +01:00
Astro 5a59ed379c haskellPackages.hail: add patches to relax cabal dependencies 2019-11-08 18:52:36 +01:00
Peter Simons 0a66656d75 LTS Haskell 14.13 2019-11-08 18:52:36 +01:00
worldofpeace 90ebe8589c
Merge pull request #73028 from arianvp/wire-maintainer
wire-desktop: Add arianvp to maintainer list
2019-11-08 17:43:38 +00:00
worldofpeace 80de79c816
Merge pull request #73046 from curiousleo/patch-1
nixos/tests: correct arguments to get_unit_info
2019-11-08 17:40:30 +00:00
Minijackson 26acc9e63d
nixos/tests: add shiori to all-tests.nix 2019-11-08 18:17:08 +01:00
Renaud 1d51fbf22b
Merge pull request #71531 from stigtsp/package/perl-mojo-redis-init
perlPackages.MojoRedis: init at 3.24
2019-11-08 18:15:48 +01:00