From 24a342d53569310de913d243e048f28cd229367f Mon Sep 17 00:00:00 2001 From: Zitrone Date: Sun, 27 Apr 2025 00:40:33 +0200 Subject: [PATCH] transset: 1.0.3 -> 1.0.4 && refactor and move to pkgs/by-name from xorg namespace --- pkgs/by-name/tr/transset/package.nix | 51 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 38 +------------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 1 - pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 55 insertions(+), 38 deletions(-) create mode 100644 pkgs/by-name/tr/transset/package.nix diff --git a/pkgs/by-name/tr/transset/package.nix b/pkgs/by-name/tr/transset/package.nix new file mode 100644 index 000000000000..57cbdf5fdff3 --- /dev/null +++ b/pkgs/by-name/tr/transset/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + libx11, + xorgproto, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "transset"; + version = "1.0.4"; + + src = fetchurl { + url = "mirror://xorg/individual/app/transset-${finalAttrs.version}.tar.xz"; + hash = "sha256-gamrdK8TdzOqjLajf4KSlIUm/n7wa4WfwP8nLEN8Czg="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + libx11 + xorgproto + ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/app/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "Utility for setting opacity/transparency property on a window"; + homepage = "https://gitlab.freedesktop.org/xorg/app/transset"; + license = with lib.licenses; [ + mit + mitOpenGroup + hpndSellVariant + ]; + mainProgram = "transset"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index dab99654eb6e..d8ffefe7de38 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -19,6 +19,7 @@ makedepend, pixman, sessreg, + transset, util-macros, xbitmaps, xcb-proto, @@ -44,6 +45,7 @@ self: with self; { makedepend pixman sessreg + transset xbitmaps xorgproto xtrans @@ -3304,42 +3306,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - transset = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - xorgproto, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "transset"; - version = "1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/transset-1.0.4.tar.xz"; - sha256 = "0f0bgi1jq9zzq2gqaszhgvz2d1clja17z8xnijm36xqkmxsapac1"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libX11 - xorgproto - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! twm = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 2515d4bd7e24..249f76180997 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -304,6 +304,7 @@ print OUT <