From 90990b93f2f735335e7b89779a96306dfba81ff4 Mon Sep 17 00:00:00 2001 From: Zitrone Date: Mon, 9 Jun 2025 01:05:07 +0200 Subject: [PATCH 1/6] xcmsdb: refactor and migrate to pkgs/by-name from xorg namespace --- pkgs/by-name/xc/xcmsdb/package.nix | 51 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 34 +------------ .../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(+), 34 deletions(-) create mode 100644 pkgs/by-name/xc/xcmsdb/package.nix diff --git a/pkgs/by-name/xc/xcmsdb/package.nix b/pkgs/by-name/xc/xcmsdb/package.nix new file mode 100644 index 000000000000..3b3a729f5b72 --- /dev/null +++ b/pkgs/by-name/xc/xcmsdb/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + libx11, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xcmsdb"; + version = "1.0.7"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xcmsdb-${finalAttrs.version}.tar.xz"; + hash = "sha256-XsQGjkiBh7BeqS7hNiyWt4qQ8ZzMehhExZIdcGJrvDg="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ libx11 ]; + + 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 = "Device Color Characterization utility for X Color Management System"; + longDescription = '' + xcmsdb is used to load, query, or remove Device Color Characterization data stored in + properties on the root window of the screen as specified in section 7, Device Color + Characterization, of the X11 Inter-Client Communication Conventions Manual (ICCCM). + ''; + homepage = "https://gitlab.freedesktop.org/xorg/app/xcmsdb"; + license = with lib.licenses; [ + hpnd + mitOpenGroup + ]; + mainProgram = "xcmsdb"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index dab99654eb6e..5f50f64073ea 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -22,6 +22,7 @@ util-macros, xbitmaps, xcb-proto, + xcmsdb, xkeyboard-config, xorg-cf-files, xorg-docs, @@ -45,6 +46,7 @@ self: with self; { pixman sessreg xbitmaps + xcmsdb xorgproto xtrans ; @@ -3962,38 +3964,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xcmsdb = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xcmsdb"; - version = "1.0.7"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xcmsdb-1.0.7.tar.xz"; - sha256 = "0f5wddi707cjqm21hynckkqr12mpjqn3dq9fm5gb11w19270di2y"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xcompmgr = 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..789739daf78b 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -307,6 +307,7 @@ print OUT < Date: Mon, 9 Jun 2025 01:19:57 +0200 Subject: [PATCH 2/6] xdriinfo: 1.0.7 -> 1.0.8, refactor and migrate to pkgs/by-name from xorg namespace --- pkgs/by-name/xd/xdriinfo/package.nix | 49 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 40 +-------------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 7 --- pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 53 insertions(+), 46 deletions(-) create mode 100644 pkgs/by-name/xd/xdriinfo/package.nix diff --git a/pkgs/by-name/xd/xdriinfo/package.nix b/pkgs/by-name/xd/xdriinfo/package.nix new file mode 100644 index 000000000000..9b53f106ece0 --- /dev/null +++ b/pkgs/by-name/xd/xdriinfo/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + libGL, + xorgproto, + libx11, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xdriinfo"; + version = "1.0.8"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xdriinfo-${finalAttrs.version}.tar.xz"; + hash = "sha256-AEYwVkNbgiYcInrQ3hhz/UU2EBYH+8V1QOKOSgqbcfc="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + libGL + xorgproto + libx11 + ]; + + 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 to query configuration information of X11 DRI drivers"; + homepage = "https://gitlab.freedesktop.org/xorg/app/xdriinfo"; + license = lib.licenses.mit; + mainProgram = "xdriinfo"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 5f50f64073ea..7af2c8f03b00 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -23,6 +23,7 @@ xbitmaps, xcb-proto, xcmsdb, + xdriinfo, xkeyboard-config, xorg-cf-files, xorg-docs, @@ -47,6 +48,7 @@ self: with self; { sessreg xbitmaps xcmsdb + xdriinfo xorgproto xtrans ; @@ -4244,44 +4246,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xdriinfo = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libGL, - xorgproto, - libX11, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xdriinfo"; - version = "1.0.7"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xdriinfo-1.0.7.tar.xz"; - sha256 = "0d7p9fj3znq0av9pjgi2kphqaz5w7b9hxlz63zbxs69bknp8p0yx"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libGL - xorgproto - libX11 - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xev = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 789739daf78b..6825ab76399b 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -308,6 +308,7 @@ print OUT < Date: Mon, 9 Jun 2025 01:27:05 +0200 Subject: [PATCH 3/6] xlsatoms: refactor and migrate to pkgs/by-name from xorg namespace --- pkgs/by-name/xl/xlsatoms/package.nix | 43 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 34 +-------------- .../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, 47 insertions(+), 34 deletions(-) create mode 100644 pkgs/by-name/xl/xlsatoms/package.nix diff --git a/pkgs/by-name/xl/xlsatoms/package.nix b/pkgs/by-name/xl/xlsatoms/package.nix new file mode 100644 index 000000000000..708710b177cd --- /dev/null +++ b/pkgs/by-name/xl/xlsatoms/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + libxcb, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xlsatoms"; + version = "1.1.4"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xlsatoms-${finalAttrs.version}.tar.xz"; + hash = "sha256-9L+hX1bAZtMmpdWykmRnCPJbkkdQaEC5BHzSaH3Mcbc="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ libxcb ]; + + 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 to list interned atoms defined on X server"; + homepage = "https://gitlab.freedesktop.org/xorg/app/xlsatoms"; + license = lib.licenses.mitOpenGroup; + mainProgram = "xlsatoms"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 7af2c8f03b00..15291853e339 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -25,6 +25,7 @@ xcmsdb, xdriinfo, xkeyboard-config, + xlsatoms, xorg-cf-files, xorg-docs, xorgproto, @@ -49,6 +50,7 @@ self: with self; { xbitmaps xcmsdb xdriinfo + xlsatoms xorgproto xtrans ; @@ -6878,38 +6880,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xlsatoms = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libxcb, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xlsatoms"; - version = "1.1.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xlsatoms-1.1.4.tar.xz"; - sha256 = "1dviriynilkw0jwl0s2h8y95pwh8cxj95cnmllkd6rn0args3gzl"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libxcb ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xlsclients = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 6825ab76399b..80bc58fb98f8 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -310,6 +310,7 @@ print OUT < Date: Mon, 9 Jun 2025 01:33:31 +0200 Subject: [PATCH 4/6] xlsclients: refactor and migrate to pkgs/by-name from xorg namespace --- pkgs/by-name/xl/xlsclients/package.nix | 46 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 34 +------------- .../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, 50 insertions(+), 34 deletions(-) create mode 100644 pkgs/by-name/xl/xlsclients/package.nix diff --git a/pkgs/by-name/xl/xlsclients/package.nix b/pkgs/by-name/xl/xlsclients/package.nix new file mode 100644 index 000000000000..d2cc35c2e9ca --- /dev/null +++ b/pkgs/by-name/xl/xlsclients/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + libxcb, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xlsclients"; + version = "1.1.5"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xlsclients-${finalAttrs.version}.tar.xz"; + hash = "sha256-aLruV+cCUKxKd1n7eCIYMfl9iLyOUdzC5k6z+MpWuuM="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ libxcb ]; + + 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 to list client applications running on a X11 display"; + homepage = "https://gitlab.freedesktop.org/xorg/app/xlsclients"; + license = with lib.licenses; [ + mitOpenGroup + mit + ]; + mainProgram = "xlsclients"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 15291853e339..954a63ca37d2 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -26,6 +26,7 @@ xdriinfo, xkeyboard-config, xlsatoms, + xlsclients, xorg-cf-files, xorg-docs, xorgproto, @@ -51,6 +52,7 @@ self: with self; { xcmsdb xdriinfo xlsatoms + xlsclients xorgproto xtrans ; @@ -6880,38 +6882,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xlsclients = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libxcb, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xlsclients"; - version = "1.1.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xlsclients-1.1.5.tar.xz"; - sha256 = "1qxsav5gicsfwv1dqlcfpj47vy9i30i7iysrfx5aql02wxbyxfk8"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libxcb ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xlsfonts = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 80bc58fb98f8..3524475cad1a 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -311,6 +311,7 @@ print OUT < Date: Mon, 9 Jun 2025 01:58:44 +0200 Subject: [PATCH 5/6] xlsfonts: refactor and migrate to pkgs/by-name from xorg namespace --- pkgs/by-name/xl/xlsfonts/package.nix | 47 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 38 +-------------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 7 --- pkgs/servers/x11/xorg/tarballs.list | 1 - pkgs/top-level/all-packages.nix | 2 - 6 files changed, 51 insertions(+), 46 deletions(-) create mode 100644 pkgs/by-name/xl/xlsfonts/package.nix diff --git a/pkgs/by-name/xl/xlsfonts/package.nix b/pkgs/by-name/xl/xlsfonts/package.nix new file mode 100644 index 000000000000..d632b6d9e310 --- /dev/null +++ b/pkgs/by-name/xl/xlsfonts/package.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + libx11, + xorgproto, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xlsfonts"; + version = "1.0.8"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xlsfonts-${finalAttrs.version}.tar.xz"; + hash = "sha256-gH+QnqzmhLhm/GOz6WJynBIIIqbJbgUf9RzzULP/ts0="; + }; + + 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 to list core protocol fonts on an X server"; + homepage = "https://gitlab.freedesktop.org/xorg/app/xlsfonts"; + license = lib.licenses.mitOpenGroup; + mainProgram = "xlsfonts"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 954a63ca37d2..017cd8bb0dbe 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -27,6 +27,7 @@ xkeyboard-config, xlsatoms, xlsclients, + xlsfonts, xorg-cf-files, xorg-docs, xorgproto, @@ -53,6 +54,7 @@ self: with self; { xdriinfo xlsatoms xlsclients + xlsfonts xorgproto xtrans ; @@ -6882,42 +6884,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xlsfonts = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - xorgproto, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xlsfonts"; - version = "1.0.8"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xlsfonts-1.0.8.tar.xz"; - sha256 = "1kdnzyrm1wqwylghavn9lqi0h4lwf9ifkcv3zikbi176mjg90zw0"; - }; - 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! xmag = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 3524475cad1a..fa63c30ba271 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -312,6 +312,7 @@ print OUT < Date: Mon, 9 Jun 2025 02:26:58 +0200 Subject: [PATCH 6/6] xmodmap: refactor and migrate to pkgs/by-name from xorg namespace --- pkgs/by-name/xm/xmodmap/package.nix | 55 +++++++++++++++++++ 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, 59 insertions(+), 38 deletions(-) create mode 100644 pkgs/by-name/xm/xmodmap/package.nix diff --git a/pkgs/by-name/xm/xmodmap/package.nix b/pkgs/by-name/xm/xmodmap/package.nix new file mode 100644 index 000000000000..eb6e40c439a6 --- /dev/null +++ b/pkgs/by-name/xm/xmodmap/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + libx11, + xorgproto, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xmodmap"; + version = "1.0.11"; + + src = fetchurl { + url = "mirror://xorg/individual/app/xmodmap-${finalAttrs.version}.tar.xz"; + hash = "sha256-mi+BaPewvDgoKIR0A5Astr8XXhdlizYYnqyH7dqHfoE="; + }; + + 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 modifying keymaps and pointer button mappings in X"; + longDescription = '' + The xmodmap program is used to edit and display the keyboard modifier map and keymap table + that are used by client applications to convert event keycodes into keysyms. It is usually run + from the user's session startup script to configure the keyboard according to personal tastes. + ''; + homepage = "https://gitlab.freedesktop.org/xorg/app/xmodmap"; + license = with lib.licenses; [ + mit + mitOpenGroup + ]; + mainProgram = "xmodmap"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 017cd8bb0dbe..21ed856105e8 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -28,6 +28,7 @@ xlsatoms, xlsclients, xlsfonts, + xmodmap, xorg-cf-files, xorg-docs, xorgproto, @@ -55,6 +56,7 @@ self: with self; { xlsatoms xlsclients xlsfonts + xmodmap xorgproto xtrans ; @@ -6970,42 +6972,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xmodmap = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - xorgproto, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xmodmap"; - version = "1.0.11"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xmodmap-1.0.11.tar.xz"; - sha256 = "10byhzdfv1xckqc3d2v52xg1ggxn5j806x4450l3ig5hyxl82bws"; - }; - 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! xmore = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index fa63c30ba271..0b4c15925a56 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -313,6 +313,7 @@ print OUT <