npins: update lockfile as of 2024-11-19

.github/workflows/check.yml

@@ -11,5 +11,5 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: DeterminateSystems/nix-installer-action@v16
+      - uses: DeterminateSystems/nix-installer-action@v15
       - run: make check

.github/workflows/site.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: DeterminateSystems/nix-installer-action@v16
+      - uses: DeterminateSystems/nix-installer-action@v15
       - run: make build
       - name: Upload artifact
         id: deployment

.github/workflows/update-deps.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: DeterminateSystems/nix-installer-action@v16
+      - uses: DeterminateSystems/nix-installer-action@v15
       - run: nix develop --command make update
       - id: datetime
         run: |

docs/default.nix

@@ -110,7 +110,7 @@ in
 
     buildHugoSite {
       pname = "wrapper-manager-docs";
-      version = "2024-11-21";
+      version = "2024-07-13";
 
       src = lib.fileset.toSource {
         root = ./website;
@@ -124,7 +124,7 @@ in
         ];
       };
 
-      vendorHash = "sha256-UDDCYQB/kdYT63vRlRzL6lOePl9F7j3eUIHX/m6rwEs=";
+      vendorHash = "sha256-qsmXolxEcYjY2jwIlPRqir5gE8TeVknPGIGF4g89x54=";
 
       buildFlags = [ "--baseURL" baseUrl ];
 

docs/gemset.nix

