From 4c2c1937662b3973071ce3d3cac34436ee822e32 Mon Sep 17 00:00:00 2001 From: Sunny <89862130+sunworms@users.noreply.github.com> Date: Sat, 18 Apr 2026 07:12:19 +0530 Subject: [PATCH] added non-flake nix compatibility with flake-compat (#2009) * added non-flake nix compatibility with flake-compat * nix: move flake-compat files to distro/nix --------- Co-authored-by: LuckShiba --- distro/nix/default.nix | 11 +++++++++++ distro/nix/shell.nix | 11 +++++++++++ flake.lock | 17 +++++++++++++++++ flake.nix | 4 ++++ 4 files changed, 43 insertions(+) create mode 100644 distro/nix/default.nix create mode 100644 distro/nix/shell.nix diff --git a/distro/nix/default.nix b/distro/nix/default.nix new file mode 100644 index 00000000..10c0d529 --- /dev/null +++ b/distro/nix/default.nix @@ -0,0 +1,11 @@ +(import ( + let + lock = builtins.fromJSON (builtins.readFile ../../flake.lock); + in + fetchTarball { + url = + lock.nodes.flake-compat.locked.url + or "https://github.com/NixOS/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; + sha256 = lock.nodes.flake-compat.locked.narHash; + } +) { src = ../..; }).defaultNix diff --git a/distro/nix/shell.nix b/distro/nix/shell.nix new file mode 100644 index 00000000..478679cf --- /dev/null +++ b/distro/nix/shell.nix @@ -0,0 +1,11 @@ +(import ( + let + lock = builtins.fromJSON (builtins.readFile ../../flake.lock); + in + fetchTarball { + url = + lock.nodes.flake-compat.locked.url + or "https://github.com/NixOS/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; + sha256 = lock.nodes.flake-compat.locked.narHash; + } +) { src = ../..; }).shellNix diff --git a/flake.lock b/flake.lock index f256bff7..78a2a1ef 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1776169885, @@ -39,6 +55,7 @@ }, "root": { "inputs": { + "flake-compat": "flake-compat", "nixpkgs": "nixpkgs", "quickshell": "quickshell" } diff --git a/flake.nix b/flake.nix index ffefd6a0..981f3068 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,10 @@ url = "git+https://git.outfoxxed.me/quickshell/quickshell?rev=41828c4180fb921df7992a5405f5ff05d2ac2fff"; inputs.nixpkgs.follows = "nixpkgs"; }; + flake-compat = { + url = "github:NixOS/flake-compat"; + flake = false; + }; }; outputs =