aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/default.nix24
-rw-r--r--modules/private/websites/chloe/app/chloe.json14
-rw-r--r--modules/private/websites/chloe/app/default.nix9
-rw-r--r--modules/private/websites/connexionswing/app/connexionswing.json14
-rw-r--r--modules/private/websites/connexionswing/app/default.nix7
-rw-r--r--modules/private/websites/florian/app/default.nix7
-rw-r--r--modules/private/websites/florian/app/tellesflorian.json14
-rw-r--r--modules/private/websites/isabelle/aten_app/aten.json14
-rw-r--r--modules/private/websites/isabelle/aten_app/default.nix13
-rw-r--r--modules/private/websites/isabelle/iridologie_app/default.nix10
-rw-r--r--modules/private/websites/isabelle/iridologie_app/iridologie.json13
-rw-r--r--modules/private/websites/ludivine/app/default.nix7
-rw-r--r--modules/private/websites/ludivine/app/ludivinecassal.json14
-rw-r--r--modules/private/websites/piedsjaloux/app/default.nix7
-rw-r--r--modules/private/websites/piedsjaloux/app/piedsjaloux.json14
-rw-r--r--modules/private/websites/richie/production.nix8
-rw-r--r--modules/private/websites/richie/richie.json14
-rw-r--r--nix/sources.json155
-rw-r--r--overlays/ldapvi/default.nix4
-rw-r--r--overlays/pass/default.nix13
-rw-r--r--overlays/pass/pass.json14
-rw-r--r--pkgs/python-packages/buildbot/plugins/buildslist/buildslist.json14
-rw-r--r--pkgs/python-packages/buildbot/plugins/buildslist/default.nix12
-rw-r--r--pkgs/python-packages/buildbot/plugins/default.nix3
-rw-r--r--pkgs/python-packages/default.nix2
-rw-r--r--pkgs/webapps/default.nix2
-rw-r--r--pkgs/webapps/mediagoblin/default.nix13
-rw-r--r--pkgs/webapps/mediagoblin/mediagoblin.json14
-rw-r--r--pkgs/webapps/surfer/Surfer.json14
-rw-r--r--pkgs/webapps/surfer/default.nix4
-rw-r--r--pkgs/webapps/surfer/node-packages.nix4
-rw-r--r--pkgs/webapps/ttrss/default.nix10
-rw-r--r--pkgs/webapps/ttrss/tt-rss.json14
33 files changed, 216 insertions, 279 deletions
diff --git a/lib/default.nix b/lib/default.nix
index 26557ed..57bde79 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -12,28 +12,4 @@ rec {
12 name = "${pname}-${version}"; 12 name = "${pname}-${version}";
13 src = fetchFromGitHub json.github; 13 src = fetchFromGitHub json.github;
14 }; 14 };
15
16 fetchedGit = path:
17 let
18 json = lib.importJSON path;
19 in rec {
20 version = json.tag;
21 pname = json.meta.name;
22 name = "${pname}-${version}";
23 src = fetchgit json.git;
24 };
25
26 fetchedGitPrivate = path:
27 let
28 json = lib.importJSON path;
29 in rec {
30 version = json.tag;
31 pname = json.meta.name;
32 name = "${pname}-${version}";
33 src = builtins.fetchGit {
34 url = json.git.url;
35 ref = "master";
36 rev = json.git.rev;
37 };
38 };
39} // (if builtins.pathExists ./private then callPackage ./private {} else {}) 15} // (if builtins.pathExists ./private then callPackage ./private {} else {})
diff --git a/modules/private/websites/chloe/app/chloe.json b/modules/private/websites/chloe/app/chloe.json
deleted file mode 100644
index d0021b6..0000000
--- a/modules/private/websites/chloe/app/chloe.json
+++ /dev/null
@@ -1,14 +0,0 @@
1{
2 "tag": "882f166-master",
3 "meta": {
4 "name": "chloe",
5 "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Chloe",
6 "branch": "master"
7 },
8 "git": {
9 "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Chloe",
10 "rev": "882f166999a59081ad896f26318e6a04db9f9f43",
11 "sha256": "131095y1bjnslipq90w9345cmgyk2bfiz5pfpkbg1jbj2ypl4haj",
12 "fetchSubmodules": true
13 }
14}
diff --git a/modules/private/websites/chloe/app/default.nix b/modules/private/websites/chloe/app/default.nix
index 92a5e42..d23e3e0 100644
--- a/modules/private/websites/chloe/app/default.nix
+++ b/modules/private/websites/chloe/app/default.nix
@@ -1,8 +1,11 @@
1{ environment ? "prod" 1{ environment ? "prod"
2, varDir ? "/var/lib/chloe_${environment}" 2, varDir ? "/var/lib/chloe_${environment}"
3, spip, stdenv, mylibs, sassc }: 3, spip, stdenv, sassc, sources }:
4let 4let
5 siteDir = stdenv.mkDerivation (mylibs.fetchedGitPrivate ./chloe.json // rec { 5 siteDir = stdenv.mkDerivation {
6 version = sources.websites-chloe-app.version;
7 pname = "chloe";
8 src = sources.websites-chloe-app;
6 buildPhase = '' 9 buildPhase = ''
7 make 10 make
8 ''; 11 '';
@@ -10,7 +13,7 @@ let
10 cp -a . $out 13 cp -a . $out
11 ''; 14 '';
12 buildInputs = [ sassc ]; 15 buildInputs = [ sassc ];
13 }); 16 };
14in 17in
15spip.override { 18spip.override {
16 ldap = true; 19 ldap = true;
diff --git a/modules/private/websites/connexionswing/app/connexionswing.json b/modules/private/websites/connexionswing/app/connexionswing.json
deleted file mode 100644
index 7d792ae..0000000
--- a/modules/private/websites/connexionswing/app/connexionswing.json
+++ /dev/null
@@ -1,14 +0,0 @@
1{
2 "tag": "ed58743-master",
3 "meta": {
4 "name": "connexionswing",
5 "url": "ssh://gitolite@git.immae.eu/perso/Immae/Projets/Connexionswing",
6 "branch": "master"
7 },
8 "git": {
9 "url": "ssh://gitolite@git.immae.eu/perso/Immae/Projets/Connexionswing",
10 "rev": "ed5874396d35766e0810a6d4e78e1a8f6b170835",
11 "sha256": "1cjjl24j5di7f9xagm3xk2y80jga6kf3q9zws185jkrwwp3xmfhf",
12 "fetchSubmodules": true
13 }
14}
diff --git a/modules/private/websites/connexionswing/app/default.nix b/modules/private/websites/connexionswing/app/default.nix
index 37ce42d..31e88db 100644
--- a/modules/private/websites/connexionswing/app/default.nix
+++ b/modules/private/websites/connexionswing/app/default.nix
@@ -1,12 +1,15 @@
1{ environment ? "prod" 1{ environment ? "prod"
2, varDir ? "/var/lib/connexionswing_${environment}" 2, varDir ? "/var/lib/connexionswing_${environment}"
3, secretsPath ? "/var/secrets/webapps/${environment}-connexionswing" 3, secretsPath ? "/var/secrets/webapps/${environment}-connexionswing"
4, composerEnv, fetchurl, fetchgit, mylibs }: 4, composerEnv, fetchurl, fetchgit, sources }:
5let 5let
6 app = composerEnv.buildPackage ( 6 app = composerEnv.buildPackage (
7 import ./php-packages.nix { inherit composerEnv fetchurl fetchgit; } // 7 import ./php-packages.nix { inherit composerEnv fetchurl fetchgit; } //
8 mylibs.fetchedGitPrivate ./connexionswing.json //
9 rec { 8 rec {
9 pname = "connexionswing";
10 name = "${pname}-${version}";
11 version = sources.websites-connexionswing-app.version;
12 src = sources.websites-connexionswing-app;
10 noDev = (environment == "prod"); 13 noDev = (environment == "prod");
11 preInstall = '' 14 preInstall = ''
12 export SYMFONY_ENV="${environment}" 15 export SYMFONY_ENV="${environment}"
diff --git a/modules/private/websites/florian/app/default.nix b/modules/private/websites/florian/app/default.nix
index b31e12d..2ef0e86 100644
--- a/modules/private/websites/florian/app/default.nix
+++ b/modules/private/websites/florian/app/default.nix
@@ -1,12 +1,15 @@
1{ environment ? "prod" 1{ environment ? "prod"
2, varDir ? "/var/lib/tellesflorian_${environment}" 2, varDir ? "/var/lib/tellesflorian_${environment}"
3, secretsPath ? "/var/secrets/webapps/${environment}-tellesflorian" 3, secretsPath ? "/var/secrets/webapps/${environment}-tellesflorian"
4, composerEnv, fetchurl, mylibs }: 4, composerEnv, fetchurl, sources }:
5let 5let
6 app = composerEnv.buildPackage ( 6 app = composerEnv.buildPackage (
7 import ./php-packages.nix { inherit composerEnv fetchurl; } // 7 import ./php-packages.nix { inherit composerEnv fetchurl; } //
8 mylibs.fetchedGitPrivate ./tellesflorian.json //
9 rec { 8 rec {
9 version = sources.websites-florian-app.version;
10 pname = "tellesflorian";
11 name = "${pname}-${version}";
12 src = sources.websites-florian-app;
10 noDev = (environment == "prod"); 13 noDev = (environment == "prod");
11 preInstall = '' 14 preInstall = ''
12 export SYMFONY_ENV="${environment}" 15 export SYMFONY_ENV="${environment}"
diff --git a/modules/private/websites/florian/app/tellesflorian.json b/modules/private/websites/florian/app/tellesflorian.json
deleted file mode 100644
index 693336d..0000000
--- a/modules/private/websites/florian/app/tellesflorian.json
+++ /dev/null
@@ -1,14 +0,0 @@
1{
2 "tag": "1793d5c-master",
3 "meta": {
4 "name": "tellesflorian",
5 "url": "ssh://gitolite@git.immae.eu/perso/florian_telles/stabilo",
6 "branch": "master"
7 },
8 "git": {
9 "url": "ssh://gitolite@git.immae.eu/perso/florian_telles/stabilo",
10 "rev": "1793d5c7912d1b20ad1df1ac59be9d7f1220e919",
11 "sha256": "1zhxcrbglbjb6xfr8sfm4m2miabbkkb0a7543va3b5akrn6yk0cb",
12 "fetchSubmodules": true
13 }
14}
diff --git a/modules/private/websites/isabelle/aten_app/aten.json b/modules/private/websites/isabelle/aten_app/aten.json
deleted file mode 100644
index 10a315a..0000000
--- a/modules/private/websites/isabelle/aten_app/aten.json
+++ /dev/null
@@ -1,14 +0,0 @@
1{
2 "tag": "b99537f-master",
3 "meta": {
4 "name": "aten",
5 "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Aten",
6 "branch": "master"
7 },
8 "git": {
9 "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Aten",
10 "rev": "b99537fdad41291afb4f1bb8b2e2aa4081c71fae",
11 "sha256": "15mlyik6zivxwry6zc906bqnivxhby27yr8kj4lg5n68pvb877dn",
12 "fetchSubmodules": true
13 }
14}
diff --git a/modules/private/websites/isabelle/aten_app/default.nix b/modules/private/websites/isabelle/aten_app/default.nix
index ba98394..30d10ba 100644
--- a/modules/private/websites/isabelle/aten_app/default.nix
+++ b/modules/private/websites/isabelle/aten_app/default.nix
@@ -1,17 +1,17 @@
1{ environment ? "prod" 1{ environment ? "prod"
2, varDir ? "/var/lib/aten_${environment}" 2, varDir ? "/var/lib/aten_${environment}"
3, mylibs, composerEnv, fetchgit, runCommand, nodejs, jq, libsass, python, fetchurl, yarn2nix-moretea }: 3, composerEnv, fetchgit, runCommand, nodejs, jq, libsass, python, fetchurl, yarn2nix-moretea, sources }:
4let 4let
5 packagesource = mylibs.fetchedGitPrivate ./aten.json; 5 packagesource = sources.websites-isabelle-aten;
6 packagejson = runCommand "package.json" { buildInputs = [ jq ]; } '' 6 packagejson = runCommand "package.json" { buildInputs = [ jq ]; } ''
7 cat ${packagesource.src}/package.json | jq -r '.version = "v1.0.0"|.name="aten"' > $out 7 cat ${packagesource}/package.json | jq -r '.version = "v1.0.0"|.name="aten"' > $out
8 ''; 8 '';
9 yarnModules = yarn2nix-moretea.mkYarnModules rec { 9 yarnModules = yarn2nix-moretea.mkYarnModules rec {
10 name = "aten-yarn"; 10 name = "aten-yarn";
11 pname = name; 11 pname = name;
12 version = "v1.0.0"; 12 version = "v1.0.0";
13 packageJSON = packagejson; 13 packageJSON = packagejson;
14 yarnLock = "${packagesource.src}/yarn.lock"; 14 yarnLock = "${packagesource}/yarn.lock";
15 yarnNix = ./yarn-packages.nix; 15 yarnNix = ./yarn-packages.nix;
16 pkgConfig = { 16 pkgConfig = {
17 node-sass = { 17 node-sass = {
@@ -30,8 +30,11 @@ let
30 }; 30 };
31 app = composerEnv.buildPackage ( 31 app = composerEnv.buildPackage (
32 import ./php-packages.nix { inherit composerEnv fetchurl fetchgit; } // 32 import ./php-packages.nix { inherit composerEnv fetchurl fetchgit; } //
33 packagesource //
34 rec { 33 rec {
34 version = packagesource.version;
35 pname = "aten";
36 name = "${pname}-${version}";
37 src = packagesource;
35 noDev = (environment == "prod"); 38 noDev = (environment == "prod");
36 preInstall = '' 39 preInstall = ''
37 export SYMFONY_ENV="${environment}" 40 export SYMFONY_ENV="${environment}"
diff --git a/modules/private/websites/isabelle/iridologie_app/default.nix b/modules/private/websites/isabelle/iridologie_app/default.nix
index 604d250..edb7eef 100644
--- a/modules/private/websites/isabelle/iridologie_app/default.nix
+++ b/modules/private/websites/isabelle/iridologie_app/default.nix
@@ -1,12 +1,16 @@
1{ environment ? "prod" 1{ environment ? "prod"
2, varDir ? "/var/lib/iridologie_${environment}" 2, varDir ? "/var/lib/iridologie_${environment}"
3, spip, stdenv, mylibs, sassc }: 3, spip, stdenv, sassc, sources }:
4let 4let
5 siteDir = stdenv.mkDerivation (mylibs.fetchedGitPrivate ./iridologie.json // rec { 5 siteDir = stdenv.mkDerivation rec {
6 version = sources.websites-isabelle-iridologie.version;
7 pname = "iridologie";
8 name = "${pname}-${version}";
9 src = sources.websites-isabelle-iridologie;
6 installPhase = '' 10 installPhase = ''
7 cp -a . $out 11 cp -a . $out
8 ''; 12 '';
9 }); 13 };
10in 14in
11spip.override { 15spip.override {
12 ldap = true; 16 ldap = true;
diff --git a/modules/private/websites/isabelle/iridologie_app/iridologie.json b/modules/private/websites/isabelle/iridologie_app/iridologie.json
deleted file mode 100644
index 5cc7f91..0000000
--- a/modules/private/websites/isabelle/iridologie_app/iridologie.json
+++ /dev/null
@@ -1,13 +0,0 @@
1{
2 "tag": "2f2ec6b-master",
3 "meta": {
4 "name": "iridologie",
5 "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Iridologie",
6 "branch": "master"
7 },
8 "git": {
9 "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Iridologie",
10 "rev": "2f2ec6b003f4de97e9f8651db540c9114ac877c2",
11 "fetchSubmodules": true
12 }
13}
diff --git a/modules/private/websites/ludivine/app/default.nix b/modules/private/websites/ludivine/app/default.nix
index 05be0b1..6e751b0 100644
--- a/modules/private/websites/ludivine/app/default.nix
+++ b/modules/private/websites/ludivine/app/default.nix
@@ -1,12 +1,15 @@
1{ environment ? "prod" 1{ environment ? "prod"
2, varDir ? "/var/lib/ludivinecassal_${environment}" 2, varDir ? "/var/lib/ludivinecassal_${environment}"
3, secretsPath ? "/var/secrets/webapps/${environment}-ludivinecassal" 3, secretsPath ? "/var/secrets/webapps/${environment}-ludivinecassal"
4, composerEnv, fetchurl, fetchgit, imagemagick, sass, ruby, mylibs }: 4, composerEnv, fetchurl, fetchgit, imagemagick, sass, ruby, sources }:
5let 5let
6 app = composerEnv.buildPackage ( 6 app = composerEnv.buildPackage (
7 import ./php-packages.nix { inherit composerEnv fetchurl fetchgit; } // 7 import ./php-packages.nix { inherit composerEnv fetchurl fetchgit; } //
8 mylibs.fetchedGitPrivate ./ludivinecassal.json //
9 rec { 8 rec {
9 name = "${pname}-${version}";
10 pname = "ludivinecassal";
11 version = sources.websites-ludivine-app.version;
12 src = sources.websites-ludivine-app;
10 noDev = (environment == "prod"); 13 noDev = (environment == "prod");
11 preInstall = '' 14 preInstall = ''
12 export SYMFONY_ENV="${environment}" 15 export SYMFONY_ENV="${environment}"
diff --git a/modules/private/websites/ludivine/app/ludivinecassal.json b/modules/private/websites/ludivine/app/ludivinecassal.json
deleted file mode 100644
index f0d23c3..0000000
--- a/modules/private/websites/ludivine/app/ludivinecassal.json
+++ /dev/null
@@ -1,14 +0,0 @@
1{
2 "tag": "0dacc32-master",
3 "meta": {
4 "name": "ludivinecassal",
5 "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Ludivine",
6 "branch": "master"
7 },
8 "git": {
9 "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Ludivine",
10 "rev": "0dacc320ea052b69f79861c84bceaa89be53de60",
11 "sha256": "10khg1fq9ixly3xak591n3v0rv3f2hn91rd46d75yv3wjxaj1c2d",
12 "fetchSubmodules": true
13 }
14}
diff --git a/modules/private/websites/piedsjaloux/app/default.nix b/modules/private/websites/piedsjaloux/app/default.nix
index 726d93c..a3d48bd 100644
--- a/modules/private/websites/piedsjaloux/app/default.nix
+++ b/modules/private/websites/piedsjaloux/app/default.nix
@@ -1,12 +1,15 @@
1{ environment ? "prod" 1{ environment ? "prod"
2, varDir ? "/var/lib/piedsjaloux_${environment}" 2, varDir ? "/var/lib/piedsjaloux_${environment}"
3, secretsPath ? "/var/secrets/webapps/${environment}-piedsjaloux" 3, secretsPath ? "/var/secrets/webapps/${environment}-piedsjaloux"
4, composerEnv, fetchurl, fetchgit, mylibs }: 4, composerEnv, fetchurl, fetchgit, sources }:
5let 5let
6 app = composerEnv.buildPackage ( 6 app = composerEnv.buildPackage (
7 import ./php-packages.nix { inherit composerEnv fetchurl fetchgit; } // 7 import ./php-packages.nix { inherit composerEnv fetchurl fetchgit; } //
8 mylibs.fetchedGitPrivate ./piedsjaloux.json //
9 rec { 8 rec {
9 version = sources.websites-piedsjaloux-app.version;
10 pname = "piedsjaloux";
11 name = "${pname}-${version}";
12 src = sources.websites-piedsjaloux-app;
10 noDev = (environment == "prod"); 13 noDev = (environment == "prod");
11 preInstall = '' 14 preInstall = ''
12 export SYMFONY_ENV="${environment}" 15 export SYMFONY_ENV="${environment}"
diff --git a/modules/private/websites/piedsjaloux/app/piedsjaloux.json b/modules/private/websites/piedsjaloux/app/piedsjaloux.json
deleted file mode 100644
index dc2c083..0000000
--- a/modules/private/websites/piedsjaloux/app/piedsjaloux.json
+++ /dev/null
@@ -1,14 +0,0 @@
1{
2 "tag": "4ee4538-master",
3 "meta": {
4 "name": "piedsjaloux",
5 "url": "ssh://gitolite@git.immae.eu/Pieds_jaloux/NewSite",
6 "branch": "master"
7 },
8 "git": {
9 "url": "ssh://gitolite@git.immae.eu/Pieds_jaloux/NewSite",
10 "rev": "4ee45386ad9ec9c081234a2fbde66e5b0c3294be",
11 "sha256": "10a41chh4crn95z6lk6nhkx27089djkngypa9m76bg7ph508mvnq",
12 "fetchSubmodules": true
13 }
14}
diff --git a/modules/private/websites/richie/production.nix b/modules/private/websites/richie/production.nix
index d7da458..a6957af 100644
--- a/modules/private/websites/richie/production.nix
+++ b/modules/private/websites/richie/production.nix
@@ -2,7 +2,11 @@
2let 2let
3 cfg = config.myServices.websites.richie.production; 3 cfg = config.myServices.websites.richie.production;
4 vardir = "/var/lib/richie_production"; 4 vardir = "/var/lib/richie_production";
5 richieSrc = pkgs.stdenv.mkDerivation (pkgs.mylibs.fetchedGitPrivate ./richie.json // { 5 richieSrc = pkgs.stdenv.mkDerivation rec {
6 version = pkgs.sources.websites-richie-app.version;
7 pname = "richie";
8 name = "${pname}-${version}";
9 src = pkgs.sources.websites-richie-app;
6 phases = "installPhase"; 10 phases = "installPhase";
7 installPhase = '' 11 installPhase = ''
8 cp -a $src $out 12 cp -a $src $out
@@ -12,7 +16,7 @@ let
12 ln -sf ${vardir}/photos $out/ 16 ln -sf ${vardir}/photos $out/
13 sed -i "s@localedef --list-archive@localedef --list-archive /run/current-system/sw/lib/locale/locale-archive@" $out/admin/parametres.php 17 sed -i "s@localedef --list-archive@localedef --list-archive /run/current-system/sw/lib/locale/locale-archive@" $out/admin/parametres.php
14 ''; 18 '';
15 }); 19 };
16 webappdir = config.services.websites.webappDirsPaths.richie_production; 20 webappdir = config.services.websites.webappDirsPaths.richie_production;
17 secretPath = config.secrets.fullPaths."websites/richie/production"; 21 secretPath = config.secrets.fullPaths."websites/richie/production";
18 apacheUser = config.services.httpd.Prod.user; 22 apacheUser = config.services.httpd.Prod.user;
diff --git a/modules/private/websites/richie/richie.json b/modules/private/websites/richie/richie.json
deleted file mode 100644
index f51d8c1..0000000
--- a/modules/private/websites/richie/richie.json
+++ /dev/null
@@ -1,14 +0,0 @@
1{
2 "tag": "11490d4-master",
3 "meta": {
4 "name": "richie",
5 "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Richie",
6 "branch": "master"
7 },
8 "git": {
9 "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Richie",
10 "rev": "11490d4591034deca7681aae8d9a22ca6cd8da4a",
11 "sha256": "1rlq5qkbaw9n7yxhyvvimrizwkpqlhhsc8mhipzxlwk1si81fci1",
12 "fetchSubmodules": true
13 }
14}
diff --git a/nix/sources.json b/nix/sources.json
index ffcdc0d..dd27752 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -1,10 +1,44 @@
1{ 1{
2 "ldapvi": { 2 "buildbot-cours-deps": {
3 "ref": "master", 3 "ref": "master",
4 "repo": "http://www.lichteblau.com/git/ldapvi.git", 4 "repo": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Cours",
5 "rev": "f1d42bad66cc4623d1ff21fbd5dddbf5009d3e40", 5 "rev": "33f139f2e2ea0a16b8ed813c5436e5a5bb506f6d",
6 "type": "git"
7 },
8 "buildbot-cours-nixpkgs": {
9 "branch": "nixos-unstable",
10 "description": "Frozen nixpkgs snapshot for texlive",
11 "homepage": "https://github.com/NixOS/nixpkgs",
12 "owner": "NixOS",
13 "repo": "nixpkgs-channels",
14 "rev": "fce7562cf46727fdaf801b232116bc9ce0512049",
15 "sha256": "14rvi69ji61x3z88vbn17rg5vxrnw2wbnanxb7y0qzyqrj7spapx",
16 "type": "tarball",
17 "url": "https://github.com/NixOS/nixpkgs-channels/archive/fce7562cf46727fdaf801b232116bc9ce0512049.tar.gz",
18 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
19 },
20 "buildbot-normalesup-deps": {
21 "ref": "master",
22 "repo": "ssh://gitolite@git.immae.eu/perso/Immae/Projets/Sites/Normalesup",
23 "rev": "de294da4027e80a7b8bf7ec8c393ca0b60218575",
6 "type": "git" 24 "type": "git"
7 }, 25 },
26 "buildbot-normalesup-nixpkgs": {
27 "description": "Frozen nixpkgs snapshot for texlive",
28 "revision": "173017.85f820d6e41",
29 "sha256": "0fs390gvz8d3n7v4zj538gf3n1b14sikbf0ijrxgxib5i0704mdb",
30 "type": "tarball",
31 "url": "https://releases.nixos.org/nixos/19.03/nixos-19.03.173017.85f820d6e41/nixexprs.tar.xz",
32 "url_template": "https://releases.nixos.org/nixos/<version>/nixos-<version>.<revision>/nixexprs.tar.xz",
33 "version": "19.03"
34 },
35 "buildbot-plugin-buildslist": {
36 "ref": "master",
37 "repo": "https://git.immae.eu/perso/Immae/Projets/Buildbot/buildslist",
38 "rev": "fb8641f2badcec9f232cc5f727009911fc1c89b0",
39 "type": "git",
40 "version": "f1d42ba-master"
41 },
8 "niv": { 42 "niv": {
9 "branch": "master", 43 "branch": "master",
10 "description": "Easy dependency management for Nix projects", 44 "description": "Easy dependency management for Nix projects",
@@ -23,30 +57,12 @@
23 "homepage": "https://github.com/NixOS/nixpkgs", 57 "homepage": "https://github.com/NixOS/nixpkgs",
24 "owner": "NixOS", 58 "owner": "NixOS",
25 "repo": "nixpkgs-channels", 59 "repo": "nixpkgs-channels",
26 "rev": "ae6bdcc53584aaf20211ce1814bea97ece08a248", 60 "rev": "fce7562cf46727fdaf801b232116bc9ce0512049",
27 "sha256": "0hjhznns1cxgl3hww2d5si6vhy36pnm53hms9h338v6r633dcy77", 61 "sha256": "14rvi69ji61x3z88vbn17rg5vxrnw2wbnanxb7y0qzyqrj7spapx",
28 "type": "tarball", 62 "type": "tarball",
29 "url": "https://github.com/NixOS/nixpkgs-channels/archive/ae6bdcc53584aaf20211ce1814bea97ece08a248.tar.gz", 63 "url": "https://github.com/NixOS/nixpkgs-channels/archive/fce7562cf46727fdaf801b232116bc9ce0512049.tar.gz",
30 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" 64 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
31 }, 65 },
32 "nixpkgs-buildbot-cours": {
33 "description": "Frozen nixpkgs snapshot for texlive",
34 "revision": "173017.85f820d6e41",
35 "sha256": "0fs390gvz8d3n7v4zj538gf3n1b14sikbf0ijrxgxib5i0704mdb",
36 "type": "tarball",
37 "url": "https://releases.nixos.org/nixos/19.03/nixos-19.03.173017.85f820d6e41/nixexprs.tar.xz",
38 "url_template": "https://releases.nixos.org/nixos/<version>/nixos-<version>.<revision>/nixexprs.tar.xz",
39 "version": "19.03"
40 },
41 "nixpkgs-buildbot-normalesup": {
42 "description": "Frozen nixpkgs snapshot for texlive",
43 "revision": "173017.85f820d6e41",
44 "sha256": "0fs390gvz8d3n7v4zj538gf3n1b14sikbf0ijrxgxib5i0704mdb",
45 "type": "tarball",
46 "url": "https://releases.nixos.org/nixos/19.03/nixos-19.03.173017.85f820d6e41/nixexprs.tar.xz",
47 "url_template": "https://releases.nixos.org/nixos/<version>/nixos-<version>.<revision>/nixexprs.tar.xz",
48 "version": "19.03"
49 },
50 "nixpkgs-nixops": { 66 "nixpkgs-nixops": {
51 "branch": "nixos-unstable", 67 "branch": "nixos-unstable",
52 "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to", 68 "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
@@ -82,5 +98,96 @@
82 "type": "tarball", 98 "type": "tarball",
83 "url": "https://github.com/NixOS/nixpkgs-channels/archive/34c7eb7545d155cc5b6f499b23a7cb1c96ab4d59.tar.gz", 99 "url": "https://github.com/NixOS/nixpkgs-channels/archive/34c7eb7545d155cc5b6f499b23a7cb1c96ab4d59.tar.gz",
84 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" 100 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
101 },
102 "overlays-ldapvi": {
103 "ref": "master",
104 "repo": "http://www.lichteblau.com/git/ldapvi.git",
105 "rev": "f1d42bad66cc4623d1ff21fbd5dddbf5009d3e40",
106 "type": "git",
107 "version": "f1d42ba-master"
108 },
109 "overlays-pass": {
110 "ref": "master",
111 "repo": "https://git.zx2c4.com/password-store/",
112 "rev": "d29a389a40524c684595f51bb937f66958bc14ea",
113 "type": "git",
114 "version": "d29a389-master"
115 },
116 "webapps-mediagoblin": {
117 "ref": "stable",
118 "repo": "git://git.savannah.gnu.org/mediagoblin.git",
119 "rev": "cd465ebfec837a75a44c4ebd727dffe2fff6d850",
120 "type": "git",
121 "version": "cd465eb-stable"
122 },
123 "webapps-surfer": {
124 "ref": "master",
125 "repo": "https://git.immae.eu/perso/Immae/Projets/Nodejs/Surfer.git",
126 "rev": "476177380452c9c7c5b1624805feedc824c5995e",
127 "type": "git",
128 "version": "4761773-master"
129 },
130 "webapps-ttrss": {
131 "ref": "master",
132 "repo": "https://git.tt-rss.org/fox/tt-rss.git",
133 "rev": "986ca251f995f7754a0470d3e0c44538a545081f",
134 "type": "git",
135 "version": "986ca25-master"
136 },
137 "websites-chloe-app": {
138 "ref": "master",
139 "repo": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Chloe",
140 "rev": "882f166999a59081ad896f26318e6a04db9f9f43",
141 "type": "git",
142 "version": "882f166-master"
143 },
144 "websites-connexionswing-app": {
145 "ref": "master",
146 "repo": "ssh://gitolite@git.immae.eu/perso/Immae/Projets/Connexionswing",
147 "rev": "ed5874396d35766e0810a6d4e78e1a8f6b170835",
148 "type": "git",
149 "version": "ed58743-master"
150 },
151 "websites-florian-app": {
152 "ref": "master",
153 "repo": "ssh://gitolite@git.immae.eu/perso/florian_telles/stabilo",
154 "rev": "1793d5c7912d1b20ad1df1ac59be9d7f1220e919",
155 "type": "git",
156 "version": "1793d5c-master"
157 },
158 "websites-isabelle-aten": {
159 "ref": "master",
160 "repo": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Aten",
161 "rev": "b99537fdad41291afb4f1bb8b2e2aa4081c71fae",
162 "type": "git",
163 "version": "b99537f-master"
164 },
165 "websites-isabelle-iridologie": {
166 "ref": "master",
167 "repo": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Iridologie",
168 "rev": "2f2ec6b003f4de97e9f8651db540c9114ac877c2",
169 "type": "git",
170 "version": "2f2ec6b-master"
171 },
172 "websites-ludivine-app": {
173 "ref": "master",
174 "repo": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Ludivine",
175 "rev": "0dacc320ea052b69f79861c84bceaa89be53de60",
176 "type": "git",
177 "version": "0dacc32-master"
178 },
179 "websites-piedsjaloux-app": {
180 "ref": "master",
181 "repo": "ssh://gitolite@git.immae.eu/Pieds_jaloux/NewSite",
182 "rev": "4ee45386ad9ec9c081234a2fbde66e5b0c3294be",
183 "type": "git",
184 "version": "4ee4538-master"
185 },
186 "websites-richie-app": {
187 "ref": "master",
188 "repo": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Richie",
189 "rev": "11490d4591034deca7681aae8d9a22ca6cd8da4a",
190 "type": "git",
191 "version": "11490d4-master"
85 } 192 }
86} 193}
diff --git a/overlays/ldapvi/default.nix b/overlays/ldapvi/default.nix
index 58cd4ed..6a08ac4 100644
--- a/overlays/ldapvi/default.nix
+++ b/overlays/ldapvi/default.nix
@@ -1,7 +1,7 @@
1self: super: { 1self: super: {
2 ldapvi = super.ldapvi.overrideAttrs (old: rec { 2 ldapvi = super.ldapvi.overrideAttrs (old: rec {
3 name = "ldapvi-${version}"; 3 name = "ldapvi-${version}";
4 version = "${builtins.substring 0 7 self.sources.ldapvi.rev}-${self.sources.ldapvi.ref}"; 4 version = self.sources.overlays-ldapvi.version;
5 src = self.sources.ldapvi; 5 src = self.sources.overlays-ldapvi;
6 }); 6 });
7} 7}
diff --git a/overlays/pass/default.nix b/overlays/pass/default.nix
index 262492f..9deda77 100644
--- a/overlays/pass/default.nix
+++ b/overlays/pass/default.nix
@@ -1,8 +1,9 @@
1self: super: { 1self: super: {
2 pass = super.pass.overrideAttrs (old: 2 pass = super.pass.overrideAttrs (old: rec {
3 self.mylibs.fetchedGit ./pass.json // { 3 pname = "password-store";
4 patches = old.patches ++ [ ./pass-fix-pass-init.patch ]; 4 name = "${pname}-${version}";
5 } 5 version = self.sources.overlays-pass.version;
6 ); 6 src = self.sources.overlays-pass;
7 7 patches = old.patches ++ [ ./pass-fix-pass-init.patch ];
8 });
8} 9}
diff --git a/overlays/pass/pass.json b/overlays/pass/pass.json
deleted file mode 100644
index a4638c1..0000000
--- a/overlays/pass/pass.json
+++ /dev/null
@@ -1,14 +0,0 @@
1{
2 "tag": "d29a389-master",
3 "meta": {
4 "name": "password-store",
5 "url": "https://git.zx2c4.com/password-store/",
6 "branch": "master"
7 },
8 "git": {
9 "url": "https://git.zx2c4.com/password-store/",
10 "rev": "d29a389a40524c684595f51bb937f66958bc14ea",
11 "sha256": "17g43i0if9nggcq6005iyxxy9my8s15ihc2nzwjgqzhy3svh5xvn",
12 "fetchSubmodules": true
13 }
14}
diff --git a/pkgs/python-packages/buildbot/plugins/buildslist/buildslist.json b/pkgs/python-packages/buildbot/plugins/buildslist/buildslist.json
deleted file mode 100644
index e61d7ab..0000000
--- a/pkgs/python-packages/buildbot/plugins/buildslist/buildslist.json
+++ /dev/null
@@ -1,14 +0,0 @@
1{
2 "tag": "fb8641f-master",
3 "meta": {
4 "name": "buildslist",
5 "url": "https://git.immae.eu/perso/Immae/Projets/Buildbot/buildslist",
6 "branch": "master"
7 },
8 "git": {
9 "url": "https://git.immae.eu/perso/Immae/Projets/Buildbot/buildslist",
10 "rev": "fb8641f2badcec9f232cc5f727009911fc1c89b0",
11 "sha256": "0hgz5yaq0mz9lvfywbkbjap7z55839k18vfyg1yhx6l1mvvbq8zc",
12 "fetchSubmodules": true
13 }
14}
diff --git a/pkgs/python-packages/buildbot/plugins/buildslist/default.nix b/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
index ad87111..3f77f63 100644
--- a/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
+++ b/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
@@ -1,8 +1,8 @@
1{ mylibs, stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, fetchurl, jq, yarn, nodejs, yarn2nix-moretea }: 1{ stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, fetchurl, jq, yarn, nodejs, yarn2nix-moretea, sources }:
2let 2let
3 buildslist_src = mylibs.fetchedGit ./buildslist.json; 3 buildslist_src = sources.buildbot-plugin-buildslist;
4 packagejson = runCommand "package.json" { buildInputs = [ jq ]; } '' 4 packagejson = runCommand "package.json" { buildInputs = [ jq ]; } ''
5 cat ${buildslist_src.src}/package.json | jq -r '.version = "${pythonPackages.buildbot-pkg.version}"|.license= "MIT"' > $out 5 cat ${buildslist_src}/package.json | jq -r '.version = "${pythonPackages.buildbot-pkg.version}"|.license= "MIT"' > $out
6 ''; 6 '';
7 nodeHeaders = fetchurl { 7 nodeHeaders = fetchurl {
8 url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz"; 8 url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz";
@@ -13,7 +13,7 @@ let
13 pname = name; 13 pname = name;
14 inherit (pythonPackages.buildbot-pkg) version; 14 inherit (pythonPackages.buildbot-pkg) version;
15 packageJSON = packagejson; 15 packageJSON = packagejson;
16 yarnLock = "${buildslist_src.src}/yarn.lock"; 16 yarnLock = "${buildslist_src}/yarn.lock";
17 yarnNix = ./yarn-packages.nix; 17 yarnNix = ./yarn-packages.nix;
18 pkgConfig = { 18 pkgConfig = {
19 node-sass = { 19 node-sass = {
@@ -28,7 +28,7 @@ let
28 buildslist_bower = buildBowerComponents { 28 buildslist_bower = buildBowerComponents {
29 name = "buildslist"; 29 name = "buildslist";
30 generated = ./bower.nix; 30 generated = ./bower.nix;
31 src = "${buildslist_src.src}/guanlecoja/"; 31 src = "${buildslist_src}/guanlecoja/";
32 }; 32 };
33 # the buildbot-pkg calls yarn and screws up everything... 33 # the buildbot-pkg calls yarn and screws up everything...
34 fakeYarn = writeScriptBin "yarn" '' 34 fakeYarn = writeScriptBin "yarn" ''
@@ -57,5 +57,5 @@ pythonPackages.buildPythonPackage rec {
57 buildInputs = [ buildslist_yarn buildslist_bower ]; 57 buildInputs = [ buildslist_yarn buildslist_bower ];
58 58
59 doCheck = false; 59 doCheck = false;
60 src = buildslist_src.src; 60 src = buildslist_src;
61} 61}
diff --git a/pkgs/python-packages/buildbot/plugins/default.nix b/pkgs/python-packages/buildbot/plugins/default.nix
index 4952819..22a8507 100644
--- a/pkgs/python-packages/buildbot/plugins/default.nix
+++ b/pkgs/python-packages/buildbot/plugins/default.nix
@@ -1,7 +1,6 @@
1{ mylibs, callPackage, python }: 1{ callPackage, python }:
2{ 2{
3 buildslist = callPackage ./buildslist { 3 buildslist = callPackage ./buildslist {
4 inherit mylibs;
5 pythonPackages = python.pkgs; 4 pythonPackages = python.pkgs;
6 }; 5 };
7} 6}
diff --git a/pkgs/python-packages/default.nix b/pkgs/python-packages/default.nix
index 2616d64..9347a06 100644
--- a/pkgs/python-packages/default.nix
+++ b/pkgs/python-packages/default.nix
@@ -1,7 +1,7 @@
1{ mylibs, callPackage, python }: 1{ mylibs, callPackage, python }:
2{ 2{
3 apprise = callPackage ./apprise { inherit mylibs; pythonPackages = python.pkgs; }; 3 apprise = callPackage ./apprise { inherit mylibs; pythonPackages = python.pkgs; };
4 buildbot-plugins = callPackage ./buildbot/plugins { inherit mylibs python; }; 4 buildbot-plugins = callPackage ./buildbot/plugins { inherit python; };
5 wokkel = callPackage ./wokkel.nix { pythonPackages = python.pkgs; }; 5 wokkel = callPackage ./wokkel.nix { pythonPackages = python.pkgs; };
6 pymilter = callPackage ./pymilter.nix { pythonPackages = python.pkgs; }; 6 pymilter = callPackage ./pymilter.nix { pythonPackages = python.pkgs; };
7} 7}
diff --git a/pkgs/webapps/default.nix b/pkgs/webapps/default.nix
index 33fd730..68604f5 100644
--- a/pkgs/webapps/default.nix
+++ b/pkgs/webapps/default.nix
@@ -21,7 +21,7 @@ rec {
21 spip = callPackage ./spip {}; 21 spip = callPackage ./spip {};
22 surfer = callPackage ./surfer { inherit mylibs; }; 22 surfer = callPackage ./surfer { inherit mylibs; };
23 taskwarrior-web = callPackage ./taskwarrior-web { inherit mylibs; }; 23 taskwarrior-web = callPackage ./taskwarrior-web { inherit mylibs; };
24 ttrss = callPackage ./ttrss { inherit mylibs; }; 24 ttrss = callPackage ./ttrss {};
25 wallabag = callPackage ./wallabag { inherit composerEnv; }; 25 wallabag = callPackage ./wallabag { inherit composerEnv; };
26 yourls = callPackage ./yourls { inherit mylibs; }; 26 yourls = callPackage ./yourls { inherit mylibs; };
27} 27}
diff --git a/pkgs/webapps/mediagoblin/default.nix b/pkgs/webapps/mediagoblin/default.nix
index d348ce1..29c1981 100644
--- a/pkgs/webapps/mediagoblin/default.nix
+++ b/pkgs/webapps/mediagoblin/default.nix
@@ -1,4 +1,4 @@
1{ makeWrapper, stdenv, writeScript, fetchurl, buildBowerComponents, mylibs, which, python36, gst_all_1, automake, autoconf, nodejs, nodePackages, lib, callPackage }: 1{ makeWrapper, stdenv, writeScript, fetchurl, buildBowerComponents, mylibs, which, python36, gst_all_1, automake, autoconf, nodejs, nodePackages, lib, callPackage, sources }:
2let 2let
3 overridePython = let 3 overridePython = let
4 packageOverrides = self: super: { 4 packageOverrides = self: super: {
@@ -108,10 +108,11 @@ let
108 load_entry_point('mediagoblin', 'console_scripts', 'gmg')() 108 load_entry_point('mediagoblin', 'console_scripts', 'gmg')()
109 ) 109 )
110 ''; 110 '';
111 mediagoblinSrc = sources.webapps-mediagoblin;
111 bowerComponents = buildBowerComponents { 112 bowerComponents = buildBowerComponents {
112 name = "mediagoblin-bower-components"; 113 name = "mediagoblin-bower-components";
113 generated = ./bower-packages.nix; 114 generated = ./bower-packages.nix;
114 src = (mylibs.fetchedGit ./mediagoblin.json).src; 115 src = mediagoblinSrc;
115 }; 116 };
116 pluginNames = [ "basicsearch" ]; 117 pluginNames = [ "basicsearch" ];
117 allPlugins = lib.attrsets.genAttrs pluginNames 118 allPlugins = lib.attrsets.genAttrs pluginNames
@@ -129,7 +130,11 @@ let
129 passthru = toPassthru newMediagoblin; 130 passthru = toPassthru newMediagoblin;
130 }); 131 });
131 in newMediagoblin; 132 in newMediagoblin;
132 package = stdenv.mkDerivation (mylibs.fetchedGit ./mediagoblin.json // rec { 133 package = stdenv.mkDerivation rec {
134 pname = "mediagoblin";
135 name = "${pname}-${version}";
136 version = mediagoblinSrc.version;
137 src = mediagoblinSrc;
133 preConfigure = '' 138 preConfigure = ''
134 # ./bootstrap.sh 139 # ./bootstrap.sh
135 aclocal -I m4 --install 140 aclocal -I m4 --install
@@ -178,5 +183,5 @@ let
178 buildInputs = [ makeWrapper automake autoconf which nodePackages.bower nodejs python ]; 183 buildInputs = [ makeWrapper automake autoconf which nodePackages.bower nodejs python ];
179 propagatedBuildInputs = with gst_all_1; [ python gst-libav gst-plugins-good gst-plugins-bad gst-plugins-ugly gstreamer ]; 184 propagatedBuildInputs = with gst_all_1; [ python gst-libav gst-plugins-good gst-plugins-bad gst-plugins-ugly gstreamer ];
180 passthru = toPassthru package; 185 passthru = toPassthru package;
181 }); 186 };
182in package 187in package
diff --git a/pkgs/webapps/mediagoblin/mediagoblin.json b/pkgs/webapps/mediagoblin/mediagoblin.json
deleted file mode 100644
index 7ea72d1..0000000
--- a/pkgs/webapps/mediagoblin/mediagoblin.json
+++ /dev/null
@@ -1,14 +0,0 @@
1{
2 "tag": "cd465eb-stable",
3 "meta": {
4 "name": "mediagoblin",
5 "url": "git://git.savannah.gnu.org/mediagoblin.git",
6 "branch": "stable"
7 },
8 "git": {
9 "url": "git://git.savannah.gnu.org/mediagoblin.git",
10 "rev": "cd465ebfec837a75a44c4ebd727dffe2fff6d850",
11 "sha256": "1yz4i4i97z3rxl534a6psaybyjbyp5nnc52v3nvbpzc4pd2s69mx",
12 "fetchSubmodules": true
13 }
14}
diff --git a/pkgs/webapps/surfer/Surfer.json b/pkgs/webapps/surfer/Surfer.json
deleted file mode 100644
index 30a63ba..0000000
--- a/pkgs/webapps/surfer/Surfer.json
+++ /dev/null
@@ -1,14 +0,0 @@
1{
2 "tag": "4761773-master",
3 "meta": {
4 "name": "Surfer",
5 "url": "https://git.immae.eu/perso/Immae/Projets/Nodejs/Surfer.git",
6 "branch": "master"
7 },
8 "git": {
9 "url": "https://git.immae.eu/perso/Immae/Projets/Nodejs/Surfer.git",
10 "rev": "476177380452c9c7c5b1624805feedc824c5995e",
11 "sha256": "0ibg7hbilvlq7dw4ayawdcjhfl2nkgzfc4ra6n73y7hjasxrnm07",
12 "fetchSubmodules": true
13 }
14}
diff --git a/pkgs/webapps/surfer/default.nix b/pkgs/webapps/surfer/default.nix
index cf2a7a3..9a04da5 100644
--- a/pkgs/webapps/surfer/default.nix
+++ b/pkgs/webapps/surfer/default.nix
@@ -1,8 +1,8 @@
1{ callPackage, mylibs }: 1{ callPackage, mylibs, sources }:
2# built using node2nix -l package-lock.json 2# built using node2nix -l package-lock.json
3# and changing "./." to "src" 3# and changing "./." to "src"
4(callPackage ./node-packages.nix { 4(callPackage ./node-packages.nix {
5 inherit (mylibs) fetchedGit; 5 src = sources.webapps-surfer;
6 nodeEnv = callPackage mylibs.nodeEnv {}; 6 nodeEnv = callPackage mylibs.nodeEnv {};
7}).package.overrideAttrs(old: { 7}).package.overrideAttrs(old: {
8 postInstall = '' 8 postInstall = ''
diff --git a/pkgs/webapps/surfer/node-packages.nix b/pkgs/webapps/surfer/node-packages.nix
index e1b1a8a..a1fb5ba 100644
--- a/pkgs/webapps/surfer/node-packages.nix
+++ b/pkgs/webapps/surfer/node-packages.nix
@@ -1,6 +1,6 @@
1# This file has been generated by node2nix 1.8.0. Do not edit! 1# This file has been generated by node2nix 1.8.0. Do not edit!
2 2
3{nodeEnv, fetchedGit, fetchurl, fetchgit, globalBuildInputs ? []}: 3{nodeEnv, src, fetchurl, fetchgit, globalBuildInputs ? []}:
4 4
5let 5let
6 sources = { 6 sources = {
@@ -2061,7 +2061,7 @@ let
2061 name = "cloudron-surfer"; 2061 name = "cloudron-surfer";
2062 packageName = "cloudron-surfer"; 2062 packageName = "cloudron-surfer";
2063 version = "5.10.0"; 2063 version = "5.10.0";
2064 src = (fetchedGit ./Surfer.json).src; 2064 inherit src;
2065 dependencies = [ 2065 dependencies = [
2066 (sources."accepts-1.3.4" // { 2066 (sources."accepts-1.3.4" // {
2067 dependencies = [ 2067 dependencies = [
diff --git a/pkgs/webapps/ttrss/default.nix b/pkgs/webapps/ttrss/default.nix
index 38200a1..aeb573c 100644
--- a/pkgs/webapps/ttrss/default.nix
+++ b/pkgs/webapps/ttrss/default.nix
@@ -1,6 +1,6 @@
1{ ttrss_config ? "/etc/ttrss/config.php" 1{ ttrss_config ? "/etc/ttrss/config.php"
2, varDir ? "/var/lib/ttrss" 2, varDir ? "/var/lib/ttrss"
3, stdenv, mylibs, lib, callPackage }: 3, stdenv, lib, callPackage, sources }:
4let 4let
5 pluginNames = [ "auth_ldap" "af_feedmod" "feediron" "ff_instagram" "tumblr_gdpr_ua" ]; 5 pluginNames = [ "auth_ldap" "af_feedmod" "feediron" "ff_instagram" "tumblr_gdpr_ua" ];
6 allPlugins = lib.attrsets.genAttrs pluginNames 6 allPlugins = lib.attrsets.genAttrs pluginNames
@@ -19,7 +19,11 @@ let
19 passthru = toPassthru newTtrss (pkg.plugins ++ plugins); 19 passthru = toPassthru newTtrss (pkg.plugins ++ plugins);
20 }); 20 });
21 in newTtrss; 21 in newTtrss;
22 package = stdenv.mkDerivation (mylibs.fetchedGit ./tt-rss.json // rec { 22 package = stdenv.mkDerivation rec {
23 pname = "tt-rss";
24 version = sources.webapps-ttrss.version;
25 name = "${pname}-${version}";
26 src = sources.webapps-ttrss;
23 buildPhase = '' 27 buildPhase = ''
24 rm -rf lock feed-icons cache 28 rm -rf lock feed-icons cache
25 ln -sf ${varDir}/{lock,feed-icons,cache} . 29 ln -sf ${varDir}/{lock,feed-icons,cache} .
@@ -29,5 +33,5 @@ let
29 ln -s ${ttrss_config} $out/config.php 33 ln -s ${ttrss_config} $out/config.php
30 ''; 34 '';
31 passthru = toPassthru package []; 35 passthru = toPassthru package [];
32 }); 36 };
33in package 37in package
diff --git a/pkgs/webapps/ttrss/tt-rss.json b/pkgs/webapps/ttrss/tt-rss.json
deleted file mode 100644
index e2731b0..0000000
--- a/pkgs/webapps/ttrss/tt-rss.json
+++ /dev/null
@@ -1,14 +0,0 @@
1{
2 "tag": "986ca25-master",
3 "meta": {
4 "name": "tt-rss",
5 "url": "https://git.tt-rss.org/fox/tt-rss.git",
6 "branch": "master"
7 },
8 "git": {
9 "url": "https://git.tt-rss.org/fox/tt-rss.git",
10 "rev": "986ca251f995f7754a0470d3e0c44538a545081f",
11 "sha256": "0xkafkh7l9zazm5d6snlq03kdfxfhkb4c8fdsb32wn8b9bhdzf5s",
12 "fetchSubmodules": true
13 }
14}