From 0d0ebcae5193300d3f88ee201ea0ccdf825ede88 Mon Sep 17 00:00:00 2001 From: Firelight Flagboy Date: Sun, 1 Sep 2024 16:50:17 +0200 Subject: [PATCH 1/5] Update nixpkgs to 8a3354191c0d7144db9756a74755672387b702ba --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 9caeb5e..8985dd1 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1714635257, - "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", + "lastModified": 1723991338, + "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", + "rev": "8a3354191c0d7144db9756a74755672387b702ba", "type": "github" }, "original": { From dee19b132a767e3bce5ed6cd6e5baa63ec7437fb Mon Sep 17 00:00:00 2001 From: Firelight Flagboy Date: Sun, 1 Sep 2024 17:42:59 +0200 Subject: [PATCH 2/5] Update plover update --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 8985dd1..af79198 100644 --- a/flake.lock +++ b/flake.lock @@ -18,11 +18,11 @@ }, "plover-update": { "locked": { - "lastModified": 1714371516, - "narHash": "sha256-MA545Hf1h8ez1joKIfPvpxmR2dUjvHJ7SukIbgdWXl0=", + "lastModified": 1725204046, + "narHash": "sha256-oidkpNBN5/oukD+SX3UMU8OKAFKxn907G+cz0QUTKGc=", "owner": "FirelightFlagboy", "repo": "nixpkgs", - "rev": "83c4b4366d9dab01f807b9e279e99f92952d5e68", + "rev": "514092d89804d96daafaa22a5aa94143bb2e67a5", "type": "github" }, "original": { From 4d4b62fed85c85f676a829fdd557a207aa2ca2bc Mon Sep 17 00:00:00 2001 From: Firelight Flagboy Date: Tue, 7 Jan 2025 10:04:37 +0100 Subject: [PATCH 3/5] Apply patch from PR-303669 instead of overlay This avoid the conflict with different version of python used by the 2 nixpkgs copy --- flake.lock | 19 +------------------ flake.nix | 52 +++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 42 insertions(+), 29 deletions(-) diff --git a/flake.lock b/flake.lock index af79198..abe320a 100644 --- a/flake.lock +++ b/flake.lock @@ -16,26 +16,9 @@ "type": "github" } }, - "plover-update": { - "locked": { - "lastModified": 1725204046, - "narHash": "sha256-oidkpNBN5/oukD+SX3UMU8OKAFKxn907G+cz0QUTKGc=", - "owner": "FirelightFlagboy", - "repo": "nixpkgs", - "rev": "514092d89804d96daafaa22a5aa94143bb2e67a5", - "type": "github" - }, - "original": { - "owner": "FirelightFlagboy", - "ref": "update-plover-4.0.0.dev12", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { - "nixpkgs": "nixpkgs", - "plover-update": "plover-update" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index aadd5a4..ba3f2a2 100644 --- a/flake.nix +++ b/flake.nix @@ -3,20 +3,44 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - plover-update.url = "github:FirelightFlagboy/nixpkgs/update-plover-4.0.0.dev12"; }; - outputs = { self, nixpkgs, plover-update }: + outputs = + { + self, + nixpkgs, + }: let system = "x86_64-linux"; - overlay = final: prev: { - plover.dev = plover-update.legacyPackages.${prev.system}.plover.dev; + pkgsPrePatch = import nixpkgs { + inherit system; }; - pkgs = import nixpkgs { + patches = [ + # Update plover from 4.0.0.dev10 to 4.0.0.dev12 + (pkgsPrePatch.fetchpatch { + url = "https://github.com/NixOS/nixpkgs/commit/37f589b5fef07ea8bb110afac4abc13a1f7e59a9.patch"; + sha256 = "1bmn11dggzk3j59pzxl9gsryl35njblm3h6ag5v87wsga1ph1001"; + }) + # Update plover from 4.0.0.dev12 to 4.0.0.rc2 + (pkgsPrePatch.fetchpatch { + url = "https://github.com/NixOS/nixpkgs/commit/634e203d1c07115763a5759b53ce4e9805c8663a.patch"; + sha256 = "1zh4gilpr29f381aa51a3irv13cxybp4rcdi1fww1ihh54yhmk37"; + }) + # Remove `plover.stable` + (pkgsPrePatch.fetchpatch { + url = "https://github.com/NixOS/nixpkgs/pull/303669/commits/30ef197717d8ec87fab88c56e63e4a347bf90e31.patch"; + sha256 = "01aqbglla8wvvj6ppy9vim6gj6zyxcqja47bsflpjc5nark666hp"; + }) + ]; + + pkgsPatched = pkgsPrePatch.applyPatches { + src = pkgsPrePatch.path; + inherit patches; + }; + pkgs = import pkgsPatched { inherit system; - overlays = [ overlay ]; }; plover-base = pkgs.plover.dev; @@ -52,14 +76,20 @@ propagatedBuildInputs = [ pkgs.dotool ]; }; plover.dev = plover-base; - plover-wtype = plover-base.overrideAttrs - (old: { propagatedBuildInputs = old.propagatedBuildInputs ++ [ plover-wtype-output ]; }); - plover-dotool = plover-base.overrideAttrs - (old: { propagatedBuildInputs = old.propagatedBuildInputs ++ [ plover-dotool-output ]; }); + plover-wtype = plover-base.overrideAttrs (old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ plover-wtype-output ]; + }); + plover-dotool = plover-base.overrideAttrs (old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ plover-dotool-output ]; + }); }; devShells.${system}.default = pkgs.mkShell { - buildInputs = with pkgs; [ plover-base self-pkgs.plover-wtype-output self-pkgs.plover-dotool-output ]; + buildInputs = with pkgs; [ + plover-base + self-pkgs.plover-wtype-output + self-pkgs.plover-dotool-output + ]; }; }; } From 018941de72ebcf8e2825611a9022f02d23c7e8ac Mon Sep 17 00:00:00 2001 From: Firelight Flagboy Date: Tue, 7 Jan 2025 10:06:22 +0100 Subject: [PATCH 4/5] Update nixpkgs to 8f3e1f807051e32d8c95cd12b9b421623850a34d --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index abe320a..0782e05 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1723991338, - "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8a3354191c0d7144db9756a74755672387b702ba", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { From 22002b308934b1aeed7ec312a36467686b8edc31 Mon Sep 17 00:00:00 2001 From: Firelight Flagboy Date: Wed, 8 Jan 2025 18:27:45 +0100 Subject: [PATCH 5/5] fixup! Apply patch from PR-303669 instead of overlay --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index ba3f2a2..5174fc1 100644 --- a/flake.nix +++ b/flake.nix @@ -30,7 +30,7 @@ }) # Remove `plover.stable` (pkgsPrePatch.fetchpatch { - url = "https://github.com/NixOS/nixpkgs/pull/303669/commits/30ef197717d8ec87fab88c56e63e4a347bf90e31.patch"; + url = "https://github.com/NixOS/nixpkgs/commits/30ef197717d8ec87fab88c56e63e4a347bf90e31.patch"; sha256 = "01aqbglla8wvvj6ppy9vim6gj6zyxcqja47bsflpjc5nark666hp"; }) ];