From 010a4524d67451e1c177b795a347fd728f102067 Mon Sep 17 00:00:00 2001 From: Xarvex <60973030+xarvex@users.noreply.github.com> Date: Mon, 17 Mar 2025 20:36:06 -0500 Subject: [PATCH] fix(flake): remove pinned input, only consume in Nix shell (#872) --- flake.lock | 17 ----------------- flake.nix | 2 -- nix/shell.nix | 15 ++++++++------- 3 files changed, 8 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index 1750fba8..46071142 100644 --- a/flake.lock +++ b/flake.lock @@ -36,27 +36,10 @@ "type": "github" } }, - "nixpkgs-qt6": { - "locked": { - "lastModified": 1734856068, - "narHash": "sha256-Q+CB1ajsJg4Z9HGHTBAGY1q18KpnnkmF/eCTLUY6FQ0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "93ff48c9be84a76319dac293733df09bbbe3f25c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "93ff48c9be84a76319dac293733df09bbbe3f25c", - "type": "github" - } - }, "root": { "inputs": { "flake-parts": "flake-parts", "nixpkgs": "nixpkgs", - "nixpkgs-qt6": "nixpkgs-qt6", "systems": "systems" } }, diff --git a/flake.nix b/flake.nix index 11afdf14..62143cb4 100644 --- a/flake.nix +++ b/flake.nix @@ -9,8 +9,6 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixpkgs-qt6.url = "github:NixOS/nixpkgs/93ff48c9be84a76319dac293733df09bbbe3f25c"; - systems.url = "github:nix-systems/default"; }; diff --git a/nix/shell.nix b/nix/shell.nix index 76f0899e..22e9d7f7 100644 --- a/nix/shell.nix +++ b/nix/shell.nix @@ -1,12 +1,13 @@ -{ - inputs, - lib, - pkgs, - ... -}: +{ lib, pkgs, ... }: let - qt6Pkgs = import inputs.nixpkgs-qt6 { inherit (pkgs) system; }; + # INFO: PySide6 from PIP is compiled for 6.8.0 of Qt, must pin to match version. + # Long term this can be solved with an alternative like uv2nix for the devshell. + qt6Pkgs = import (builtins.fetchTarball { + name = "nixos-unstable-qt6-pinned"; + url = "https://github.com/NixOS/nixpkgs/archive/93ff48c9be84a76319dac293733df09bbbe3f25c.tar.gz"; + sha256 = "038m7932v4z0zn2lk7k7mbqbank30q84r1viyhchw9pcm3aq3q23"; + }) { inherit (pkgs) system; }; pythonLibraryPath = lib.makeLibraryPath ( (with pkgs; [