From 566b392b2193c3bd39ac2cf313372a4de9713ed2 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Mon, 2 Oct 2023 23:13:04 +0200 Subject: [PATCH] feat(metis): Use upstream expression for the package --- machines/web01/metis/default.nix | 2 +- machines/web01/metis/package.nix | 23 ----------------------- 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 machines/web01/metis/package.nix diff --git a/machines/web01/metis/default.nix b/machines/web01/metis/default.nix index 71c922b..5ccdd77 100644 --- a/machines/web01/metis/default.nix +++ b/machines/web01/metis/default.nix @@ -1,7 +1,7 @@ { lib, pkgs, sources, ... }: let - package = pkgs.callPackage ./package.nix { src = sources.metis; }; + package = (import sources.metis { inherit pkgs; }).production; providers = { klub-reseau = "nuage.beta.rz.ens.wtf"; diff --git a/machines/web01/metis/package.nix b/machines/web01/metis/package.nix deleted file mode 100644 index eaae274..0000000 --- a/machines/web01/metis/package.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, fetchgit, buildNpmPackage, src }: - -buildNpmPackage { - pname = "metis"; - version = "unstable"; - - inherit src; - - npmDepsHash = "sha256-RbjWNVY8KlPP9ajQRnrsWhOZiiyyMGQSY39lmZnTC1I="; - - installPhase = '' - cp -r public $out - ''; - - meta = with lib; { - description = ""; - homepage = "https://git.dgnum.eu/DGNum/metis"; - license = licenses.unfree; # FIXME: nix-init did not found a license - maintainers = with maintainers; [ thubrecht ]; - mainProgram = "metis"; - platforms = platforms.all; - }; -}