Commit Graph

23242 Commits

Author SHA1 Message Date
Frederik Rietdijk
3209775495 Merge master into staging 2018-07-22 11:14:41 +02:00
Frederik Rietdijk
6c72782d36 Merge staging-next into master 2018-07-22 11:04:28 +02:00
volth
cc55a3ebcb treewide: fix build with disallowed aliases (#43872)
fixes build with disallowed aliases
2018-07-21 22:03:24 -04:00
Jan Tojnar
710d4e76dd
Merge pull request #43868 from jtojnar/drop-geoclue1
Drop geoclue1 & geoclue2: 2.4.8 → 2.4.10
2018-07-22 00:41:45 +02:00
Vladimír Čunát
bddcd35e1d
Merge #43141: lua-5.3 and lpeg updates 2018-07-21 23:05:44 +02:00
Matthew Bauer
916f096911
Merge pull request #43890 from matthewbauer/mingw-fixes
Mingw fixes
2018-07-21 17:04:20 -04:00
Matthew Bauer
09fed91ec8 file: build on windows 2018-07-21 17:00:05 -04:00
Matthew Bauer
53cb8dc09e windows.libgnurx: init 2018-07-21 17:00:05 -04:00
Daiderd Jordan
d3cc05e607
Merge pull request #43561 from LnL7/darwin-llvm-boot
stdenv: cleanup darwin bootstrapping
2018-07-21 22:37:17 +02:00
Frederik Rietdijk
ad47d658d1 Merge master into staging-next 2018-07-21 19:43:53 +02:00
Jörg Thalheim
218298b30f
Merge branch 'master' into unused5 2018-07-21 15:41:22 +01:00
Bas van Dijk
1c48e89eb1 libtensorflow: init at 1.8.0
Required for haskell.packages.ghc822.tensorflow
2018-07-21 16:22:13 +02:00
Daiderd Jordan
93c34c7616
stdenv: cleanup darwin bootstrapping
Also gets rid of the full python and some of it's dependencies in the
stdenv build closure.
2018-07-21 11:42:37 +02:00
Daiderd Jordan
d4943ea0c9
Merge pull request #43523 from Enzime/fix/synergy-on-darwin
Fix Synergy building on macOS
2018-07-21 11:34:56 +02:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Jan Tojnar
919a507cb2
geoclue2: move to default.nix 2018-07-21 02:30:10 +02:00
Jan Tojnar
75162b1045
geoclue: drop 2018-07-21 02:29:02 +02:00
Sarah Brofeldt
ce7ff54ceb
Merge pull request #43786 from acowley/paraview-5.5.2
paraview: 5.4.1 -> 5.5.2
2018-07-20 15:10:49 +02:00
Frederik Rietdijk
8213ff161c Merge master into staging-next 2018-07-19 18:24:24 +02:00
Robert Schütz
e7e5aaa0b9
Merge pull request #43782 from Ma27/fix-simpleldap-python3
python3Packages.simpleldap: remove
2018-07-19 17:54:13 +02:00
Maximilian Bosch
0adca53c79
inginious: remove
Fallout of 9db7f15ea3ce57eee25458daf87cce7a04ea98b2 which removed
simpleldap.

@layus suggests to remove:

* https://github.com/NixOS/nixpkgs/pull/43782#issuecomment-406186881
* https://github.com/NixOS/nixpkgs/pull/31975#issuecomment-346647857
2018-07-19 17:31:40 +02:00
Matthew Bauer
dc24ab2776 gtkd: fixup from treewide commit
This was mistakenly replaced when it was already avoiding the alias.

Thanks @jtojnar
2018-07-19 09:57:29 -04:00
Tim Steinbach
e953d314a8
docker: 18.03 -> 18.06 2018-07-19 08:34:13 -04:00
Johannes Frankenau
402ee4e9ea mpv: use wrapper for scripts and add mpris script 2018-07-19 09:50:32 +02:00
lewo
fd3b874ee6
Merge pull request #43606 from MarcFontaine/xlog
xlog: init at 2.0.15
2018-07-19 09:12:38 +02: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
aab3182ca4 lollypop-portal: use callPackage
otherwise we get this error on evaluation:

derivation 'lollypop-portal' has invalid meta attribute 'override'
derivation 'lollypop-portal' has invalid meta attribute 'overrideDerivation'
2018-07-18 23:25:19 -04:00
Matthew Bauer
76999cc40e treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
2018-07-18 23:25:20 -04:00
Anthony Cowley
6690ec57f8 paraview: 5.4.1 -> 5.5.2
This update should also fix the build the hydra: one part of the
change is to build paraview with Qt-5.9, as this is the configuration
that paraview upstream supports.
2018-07-18 20:05:15 -04:00
Silvan Mosberger
b9c9a34d8c
Merge pull request #42679 from Moredread/vcvrack/init
vcv-rack: Init at 0.6.2b
2018-07-18 22:13:02 +02:00
Silvan Mosberger
810f91f46d
Merge pull request #43308 from Chiiruno/dev/hydron
hydron: init at 2018-07-11
2018-07-18 22:10:11 +02:00
Okina Matara
920f1bc190 hydron: init at 2018-07-15 2018-07-18 13:17:42 -05:00
André-Patrick Bubel
6878c20af9
vcv-rack: init at 0.6.2b 2018-07-18 19:08:38 +02:00
Thomas Tuegel
9cfbef8bf2
Merge pull request #43609 from ttuegel/emacs-packages-2018-07-14
Emacs package updates
2018-07-17 17:53:54 -05:00
Yegor Timoshenko
072febaa92
sdcc: null out gputils by default 2018-07-17 19:05:15 +03:00
Yorick van Pelt
9ba3b39e44
gputils: init at 1.5.0-1 2018-07-17 17:28:13 +02:00
Michael Raskin
c4de32e192
Merge pull request #43624 from oxij/tree/fix-or-disable-tests
treewide: either fix or disable tests
2018-07-17 14:49:26 +00:00
Jan Malakhovski
02acff8839 neon, neon_0_29: make tests run, but disable 2018-07-17 14:41:53 +00:00
lewo
a7d17e287a
Merge pull request #43644 from flokli/ksonnet
ksonnet: init at 0.11.0
2018-07-17 15:08:42 +02:00
Florian Klink
cf00b9aff4 ksonnet: init at 0.11.0
closes #42596
2018-07-17 14:37:43 +02:00
MarcFontaine
325dd796d1 xlog: init at 2.0.15 2018-07-17 13:50:48 +02:00
Zack Grannan
c17decb15c markdown-pp: init at 1.4 (#43525)
* markdown-pp: init at 1.3

* Increment version, fix tests
2018-07-17 13:24:13 +02:00
Frederik Rietdijk
12949bf84a Merge master into staging 2018-07-17 10:05:50 +02:00
Frederik Rietdijk
1ae2f10642 Merge staging-next into master 2018-07-17 10:04:59 +02:00
lewo
bac995cd9f
Merge pull request #43384 from mbode/aws-rotate-key
aws-rotate-key: init at 1.0.0
2018-07-17 09:05:28 +02:00
Tuomas Tynkkynen
8258f5bda4 ibniz: init at 1.18 2018-07-17 02:51:41 +03:00
Peter Simons
9a32dafd05
Merge pull request #43444 from Infinisil/idris-cleanup
idris: Recurse into attrs, fix build and remove unneeded overrides
2018-07-16 20:38:53 +02:00
Thomas Tuegel
a5f026f778
emacsPackagesNg.magit: find Git during build 2018-07-16 12:29:10 -05:00
xeji
f4fbdf0578
Merge pull request #43601 from thefloweringash/ffmpeg-libvpx
ffmpeg, ffmpeg-full: enable libvpx on Darwin
2018-07-16 17:16:56 +02:00
Frederik Rietdijk
6d339e5863 Merge staging-next into staging 2018-07-16 17:14:44 +02:00