maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(nix): Move files around to conform to new read-tree layout

Browse source 
Broadly speaking, the following things are included:

* there is now a uniform `args` struct that is passed to all
  derivations, package headers have been changed appropriately
* overrides are now loaded from a separate `override` folder just
  using read-tree.nix
* third-party packages have moved into the `third_party` attribute set
This commit is contained in:
Vincent Ambo 2019-11-15 15:26:08 +00:00
parent 4d852e2ef7
commit c1c379848a
19 changed files with 109 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

27
third_party/common_lisp/quicklisp-to-nix-output/cl-prevalence.nix vendored
View file

@ -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) */

25
third_party/common_lisp/quicklisp-to-nix-output/s-sysdeps.nix vendored
View file

@ -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) */

27
third_party/common_lisp/quicklisp-to-nix-output/s-xml.nix vendored
View file

@ -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)) */

29
third_party/common_lisp/quicklisp.nix vendored
View file

@ -1,29 +0,0 @@
# Overlay over `pkgs.lispPackages` that adds additional packages which
# are missing from the imported Quicklisp package set in nixpkgs.
{ 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;
}));
})

9
third_party/naersk.nix vendored Normal file
View file

@ -0,0 +1,9 @@
{ pkgs, ... }:
let inherit (pkgs) callPackage fetchFromGitHub;
in callPackage (fetchFromGitHub {
owner = "nmattia";
repo = "naersk";
rev = "68c1c2b2b661913cdc5ecabea518dfdc4f449027";
sha256 = "1ll310pl44kdbwfslzwvg2v7khf1y0xkg2j5wcfia4k7sj6bcl28";
}) {}

2
third_party/nixery.nix vendored
View file

@ -1,6 +1,6 @@
# Technically I suppose Nixery is not a third-party program, but it's
# outside of this repository ...
{ pkgs }:
{ pkgs, ... }:
let src = pkgs.fetchFromGitHub {
owner = "google";

8
third_party/ormolu.nix vendored Normal file
View file

@ -0,0 +1,8 @@
{ pkgs, ... }:
import (pkgs.fetchFromGitHub {
owner = "tweag";
repo = "ormolu";
rev = "a7076c0f83e5c06ea9067b71171859fa2ba8afd9";
sha256 = "1p4n2ja4ciw3qfskn65ggpy37mvgf2sslxqmqn8s8jjarnqcyfny";
}) { inherit pkgs; }

3
third_party/terraform-gcp.nix vendored Normal file
View file

@ -0,0 +1,3 @@
{ pkgs, ... }:
pkgs.terraform_0_12.withPlugins(p: [ p.google p.google-beta ])