From b92194f2743c198a11f08a2d65e3a96fe3b3c2b0 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 12 Feb 2026 13:00:24 +0100 Subject: [PATCH] nix: update sources & lock --- flake.lock | 93 ++++++++++++++++++++++++++++++++++++++++++------------ flake.nix | 6 ++-- 2 files changed, 75 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index e45599e26..067da7e7d 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -18,32 +18,84 @@ "type": "github" } }, + "flake-utils": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixgl": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1713543440, + "narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=", + "owner": "nix-community", + "repo": "nixGL", + "rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixGL", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1728930054, - "narHash": "sha256-mCaSyViQyiLgZKVLpDcVacbPSNjvsBzfWnGaxvhTzs8=", - "owner": "nim65s", + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "8e906b3e2aa2274c9d0c555393b4801d3c0badee", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", "type": "github" }, "original": { - "owner": "nim65s", - "ref": "qt6-libqglviewer", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-lib": { "locked": { - "lastModified": 1727825735, - "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + "lastModified": 1769909678, + "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "72716169fe93074c333e8d0173151350670b824c", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1660551188, + "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "441dc5d512153039f19ef198e662e4f3dbb9fd65", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" } }, "root": { @@ -58,20 +110,21 @@ "flake-parts": [ "flake-parts" ], + "nixgl": "nixgl", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1729076781, - "narHash": "sha256-9OWCN3gaJSmwoNtj14g+Se7U5hhoj8ZDaqvmkruDYG8=", - "owner": "nim65s", + "lastModified": 1770882397, + "narHash": "sha256-pCtR6kzquOgK4188nowRsF+g82f9UGL8zBH669slu08=", + "owner": "sofa-framework", "repo": "sofa", - "rev": "8808d2463a93229cc938b1bb29f362c36ba22321", + "rev": "4c1332e726ae247c219572bc59930e4ff5bcb2fe", "type": "github" }, "original": { - "owner": "nim65s", + "owner": "sofa-framework", "repo": "sofa", "type": "github" } diff --git a/flake.nix b/flake.nix index 281d98745..e0f188998 100644 --- a/flake.nix +++ b/flake.nix @@ -3,11 +3,9 @@ inputs = { flake-parts.url = "github:hercules-ci/flake-parts"; - #nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - # ref. https://github.com/NixOS/nixpkgs/pull/348549 - nixpkgs.url = "github:nim65s/nixpkgs/qt6-libqglviewer"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; sofa = { - url = "github:nim65s/sofa"; # update this after PR + url = "github:sofa-framework/sofa"; inputs = { flake-parts.follows = "flake-parts"; nixpkgs.follows = "nixpkgs";