diff --git a/modules/system-packages.nix b/modules/system-packages.nix index af4cffb..21a6787 100644 --- a/modules/system-packages.nix +++ b/modules/system-packages.nix @@ -16,6 +16,14 @@ let patches = newPatches; }); mkPatchedAuto = pkg: mkPatched pkg [ nixtamal.${pkg.pname + "-patch"} ]; + + importFlake = flakeRef: + let + src = nixtamal.${flakeRef}; + in + ((import nixtamal.flake-compat { inherit pkgs; }) { + inherit src; + }).defaultNix.packages.${pkgs.system}.default; }; in { diff --git a/tamal/lock.json b/tamal/lock.json index 33d1367..16124e0 100644 --- a/tamal/lock.json +++ b/tamal/lock.json @@ -5,6 +5,7 @@ ,"catppuccin":{"sn":"catppuccin-src","kd":[1,{"ft":0,"ur":"https://github.com/catppuccin/nix/archive/f2c7dd14ecce785c206a39466cbe227ff62e3803.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-2/Fs6S8wK0GSJvEx1rPMW6KWORM8TZCleAmBxQDs5oA="},"fv":"f2c7dd14ecce785c206a39466cbe227ff62e3803","ps":[]} ,"catppuccin-godot":{"sn":"catppuccin-godot-src","kd":[0,{"ft":0,"ur":"https://raw.githubusercontent.com/catppuccin/godot/d8b72b679078f0103a5e5c1ef793c1d698a563b1/themes/Catppuccin%20Mocha.tet","ms":[]}],"ha":{"al":2,"vl":"blake3-WVY58qsBKJlGvir08RYlS+RcjdhFvXz+7YHVfEr6tes="},"fv":"d8b72b679078f0103a5e5c1ef793c1d698a563b1","ps":[]} ,"dolphin-overlay":{"sn":"dolphin-overlay-src","kd":[1,{"ft":0,"ur":"https://github.com/rumboon/dolphin-overlay/archive/65dd612c8d72d4cf5cb0eb4d9188ed7a16a042dd.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-PCS3mMGsTYXadc/DDU/EQv2T/0YORMigwUP6NEeOJW4="},"fv":"65dd612c8d72d4cf5cb0eb4d9188ed7a16a042dd","ps":["kservice_fix"]} +,"flake-compat":{"sn":"flake-compat-src","kd":[1,{"ft":0,"ur":"https://github.com/NixOS/flake-compat/archive/5edf11c44bc78a0d334f6334cdaf7d60d732daab.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-MmtcMfj5QuWGiFGGOdUMcaS0MSNzyV8dNCcsrPQq+Gk="},"fv":"5edf11c44bc78a0d334f6334cdaf7d60d732daab","ps":[]} ,"home-manager":{"sn":"home-manager-src","kd":[1,{"ft":0,"ur":"https://github.com/nix-community/home-manager/archive/4ad9aaae70c9aaab504127f926c0fa9cfbc2b365.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-20slOYEZOXjsi48ytBvFJMxsthykNS1mSzHRjiIBnWE="},"fv":"4ad9aaae70c9aaab504127f926c0fa9cfbc2b365","ps":[]} ,"lact-patch":{"sn":"lact-patch-src","kd":[0,{"ft":0,"ur":"https://patch-diff.githubusercontent.com/raw/ilya-zlobintsev/LACT/pull/1080.patch","ms":[]}],"ha":{"al":2,"vl":"blake3-x+HU/32454H6ZHu2i3AkdPECt9Jj4vW0Ac2jTzjpUvk="},"fv":"W/735aa2b881ef2024d0d6fcb4d2d48dd4","ps":[]} ,"low_latency_layer-git":{"sn":"low_latency_layer-git-src","kd":[1,{"ft":0,"ur":"https://github.com/Korthos-Software/low_latency_layer/archive/3138b14ebd059cd540444771dd184fbf7ead2a12.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-eaek3w60syOHOmRNdCDBTQ+MZw4O9fDGbpirlyuUnoQ="},"fv":"3138b14ebd059cd540444771dd184fbf7ead2a12","ps":[]} diff --git a/tamal/manifest.kdl b/tamal/manifest.kdl index ca40534..dc3890d 100644 --- a/tamal/manifest.kdl +++ b/tamal/manifest.kdl @@ -71,6 +71,16 @@ inputs { } } + flake-compat { + archive { + url "https://github.com/NixOS/flake-compat/archive/{{fresh_value}}.tar.gz" + } + fresh-cmd { + $ git ls-remote --branches "https://github.com/NixOS/flake-compat.git" --refs "refs/heads/master" + | cut -f1 + } + } + nix-citizen { archive { url "https://github.com/LovingMelody/nix-citizen/archive/{{fresh_value}}.tar.gz"