1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-11 23:24:35 +00:00
Commit graph

69 commits

Author SHA1 Message Date
John Ericson f6f40e3fe5 stdenv-setup and misc pkgs: Revert to space-deliminated propagated-* files
We cannot switch to line-delimited yet, because certain Nix commands do
not read in the entire file, but just the first line.
2017-07-26 09:07:55 -04:00
John Ericson 3cb745d5a6 stdenv: Store one package per line in nix-support/propagated-*
This makes those files a bit easier to read. Also, for what it's worth,
it brings us one baby step closer to handling spaces in store paths.

Also, I optimized handling of many transitive deps with read. Probably,
not very beneficial, but nice to enforce the pkg-per-line structure.
Doing so let me find much dubious code and fix it.

Two misc notes:

 - `propagated-user-env-packages` also needed to be adjusted as
   sometimes it is copied to/from the propagated input files.

 - `local fd` should ensure that file descriptors aren't clobbered
   during recursion.
2017-07-10 13:32:13 -04:00
Vladimír Čunát 5ad7d3106e
kde4.kdepimlibs: fixup build by using older cmake
I have no idea why, but apparently the last cmake update caused:
  kdepimlibs-4.14.3/akonadi/tests/../pastehelper.cpp:343:27:
    fatal error: pastehelper.moc: No such file or directory
2017-06-13 14:27:44 +02:00
Michael Weiss 8c9b60a830 pykde4: Remove kde4.pykde4
This package is broken since 0a3b7f994e
(python-sip: 4.18.1 -> 4.19.1). Removing it seems reasonable since we're
dropping KDE4 anyway.

Fixes #24548.
2017-04-29 23:10:07 +02:00
Vladimír Čunát 96d41e393d
treewide: purge maintainers.urkud
It's sad, but he's been inactive for the last five years.
Keeping such people in meta.maintainers is counter-productive.
2017-03-27 19:52:29 +02:00
Thomas Tuegel f28848cb4d
kde4.kdelibs -> kdelibs4
Our kdelibs4 package does not come from KDE 4, so per upstream's request I am
moving it out of the kde4 set.
2017-02-24 17:16:28 -06:00
Thomas Tuegel b4ba042924
qt4: Don't pass top-level attribute through kde4 2017-02-24 16:49:06 -06:00
Thomas Tuegel 9d6bfacc85
kde4: remove inessential KDE 4 modules 2017-02-24 16:49:02 -06:00
Peter Hoeg 5dbbdce047 kde4.krdc: depend on freerdp_legacy 2017-02-05 14:05:10 +08:00
Eelco Dolstra 020e88704a kde4: Get rid of some Nepomuk cruft by default 2016-09-29 20:03:54 +02:00
Eelco Dolstra d65af13533 kde4: Eliminate dev outputs from the closure
Obviously there are more improvements that can be done here,
especially moving headers to .dev, but that's not entirely trivial and
probably not worth it since kde4 is old.
2016-09-29 20:03:46 +02:00
Eelco Dolstra 1dd3ece50e cmake-2_8 -> cmake_2_8 2016-09-20 11:56:07 +02:00
Eelco Dolstra 452afd1ed6 ilmbase: Use separate outputs 2016-09-01 18:57:43 +02:00
Robin Gloster 33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
Frederik Rietdijk faa9ed0b10 Remove top-level pycups
See #11567.
2016-08-14 13:52:42 +02:00
Frederik Rietdijk 6842a24b21 Remove top-level pyqt4
See #11567.
2016-08-14 12:38:01 +02:00
Robin Gloster 5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Bjørn Forsman bd01fad0ed Captialize meta.description of all packages
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
Robin Gloster d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Robin Gloster f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
Eelco Dolstra bb43b542d6 pykde4: Fix gcc 5 build failure 2016-03-11 12:53:14 +01:00
Franz Pletz aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Robin Gloster 3c4729e980 kde4.qtruby: pin to ruby_2_2 2016-02-12 01:35:37 +00:00
Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Tobias Geerinckx-Rice 32d40f0f98 Remove no longer (or never) referenced patches
55 files changed, 6041 deletions. Tested with `nix-build -A tarball`.
2016-01-24 02:02:21 +01:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Bjørn Forsman ee807863ee system-config-printer: align attrname with pkgname
s/system_config_printer/system-config-printer/
2016-01-03 15:18:04 +01:00
Tobias Geerinckx-Rice 99075fb402 saneBackends{,Git} -> sane-backends{,-git}
Fixes xsane evaluation.
2016-01-03 03:31:38 +01:00
Luca Bruno bbcf127c7c Fix evaluation after merge in multi-outputs 2015-12-14 10:29:29 +01:00
Vladimír Čunát 8c8aba5d36 kde-runtime: fix with multiple outputs after 7477a7cd 2015-12-04 12:52:36 +01:00
Vladimír Čunát 81b9cc6f54 html-tidy: unify with its drop-in replacement tidy-html5
- the original project has been unmaintained for years
- some dependants needed to be patched due to renamed headers
  https://github.com/htacg/tidy-html5/issues/326#issuecomment-160329114
