From 187c3bb98399cf6317db7ff96278e3e76cd8995b Mon Sep 17 00:00:00 2001 From: hexchen Date: Sun, 29 Nov 2020 02:30:46 +0000 Subject: [PATCH] pkgs: remove unnecessary packages --- pkgs/default.nix | 7 +------ pkgs/fb_exporter/default.nix | 32 -------------------------------- 2 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 pkgs/fb_exporter/default.nix diff --git a/pkgs/default.nix b/pkgs/default.nix index 0eed995..610ea1e 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -4,18 +4,13 @@ let pkgs = import nixpkgs {}; callPackage = pkgs.lib.callPackageWith (pkgs // newpkgs); - shelfieSrc = fetchGit { - url = "https://github.com/spacekookie/shelfie"; - rev = "fb09d6d9ff94ea0679cf6406a3153735d49f38cd"; - }; wasiSrc = fetchGit { url = "https://gitlab.infra4future.de/wasi/wasi-rust"; rev = "356dbc23a3683d134f13156af71baeaa06fb80d1"; }; newpkgs = { - fb_exporter = callPackage ./fb_exporter {}; - shelfie = import shelfieSrc { inherit shelfieSrc; pkgs = pkgs // newpkgs; }; + # package = callPackage ./package {}; wasi = import wasiSrc { inherit wasiSrc; pkgs = pkgs // newpkgs; }; }; diff --git a/pkgs/fb_exporter/default.nix b/pkgs/fb_exporter/default.nix deleted file mode 100644 index c211e1a..0000000 --- a/pkgs/fb_exporter/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - pkgs ? import {} -}: - -with pkgs; - -stdenv.mkDerivation { - pname = "fb_exporter"; - version = "0.1.0"; - src = fetchgit { - url = "https://cgit.ctu.cx/fritzbox-exporter"; - rev = "fc7cb10f4673107c050b6d342e55b8838fe3a424"; - sha256 = "168r93l5sqvn6wp7jdyw1g9jz613iwd11pg4zrsnlmr6n466hqh8"; - }; - nativeBuildInputs = [ nim ]; - buildInputs = [ pcre openssl ]; - buildPhase = '' - runHook preBuild - nim c -d:release --nimcache:$PWD src/fb_exporter.nim - runHook postBuild - ''; - installPhase = '' - runHook preInstall - install -Dm755 src/fb_exporter $out/bin/fb_exporter - runHook postInstall - ''; - fixupPhase = '' - runHook preFixup - patchelf --set-rpath ${lib.makeLibraryPath [ pcre openssl ]} $out/bin/fb_exporter - runHook postFixup - ''; -}