3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

52 commits

Author SHA1 Message Date
Sergei Trofimovich c0f308b787 conky: use xorg.* packages directly instead of xlibsWrapper indirection
Validated as no change in `out` output with `diffoscope`.
2022-10-09 10:04:52 +01:00
R. Ryantm c4ee6537fa conky: 1.12.2 -> 1.13.1 2022-09-20 06:36:05 +00:00
Maximilian Bosch 0bdcc48485
conky: fix build w/glibc-2.34
Failing Hydra build: https://hydra.nixos.org/build/155171697
2022-02-27 10:26:50 +01:00
R. RyanTM df6b666353 conky: 1.12.1 -> 1.12.2 2021-04-25 21:14:42 +00:00
R. RyanTM 4c3ad2c1fc conky: 1.11.6 -> 1.12.1 2021-03-02 20:26:21 +00:00
Jonathan Ringer 9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Ben Siraphob 16d91ee628 pkgs/os-specific: stdenv.lib -> lib 2021-01-17 23:26:08 +07:00
Profpatsch 4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
R. RyanTM afaf5d5d43 conky: 1.11.5 -> 1.11.6 2020-07-31 00:37:27 -07:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Frederik Rietdijk f65aa21bb2 Merge master into staging-next 2019-08-18 12:53:44 +02:00
R. RyanTM 1632ca535f conky: 1.11.3 -> 1.11.5
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/conky/versions
2019-08-17 15:25:07 -07:00
volth 46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
R. RyanTM fcc50e80b8 conky: 1.11.2 -> 1.11.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/conky/versions
2019-03-01 16:34:34 -08:00
Jan Malakhovski 0f4eb7f977 conky: move defaults to package file 2019-02-03 15:33:12 +00:00
Tim Steinbach 43c6a83041
conky: journal support 2019-01-26 22:14:10 -05:00
Tim Steinbach 3da56c7844
conky: 1.11.1 -> 1.11.2 2019-01-25 22:57:53 -05:00
David Guibert d8e907ba18 conky: 1.11.0 -> 1.11.1 (#53157)
This fixes #52797.
2019-01-02 09:54:22 +01:00
R. RyanTM db250b9f84 conky: 1.10.8 -> 1.11.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/conky/versions
2018-12-16 17:08:57 +01:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Nicolas Schneider d0a9dcb01d
conky: provide option to build with pulseaudio support 2018-03-18 14:36:45 +01:00
Guillaume Maudoux 71f72219fc conky: 1.10.7 -> 1.10.8 2018-02-15 16:43:17 +01:00
Franz Pletz 943e32abb7
conky: 1.10.6 -> 1.10.7 2018-01-28 18:52:23 +01:00
Orivej Desh 5ae64cbfe7 conky: disable parallel building 2017-12-07 08:52:42 +00:00
Andreas Rammhold 141644e752
conky: fix compilation with gcc-7 2017-11-25 15:57:40 +01:00
Jan Tojnar 7c690aec16
conky: Rely on XML_CATALOG_FILES variable 2017-10-07 23:38:32 +02:00
John Ericson 531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
aszlig 7f99876f50
conky: Don't enable nvidiaSupport by default
This has been introduced in 6a6fb6d31c.

Relying on non-free software by default is probably a bad idea. Apart
from the fact that (sane) people usually don't want to have it sitting
on their system even people who don't care will have to set
"allowUnfree" to true in order to install conky.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @canndrew, @Mic92
2017-09-01 17:35:17 +02:00
Andrew Cann 6a6fb6d31c conky: enable nvidia support 2017-08-30 12:29:57 +08:00
José Luis Lafuente c70ded3295
conky: 1.10.5 -> 1.10.6 2017-03-13 18:18:42 +01:00
Tim Steinbach b43c0dab8e
conky: 1.10.3 -> 1.10.5 2016-10-14 23:16:45 -04:00
Aneesh Agrawal fcee1d0b28
Remove redundant -DCMAKE_BUILD_TYPE=Release flags
Since commit 183d05a0 in 2012, this is the default.

fixes #18000
2016-10-01 16:13:41 +02:00
Tim Steinbach 9672c36651 conky: 1.10.1 -> 1.10.3 2016-07-11 23:20:25 +00:00
Al Zohali c4b346a539 conky: added double buffer support
Closes #16515.
2016-06-30 09:48:06 +02:00
koral dd4dd8c87a conky: 1.10.0 -> 1.10.1 2016-01-17 11:22:10 +01:00
Bjørn Forsman 4f3d769d6f conky: add meta.platforms 2015-12-29 13:16:01 +01:00
Jan Malakhovski 43a1cfccf5 conky: build the docs, fixes #11461 2015-12-05 20:34:57 +01:00
aszlig 880eba6481
conky: Fix building with CMake 3.4.0.
Regression introduced by 050bebb8c4.

It's essentially an upgrade to CMake 3.4.0, which breaks the build
because it seems that in CMake 3.3.x, the check_include_files() command
was implicitly included (haven't found out about why exactly).

So we're now just adding an import for CheckIncludeFiles in addition to
CheckIncludeFile, so that we have both commands (the plural and the
singular variant) available.

My original goal was to use brndnmtthws/conky@3a574ba, but this breaks
the build as well, because check_include_files doesn't accept additional
compile flags.

However, this is needed if building with wireless support, because
including iwlib.h needs -D_GNU_SOURCE set and check_include_files
doesn't do that.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-11-17 05:51:27 +01:00
Vladimír Čunát 21e3ff658a x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
koral 7eb5b00d82 conky: 1.9.0 -> 1.10.0 2015-08-30 14:18:47 +00:00
Jan Malakhovski 8591b7b48c conky: add lua-imlib2 and lua-cairo support, add more options, rename old ones so that they would conform to a common standard, make the defaults for a "normal desktop user" 2015-03-29 23:23:29 +00:00
Bjørn Forsman c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
aszlig e07e3a7591
conky: Link against GCC runtime library.
This is needed for Conky to shut down cleanly, because it relies on
pthread_cancel() to work.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-07-14 09:35:24 +02:00
Christoph Hrdinka 26d5d506c9 conky: add config options 2014-03-16 12:30:15 +01:00
aszlig 109fdfe34f
conky: Enable weather plugins.
Those plugins do not require additional dependencis or at least no dependencies
we don't actually use, so let's build them aswell. And after all, If you work in
your hermetically sealed environment, you surely want to know what's going on
outside.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-10 23:54:00 +02:00
aszlig 2b7e88e9f5
conky: Re-enable support for ncurses.
Build breakage with enabled ncurses is fixed in 1.9.0 now, so we can safely
re-enable it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-10 23:54:00 +02:00
aszlig b0ace9fa11
conky: Add license attribute to meta.
As the GPL license is more restrictive than the BSD license of the original
(torsmo) of the fork, I'm adding GPL as the license here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-10 23:54:00 +02:00
aszlig 3b7dd3c930
conky: Patch to #include <stdbool.h> in conky.c.
In current upstream master, they converted conky.c to C++ already, so it's not
an issue there anymore. But until then we need to patch it on our own to fix the
build.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-10 23:53:59 +02:00
aszlig b2b67c055b
conky: Remove curl/types.h patch.
This patch is no longer needed, as it is fixed upstream now.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-10 23:53:59 +02:00
aszlig 3692a2e83d
conky: Update to version 1.9.0.
Version 1.8.1 seems to be quite dated, in addition I'd like to use the weather
plugin, which isn't available in 1.8.1 as well. If you work in your hermetically
sealed environment, you surely want to know what's going on outside.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-10 23:53:59 +02:00