diff --git a/third_party/npmlock2nix/default.nix b/third_party/npmlock2nix/default.nix deleted file mode 100644 index ad8c20f8f..000000000 --- a/third_party/npmlock2nix/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ depot, pkgs, ... }: - -pkgs.callPackage depot.third_party.sources.npmlock2nix { } diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json index e582563ce..b3ec3d460 100644 --- a/third_party/sources/sources.json +++ b/third_party/sources/sources.json @@ -104,18 +104,6 @@ "url": "https://github.com/NixOS/nixpkgs/archive/205fd4226592cc83fd4c0885a3e4c9c400efabb5.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, - "npmlock2nix": { - "branch": "master", - "description": "nixify npm based packages [maintainer=@andir] ", - "homepage": "", - "owner": "mitya57", - "repo": "npmlock2nix", - "rev": "9197bbf397d76059a76310523d45df10d2e4ca81", - "sha256": "1ddfby72fsnpn4yw43g4zxvg6jzlk5hi5cfnnccg9jgw53ckr4xh", - "type": "tarball", - "url": "https://github.com/mitya57/npmlock2nix/archive/9197bbf397d76059a76310523d45df10d2e4ca81.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, "rust-overlay": { "branch": "master", "description": "Pure and reproducible nix overlay of binary distributed rust toolchains", diff --git a/web/default.nix b/web/default.nix index ca8b79139..f4bc95096 100644 --- a/web/default.nix +++ b/web/default.nix @@ -9,13 +9,22 @@ ]; }; - website = depot.third_party.npmlock2nix.v2.build { + website = pkgs.buildNpmPackage { pname = "snix-website"; version = "0.0.0"; + nativeBuildInputs = [ + pkgs.hugo + ]; + src = depot.third_party.gitignoreSource ./.; + npmDeps = pkgs.importNpmLock { + npmRoot = ./.; + }; + + npmConfigHook = pkgs.importNpmLock.npmConfigHook; + installPhase = "cp -r public/. $out"; - buildCommands = [ "PATH=\"$PATH:${pkgs.hugo}/bin\" npm run build" ]; }; }