From b18e7b3e1c10b6c57b060fb52c164e9a05e571de Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 11 Jun 2024 19:23:47 -0400 Subject: [PATCH 1/8] flatpak: migrate to by-name --- .../libraries => by-name/fl}/flatpak/binary-path.patch | 0 .../libraries => by-name/fl}/flatpak/fix-fonts-icons.patch | 0 .../libraries => by-name/fl}/flatpak/fix-icon-validation.patch | 0 .../libraries => by-name/fl}/flatpak/fix-paths.patch | 0 .../libraries => by-name/fl}/flatpak/fix-test-paths.patch | 0 .../flatpak/default.nix => by-name/fl/flatpak/package.nix} | 0 .../fl}/flatpak/respect-xml-catalog-files-var.patch | 0 .../libraries => by-name/fl}/flatpak/unset-env-vars.patch | 0 pkgs/top-level/all-packages.nix | 2 -- 9 files changed, 2 deletions(-) rename pkgs/{development/libraries => by-name/fl}/flatpak/binary-path.patch (100%) rename pkgs/{development/libraries => by-name/fl}/flatpak/fix-fonts-icons.patch (100%) rename pkgs/{development/libraries => by-name/fl}/flatpak/fix-icon-validation.patch (100%) rename pkgs/{development/libraries => by-name/fl}/flatpak/fix-paths.patch (100%) rename pkgs/{development/libraries => by-name/fl}/flatpak/fix-test-paths.patch (100%) rename pkgs/{development/libraries/flatpak/default.nix => by-name/fl/flatpak/package.nix} (100%) rename pkgs/{development/libraries => by-name/fl}/flatpak/respect-xml-catalog-files-var.patch (100%) rename pkgs/{development/libraries => by-name/fl}/flatpak/unset-env-vars.patch (100%) diff --git a/pkgs/development/libraries/flatpak/binary-path.patch b/pkgs/by-name/fl/flatpak/binary-path.patch similarity index 100% rename from pkgs/development/libraries/flatpak/binary-path.patch rename to pkgs/by-name/fl/flatpak/binary-path.patch diff --git a/pkgs/development/libraries/flatpak/fix-fonts-icons.patch b/pkgs/by-name/fl/flatpak/fix-fonts-icons.patch similarity index 100% rename from pkgs/development/libraries/flatpak/fix-fonts-icons.patch rename to pkgs/by-name/fl/flatpak/fix-fonts-icons.patch diff --git a/pkgs/development/libraries/flatpak/fix-icon-validation.patch b/pkgs/by-name/fl/flatpak/fix-icon-validation.patch similarity index 100% rename from pkgs/development/libraries/flatpak/fix-icon-validation.patch rename to pkgs/by-name/fl/flatpak/fix-icon-validation.patch diff --git a/pkgs/development/libraries/flatpak/fix-paths.patch b/pkgs/by-name/fl/flatpak/fix-paths.patch similarity index 100% rename from pkgs/development/libraries/flatpak/fix-paths.patch rename to pkgs/by-name/fl/flatpak/fix-paths.patch diff --git a/pkgs/development/libraries/flatpak/fix-test-paths.patch b/pkgs/by-name/fl/flatpak/fix-test-paths.patch similarity index 100% rename from pkgs/development/libraries/flatpak/fix-test-paths.patch rename to pkgs/by-name/fl/flatpak/fix-test-paths.patch diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/by-name/fl/flatpak/package.nix similarity index 100% rename from pkgs/development/libraries/flatpak/default.nix rename to pkgs/by-name/fl/flatpak/package.nix diff --git a/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch b/pkgs/by-name/fl/flatpak/respect-xml-catalog-files-var.patch similarity index 100% rename from pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch rename to pkgs/by-name/fl/flatpak/respect-xml-catalog-files-var.patch diff --git a/pkgs/development/libraries/flatpak/unset-env-vars.patch b/pkgs/by-name/fl/flatpak/unset-env-vars.patch similarity index 100% rename from pkgs/development/libraries/flatpak/unset-env-vars.patch rename to pkgs/by-name/fl/flatpak/unset-env-vars.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab567c421e6c..29441e3a6e4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7878,8 +7878,6 @@ with pkgs; flashbench = callPackage ../os-specific/linux/flashbench { }; - flatpak = callPackage ../development/libraries/flatpak { }; - flatpak-builder = callPackage ../development/tools/flatpak-builder { binutils = binutils-unwrapped; }; From 2ef5b8fb851f99506f2c5b1539489c6584dacf88 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 11 Jun 2024 19:24:05 -0400 Subject: [PATCH 2/8] flatpak: format with nixfmt --- pkgs/by-name/fl/flatpak/package.nix | 144 +++++++++++++++------------- 1 file changed, 78 insertions(+), 66 deletions(-) diff --git a/pkgs/by-name/fl/flatpak/package.nix b/pkgs/by-name/fl/flatpak/package.nix index 931e15457893..047f1e58c8ab 100644 --- a/pkgs/by-name/fl/flatpak/package.nix +++ b/pkgs/by-name/fl/flatpak/package.nix @@ -1,55 +1,57 @@ -{ lib, stdenv -, fetchurl -, autoreconfHook -, docbook_xml_dtd_45 -, docbook-xsl-nons -, which -, libxml2 -, gobject-introspection -, gtk-doc -, intltool -, libxslt -, pkg-config -, xmlto -, substituteAll -, runCommand -, bison -, xdg-dbus-proxy -, p11-kit -, appstream -, bubblewrap -, bzip2 -, curl -, dbus -, glib -, gpgme -, json-glib -, libarchive -, libcap -, libseccomp -, coreutils -, socat -, gettext -, hicolor-icon-theme -, shared-mime-info -, desktop-file-utils -, gtk3 -, fuse3 -, nixosTests -, xz -, zstd -, ostree -, polkit -, python3 -, systemd -, xorg -, valgrind -, glib-networking -, wrapGAppsNoGuiHook -, dconf -, gsettings-desktop-schemas -, librsvg -, makeWrapper +{ + lib, + stdenv, + fetchurl, + autoreconfHook, + docbook_xml_dtd_45, + docbook-xsl-nons, + which, + libxml2, + gobject-introspection, + gtk-doc, + intltool, + libxslt, + pkg-config, + xmlto, + substituteAll, + runCommand, + bison, + xdg-dbus-proxy, + p11-kit, + appstream, + bubblewrap, + bzip2, + curl, + dbus, + glib, + gpgme, + json-glib, + libarchive, + libcap, + libseccomp, + coreutils, + socat, + gettext, + hicolor-icon-theme, + shared-mime-info, + desktop-file-utils, + gtk3, + fuse3, + nixosTests, + xz, + zstd, + ostree, + polkit, + python3, + systemd, + xorg, + valgrind, + glib-networking, + wrapGAppsNoGuiHook, + dconf, + gsettings-desktop-schemas, + librsvg, + makeWrapper, }: stdenv.mkDerivation (finalAttrs: { @@ -57,7 +59,14 @@ stdenv.mkDerivation (finalAttrs: { version = "1.14.6"; # TODO: split out lib once we figure out what to do with triggerdir - outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ]; + outputs = [ + "out" + "dev" + "man" + "doc" + "devdoc" + "installedTests" + ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz"; @@ -69,7 +78,12 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/flatpak/flatpak/issues/1460 (substituteAll { src = ./fix-test-paths.patch; - inherit coreutils gettext socat gtk3; + inherit + coreutils + gettext + socat + gtk3 + ; smi = shared-mime-info; dfu = desktop-file-utils; hicolorIconTheme = hicolor-icon-theme; @@ -149,9 +163,7 @@ stdenv.mkDerivation (finalAttrs: { ostree ]; - nativeCheckInputs = [ - valgrind - ]; + nativeCheckInputs = [ valgrind ]; # TODO: some issues with temporary files doCheck = false; @@ -177,15 +189,15 @@ stdenv.mkDerivation (finalAttrs: { "installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/flatpak" ]; - postPatch = let - vsc-py = python3.withPackages (pp: [ - pp.pyparsing - ]); - in '' - patchShebangs buildutil - patchShebangs tests - PATH=${lib.makeBinPath [vsc-py]}:$PATH patchShebangs --build subprojects/variant-schema-compiler/variant-schema-compiler - ''; + postPatch = + let + vsc-py = python3.withPackages (pp: [ pp.pyparsing ]); + in + '' + patchShebangs buildutil + patchShebangs tests + PATH=${lib.makeBinPath [ vsc-py ]}:$PATH patchShebangs --build subprojects/variant-schema-compiler/variant-schema-compiler + ''; passthru = { icon-validator-patch = substituteAll { From feeae371effa5d77b94814fd101b6d83ce32e7fc Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 11 Jun 2024 19:25:14 -0400 Subject: [PATCH 3/8] flatpak: adopt --- pkgs/by-name/fl/flatpak/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fl/flatpak/package.nix b/pkgs/by-name/fl/flatpak/package.nix index 047f1e58c8ab..af3982c60bf6 100644 --- a/pkgs/by-name/fl/flatpak/package.nix +++ b/pkgs/by-name/fl/flatpak/package.nix @@ -219,7 +219,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Linux application sandboxing and distribution framework"; homepage = "https://flatpak.org/"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ getchoo ]; platforms = platforms.linux; }; }) From cda85c65be8c493e0bd37e5af9cd5c673a53a165 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 11 Jun 2024 19:29:03 -0400 Subject: [PATCH 4/8] flatpak: modernize https://github.com/NixOS/nixpkgs/issues/208242 --- pkgs/by-name/fl/flatpak/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/fl/flatpak/package.nix b/pkgs/by-name/fl/flatpak/package.nix index af3982c60bf6..50b8dcc592c4 100644 --- a/pkgs/by-name/fl/flatpak/package.nix +++ b/pkgs/by-name/fl/flatpak/package.nix @@ -51,7 +51,6 @@ dconf, gsettings-desktop-schemas, librsvg, - makeWrapper, }: stdenv.mkDerivation (finalAttrs: { @@ -70,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-U482ssb4xw7v0S0TrVsa2DCCAQaovTqfa45NnegeSUY="; # Taken from https://github.com/flatpak/flatpak/releases/ + hash = "sha256-U482ssb4xw7v0S0TrVsa2DCCAQaovTqfa45NnegeSUY="; }; patches = [ @@ -174,8 +173,8 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--with-curl" - "--with-system-bubblewrap=${bubblewrap}/bin/bwrap" - "--with-system-dbus-proxy=${xdg-dbus-proxy}/bin/xdg-dbus-proxy" + "--with-system-bubblewrap=${lib.getExe bubblewrap}" + "--with-system-dbus-proxy=${lib.getExe xdg-dbus-proxy}" "--with-dbus-config-dir=${placeholder "out"}/share/dbus-1/system.d" "--with-profile-dir=${placeholder "out"}/etc/profile.d" "--localstatedir=/var" @@ -215,11 +214,12 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = with lib; { + meta = { description = "Linux application sandboxing and distribution framework"; homepage = "https://flatpak.org/"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ getchoo ]; - platforms = platforms.linux; + changelog = "https://github.com/flatpak/flatpak/releases/tag/${finalAttrs.version}"; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ getchoo ]; + platforms = lib.platforms.linux; }; }) From ceb3b7ee267279a3c73a14b29b08c6b03fbe4040 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 11 Jun 2024 19:31:12 -0400 Subject: [PATCH 5/8] flatpak: add version test --- pkgs/by-name/fl/flatpak/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/fl/flatpak/package.nix b/pkgs/by-name/fl/flatpak/package.nix index 50b8dcc592c4..1f0a88f51f58 100644 --- a/pkgs/by-name/fl/flatpak/package.nix +++ b/pkgs/by-name/fl/flatpak/package.nix @@ -37,6 +37,7 @@ desktop-file-utils, gtk3, fuse3, + testers, nixosTests, xz, zstd, @@ -211,6 +212,8 @@ stdenv.mkDerivation (finalAttrs: { ${finalAttrs.finalPackage}/libexec/flatpak-validate-icon --sandbox 512 512 ${../../../applications/audio/zynaddsubfx/ZynLogo.svg} > "$out" grep format=svg "$out" ''; + + version = testers.testVersion { package = finalAttrs.finalPackage; }; }; }; From 619dd38e9fd269a13963ae5b650de70a1e640c15 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 11 Jun 2024 19:32:52 -0400 Subject: [PATCH 6/8] flatpak: add updateScript --- pkgs/by-name/fl/flatpak/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/fl/flatpak/package.nix b/pkgs/by-name/fl/flatpak/package.nix index 1f0a88f51f58..b130ef4f32c7 100644 --- a/pkgs/by-name/fl/flatpak/package.nix +++ b/pkgs/by-name/fl/flatpak/package.nix @@ -52,6 +52,7 @@ dconf, gsettings-desktop-schemas, librsvg, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -205,6 +206,8 @@ stdenv.mkDerivation (finalAttrs: { inherit (builtins) storeDir; }; + updateScript = nix-update-script { }; + tests = { installedTests = nixosTests.installed-tests.flatpak; From 85338a0427bb48b47d55e78874f10ee82cbe3e9f Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 21 Jun 2024 17:36:48 -0400 Subject: [PATCH 7/8] flatpak: use `nixos-icons` for validate-icon test --- pkgs/by-name/fl/flatpak/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fl/flatpak/package.nix b/pkgs/by-name/fl/flatpak/package.nix index b130ef4f32c7..afcb3234f0e1 100644 --- a/pkgs/by-name/fl/flatpak/package.nix +++ b/pkgs/by-name/fl/flatpak/package.nix @@ -53,6 +53,7 @@ gsettings-desktop-schemas, librsvg, nix-update-script, + nixos-icons }: stdenv.mkDerivation (finalAttrs: { @@ -212,7 +213,10 @@ stdenv.mkDerivation (finalAttrs: { installedTests = nixosTests.installed-tests.flatpak; validate-icon = runCommand "test-icon-validation" { } '' - ${finalAttrs.finalPackage}/libexec/flatpak-validate-icon --sandbox 512 512 ${../../../applications/audio/zynaddsubfx/ZynLogo.svg} > "$out" + ${finalAttrs.finalPackage}/libexec/flatpak-validate-icon \ + --sandbox 512 512 \ + "${nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake-white.svg" > "$out" + grep format=svg "$out" ''; From 0949980cd29f2c242c3048f8297b2618e8121247 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 21 Jun 2024 17:47:56 -0400 Subject: [PATCH 8/8] flatpak: reorganize arguments --- pkgs/by-name/fl/flatpak/package.nix | 66 ++++++++++++++--------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/pkgs/by-name/fl/flatpak/package.nix b/pkgs/by-name/fl/flatpak/package.nix index afcb3234f0e1..fc109bf50834 100644 --- a/pkgs/by-name/fl/flatpak/package.nix +++ b/pkgs/by-name/fl/flatpak/package.nix @@ -2,58 +2,58 @@ lib, stdenv, fetchurl, - autoreconfHook, - docbook_xml_dtd_45, - docbook-xsl-nons, - which, - libxml2, - gobject-introspection, - gtk-doc, - intltool, - libxslt, - pkg-config, - xmlto, - substituteAll, runCommand, - bison, - xdg-dbus-proxy, - p11-kit, appstream, + autoreconfHook, + bison, bubblewrap, bzip2, + coreutils, curl, dbus, + dconf, + desktop-file-utils, + docbook_xml_dtd_45, + docbook-xsl-nons, + fuse3, + gettext, glib, + glib-networking, + gobject-introspection, gpgme, + gsettings-desktop-schemas, + gtk3, + gtk-doc, + hicolor-icon-theme, + intltool, json-glib, libarchive, libcap, + librsvg, libseccomp, - coreutils, - socat, - gettext, - hicolor-icon-theme, - shared-mime-info, - desktop-file-utils, - gtk3, - fuse3, - testers, + libxml2, + libxslt, + nix-update-script, nixosTests, - xz, - zstd, + nixos-icons, ostree, + p11-kit, + pkg-config, polkit, python3, + shared-mime-info, + socat, + substituteAll, systemd, - xorg, + testers, valgrind, - glib-networking, + which, wrapGAppsNoGuiHook, - dconf, - gsettings-desktop-schemas, - librsvg, - nix-update-script, - nixos-icons + xdg-dbus-proxy, + xmlto, + xorg, + xz, + zstd, }: stdenv.mkDerivation (finalAttrs: {