From 809beefe79653c50462de9737a5512e1d918daa3 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sat, 9 Nov 2024 16:00:26 +0100 Subject: [PATCH 1/5] bottles: 51.13 -> 51.15 --- pkgs/applications/misc/bottles/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index bc9d3cb2e444..3bcd36fc6c3b 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -29,13 +29,13 @@ python3Packages.buildPythonApplication rec { pname = "bottles-unwrapped"; - version = "51.13"; + version = "51.15"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = "bottles"; - rev = version; - hash = "sha256-ZcUevGY81H3ATTk390ojBp/4zBE2Lui7Qa+Qe8B0XL4="; + rev = "refs/tags/${version}"; + hash = "sha256-HjGAeIh9s7xWBy35Oj66tCtgKCd/DpHg1sMPsdjWKDs="; }; patches = [ ./vulkan_icd.patch ]; From e024ba7ba9fbb8259489785a14abaee2f177fcc8 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sat, 9 Nov 2024 16:02:04 +0100 Subject: [PATCH 2/5] bottles: avoid with libs; --- pkgs/applications/misc/bottles/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 3bcd36fc6c3b..8525f99dfdec 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -104,16 +104,16 @@ python3Packages.buildPythonApplication rec { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { description = "Easy-to-use wineprefix manager"; homepage = "https://usebottles.com/"; downloadPage = "https://github.com/bottlesdevs/Bottles/releases"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ psydvl shamilton ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; mainProgram = "bottles"; }; } From e87c4e37493bf4bff74545a6e8f70726205f9c17 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sat, 9 Nov 2024 16:03:06 +0100 Subject: [PATCH 3/5] bottles: add Gliczy as maintainer --- pkgs/applications/misc/bottles/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 8525f99dfdec..69dccd4ae7f9 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -112,6 +112,7 @@ python3Packages.buildPythonApplication rec { maintainers = with lib.maintainers; [ psydvl shamilton + Gliczy ]; platforms = lib.platforms.linux; mainProgram = "bottles"; From d2cfb56cafd2aa7803e793413dd6622e565a3113 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sat, 9 Nov 2024 16:05:07 +0100 Subject: [PATCH 4/5] bottles: use nix-update-script gitUpdater was picking up an older version of bottles. --- pkgs/applications/misc/bottles/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 69dccd4ae7f9..c6aa927e1c02 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - gitUpdater, python3Packages, blueprint-compiler, meson, @@ -25,6 +24,7 @@ mangohud, vkbasalt-cli, vmtouch, + nix-update-script, }: python3Packages.buildPythonApplication rec { @@ -102,7 +102,7 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - passthru.updateScript = gitUpdater { }; + passthru.updateScript = nix-update-script { }; meta = { description = "Easy-to-use wineprefix manager"; From b1a9ea361136e9207ab31320cd43a4c039a13385 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sat, 9 Nov 2024 16:09:25 +0100 Subject: [PATCH 5/5] bottles: move to pkgs/by-name --- .../default.nix => by-name/bo/bottles-unwrapped/package.nix} | 0 .../bottles => by-name/bo/bottles-unwrapped}/vulkan_icd.patch | 0 .../bottles/fhsenv.nix => by-name/bo/bottles/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 4 files changed, 4 deletions(-) rename pkgs/{applications/misc/bottles/default.nix => by-name/bo/bottles-unwrapped/package.nix} (100%) rename pkgs/{applications/misc/bottles => by-name/bo/bottles-unwrapped}/vulkan_icd.patch (100%) rename pkgs/{applications/misc/bottles/fhsenv.nix => by-name/bo/bottles/package.nix} (100%) diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/by-name/bo/bottles-unwrapped/package.nix similarity index 100% rename from pkgs/applications/misc/bottles/default.nix rename to pkgs/by-name/bo/bottles-unwrapped/package.nix diff --git a/pkgs/applications/misc/bottles/vulkan_icd.patch b/pkgs/by-name/bo/bottles-unwrapped/vulkan_icd.patch similarity index 100% rename from pkgs/applications/misc/bottles/vulkan_icd.patch rename to pkgs/by-name/bo/bottles-unwrapped/vulkan_icd.patch diff --git a/pkgs/applications/misc/bottles/fhsenv.nix b/pkgs/by-name/bo/bottles/package.nix similarity index 100% rename from pkgs/applications/misc/bottles/fhsenv.nix rename to pkgs/by-name/bo/bottles/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 930d24a9eb82..23429d8e6dbc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13603,10 +13603,6 @@ with pkgs; bluejeans-gui = callPackage ../applications/networking/instant-messengers/bluejeans { }; - bottles = callPackage ../applications/misc/bottles/fhsenv.nix { }; - - bottles-unwrapped = callPackage ../applications/misc/bottles { }; - breezy = with python3Packages; toPythonApplication breezy; cage = callPackage ../applications/window-managers/cage {