Commit Graph

71 Commits

Author SHA1 Message Date
Jan Tojnar
8ef5fcf4f5 upower: Simplify DESTDIR hack
Let’s point `DESTDIR` to a path under the build directory rather than under "$out".
This will prevent `installPhase` from creating `$out` or any other output directory,
allowing us to install the outputs just by moving them out of `$DESTDIR` directly into the store with `mv`.
Of course, that will also require moving the installing of `etc` and `var` after the outputs are installed
and ensuring there is no library litter from `checkPhase`.

Since `$out` does not currently contain `var` subdirectory, we can also just move `$DESTDIR/var` directly to `$out` rather than copying it.
`$out/etc` does exist but we can just merge it with `cp --recursive` instead of `rsync` so `rsync` is not actually necessary.

The code remains written defensively against files accidentally being misplaced while shuffling them around – parent directories of targets are used as `mv` destinations so that the move fails loudly if the directory already exists, rather than being moved inside as e.g. `$out/etc/etc`.


While at it let’s also improve practices a bit:
- Add vertical space and clearer comments.
- Handle non-standard Nix store paths.
2023-11-19 18:45:00 +01:00
Alyssa Ross
af82a43ffc
treewide: disable gobject-introspection when unavailable
This makes gsettings-desktop-schemas, harfbuzz, json-glib, and
libsecret buildable statically, and is still the right thing to do
everywhere else even where it's not a complete fix.
2023-10-12 13:25:31 +00:00
Artturin
ee197e8908 upower: Fix cross
Improve optionals
2023-08-04 00:22:11 +03:00
Jan Tojnar
d08e84b3be upower: Add installed tests 2023-07-13 19:12:22 +02:00
Jan Tojnar
b9c867fdad upower: 1.90.0 → 1.90.2
- Fixes flaky test with libgupower 238.
- Adds support for installed tests.

https://gitlab.freedesktop.org/upower/upower/-/compare/v1.90.0...v1.90.1
https://gitlab.freedesktop.org/upower/upower/-/compare/v1.90.1...v1.90.2
2023-07-13 09:13:30 +02:00
Jan Tojnar
416d02f9fd upower: Clean up
- Switch to `finalAttrs` pattern.
- Move `DESTDIR` into `env`.
- Use `lib.optionals` for patches and move the comment inside, in preparation for more patches.
2023-07-13 09:13:30 +02:00
Guillaume Girol
33afbf39f6 treewide: switch to nativeCheckInputs
checkInputs used to be added to nativeBuildInputs. Now we have
nativeCheckInputs to do that instead. Doing this treewide change allows
to keep hashes identical to before the introduction of
nativeCheckInputs.
2023-01-21 12:00:00 +00:00
sg2002
6667ea80ca upower: fix on i686 by removing one test check 2022-11-11 12:57:39 +03:00
Yuriy Taraday
9b0f3bcc82 upower: Fix GI_TYPELIB_PATH for tests
gobject-introspection doesn't handle checkInputs since
https://github.com/NixOS/nixpkgs/pull/177538, so tests
couldn't find UMockdev namespace. Added umockdev to buildInputs.
2022-07-24 19:40:20 +00:00
Tom Fitzhenry
10164a5de1 upower: 0.99.19 -> 1.90.0 2022-07-24 01:22:59 +10:00
Jan Tojnar
2a1fddab47 upower: Add test dependencies 2022-06-17 15:37:58 +02:00
Jan Tojnar
1cc2026421 upower: 0.99.17 → 0.99.19
https://gitlab.freedesktop.org/upower/upower/-/blob/v0.99.19/NEWS
2022-06-09 15:26:29 +02:00
Rick van Schijndel
48d473f1c3 upower: fix cross-compilation support
Disable gtk-doc and introspection when cross-compiling
2022-04-26 09:04:33 +02:00
Jan Tojnar
c2fd5cb6d3 upower: 0.99.15 → 0.99.17
https://gitlab.freedesktop.org/upower/upower/-/blob/v0.99.17/NEWS

