From b18e7b3e1c10b6c57b060fb52c164e9a05e571de Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 11 Jun 2024 19:23:47 -0400 Subject: [PATCH] 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; };