diff --git a/nixos/modules/hardware/glasgow.nix b/nixos/modules/hardware/glasgow.nix index 9f67937c5f86..8e478e5437d9 100644 --- a/nixos/modules/hardware/glasgow.nix +++ b/nixos/modules/hardware/glasgow.nix @@ -22,6 +22,7 @@ in }; config = lib.mkIf cfg.enable { + environment.systemPackages = [ pkgs.glasgow ]; services.udev.packages = [ pkgs.glasgow ]; users.groups.plugdev = { }; }; diff --git a/pkgs/by-name/gl/glasgow/package.nix b/pkgs/by-name/gl/glasgow/package.nix index a84b81799ce0..9c9a4c44f328 100644 --- a/pkgs/by-name/gl/glasgow/package.nix +++ b/pkgs/by-name/gl/glasgow/package.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "glasgow"; - version = "0-unstable-2025-07-28"; + version = "0-unstable-2025-12-22"; # Similar to `pdm show`, but without the commit counter pdmVersion = let @@ -18,16 +18,17 @@ python3.pkgs.buildPythonApplication rec { rev = lib.substring 0 7 src.rev; in "${tag}.1.dev0+g${rev}"; - # the latest commit ID touching the `firmware` directory, can differ from rev! - firmwareGitRev = "4fe35360"; + # The latest commit ID touching the `firmware` directory, before a "deploy firmware" commit. + # Differs from rev! + firmwareGitRev = "8b5afc70"; pyproject = true; src = fetchFromGitHub { owner = "GlasgowEmbedded"; repo = "glasgow"; - rev = "18442e9684cdda4bb2cbd2be9c31b3c6dffc625a"; - hash = "sha256-b0kpgCHMk5Ylj4hY29sHRzY/zI1JXReHioHxHSO4h5E="; + rev = "ccee116d8b59f25ed0874d152f6b9f9974b185f1"; + hash = "sha256-2fF0lPfRtpci76q4fEhWAwLBXP0kfIP3dH5z8u/+yd8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix index 5f040fbb4d3c..f308641a42ef 100644 --- a/pkgs/development/python-modules/fx2/default.nix +++ b/pkgs/development/python-modules/fx2/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "fx2"; - version = "0.13"; + version = "0.14"; format = "setuptools"; src = fetchFromGitHub { owner = "whitequark"; repo = "libfx2"; rev = "v${version}"; - hash = "sha256-PtWxjT+97+EeNMN36zOT1+ost/w3lRRkaON3Cl3dpp4="; + hash = "sha256-uMgf1VL3yvkLUfRlBn9NKcerfHfcFg9yEgHGWmwyh8I="; }; nativeBuildInputs = [