Also remove alias use and add meta.{changelog,maintainers}.
2022-03-26 10:20:03 +01:00
Jan Tojnar
dccf7b3dee upower: 0.99.13 → 0.99.15
https://gitlab.freedesktop.org/upower/upower/-/releases/v0.99.14
https://gitlab.freedesktop.org/upower/upower/-/releases/v0.99.15
2022-02-28 15:18:35 +01:00
Yurii Matsiuk
ea0f9ce763
upower: 0.99.11 -> 0.99.13 2021-09-07 14:40:12 +02: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
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Matthew Harm Bekkema
f83a83f964 upower: load config from /etc
In the process of making UPower.conf customizable (#73968), it came up
that UPower doesn't load its config from /etc by default.

The UPower derivation is modified to make it load its config from /etc
at runtime, but still install the default config to its nix store path
as before.

The UPower module is modified to put the config in /etc.
2019-12-04 12:26:30 +11:00
worldofpeace
362c2f67f9
Merge pull request #68037 from dtzWill/update/upower-0.99.11
upower: 0.99.10 -> 0.99.11
2019-09-08 08:14:35 -04:00
worldofpeace
579a08ab15 upower: cleanup
* correct inputs
* drop dbus-glib
  Has not been needed for a very long
  time.
* intltool -> gettext
* add optional libimobiledevice
* propagate glib
  It's in Requires
* dev output
* drop useSystemd
2019-09-08 07:02:41 -04:00
Vladimír Čunát
4aad2947f8
Merge branch 'master' into staging-next 2019-09-04 11:00:56 +02:00
Will Dietz
11b43cef8e
upower: 0.99.10 -> 0.99.11
https://gitlab.freedesktop.org/upower/upower/-/tags/UPOWER_0_99_11
2019-09-03 18:32:18 -05:00
worldofpeace
59e68d3b74 treewide: don't use single quotes with placeholder 2019-09-03 13:01:42 -04:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
worldofpeace
b39324bf52 upower: 0.99.9 -> 0.99.10
Using placeholder and drop the NIX_CFLAGS_LINK.

https://gitlab.freedesktop.org/upower/upower/blob/UPOWER_0_99_10/NEWS
2019-05-08 23:06:00 -04:00
Jan Tojnar
a51a99c690
gobject-introspection: rename package
camelCase package name was a huge inconsistency in GNOME package set.
2018-12-02 12:42:29 +01:00
Will Dietz
b5bac7d8a8 upower: 0.99.8 -> 0.99.9 2018-10-29 08:07:01 -05:00
Will Dietz
2e76bf06d8 upower: 0.99.7 -> 0.99.8
(cherry picked from commit 67ac9c649ffc036c49006191c64555eae2e6012f)
2018-10-29 08:06:57 -05:00
Pascal Wittmann
8aafab9b49
upower: add license
see issue #43716
2018-08-04 16:21:21 +02:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
John Ericson
cf06e42d1c Merge remote-tracking branch 'upstream/master' into staging 2018-05-03 16:35:36 -04:00
Matthew Bauer
143978a477 treewide: remove platform assertions
linux: readd assertion
2018-05-03 13:09:20 -05:00
Jan Malakhovski
7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Jan Tojnar
a31d98f312
tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
Franz Pletz
f2dc4781f1
upower: 0.99.4 -> 0.99.7 2018-01-29 19:17:10 +01:00
Samuel Dionne-Riel
7b97c8c0c8 treewide: homepage+src updates (found by repology, #33263) 2018-01-05 20:42:46 +01:00
Tim Steinbach
3f3e8ed82b upower: 0.99.3 -> 0.99.4 2016-03-07 02:04:20 +00:00
Eelco Dolstra
01f19f54e0 Merge remote-tracking branch 'origin/master' into systemd-219
Conflicts:
	pkgs/os-specific/linux/systemd/fixes.patch
	pkgs/os-specific/linux/upower/0.99.nix
	pkgs/top-level/all-packages.nix
2015-09-21 12:57:30 +02:00
Eelco Dolstra
af82c983fc upower: Update to 0.99.3 2015-09-09 11:44:14 +02:00
Eelco Dolstra
a6a73a1429 upower: Remove unused dependencies 2015-09-09 11:44:14 +02:00
Eelco Dolstra
2a2cb8354e Remove upower-old 2015-09-09 11:44:14 +02:00
Eelco Dolstra
2a8e86bb05 upower: Use libgudev 2015-09-08 20:19:37 +02:00
Vladimír Čunát
7671875b25 upower_99: port commit bf3fd50e14 2014-12-25 18:29:08 +01:00
Vladimír Čunát
38ee8859e8 upower_99: update
It doesn't depend on polkit anymore (upstream change in 0.99.1).
2014-12-25 18:17:00 +01:00
Eelco Dolstra
bf3fd50e14 upower: Fix lib/systemd/system-sleep/system-sleep 2014-12-05 12:57:00 +01:00
Vladimír Čunát
36e79e3b90 upower: pull patches used in Ubuntu/trusty (fix #2884) 2014-06-19 20:51:30 +02:00
Luca Bruno
df95a8cc2f upower: add 0.99 version for gnome 3.12 2014-05-20 13:41:39 +02:00