Commit Graph
162630 Commits
Author SHA1 Message Date
John Ericson 53449badb6 Merge branch 'pkgsStatic-temp'
No files are changed with this merge. See second parent commit for
rational.
2018-12-13 17:39:03 -05:00
Andrew Childsandworldofpeace b0dc7bc6a3 quaternion: 0.0.9.2 -> 0.0.9.3 2018-12-13 17:38:14 -05:00
Alexey ShmalkoandGitHub 7aad64b0f3 Merge pull request #51949 from Synthetica9/sublime-url-fix
sublime: add new download url
2018-12-14 00:36:47 +02:00
John Ericson 18e5cfff04 Merge branch 'crossOverlays-for-18.09' (early part) into tempory branch
This was an early "pre-release" to stable, with a warning that the
interface is not stable yet (thought we don't actually expect it to
change).

We do expect to make many static build fixes, however, which should go
to master and staging, so we merge the cherry-picks back into master so
we can do those fixes against:

  git merge-base upstream/master upstream/release-18.09

and merge into both master and release-18.09. This is easier than
cherry-picking when one knows in advance they are targeting multiple
branches.

No files should be changed with this merge.
2018-12-13 17:33:00 -05:00
Alyssa RossandGitHub 6ccc922e1d Merge pull request #51953 from WilliButz/grafana-update
grafana: 5.4.1 -> 5.4.2
2018-12-13 21:55:29 +00:00
worldofpeaceandGitHub c86349b317 Merge pull request #51815 from c0deaddict/master
swiftclient: init at 3.6.0
2018-12-13 16:50:11 -05:00
worldofpeaceandJörg Thalheim 2417859932 doc/breakpointHook: correct typos 2018-12-13 21:36:29 +00:00
Jörg ThalheimandGitHub 8092c40425 Merge pull request #51950 from guibou/patch-2
Fix english in stdenv.xml
2018-12-13 21:33:20 +00:00
Jörg ThalheimandGitHub 1f5d457e7c Merge pull request #51964 from rawkode/feature/upgrade-kind
kind: master -> 0.0.1
2018-12-13 21:31:10 +00:00
Jörg ThalheimandGitHub c72290a8b0 Merge pull request #51967 from etu/fix-windowMananger-spelling
nixos/{sddm,lightdm}: Fix window mananger spelling
2018-12-13 21:30:47 +00:00
Elis Hirwing 6fa51fe5cf nixos/lightdm: Fix spelling of option in docs 2018-12-13 22:26:12 +01:00
Elis Hirwing c974813b92 nixos/sddm: Fix spelling of option in docs 2018-12-13 22:25:19 +01:00
David McKay fbabead264 kind: master -> 0.0.1 2018-12-13 20:32:59 +00:00
Jos van Bakel 35aab266e3 swiftclient: init at 3.6.0 2018-12-13 21:18:09 +01:00
Michael Weiss 81eed0f30a androidStudioPackages.{dev,canary}: 3.4.0.6 -> 3.4.0.7 2018-12-13 20:50:21 +01:00
Michael Weiss 1c63a4678a gitRepo: 1.12.37 -> 1.13.0 2018-12-13 20:46:13 +01:00
Matthew BauerandJohn Ericson 3170d617ef ncurses: make shared linking optinoal
when enableShared = false, we set --without-shared flag.

(cherry picked from commit 53a67891ab)
2018-12-13 14:04:34 -05:00
Matthew BauerandJohn Ericson a8e0694993 zlib: clean up static/shared distincion
This is kind of a mess, but basically:

- static=true, shared=true means to build statically but move it to
  the static output
- static=true, shared=false means to build statically and leave it in
  the main output
- static=false, shared=true means to not build static at all

Confusingly, the old default was static=true, shared=true even though
static=false? Still can’t figure out what was meant by that.

(cherry picked from commit e999def159)
2018-12-13 14:04:34 -05:00
Matthew BauerandJohn Ericson f11d5341aa darwin/libiconv: fix static/shared logic
The conditional was incorrect - postInstall script should only hsppen
when enableShared = true.

(cherry picked from commit 5e06294276)
2018-12-13 14:04:33 -05:00
Matthew BauerandJohn Ericson 7fcbc52d7d stdenv/adapters.nix: fixup makeStaticBinaries
- makeStaticBinaries don’t work on Darwin (no stable ABI!)
- Need to make sure NIX_CFLAGS_LINK appends
- isStatic is not used anymore

(cherry picked from commit 8726f6a558)
2018-12-13 14:04:33 -05:00
Matthew BauerandJohn Ericson e84255296f stdenv: implement crossOverlays
crossOverlays only apply to the packages being built, not the build
packages. It is useful when you don’t care what is used to build your
packages, just what is being built. The idea relies heavily on the
cross compiling infrastructure. Using this implies that we need to
create a cross stdenv.

