From 5b725a3f825cffbdde7d981a0b88970cbf2764cd Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Thu, 16 Nov 2017 16:06:31 +0100 Subject: nix: Remove zr It stopped building successfully and I never started using it anyway --- nix/.config/nixpkgs/config.nix | 2 -- nix/.config/nixpkgs/zr.nix | 42 ------------------------------------------ 2 files changed, 44 deletions(-) delete mode 100644 nix/.config/nixpkgs/zr.nix diff --git a/nix/.config/nixpkgs/config.nix b/nix/.config/nixpkgs/config.nix index ea6ae1a..11d704a 100644 --- a/nix/.config/nixpkgs/config.nix +++ b/nix/.config/nixpkgs/config.nix @@ -10,8 +10,6 @@ emacs = if stdenv.isDarwin then emacs25Macport else emacs; }; nodejs = pkgsUnstable.nodejs-8_x; - - zr = super.callPackage ./zr.nix {}; }; allowUnfree = true; diff --git a/nix/.config/nixpkgs/zr.nix b/nix/.config/nixpkgs/zr.nix deleted file mode 100644 index 1ef3e32..0000000 --- a/nix/.config/nixpkgs/zr.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - fetchFromGitHub, - darwin, - stdenv, - rustPlatform, - cmake, - curl, - libiconv, - openssl, - zlib -}: -with rustPlatform; - -buildRustPackage rec { - name = "zr-${version}"; - version = "0.4.8"; - - src = fetchFromGitHub { - owner = "jedahan"; - repo = "zr"; - rev = "${version}"; - sha256 = "07kb8bk2zri1087dp3pk2zpqjy8rd40nw931z6nnm230ygq481zm"; - }; - - buildInputs = [ cmake curl openssl zlib libiconv ] ++ stdenv.lib.optionals stdenv.isDarwin - (with darwin.apple_sdk.frameworks; [ Security ]); - - cargoDepsHook = stdenv.lib.optionals stdenv.isDarwin '' - export OPENSSL_DIR=${openssl} - export OPENSSL_LIB_DIR=${openssl.out}/lib - export OPENSSL_INCLUDE_DIR=${openssl.dev}/include - ''; - - depsSha256 = "0cjnqilsb9la28b65j1w1n8gdr49b1d9m3z7wsl4q2w3qc42ad52"; - - meta = with stdenv.lib; { - description = "zsh plugin manager written in rust"; - homepage = https://github.com/jedahan/zr; - license = with licenses; [ unfree ]; - platforms = platforms.all; - }; -} -- cgit 1.4.1