From aab85ef0db43a34af1fe961c9f69b17a91b13e19 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 22 Jan 2020 01:28:46 +0000 Subject: chore(overrides): Remove lispPackages overrides No longer required since Gemma now uses buildLisp.nix --- overrides/lispPackages/default.nix | 8 ------- .../quicklisp-to-nix-output/cl-prevalence.nix | 27 ---------------------- .../quicklisp-to-nix-output/s-sysdeps.nix | 25 -------------------- .../lispPackages/quicklisp-to-nix-output/s-xml.nix | 27 ---------------------- overrides/lispPackages/quicklisp.nix | 26 --------------------- 5 files changed, 113 deletions(-) delete mode 100644 overrides/lispPackages/default.nix delete mode 100644 overrides/lispPackages/quicklisp-to-nix-output/cl-prevalence.nix delete mode 100644 overrides/lispPackages/quicklisp-to-nix-output/s-sysdeps.nix delete mode 100644 overrides/lispPackages/quicklisp-to-nix-output/s-xml.nix delete mode 100644 overrides/lispPackages/quicklisp.nix (limited to 'overrides') diff --git a/overrides/lispPackages/default.nix b/overrides/lispPackages/default.nix deleted file mode 100644 index c6502975e310..000000000000 --- a/overrides/lispPackages/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -# One of Gemma's dependencies is missing in nixpkgs' Quicklisp -# package set, it is overlaid locally here. -{ pkgs, ... }: - -import ./quicklisp.nix { - inherit (pkgs) lib; - inherit (pkgs.third_party) lispPackages; -} diff --git a/overrides/lispPackages/quicklisp-to-nix-output/cl-prevalence.nix b/overrides/lispPackages/quicklisp-to-nix-output/cl-prevalence.nix deleted file mode 100644 index 4e5e3ec5d6e8..000000000000 --- a/overrides/lispPackages/quicklisp-to-nix-output/cl-prevalence.nix +++ /dev/null @@ -1,27 +0,0 @@ -args @ { fetchurl, ... }: -rec { - baseName = ''cl-prevalence''; - version = ''20130720-hg''; - - description = ''Common Lisp Prevalence Package''; - - deps = [ args."s-sysdeps" args."s-xml" ]; - - src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-prevalence/2013-07-20/cl-prevalence-20130720-hg.tgz''; - sha256 = ''09pqbw6xcgy0242npiqw7sd8jwwjc0kz7m0sas48jjr0zgnnmi89''; - }; - - packageName = "cl-prevalence"; - - asdFilesToKeep = ["cl-prevalence.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-prevalence DESCRIPTION Common Lisp Prevalence Package SHA256 - 09pqbw6xcgy0242npiqw7sd8jwwjc0kz7m0sas48jjr0zgnnmi89 URL - http://beta.quicklisp.org/archive/cl-prevalence/2013-07-20/cl-prevalence-20130720-hg.tgz - MD5 6176c34b8e1621b65906b1575d9fa20d NAME cl-prevalence FILENAME - cl-prevalence DEPS - ((NAME s-sysdeps FILENAME s-sysdeps) (NAME s-xml FILENAME s-xml)) - DEPENDENCIES (s-sysdeps s-xml) VERSION 20130720-hg SIBLINGS - (cl-prevalence-test) PARASITES NIL) */ diff --git a/overrides/lispPackages/quicklisp-to-nix-output/s-sysdeps.nix b/overrides/lispPackages/quicklisp-to-nix-output/s-sysdeps.nix deleted file mode 100644 index 1c28ec6e2afd..000000000000 --- a/overrides/lispPackages/quicklisp-to-nix-output/s-sysdeps.nix +++ /dev/null @@ -1,25 +0,0 @@ -args @ { fetchurl, ... }: -rec { - baseName = ''s-sysdeps''; - version = ''20130128-git''; - - description = ''An abstraction layer over platform dependent functionality''; - - deps = [ ]; - - src = fetchurl { - url = ''http://beta.quicklisp.org/archive/s-sysdeps/2013-01-28/s-sysdeps-20130128-git.tgz''; - sha256 = ''048q0mzypnm284bvv7036d4z7bv7rdcqks5l372s74kq279l2y00''; - }; - - packageName = "s-sysdeps"; - - asdFilesToKeep = ["s-sysdeps.asd"]; - overrides = x: x; -} -/* (SYSTEM s-sysdeps DESCRIPTION - An abstraction layer over platform dependent functionality SHA256 - 048q0mzypnm284bvv7036d4z7bv7rdcqks5l372s74kq279l2y00 URL - http://beta.quicklisp.org/archive/s-sysdeps/2013-01-28/s-sysdeps-20130128-git.tgz - MD5 2fe61fadafd62ef9597e17b4783889ef NAME s-sysdeps FILENAME s-sysdeps DEPS - NIL DEPENDENCIES NIL VERSION 20130128-git SIBLINGS NIL PARASITES NIL) */ diff --git a/overrides/lispPackages/quicklisp-to-nix-output/s-xml.nix b/overrides/lispPackages/quicklisp-to-nix-output/s-xml.nix deleted file mode 100644 index ec12dde52231..000000000000 --- a/overrides/lispPackages/quicklisp-to-nix-output/s-xml.nix +++ /dev/null @@ -1,27 +0,0 @@ -args @ { fetchurl, ... }: -rec { - baseName = ''s-xml''; - version = ''20150608-git''; - - parasites = [ "s-xml.examples" "s-xml.test" ]; - - description = ''Simple Common Lisp XML Parser''; - - deps = [ ]; - - src = fetchurl { - url = ''http://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz''; - sha256 = ''0cy36wqzasqma4maw9djq1vdwsp5hxq8svlbnhbv9sq9zzys5viq''; - }; - - packageName = "s-xml"; - - asdFilesToKeep = ["s-xml.asd"]; - overrides = x: x; -} -/* (SYSTEM s-xml DESCRIPTION Simple Common Lisp XML Parser SHA256 - 0cy36wqzasqma4maw9djq1vdwsp5hxq8svlbnhbv9sq9zzys5viq URL - http://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz - MD5 9c31c80f0661777c493fab683f776716 NAME s-xml FILENAME s-xml DEPS NIL - DEPENDENCIES NIL VERSION 20150608-git SIBLINGS NIL PARASITES - (s-xml.examples s-xml.test)) */ diff --git a/overrides/lispPackages/quicklisp.nix b/overrides/lispPackages/quicklisp.nix deleted file mode 100644 index 1d23db762d34..000000000000 --- a/overrides/lispPackages/quicklisp.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, lispPackages }: - -let inherit (lispPackages) buildLispPackage qlOverrides fetchurl; -in lispPackages // lib.fix(self: { - "s-xml" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."s-xml" or (x: {})) - (import ./quicklisp-to-nix-output/s-xml.nix { - inherit fetchurl; - })); - - "s-sysdeps" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."s-sysdeps" or (x: {})) - (import ./quicklisp-to-nix-output/s-sysdeps.nix { - inherit fetchurl; - })); - - "cl-prevalence" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-prevalence" or (x: {})) - (import ./quicklisp-to-nix-output/cl-prevalence.nix { - inherit fetchurl; - inherit (self) s-sysdeps s-xml; - })); -}) -- cgit 1.4.1