@@ -10,7 +10,12 @@
     version = "2.0.23";
   };
   asciidoctor-diagram = {
-    dependencies = ["asciidoctor" "asciidoctor-diagram-ditaamini" "asciidoctor-diagram-plantuml" "rexml"];
+    dependencies = [
+      "asciidoctor"
+      "asciidoctor-diagram-ditaamini"
+      "asciidoctor-diagram-plantuml"
+      "rexml"
+    ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
@@ -52,7 +57,10 @@
     version = "1.2024.5";
   };
   asciidoctor-foodogsquared-extensions = {
-    dependencies = ["asciidoctor" "rugged"];
+    dependencies = [
+      "asciidoctor"
+      "rugged"
+    ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
@@ -63,7 +71,10 @@
     version = "1.2.1";
   };
   ast = {
-    groups = ["default" "lint"];
+    groups = [
+      "default"
+      "lint"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
@@ -83,7 +94,10 @@
     version = "1.3.3";
   };
   json = {
-    groups = ["default" "lint"];
+    groups = [
+      "default"
+      "lint"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
@@ -93,7 +107,11 @@
     version = "2.7.2";
   };
   language_server-protocol = {
-    groups = ["default" "development" "lint"];
+    groups = [
+      "default"
+      "development"
+      "lint"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
@@ -103,7 +121,10 @@
     version = "3.17.0.3";
   };
   logger = {
-    groups = ["default" "development"];
+    groups = [
+      "default"
+      "development"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
@@ -123,7 +144,10 @@
     version = "1.0.0";
   };
   parallel = {
-    groups = ["default" "lint"];
+    groups = [
+      "default"
+      "lint"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
@@ -133,8 +157,14 @@
     version = "1.25.1";
   };
   parser = {
-    dependencies = ["ast" "racc"];
-    groups = ["default" "lint"];
+    dependencies = [
+      "ast"
+      "racc"
+    ];
+    groups = [
+      "default"
+      "lint"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
@@ -144,7 +174,10 @@
     version = "3.3.4.0";
   };
   prism = {
-    groups = ["default" "development"];
+    groups = [
+      "default"
+      "development"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
@@ -154,7 +187,10 @@
     version = "0.30.0";
   };
   racc = {
-    groups = ["default" "lint"];
+    groups = [
+      "default"
+      "lint"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
@@ -164,7 +200,10 @@
     version = "1.8.0";
   };
   rainbow = {
-    groups = ["default" "lint"];
+    groups = [
+      "default"
+      "lint"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
@@ -185,7 +224,10 @@
   };
   rbs = {
     dependencies = [ "logger" ];
-    groups = ["default" "development"];
+    groups = [
+      "default"
+      "development"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
@@ -195,7 +237,10 @@
     version = "3.5.2";
   };
   regexp_parser = {
-    groups = ["default" "lint"];
+    groups = [
+      "default"
+      "lint"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
@@ -206,7 +251,10 @@
   };
   rexml = {
     dependencies = [ "strscan" ];
-    groups = ["default" "lint"];
+    groups = [
+      "default"
+      "lint"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
@@ -226,7 +274,18 @@
     version = "4.3.0";
   };
   rubocop = {
-    dependencies = ["json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
+    dependencies = [
+      "json"
+      "language_server-protocol"
+      "parallel"
+      "parser"
+      "rainbow"
+      "regexp_parser"
+      "rexml"
+      "rubocop-ast"
+      "ruby-progressbar"
+      "unicode-display_width"
+    ];
     groups = [ "lint" ];
     platforms = [ ];
     source = {
@@ -238,7 +297,10 @@
   };
   rubocop-ast = {
     dependencies = [ "parser" ];
-    groups = ["default" "lint"];
+    groups = [
+      "default"
+      "lint"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
@@ -248,7 +310,12 @@
     version = "1.31.3";
   };
   ruby-lsp = {
-    dependencies = ["language_server-protocol" "prism" "rbs" "sorbet-runtime"];
+    dependencies = [
+      "language_server-protocol"
+      "prism"
+      "rbs"
+      "sorbet-runtime"
+    ];
     groups = [ "development" ];
     platforms = [ ];
     source = {
@@ -259,7 +326,10 @@
     version = "0.17.7";
   };
   ruby-progressbar = {
-    groups = ["default" "lint"];
+    groups = [
+      "default"
+      "lint"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
@@ -279,7 +349,10 @@
     version = "1.7.2";
   };
   slim = {
-    dependencies = ["temple" "tilt"];
+    dependencies = [
+      "temple"
+      "tilt"
+    ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
@@ -290,7 +363,10 @@
     version = "5.2.1";
   };
   sorbet-runtime = {
-    groups = ["default" "development"];
+    groups = [
+      "default"
+      "development"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
@@ -300,7 +376,10 @@
     version = "0.5.11481";
   };
   strscan = {
-    groups = ["default" "lint"];
+    groups = [
+      "default"
+      "lint"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
@@ -330,7 +409,10 @@
     version = "2.4.0";
   };
   unicode-display_width = {
-    groups = ["default" "lint"];
+    groups = [
+      "default"
+      "lint"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];

docs/website/go.mod

@@ -3,10 +3,10 @@ module github.com/foo-dogsquared/wrapper-manager-fds
 go 1.23.2
 
 require (
-	github.com/foo-dogsquared/hugo-mod-simple-icons v0.0.0-20241120232120-e36cafefea29 // indirect
+	github.com/foo-dogsquared/hugo-mod-simple-icons v0.0.0-20241028022226-7f7e0be42a95 // indirect
 	github.com/foo-dogsquared/hugo-mod-web-feeds v0.0.3-0.20220613123653-e0bc8e58159d // indirect
-	github.com/foo-dogsquared/hugo-theme-more-contentful v0.7.2-0.20241119041335-143341838df0 // indirect
-	github.com/foo-dogsquared/website v0.0.0-20241121041746-6b5744c9aee7 // indirect
-	github.com/refactoringui/heroicons v2.2.0+incompatible // indirect
+	github.com/foo-dogsquared/hugo-theme-more-contentful v0.7.1 // indirect
+	github.com/foo-dogsquared/website v0.0.0-20241103012127-eed6eb26f100 // indirect
+	github.com/refactoringui/heroicons v2.1.5+incompatible // indirect
 	github.com/simple-icons/simple-icons v0.0.0-20241027003233-9d720b26a17d // indirect
 )

docs/website/go.sum

@@ -1,25 +1,16 @@
 github.com/foo-dogsquared/hugo-mod-simple-icons v0.0.0-20231025231637-36998f86bbf2/go.mod h1:8HnVc0SlzI7LCEU4sITYS5MQTq0Bct/nFr/7LdsHYVQ=
 github.com/foo-dogsquared/hugo-mod-simple-icons v0.0.0-20241028022226-7f7e0be42a95 h1:knvsLW0kTmLxZ7tCKAQgK9M6e8ggjU6NPcmP3HOFKHc=
 github.com/foo-dogsquared/hugo-mod-simple-icons v0.0.0-20241028022226-7f7e0be42a95/go.mod h1:R9tJ1WSUnZf0R12SAmI9I/x9IQQbwPGek2FQyGJOC0g=
-github.com/foo-dogsquared/hugo-mod-simple-icons v0.0.0-20241113232057-c42b53cd0165/go.mod h1:R9tJ1WSUnZf0R12SAmI9I/x9IQQbwPGek2FQyGJOC0g=
-github.com/foo-dogsquared/hugo-mod-simple-icons v0.0.0-20241120232120-e36cafefea29 h1:tW39wPtZJTjpaK7+QshbQFYeLQA1airNi547vXMoy7c=
-github.com/foo-dogsquared/hugo-mod-simple-icons v0.0.0-20241120232120-e36cafefea29/go.mod h1:R9tJ1WSUnZf0R12SAmI9I/x9IQQbwPGek2FQyGJOC0g=
 github.com/foo-dogsquared/hugo-mod-web-feeds v0.0.3-0.20220613123653-e0bc8e58159d h1:IvFDTSoQiK3BsbdJxvXEqjuRxwcYo2dMHgUxGmhdYes=
 github.com/foo-dogsquared/hugo-mod-web-feeds v0.0.3-0.20220613123653-e0bc8e58159d/go.mod h1:V7UXom6wuFrWj1lBUCXQA3HguwfDhQA+tQNxyRxdClk=
 github.com/foo-dogsquared/hugo-theme-more-contentful v0.7.1-0.20240829055539-b7c3b8878050/go.mod h1:Rbsgp6Kdi2jVmAILYZTgCysqU4xvoLFwvrR0nvpSr4I=
 github.com/foo-dogsquared/hugo-theme-more-contentful v0.7.1 h1:5Mu2OBMVHHp1nytCUUFz9EEQ3gTQCBUHsovzaQssnmc=
 github.com/foo-dogsquared/hugo-theme-more-contentful v0.7.1/go.mod h1:HV3pnAPBJNG6k9bo10wDOkl6rYFib+um2IURlRIlXkg=
-github.com/foo-dogsquared/hugo-theme-more-contentful v0.7.2-0.20241119041335-143341838df0 h1:ck2aC9kc4/EUH9mqKzs+bltbJ5LOwC8LlYvqns1KgB4=
-github.com/foo-dogsquared/hugo-theme-more-contentful v0.7.2-0.20241119041335-143341838df0/go.mod h1:HV3pnAPBJNG6k9bo10wDOkl6rYFib+um2IURlRIlXkg=
 github.com/foo-dogsquared/website v0.0.0-20241103012127-eed6eb26f100 h1:+OSuIHC1ARQGEMihMeB8Xc5BE6Be5xgdban3RxbIcz4=
 github.com/foo-dogsquared/website v0.0.0-20241103012127-eed6eb26f100/go.mod h1:AkVVnWQg95UIzQEN7OuMgupRG6Mi2gAsxuaK81/DyUc=
-github.com/foo-dogsquared/website v0.0.0-20241121041746-6b5744c9aee7 h1:FJK0BK/43bHbPHB5jFI/8YuICPOptq3QDTupfDGCE2M=
-github.com/foo-dogsquared/website v0.0.0-20241121041746-6b5744c9aee7/go.mod h1:WzxWNpb3eNVQiqnnJTR66ptffyoK/SpZcw8efzOO12g=
 github.com/refactoringui/heroicons v2.0.18+incompatible/go.mod h1:82HsLWQga7MkEl5aK8TctxPPIBlXrsyWcVTB57uipuk=
 github.com/refactoringui/heroicons v2.1.5+incompatible h1:XzZpX6BwR5eYel3Owrw6u0e11/pj1FTXA3MSiN3OOvE=
 github.com/refactoringui/heroicons v2.1.5+incompatible/go.mod h1:82HsLWQga7MkEl5aK8TctxPPIBlXrsyWcVTB57uipuk=
-github.com/refactoringui/heroicons v2.2.0+incompatible h1:EKlvN4FK+3SgKcO9qy8Y30Up+SYypBifKCaOynG9Sh8=
-github.com/refactoringui/heroicons v2.2.0+incompatible/go.mod h1:82HsLWQga7MkEl5aK8TctxPPIBlXrsyWcVTB57uipuk=
 github.com/simple-icons/simple-icons v0.0.0-20231022005333-fdbaaa2d5f99/go.mod h1:oOgUUt8yVYOso/wEBi2ojfZP2MU/xxiNccIpaE+jCvE=
 github.com/simple-icons/simple-icons v0.0.0-20241027003233-9d720b26a17d h1:hkrcJOSlWIPEaFLPeE82iyslQkhnyH4aheEtIushCQg=
 github.com/simple-icons/simple-icons v0.0.0-20241027003233-9d720b26a17d/go.mod h1:oOgUUt8yVYOso/wEBi2ojfZP2MU/xxiNccIpaE+jCvE=

flake.nix

@@ -58,7 +58,7 @@
         devPackages = {
           manpage-reference = docs.outputs.manpage;
           html-reference = docs.outputs.html;
-          website = docs.website { };
+          website = docs.website;
         };
 
         checks =

modules/env/common.nix

@@ -21,17 +21,6 @@ let
           config._module.args.pkgs = lib.mkDefault pkgs;
         }
       )
-
-      (
-        { lib, ... }: {
-          options.enableInstall = lib.mkOption {
-            type = lib.types.bool;
-            default = cfg.enableInstall;
-            description = "Install the package to the wider-scoped environment.";
-            example = false;
-          };
-        }
-      )
     ] ++ cfg.sharedModules;
   };
 in
@@ -44,17 +33,6 @@ in
   ];
 
   options.wrapper-manager = {
-    enableInstall = lib.mkOption {
-      type = lib.types.bool;
-      description = ''
-        Enable installing the package to the wider-scoped environment list
-        of packages. This is to be set as the default value of
-        {option}`enableInstall` in the wrapper-manager package environment.
-      '';
-      default = true;
-      example = false;
-    };
-
     sharedModules = lib.mkOption {
       type = with lib.types; listOf deferredModule;
       default = [ ];

modules/env/home-manager/default.nix

@@ -35,11 +35,7 @@ in
     })
 
     (lib.mkIf (cfg.packages != { }) {
-      home.packages =
-        let
-          validPackages = lib.filterAttrs (_: wrapper: wrapper.enableInstall) cfg.packages;
-        in
-          lib.mapAttrsToList (_: wrapper: wrapper.build.toplevel) validPackages;
+      home.packages = lib.mapAttrsToList (_: wrapper: wrapper.build.toplevel) cfg.packages;
     })
   ];
 }

modules/env/nixos/default.nix

@@ -34,10 +34,7 @@ in
 
     (lib.mkIf (cfg.packages != { }) {
       environment.systemPackages =
-        let
-          validPackages = lib.filterAttrs (_: wrapper: wrapper.enableInstall) cfg.packages;
-        in
-          lib.mapAttrsToList (_: wrapper: wrapper.build.toplevel) validPackages;
+        lib.mapAttrsToList (_: wrapper: wrapper.build.toplevel) cfg.packages;
     })
   ];
 }

npins/sources.json

@@ -20,9 +20,9 @@
         "repo": "home-manager"
       },
       "branch": "master",
-      "revision": "819f682269f4e002884702b87e445c82840c68f2",
-      "url": "https://github.com/nix-community/home-manager/archive/819f682269f4e002884702b87e445c82840c68f2.tar.gz",
-      "hash": "190vjwgni3anaxfdbfr9dn1bp86ls11y0ad5sp9hdgzbg53zmj5g"
+      "revision": "a42fa14b53ceab66274a21da480c9f8e06204173",
+      "url": "https://github.com/nix-community/home-manager/archive/a42fa14b53ceab66274a21da480c9f8e06204173.tar.gz",
+      "hash": "0hdc0dh1ax3zlk1p5cqndz7ikmfdi1gnih44pryd64yf8k0c457s"
     },
     "nixos-stable": {
       "type": "Git",
@@ -32,9 +32,9 @@
         "repo": "nixpkgs"
       },
       "branch": "nixos-24.05",
-      "revision": "0c5b4ecbed5b155b705336aa96d878e55acd8685",
-      "url": "https://github.com/NixOS/nixpkgs/archive/0c5b4ecbed5b155b705336aa96d878e55acd8685.tar.gz",
-      "hash": "1mhbyl6r54p0nccd244f8imcvz52kxfyyxaky165w19lx100azsg"
+      "revision": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
+      "url": "https://github.com/NixOS/nixpkgs/archive/e8c38b73aeb218e27163376a2d617e61a2ad9b59.tar.gz",
+      "hash": "1n6gdjny8k5rwkxh6sp1iwg1y3ni1pm7lvh9sisifgjb18jdvzbm"
     },
     "nixos-unstable": {
       "type": "Git",
@@ -44,9 +44,9 @@
         "repo": "nixpkgs"
       },
       "branch": "nixos-unstable",
-      "revision": "970e93b9f82e2a0f3675757eb0bfc73297cc6370",
-      "url": "https://github.com/NixOS/nixpkgs/archive/970e93b9f82e2a0f3675757eb0bfc73297cc6370.tar.gz",
-      "hash": "10ah2w7wvjlsjihwbilzz0nal7ad3lw8msmad4qf52jliyplvm4c"
+      "revision": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
+      "url": "https://github.com/NixOS/nixpkgs/archive/5e4fbfb6b3de1aa2872b76d49fafc942626e2add.tar.gz",
+      "hash": "127dk2l5fr0922an96rmlzg32vh6pxh7r6qyvkhwf20jdzg9k61r"
     },
     "website": {
       "type": "Git",
@@ -56,9 +56,9 @@
         "repo": "website"
       },
       "branch": "master",
-      "revision": "60b54b8fec5d16308b1bc5ac8cd8a80c70b90df4",
-      "url": "https://github.com/foo-dogsquared/website/archive/60b54b8fec5d16308b1bc5ac8cd8a80c70b90df4.tar.gz",
-      "hash": "1lyrbabkij7n747pac4k9cdyxyv91mf5jg06id9m94039h9zm0wx"
+      "revision": "cc267430a11ac9d8707c3c6867057164ec30628b",
+      "url": "https://github.com/foo-dogsquared/website/archive/cc267430a11ac9d8707c3c6867057164ec30628b.tar.gz",
+      "hash": "1zvlgvs6pj889x0s13w8rzyvy4rmpx0g44wcmmlsvi25myikb1mh"
     }
   },
   "version": 3