From e7d7e9145615babf84aa56e5f99070d3d49a4cbb Mon Sep 17 00:00:00 2001 From: nostoromo root Date: Sat, 27 Jun 2020 16:47:15 -0700 Subject: [PATCH] Remove cloudflared -- don't need it now --- packages/cloudflared.nix | 29 ----------------------------- packages/local.nix | 6 +----- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 packages/cloudflared.nix diff --git a/packages/cloudflared.nix b/packages/cloudflared.nix deleted file mode 100644 index 5daf85c..0000000 --- a/packages/cloudflared.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchgit }: - -let - url = "https://github.com/cloudflare/cloudflared.git"; - version = "2020.2.1"; - hash = ""; - -in stdenv.mkDerivation { - name = "cloudflared"; - - src = fetchgit { - url = url; - rev = version; - sha256 = "abc"; - }; - - configurePhase = '' - # Nothing to do - ''; - - buildPhase = '' - # Nothing to do - ''; - - installPhase = '' - mkdir -p "$out/bin" - cp ./cloudflared "$out/bin" - ''; -} diff --git a/packages/local.nix b/packages/local.nix index deda25e..ba45f62 100644 --- a/packages/local.nix +++ b/packages/local.nix @@ -2,11 +2,6 @@ { nixpkgs.config.packageOverrides = pkgs: rec { - cloudflared = import ./cloudflared.nix { - stdenv = pkgs.stdenv; - fetchurl = builtins.fetchurl; - }; - letsencrypt-ca = import ./letsencrypt-ca.nix { stdenv = pkgs.stdenv; fetchurl = builtins.fetchurl; @@ -36,6 +31,7 @@ configureFlags = oldAttrs.configureFlags ++ [ "--with-gssapi" ]; buildInputs = oldAttrs.buildInputs ++ [ pkgs.krb5 ]; }); + sbcl-with-libs = pkgs.sbcl.overrideAttrs (oldAttrs: rec { extraLibs = with pkgs; [ openssl_1_1.dev