- separate tidy-html5 package was removed, as since the 5.0.0 version
  it's meant as a successor to both, and library name got back
  from libtidy5.so to libtidy.so
  https://github.com/htacg/tidy-html5/issues/326#issuecomment-160314666

/cc committers to tidy-html5: @edwjto and @zimbatm.
2015-11-29 10:32:02 +01:00
Vladimír Čunát 3c397e8ec8 taglib: bring back 1.9 to fix kde4.kdemultimedia
/cc #11097.
2015-11-20 10:44:00 +01:00
Vladimír Čunát 1640e4263b kde4: use cmake-2.8 instead of default, /cc #11097
This fixes kgamma breakage after cmake-3.4 update, and prevents future rot.
2015-11-20 10:31:16 +01:00
Domen Kožar 7477a7cdda kde: add glib include paths to NIX_CFLAGS_COMPILE
(cherry picked from commit 350ffdcc84)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-10-25 20:03:09 +01:00
Domen Kožar 87b4bdfa24 kde4.kde_runtime: depend on glib due to networkmanager 2015-10-25 12:59:11 +01:00
Thomas Tuegel 2e0589b4ca kde414: build with kdelibs-4.14.12
Upstream changes to the build system required adjusting many packages'
dependencies. On the Nixpkgs side, we no longer propagate the dependency
on cmake (to reduce closure size), so downstream dependencies had to be
adjusted for most packages that depend on kdelibs.
2015-09-27 15:08:12 -05:00
Eelco Dolstra d24a5a49ea kde-workspace: Disable gpsd dependency
This dependency causes substantial system bloat: gpsd depends on
pythonFull, which in turn depends on tcl/tk, etc.
2015-07-26 22:46:24 +02:00
William A. Kennington III b07929b0a3 Use libpulseaudio instead of pulseaudio 2015-05-29 14:32:56 -07:00
Thomas Tuegel aa5791f7ad kde4.kopete: fix build 2015-05-07 21:49:54 -05:00
Domen Kožar dfd4ada456 kde4: fix cantor build 2015-05-05 13:05:54 +02:00
Joachim Fasting bf7ad2d84f meta.description fixups
Mostly scripted substitutions with a couple of subjective enhancements.
2015-04-30 18:17:42 +02:00
Thomas Tuegel c0d5cd0ff9 poppler: fix build of Qt 4 and Qt 5 wrappers
The autoconf build system for poppler does not support building the
wrappers separately, so this slightly enlarges the size of closures. To
compensate, the command-line utilities have been separated into their
own package.
2015-04-02 09:51:44 -05:00
Karn Kallio 3661c7a842 kde-4.14 smokegen: prevent cmake from removing rpath on install
Signed-off-by: Domen Kožar <domen@dev.si>
2015-03-30 13:37:16 +02:00
Karn Kallio b09a6573a0 indilib version advance; older sources no longer available 2015-03-29 15:29:01 -05:00
Karn Kallio 52a6c8496b complete removal of obsolete kdelibs derivation 2015-03-28 17:20:25 -05:00
Thomas Tuegel c918f57ebb kde4: remove obsolete kdelibs derivation 2015-03-21 18:54:29 -05:00
Thomas Tuegel 2c4c712a70 kde4: use kdelibs from kdeApps_stable
Upstream is releasing bugfixes to kdelibs only through KDE Applications
releases, so this is the correct way to get updates until we discontinue
KDE 4. This also ensures that kdeApps and kde4 are using the same
version of kdelibs; different versions appear to be causing integration issues.
2015-03-21 18:46:54 -05:00
Peter Simons ec6b82a0c2 Merge branch 'master' into staging. 2015-01-19 18:41:17 +01:00
Evgeny Egorochkin e92c942d1d KDE4: correctly propagate user env packages 2015-01-18 08:10:25 +02:00