(cherry picked from commit a3a6ad7a01)
2018-12-13 14:04:33 -05:00
Ivan KozikandMatthew Bauer 907847061b maintainers: add github for ivan 2018-12-13 12:52:32 -06:00
Lorenzo Manacordaandworldofpeace 6283971a2c slither-analyzer: init at 0.3.0 2018-12-13 13:37:38 -05:00
Théo ZimmermannandVincent Laporte 958a6c6dd3 dune: 1.5.1 -> 1.6.2 2018-12-13 17:39:28 +00:00
Ryan MulliganandGitHub ac4eb7ef98 Merge pull request #51948 from layus/fix/modular-arithmetic
haskellPackages.modular-arithmetic: disable tests
2018-12-13 09:19:49 -08:00
694d32f47d Update doc/stdenv.xml
Co-Authored-By: guibou <guillaum.bouchard@gmail.com>
2018-12-13 18:11:52 +01:00
WilliButz 3a28198918 grafana: 5.4.1 -> 5.4.2 2018-12-13 18:07:23 +01:00
Peter SimonsandGitHub c301779be3 Merge pull request #51916 from jabranham/cran-update
R: update CRAN package set
2018-12-13 17:51:57 +01:00
worldofpeaceandGitHub b7fbde893a Merge pull request #48519 from dtzWill/update/fwupd-1.1.3
fwupd: 1.1.2 -> 1.2.1
2018-12-13 11:50:48 -05:00
Guillaume BouchardandGitHub d5c931992d Fix english in stdenv.xml 2018-12-13 17:23:51 +01:00
Patrick Hilhorst dcb5c0cd82 sublime: add new download url
The old one gave a 404. I left it there for if it ever comes back
2018-12-13 17:19:26 +01:00
Guillaume Maudoux 9a104494ec haskellPackages.modular-arithmetic: disable tests 2018-12-13 16:46:22 +01:00
Jörg ThalheimandGitHub 3d4cb55b71 Merge pull request #51937 from ivan/add-cchardet
pythonPackages.cchardet: init at 2.1.4
2018-12-13 13:58:08 +00:00
Tor Hedin BrønnerandGitHub 2727774ce1 Merge pull request #51933 from hedning/fix-nautilus-thumbnails
gnome3.nautilus: fix thumbnail generation
2018-12-13 14:34:12 +01:00
RenaudandGitHub 562b7a7702 Merge pull request #51922 from hedning/fix-xmonad-test
nixos/tests/xmonad: fix terminal title
2018-12-13 14:02:23 +01:00
Sarah BrofeldtandGitHub 7a57774158 Merge pull request #51938 from johanot/nixos-kubernetes-test-fix
nixos/kubernetes: fix import path of default nixpkgs
2018-12-13 13:05:25 +01:00
Tim Steinbach 5a15ab7b5d linux: 4.19.8 -> 4.19.9 2018-12-13 06:58:15 -05:00
Tim Steinbach f335fa6d74 linux: 4.14.87 -> 4.14.88 2018-12-13 06:58:07 -05:00
Tim Steinbach 1f92bdcd94 linux: 4.9.144 -> 4.9.145 2018-12-13 06:57:58 -05:00
Tim Steinbach adf8cdd67d linux: 4.4.166 -> 4.4.167 2018-12-13 06:57:42 -05:00
Patrick HilhorstandTim Steinbach 22d46c4b6d atom: remove myself as maintainer
I longer use atom, so I won't be regularly updating it. I am hereby removing
myself as maintainer to reflect this.
2018-12-13 11:51:53 +00:00
Patrick HilhorstandTim Steinbach e1de1050d4 atom, atom-beta: 1.32.1 -> 1.33.0, 1.33.0-beta1 -> 1.34.0-beta0 2018-12-13 11:51:53 +00:00
Alyssa RossandGitHub c5b825ca28 Merge pull request #51860 from ivan/fix-jdk11_headless
jdk11_headless: fix the build on amd64
2018-12-13 11:45:21 +00:00
Alexey ShmalkoandGitHub bb14e3b1fb Merge pull request #51929 from ivan/add-manhole
pythonPackages.manhole: init at 1.5.0
2018-12-13 13:39:36 +02:00
Tor Hedin Brønner 4d0a88b21a gnome3.nautilus: fix thumbnail generation
3.30 copied over the thumbnail code frome gnome-desktop:
https://gitlab.gnome.org/GNOME/nautilus/commit/673c81cf9f1d68b71041220e6e44624dee44dbfc

Simply patch nautilus too.

ref https://github.com/NixOS/nixpkgs/issues/50494
2018-12-13 12:37:58 +01:00
Sarah BrofeldtandGitHub b64e71e09c Merge pull request #51677 from plapadoo/pro-office-calculator-init
pro-office-calculator: init at 1.0.6
2018-12-13 12:13:35 +01:00
Ivan Kozik 76dc4b56f7 pythonPackages.cchardet: init at 2.1.4 2018-12-13 11:12:59 +00:00
Ivan Kozik da28c89797 maintainers: add ivan 2018-12-13 11:12:54 +00:00
RenaudandGitHub 40c02415ae Merge pull request #51915 from cransom/bug/enable-pdsh-darwin
pdsh: enable macOS
2018-12-13 11:21:45 +01:00
Alyssa RossandGitHub 64f73752fc Merge pull request #51928 from neonfuz/retroarch-1.7.5
retroarch: 1.7.1 -> 1.7.5
2018-12-13 10:17:55 +00:00