From bc47c7e974ece4d7b0080666dca5a443dca738a7 Mon Sep 17 00:00:00 2001 From: Hercules CI Effects Date: Mon, 9 Oct 2023 04:22:36 +0000 Subject: [PATCH 1/2] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'agenix': 'github:ryantm/agenix/1f677b3e161d3bdbfd08a939e8f25de2568e0ef4' (2023-09-22) → 'github:ryantm/agenix/daf42cb35b2dc614d1551e37f96406e4c4a2d3e4' (2023-10-08) • Updated input 'darwin': 'github:lnl7/nix-darwin/792c2e01347cb1b2e7ec84a1ef73453ca86537d8' (2023-09-30) → 'github:lnl7/nix-darwin/8b6ea26d5d2e8359d06278364f41fbc4b903b28a' (2023-10-03) • Updated input 'disko': 'github:nix-community/disko/19b62324663b6b9859caf7f335d232cf4f1f6a32' (2023-09-28) → 'github:nix-community/disko/32ce057c183506cecb0b84950e4eaf39f37e8c75' (2023-10-09) • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/21928e6758af0a258002647d14363d5ffc85545b' (2023-10-01) → 'github:hercules-ci/flake-parts/c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4' (2023-10-03) • Updated input 'home-manager': 'github:nix-community/home-manager/6f9b5b83ad1f470b3d11b8a9fe1d5ef68c7d0e30' (2023-10-01) → 'github:nix-community/home-manager/3c1d8758ac3f55ab96dcaf4d271c39da4b6e836d' (2023-10-08) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/d7186d62bb68fac3c90f1d95515e613ef299e992' (2023-10-01) → 'github:nixos/nixpkgs/5aabb5780a11c500981993d49ee93cfa6df9307b' (2023-10-08) • Updated input 'wrapper-manager': 'github:viperML/wrapper-manager/ec1cf6abbf017bd17c3e24e8dddbefe4b445b569' (2023-08-12) → 'github:viperML/wrapper-manager/d0f2277e1b1e0d95e29015e602991a1cf4e7fcf7' (2023-10-05) --- flake.lock | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 35eb62b..bc91ed1 100644 --- a/flake.lock +++ b/flake.lock @@ -13,11 +13,11 @@ ] }, "locked": { - "lastModified": 1695384796, + "lastModified": 1696775529, "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=", "owner": "ryantm", "repo": "agenix", - "rev": "1f677b3e161d3bdbfd08a939e8f25de2568e0ef4", + "rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4", "type": "github" }, "original": { @@ -49,11 +49,11 @@ ] }, "locked": { - "lastModified": 1696043447, - "narHash": "sha256-VbJ1dY5pVH2fX1bS+cT2+4+BYEk4lMHRP0+udu9G6tk=", + "lastModified": 1696360011, + "narHash": "sha256-HpPv27qMuPou4acXcZ8Klm7Zt0Elv9dgDvSJaomWb9Y=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "792c2e01347cb1b2e7ec84a1ef73453ca86537d8", + "rev": "8b6ea26d5d2e8359d06278364f41fbc4b903b28a", "type": "github" }, "original": { @@ -88,11 +88,11 @@ ] }, "locked": { - "lastModified": 1695864092, - "narHash": "sha256-Hu1SkFPqO7ND95AOzBkZE2jGXSYhfZ965C03O72Kbu8=", + "lastModified": 1696814493, + "narHash": "sha256-1qArVsJGG2RHbV2iKFpAmM5os3myvwpXMOdFy5nh54M=", "owner": "nix-community", "repo": "disko", - "rev": "19b62324663b6b9859caf7f335d232cf4f1f6a32", + "rev": "32ce057c183506cecb0b84950e4eaf39f37e8c75", "type": "github" }, "original": { @@ -124,11 +124,11 @@ ] }, "locked": { - "lastModified": 1696203690, - "narHash": "sha256-774XMEL7VHSTLDYVkqrbl5GCdmkVKsjMs+KLM4N4t7k=", + "lastModified": 1696343447, + "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "21928e6758af0a258002647d14363d5ffc85545b", + "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", "type": "github" }, "original": { @@ -206,11 +206,11 @@ ] }, "locked": { - "lastModified": 1696145345, - "narHash": "sha256-3dM7I/d4751SLPJah0to1WBlWiyzIiuCEUwJqwBdmr4=", + "lastModified": 1696737557, + "narHash": "sha256-YD/pjDjj/BNmisEvRdM/vspkCU3xyyeGVAUWhvVSi5Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "6f9b5b83ad1f470b3d11b8a9fe1d5ef68c7d0e30", + "rev": "3c1d8758ac3f55ab96dcaf4d271c39da4b6e836d", "type": "github" }, "original": { @@ -396,11 +396,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1696165369, - "narHash": "sha256-pd1cjFHCoEf9q5f9B0HhlOwwpBI9RP3HbUE6xjI7wAI=", + "lastModified": 1696725822, + "narHash": "sha256-B7uAOS7TkLlOg1aX01rQlYbydcyB6ZnLJSfaYbKVww8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d7186d62bb68fac3c90f1d95515e613ef299e992", + "rev": "5aabb5780a11c500981993d49ee93cfa6df9307b", "type": "github" }, "original": { @@ -471,11 +471,11 @@ ] }, "locked": { - "lastModified": 1691847782, - "narHash": "sha256-o442oJ4F6tcPYmd6wiC/lnjiq7r8ANa4vPpMGB3/MKk=", + "lastModified": 1696533974, + "narHash": "sha256-SYRE2nf/C40G1DZi93EeZTdTyU+5llEjXDI+jGx9pQI=", "owner": "viperML", "repo": "wrapper-manager", - "rev": "ec1cf6abbf017bd17c3e24e8dddbefe4b445b569", + "rev": "d0f2277e1b1e0d95e29015e602991a1cf4e7fcf7", "type": "github" }, "original": { From 82f8034b2b0a87ecc84c62e7e0a242834d2ebdde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= Date: Mon, 9 Oct 2023 13:55:28 +0200 Subject: [PATCH 2/2] New wrapper-manager version --- flake.lock | 6 +++--- wrappers/rash/default.nix | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index bc91ed1..8664eff 100644 --- a/flake.lock +++ b/flake.lock @@ -494,11 +494,11 @@ ] }, "locked": { - "lastModified": 1693462186, - "narHash": "sha256-q7TpkEPnzzp/6t/Gh/xxgrYmpctAb7ebGuHUpNfn+Gk=", + "lastModified": 1696852272, + "narHash": "sha256-JZlIWxCurPjOudY7Jl5523Kf32ZzXXr9OzusM4MDInQ=", "owner": "nrabulinski", "repo": "wrapper-manager-hm-compat", - "rev": "199b04b07665b85649506c807e6a39d2adcfb133", + "rev": "287bdf3c13e4d865ea131cc9433dc991a98ee41a", "type": "github" }, "original": { diff --git a/wrappers/rash/default.nix b/wrappers/rash/default.nix index 16a72af..8ee625e 100644 --- a/wrappers/rash/default.nix +++ b/wrappers/rash/default.nix @@ -43,10 +43,12 @@ basePackage = pkgs.writeShellScriptBin "rash" '' exec "${racket-with-libs}/bin/rash-repl" "$@" ''; - env. - XDG_CONFIG_HOME = pkgs.linkFarm "rash-config" { - "rash/rashrc" = ./rashrc; - "rash/rashrc.rkt" = ./rashrc.rkt; + env.XDG_CONFIG_HOME = { + value = pkgs.linkFarm "rash-config" { + "rash/rashrc" = ./rashrc; + "rash/rashrc.rkt" = ./rashrc.rkt; + }; + force = true; }; pathAdd = [ racket-with-libs