1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 17:10:48 +00:00
Commit graph

4215 commits

Author SHA1 Message Date
Thomas Tuegel 4ac6a8ba54
Merge pull request #44139 from bkchr/plasma_wayland
Plasma Wayland
2018-07-28 16:19:52 -05:00
Bastian Köcher 6e5d977b97 plasma-workspace: Improve the NixOS patch set
We changed some if condition that is not required to be changed.
2018-07-26 23:28:29 +02:00
Bastian Köcher af44ab8400 plasma.kwin: Adds libdrm depdency
Libdrm is required to enable the DRM backend that is used by Wayland.
2018-07-26 23:28:29 +02:00
Tuomas Tynkkynen b619e0b016 gnome2.GConf: Add python2 dependency for gsettings-schema-convert
https://hydra.nixos.org/build/78312507
2018-07-25 11:23:55 +03:00
Frederik Rietdijk 099c13da1b Merge staging-next into master (#44009)
* substitute(): --subst-var was silently coercing to "" if the variable does not exist.

* libffi: simplify using `checkInputs`

* pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix

* utillinux: 2.32 -> 2.32.1

https://lkml.org/lkml/2018/7/16/532

* busybox: 1.29.0 -> 1.29.1

* bind: 9.12.1-P2 -> 9.12.2

https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html

* curl: 7.60.0 -> 7.61.0

* gvfs: make tests run, but disable

* ilmbase: disable tests on i686. Spooky!

* mdds: fix tests

* git: disable checks as tests are run in installcheck

* ruby: disable tests

* libcommuni: disable checks as tests are run in installcheck

* librdf: make tests run, but disable

* neon, neon_0_29: make tests run, but disable

* pciutils: 3.6.0 -> 3.6.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions.

* mesa: more include fixes

mostly from void-linux (thanks!)

* npth: 1.5 -> 1.6

minor bump

* boost167: Add lockfree next_prior patch

* stdenv: cleanup darwin bootstrapping

Also gets rid of the full python and some of it's dependencies in the
stdenv build closure.

* Revert "pciutils: use standardized equivalent for canonicalize_file_name"

This reverts commit f8db20fb3a.
Patching should no longer be needed with 3.6.1.

* binutils-wrapper: Try to avoid adding unnecessary -L flags

(cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9)
Signed-off-by: Domen Kožar <domen@dev.si>

* libffi: don't check on darwin

libffi usages in stdenv broken darwin. We need to disable doCheck for that case.

* "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook

* python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273

When `py.test` was run with a folder as argument, it would not only
search for tests in that folder, but also create a .pytest-cache folder.
Not only is this state we don't want, but it was also causing
collisions.

* parity-ui: fix after merge

* python.pkgs.pytest-flake8: disable test, fix build

* Revert "meson: 0.46.1 -> 0.47.0"

With meson 0.47.0 (or 0.47.1, or git)
things are very wrong re:rpath handling
resulting in at best missing libs but
even corrupt binaries :(.

When we run patchelf it masks the problem
by removing obviously busted paths.
Which is probably why this wasn't noticed immediately.

Unfortunately the binary already
has a long series of paths scribbled
in a space intended for a much smaller string;
in my testing it was something like
lengths were 67 with 300+ written to it.

I think we've reported the relevant issues upstream,
but unfortunately it appears our patches
are what introduces the overwrite/corruption
(by no longer being correct in what they assume)

This doesn't look so bad to fix but it's
not something I can spend more time on
at the moment.

--

Interestingly the overwritten string data
(because it is scribbled past the bounds)
remains in the binary and is why we're suddenly
seeing unexpected references in various builds
-- notably this is is the reason we're
seeing the "extra-utils" breakage
that entirely crippled NixOS on master
(and probably on staging before?).

Fixes #43650.

This reverts commit 305ac4dade.

(cherry picked from commit 273d68eff8)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-24 15:04:48 +01: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 452017032a
fix Merge 8213ff161c
cc @FRidh
2018-07-21 20:20:36 +02:00
Frederik Rietdijk ad47d658d1 Merge master into staging-next 2018-07-21 19:43:53 +02:00
Jörg Thalheim 1399243081
Merge pull request #43776 from volth/xfce413-mousepad
xfce4-13.mousepad: 0.4.0 -> 0.4.1
2018-07-21 16:41:21 +01:00
Jörg Thalheim 218298b30f
Merge branch 'master' into unused5 2018-07-21 15:41:22 +01:00
Frederik Rietdijk 153d2241c1
Merge pull request #43749 from r-ryantm/auto-update/mate-panel
mate.mate-panel: 1.21.0 -> 1.21.1
2018-07-21 12:06:08 +02:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Frederik Rietdijk 8213ff161c Merge master into staging-next 2018-07-19 18:24:24 +02:00
Matthew Bauer 4ed7a4b993 treewide: preserve hashes from 76999cc40e
76999cc40e changed some hashes resulting in this PR being technically
a mass rebuild. To avoid this, I am restoring some of the hashes (even
though it seems silly). My main goal is to get this PR merged quickly
as treewide changes like this get out-of-date quickly.

This commit should be reverted on the next mass rebuild.
2018-07-19 00:09:01 -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
volth def83ddf4d xfce4-13.mousepad: 0.4.0 -> 0.4.1 2018-07-18 22:33:16 +00:00
volth a7e5927b47 xfce4-13.parole: 0.9.2 -> 1.0.1 (#43765) 2018-07-19 00:19:06 +02:00
volth 25b10dfaec xfce4-13.xfce4-dict: 0.8.0 -> 0.8.1 (#43764) 2018-07-19 00:14:36 +02:00
volth 4c58c20efc xfce4-13.xfce4-taskmanager: 1.2.0 -> 1.2.1 (#43763) 2018-07-18 23:58:36 +02:00
volth 022e9894d4 xfce4-13.xfwm4: fix build (add libXdamage dependency) (#43762) 2018-07-18 23:56:54 +02:00
volth d72d3b30ac xfce4-13.libxfce4util: 4.13.1 -> 4.13.2 (#43761) 2018-07-18 23:51:43 +02:00
volth d47b0ab019 xfce4-notifyd: 0.4.1 -> 0.4.2 (#43707) 2018-07-18 23:42:47 +02:00
volth e07ee596d6 xfconf: 4.13.4 -> 4.13.5 (#43703) 2018-07-18 23:42:28 +02:00
volth 58327eb214 xfce4-13.xfce4-volumed-pulse: 0.2.2 -> 0.2.3 (#43704) 2018-07-18 23:36:24 +02:00
volth 471c14b9d1 xfdesktop: 4.13.1 -> 4.13.2 (#43701) 2018-07-18 22:25:18 +02:00
volth 4884f58f4e tumbler: 0.2.0 -> 0.2.1 (#43699) 2018-07-18 21:22:24 +02:00
volth 061c7445ed xfce4-settings: 4.13.1 -> 4.13.4 (#43705) 2018-07-18 21:18:45 +02:00
volth 5e3d434a91 thunar: 1.7.0 -> 1.8.1 (#43698) 2018-07-18 21:15:50 +02:00
volth b2d855fea8 xfce4-terminal: 0.8.6 -> 0.8.7.4 (#43706) 2018-07-18 21:12:55 +02:00
volth eaeae60fbc ristretto: 0.8.2 -> 0.8.3 (#43696) 2018-07-18 21:10:55 +02:00
volth d50c276560 xfce4-13.xfce4-screenshooter: 1.9.1 -> 1.9.2 (#43625) 2018-07-18 21:04:27 +02:00
R. RyanTM c33eb38d8a mate.mate-panel: 1.21.0 -> 1.21.1
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mate-panel/versions.
2018-07-18 10:07:36 -07:00
volth 0304445996 xfce.gtk-xfce-engine: fix build when withGtk3=true (#43621) 2018-07-18 01:14:54 +02:00
volth c2e4b04d29 xfce4-13.libxfce4ui: propagate libICE libSM (#43629)
backport #16227
2018-07-18 01:13:40 +02:00
volth c849e56790 xfce4-13.exo: 0.11.5 -> 0.12.2 (#43630) 2018-07-18 01:11:27 +02:00
volth 7adce5b870 xfce4-13.xfce4-panel: 4.13.2 -> 4.13.3 (#43628) 2018-07-18 01:05:54 +02:00
volth c8f5d4708b xfce4-13.xfce4-power-manager: 1.6.0 -> 1.6.1 (#43626) 2018-07-18 01:01:02 +02:00
volth 101df126bb config.skipAliases -> config.allowAliases 2018-07-17 14:46:21 +00:00
volth 4bafaaff8a config.skipAliases: also disable vimPlugins, git, xfce and gnome3 aliases 2018-07-17 14:46:21 +00: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
Jan Tojnar e2d9a9d4db
gnome3.gnome-sound-recorder: init at 3.28.1 2018-07-16 21:43:20 +02:00
xeji dca7b10fd5
Merge pull request #43522 from volth/patch-187
orage: "/usr/share/zoneinfo" -> "${tzdata}/share/zoneinfo"
2018-07-16 17:19:01 +02:00
Frederik Rietdijk 6d339e5863 Merge staging-next into staging 2018-07-16 17:14:44 +02:00
Frederik Rietdijk 3c09808160 Merge master into staging-next 2018-07-16 07:43:37 +02:00
Jan Tojnar db00e457ac
gnome3.totem: disable vala plug-ins again
Apparently the intermittent build failure is still there,
not sure why I thought it was fixed.

Closes: https://github.com/NixOS/nixpkgs/issues/43518
2018-07-15 16:57:27 +02:00
Robert Schütz 18774d4173 Merge branch 'master' into staging 2018-07-15 12:31:18 +02:00
volth 1137200d6b xfce.xfce4-hardware-monitor-plugin: 1.5.0 -> 1.6.0 (#43520) 2018-07-14 21:11:17 +02:00
R. RyanTM 870355aa57 mate.mate-utils: 1.20.1 -> 1.21.0 (#43338)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mate-utils/versions.
2018-07-14 20:53:42 +02:00