summaryrefslogtreecommitdiff
path: root/Biz/Bild
diff options
context:
space:
mode:
Diffstat (limited to 'Biz/Bild')
-rw-r--r--Biz/Bild/Deps.nix53
-rw-r--r--Biz/Bild/Deps/Haskell.nix1
-rw-r--r--Biz/Bild/Deps/guile-opengl.nix3
-rw-r--r--Biz/Bild/Deps/inspekt3d.nix3
-rw-r--r--Biz/Bild/Nixpkgs.nix1
-rw-r--r--Biz/Bild/Sources.json36
6 files changed, 61 insertions, 36 deletions
diff --git a/Biz/Bild/Deps.nix b/Biz/Bild/Deps.nix
index 9b62f7d..fd15d9e 100644
--- a/Biz/Bild/Deps.nix
+++ b/Biz/Bild/Deps.nix
@@ -5,11 +5,12 @@ let
self.callCabal2nix name pkgs.sources.${name} {};
buildCabalSubdir = self: {name, src ? pkgs.sources.${name}, subdir ? name}:
self.callCabal2nix name (src + "/${subdir}") {};
+ ghc = "ghc884";
in rec
{
haskell = pkgs.haskell // {
packages = pkgs.haskell.packages // {
- ghc865 = pkgs.haskell.packages.ghc865.override (old: {
+ "${ghc}" = pkgs.haskell.packages."${ghc}".override (old: {
overrides = with pkgs.pkgs.haskell.lib; self: super:
pkgs.overridePinnedDeps (buildCabal self) // {
acid-state = dontCheck super.acid-state; # mac: "too many open files"
@@ -22,31 +23,31 @@ in rec
wai-middleware-metrics = dontCheck super.wai-middleware-metrics;
};
});
- ghcjs86 = pkgs.haskell.packages.ghcjs86.override (old: {
- overrides = with pkgs.haskell.lib; self: super:
- pkgs.overridePinnedDeps (buildCabal self) // {
- Glob = dontCheck super.Glob;
- QuickCheck = dontCheck super.QuickCheck;
- aeson = dontCheck super.aeson;
- base-compat-batteries = dontCheck super.base-compat-batteries;
- clay = dontCheck super.clay;
- comonad = dontCheck super.comonad;
- ghcjs-base = dontCheck (buildCabal self "ghcjs-base");
- jsaddle-warp = dontCheck (buildCabalSubdir self {
- name = "jsaddle-warp";
- src = pkgs.sources.jsaddle;
- });
- http-types = dontCheck super.http-types;
- network-uri= dontCheck super.network-uri;
- scientific = dontCheck super.scientific; # takes forever
- servant = dontCheck super.servant;
- servant-auth = buildCabalSubdir self "servant-auth";
- tasty-quickcheck = dontCheck super.tasty-quickcheck;
- temporary = dontCheck super.temporary;
- time-compat = dontCheck super.time-compat;
- vector = dontCheck super.vector;
- };
- });
+ #ghcjs86 = pkgs.haskell.packages.ghcjs86.override (old: {
+ # overrides = with pkgs.haskell.lib; self: super:
+ # pkgs.overridePinnedDeps (buildCabal self) // {
+ # Glob = dontCheck super.Glob;
+ # QuickCheck = dontCheck super.QuickCheck;
+ # aeson = dontCheck super.aeson;
+ # base-compat-batteries = dontCheck super.base-compat-batteries;
+ # clay = dontCheck super.clay;
+ # comonad = dontCheck super.comonad;
+ # ghcjs-base = dontCheck (buildCabal self "ghcjs-base");
+ # jsaddle-warp = dontCheck (buildCabalSubdir self {
+ # name = "jsaddle-warp";
+ # src = pkgs.sources.jsaddle;
+ # });
+ # http-types = dontCheck super.http-types;
+ # network-uri= dontCheck super.network-uri;
+ # scientific = dontCheck super.scientific; # takes forever
+ # servant = dontCheck super.servant;
+ # servant-auth = buildCabalSubdir self "servant-auth";
+ # tasty-quickcheck = dontCheck super.tasty-quickcheck;
+ # temporary = dontCheck super.temporary;
+ # time-compat = dontCheck super.time-compat;
+ # vector = dontCheck super.vector;
+ # };
+ #});
};
};
diff --git a/Biz/Bild/Deps/Haskell.nix b/Biz/Bild/Deps/Haskell.nix
index 4fd2d85..d2e6557 100644
--- a/Biz/Bild/Deps/Haskell.nix
+++ b/Biz/Bild/Deps/Haskell.nix
@@ -53,7 +53,6 @@ with hpkgs;
servant-server
split
stm
- string-quote
stripe-haskell
tasty
tasty-hunit
diff --git a/Biz/Bild/Deps/guile-opengl.nix b/Biz/Bild/Deps/guile-opengl.nix
index d334430..34019d5 100644
--- a/Biz/Bild/Deps/guile-opengl.nix
+++ b/Biz/Bild/Deps/guile-opengl.nix
@@ -1,4 +1,5 @@
{ stdenv
+, lib
, fetchurl
, pkgconfig
, guile
@@ -29,7 +30,7 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig guile libGL libGLU freeglut ];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Guile bindings for the OpenGL graphics API";
homepage = "https://www.gnu.org/software/guile-opengl/";
license = licenses.gpl3Plus;
diff --git a/Biz/Bild/Deps/inspekt3d.nix b/Biz/Bild/Deps/inspekt3d.nix
index 2d76b0d..1093165 100644
--- a/Biz/Bild/Deps/inspekt3d.nix
+++ b/Biz/Bild/Deps/inspekt3d.nix
@@ -1,4 +1,5 @@
{ stdenv
+, lib
, fetchFromGitHub
, autoreconfHook
, pkgconfig
@@ -30,7 +31,7 @@ stdenv.mkDerivation {
GUILE_AUTO_COMPILE = 0;
preConfigure = "./bootstrap";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Lightweight 3D viewer for Libfive written in Guile Scheme";
homepage = "https://gitlab.com/kavalogic-inc/inspekt3d";
license = licenses.gpl3;
diff --git a/Biz/Bild/Nixpkgs.nix b/Biz/Bild/Nixpkgs.nix
index 262ec6f..6b442a0 100644
--- a/Biz/Bild/Nixpkgs.nix
+++ b/Biz/Bild/Nixpkgs.nix
@@ -29,5 +29,6 @@ import sources.nixpkgs {
];
config = {
allowBroken = true;
+ allowUnfree = true;
};
}
diff --git a/Biz/Bild/Sources.json b/Biz/Bild/Sources.json
index 1e01893..d2eac19 100644
--- a/Biz/Bild/Sources.json
+++ b/Biz/Bild/Sources.json
@@ -25,6 +25,18 @@
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
"version": "cc7729b1b42a79e261091ff7835f7fc2a7ae3cee"
},
+ "docopt": {
+ "branch": "monad-fail",
+ "description": "A command-line interface description language and parser that will make you smile",
+ "homepage": "http://docopt.org/",
+ "owner": "gelisam",
+ "repo": "docopt.hs",
+ "rev": "16dc7bc596c0ea4fa4466b12f474b1abfa72c885",
+ "sha256": "1m15zhm1b9sn7ihkxxavbgaihaybmpsrhx26pn1wyng9dh8vsp8b",
+ "type": "tarball",
+ "url": "https://github.com/gelisam/docopt.hs/archive/16dc7bc596c0ea4fa4466b12f474b1abfa72c885.tar.gz",
+ "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+ },
"ghc-exactprint": {
"branch": "master",
"description": "GHC version of haskell-src-exts exactPrint",
@@ -97,6 +109,15 @@
"url": "https://github.com/nmattia/niv/archive/af958e8057f345ee1aca714c1247ef3ba1c15f5e.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
+ "nixos-mailserver": {
+ "repo": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver",
+ "rev": "5675b122a947b40e551438df6a623efad19fd2e7",
+ "sha256": "1fwhb7a5v9c98nzhf3dyqf3a5ianqh7k50zizj8v5nmj3blxw4pi",
+ "type": "tarball",
+ "url": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/5675b122a947b40e551438df6a623efad19fd2e7/nixos-mailserver-5675b122a947b40e551438df6a623efad19fd2e7.tar.gz",
+ "url_template": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/<rev>/nixos-mailserver-<rev>.tar.gz",
+ "version": "2021-06-10-master"
+ },
"nixpkgs": {
"branch": "biz",
"description": "Nix Packages collection",
@@ -104,10 +125,10 @@
"name": "nixpkgs",
"owner": "simatime",
"repo": "git://simatime.com/nixpkgs.git",
- "rev": "da6c3c99661e0d8cd8d7ef6add6e181eed8e21d5",
- "sha256": "1h3c2a8hpm4wmf0v61psb4m97frpdxvw29a9r1wrlcng0x9sak5h",
+ "rev": "fc19bcfcbf7d3a7511cccccacbe338abef57cc0a",
+ "sha256": "1zlisljka8hd9acrza6cf8n5izzw8g9qmv8hl3lzjdyhsavzi9rf",
"type": "tarball",
- "url": "https://simatime.com/archive/nixpkgs/biz/da6c3c99661e0d8cd8d7ef6add6e181eed8e21d5.tar.gz",
+ "url": "https://simatime.com/archive/nixpkgs/biz/fc19bcfcbf7d3a7511cccccacbe338abef57cc0a.tar.gz",
"url_template": "https://simatime.com/archive/<name>/<branch>/<rev>.tar.gz"
},
"regex-applicative": {
@@ -143,10 +164,11 @@
"homepage": null,
"owner": "haskell-servant",
"repo": "servant-auth",
- "rev": "696fab268e21f3d757b231f0987201b539c52621",
- "sha256": "1had0xyh511q7ggw2mlfhhk7pfbc30gqm2c9gj1y7pbflmsjgjda",
+ "rev": "servant-auth-0.4.0.0",
+ "sha256": "1wg67mr472mracyjd63ldlfiv85v2kdw2rvcvq1sahp05i591j26",
"type": "tarball",
- "url": "https://github.com/haskell-servant/servant-auth/archive/696fab268e21f3d757b231f0987201b539c52621.tar.gz",
- "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+ "url": "https://github.com/haskell-servant/servant-auth/archive/servant-auth-0.4.0.0.tar.gz",
+ "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
+ "version": "0.4.0.0"
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 08:20:56 +0000