From 040c884c42f79e141ef37e58e78cde49ac38a0ad Mon Sep 17 00:00:00 2001 From: matt1432 Date: Sat, 27 Jan 2024 03:02:01 -0500 Subject: [PATCH] chore: rollback ags and update firefoxgx --- common/overlays/default.nix | 5 +---- common/pkgs/default.nix | 3 +-- flake.lock | 7 ++++--- flake.nix | 3 +++ home/firefox/firefox-gx/default.nix | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/common/overlays/default.nix b/common/overlays/default.nix index 8911f6c..ca9d223 100644 --- a/common/overlays/default.nix +++ b/common/overlays/default.nix @@ -1,7 +1,4 @@ -{ - nixpkgs-wayland, - ... -} @ inputs: [ +{nixpkgs-wayland, ...} @ inputs: [ (import ./dracula-theme inputs) (import ./plymouth inputs) (import ./spotifywm inputs) diff --git a/common/pkgs/default.nix b/common/pkgs/default.nix index d37e05b..77d5d74 100644 --- a/common/pkgs/default.nix +++ b/common/pkgs/default.nix @@ -2,8 +2,7 @@ lib, pkgs, ... -} @ inputs: -let +} @ inputs: let inherit (lib) concatMapAttrs filterAttrs mkOption pathExists types; mkPackage = name: v: { diff --git a/flake.lock b/flake.lock index 4df4c5b..3848276 100644 --- a/flake.lock +++ b/flake.lock @@ -7,16 +7,17 @@ ] }, "locked": { - "lastModified": 1706313683, - "narHash": "sha256-Qw3o1awE7uYYeNK99qKs4FjYQcn8AHPVf2AmjLfEvAQ=", + "lastModified": 1705874780, + "narHash": "sha256-PjJdC/7+BoPZ0DucSIFUaySmI7fWLGKsIhtZVgMFhzw=", "owner": "Aylur", "repo": "ags", - "rev": "6fa8cdfc359de9019218d0d5605be522fd126cae", + "rev": "c706e43fab6f1845b6e16fa3106200ac801f6749", "type": "github" }, "original": { "owner": "Aylur", "repo": "ags", + "rev": "c706e43fab6f1845b6e16fa3106200ac801f6749", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 067b6f8..9f6a534 100644 --- a/flake.nix +++ b/flake.nix @@ -207,6 +207,9 @@ owner = "Aylur"; repo = "ags"; + # FIXME: some bugs in latest + rev = "c706e43fab6f1845b6e16fa3106200ac801f6749"; + inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/firefox/firefox-gx/default.nix b/home/firefox/firefox-gx/default.nix index e8e4bc2..8b3bb78 100644 --- a/home/firefox/firefox-gx/default.nix +++ b/home/firefox/firefox-gx/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: let pname = "firefox-gx"; - version = "8.7"; + version = "c1d9888d27543ded51f9854d7e58db601fd33d43"; in stdenvNoCC.mkDerivation { inherit pname version; @@ -12,7 +12,7 @@ in src = fetchFromGitHub { owner = "Godiesc"; repo = pname; - rev = "v.${version}"; + rev = "${version}"; sha256 = "sha256-lMco3TYQNVTQEF5TpKiHUbexdB5pD3OmqjACD2BJZaY="; };