From db343436f0e678ef3a97e6f8ac559ffa0507e422 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Sun, 10 May 2020 19:10:05 +0200 Subject: [PATCH] Migrate mylibs to niv (work in progress) --- lib/default.nix | 24 --- modules/private/websites/chloe/app/chloe.json | 14 -- .../private/websites/chloe/app/default.nix | 9 +- .../connexionswing/app/connexionswing.json | 14 -- .../websites/connexionswing/app/default.nix | 7 +- .../private/websites/florian/app/default.nix | 7 +- .../websites/florian/app/tellesflorian.json | 14 -- .../websites/isabelle/aten_app/aten.json | 14 -- .../websites/isabelle/aten_app/default.nix | 13 +- .../isabelle/iridologie_app/default.nix | 10 +- .../isabelle/iridologie_app/iridologie.json | 13 -- .../private/websites/ludivine/app/default.nix | 7 +- .../websites/ludivine/app/ludivinecassal.json | 14 -- .../websites/piedsjaloux/app/default.nix | 7 +- .../websites/piedsjaloux/app/piedsjaloux.json | 14 -- .../private/websites/richie/production.nix | 8 +- modules/private/websites/richie/richie.json | 14 -- nix/sources.json | 155 +++++++++++++++--- overlays/ldapvi/default.nix | 4 +- overlays/pass/default.nix | 13 +- overlays/pass/pass.json | 14 -- .../plugins/buildslist/buildslist.json | 14 -- .../buildbot/plugins/buildslist/default.nix | 12 +- .../buildbot/plugins/default.nix | 3 +- pkgs/python-packages/default.nix | 2 +- pkgs/webapps/default.nix | 2 +- pkgs/webapps/mediagoblin/default.nix | 13 +- pkgs/webapps/mediagoblin/mediagoblin.json | 14 -- pkgs/webapps/surfer/Surfer.json | 14 -- pkgs/webapps/surfer/default.nix | 4 +- pkgs/webapps/surfer/node-packages.nix | 4 +- pkgs/webapps/ttrss/default.nix | 10 +- pkgs/webapps/ttrss/tt-rss.json | 14 -- 33 files changed, 216 insertions(+), 279 deletions(-) delete mode 100644 modules/private/websites/chloe/app/chloe.json delete mode 100644 modules/private/websites/connexionswing/app/connexionswing.json delete mode 100644 modules/private/websites/florian/app/tellesflorian.json delete mode 100644 modules/private/websites/isabelle/aten_app/aten.json delete mode 100644 modules/private/websites/isabelle/iridologie_app/iridologie.json delete mode 100644 modules/private/websites/ludivine/app/ludivinecassal.json delete mode 100644 modules/private/websites/piedsjaloux/app/piedsjaloux.json delete mode 100644 modules/private/websites/richie/richie.json delete mode 100644 overlays/pass/pass.json delete mode 100644 pkgs/python-packages/buildbot/plugins/buildslist/buildslist.json delete mode 100644 pkgs/webapps/mediagoblin/mediagoblin.json delete mode 100644 pkgs/webapps/surfer/Surfer.json delete mode 100644 pkgs/webapps/ttrss/tt-rss.json 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 { name = "${pname}-${version}"; src = fetchFromGitHub json.github; }; - - fetchedGit = path: - let - json = lib.importJSON path; - in rec { - version = json.tag; - pname = json.meta.name; - name = "${pname}-${version}"; - src = fetchgit json.git; - }; - - fetchedGitPrivate = path: - let - json = lib.importJSON path; - in rec { - version = json.tag; - pname = json.meta.name; - name = "${pname}-${version}"; - src = builtins.fetchGit { - url = json.git.url; - ref = "master"; - rev = json.git.rev; - }; - }; } // (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 @@ -{ - "tag": "882f166-master", - "meta": { - "name": "chloe", - "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Chloe", - "branch": "master" - }, - "git": { - "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Chloe", - "rev": "882f166999a59081ad896f26318e6a04db9f9f43", - "sha256": "131095y1bjnslipq90w9345cmgyk2bfiz5pfpkbg1jbj2ypl4haj", - "fetchSubmodules": true - } -} 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 @@ { environment ? "prod" , varDir ? "/var/lib/chloe_${environment}" -, spip, stdenv, mylibs, sassc }: +, spip, stdenv, sassc, sources }: let - siteDir = stdenv.mkDerivation (mylibs.fetchedGitPrivate ./chloe.json // rec { + siteDir = stdenv.mkDerivation { + version = sources.websites-chloe-app.version; + pname = "chloe"; + src = sources.websites-chloe-app; buildPhase = '' make ''; @@ -10,7 +13,7 @@ let cp -a . $out ''; buildInputs = [ sassc ]; - }); + }; in spip.override { 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 @@ -{ - "tag": "ed58743-master", - "meta": { - "name": "connexionswing", - "url": "ssh://gitolite@git.immae.eu/perso/Immae/Projets/Connexionswing", - "branch": "master" - }, - "git": { - "url": "ssh://gitolite@git.immae.eu/perso/Immae/Projets/Connexionswing", - "rev": "ed5874396d35766e0810a6d4e78e1a8f6b170835", - "sha256": "1cjjl24j5di7f9xagm3xk2y80jga6kf3q9zws185jkrwwp3xmfhf", - "fetchSubmodules": true - } -} 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 @@ { environment ? "prod" , varDir ? "/var/lib/connexionswing_${environment}" , secretsPath ? "/var/secrets/webapps/${environment}-connexionswing" -, composerEnv, fetchurl, fetchgit, mylibs }: +, composerEnv, fetchurl, fetchgit, sources }: let app = composerEnv.buildPackage ( import ./php-packages.nix { inherit composerEnv fetchurl fetchgit; } // - mylibs.fetchedGitPrivate ./connexionswing.json // rec { + pname = "connexionswing"; + name = "${pname}-${version}"; + version = sources.websites-connexionswing-app.version; + src = sources.websites-connexionswing-app; noDev = (environment == "prod"); preInstall = '' 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 @@ { environment ? "prod" , varDir ? "/var/lib/tellesflorian_${environment}" , secretsPath ? "/var/secrets/webapps/${environment}-tellesflorian" -, composerEnv, fetchurl, mylibs }: +, composerEnv, fetchurl, sources }: let app = composerEnv.buildPackage ( import ./php-packages.nix { inherit composerEnv fetchurl; } // - mylibs.fetchedGitPrivate ./tellesflorian.json // rec { + version = sources.websites-florian-app.version; + pname = "tellesflorian"; + name = "${pname}-${version}"; + src = sources.websites-florian-app; noDev = (environment == "prod"); preInstall = '' 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 @@ -{ - "tag": "1793d5c-master", - "meta": { - "name": "tellesflorian", - "url": "ssh://gitolite@git.immae.eu/perso/florian_telles/stabilo", - "branch": "master" - }, - "git": { - "url": "ssh://gitolite@git.immae.eu/perso/florian_telles/stabilo", - "rev": "1793d5c7912d1b20ad1df1ac59be9d7f1220e919", - "sha256": "1zhxcrbglbjb6xfr8sfm4m2miabbkkb0a7543va3b5akrn6yk0cb", - "fetchSubmodules": true - } -} 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 @@ -{ - "tag": "b99537f-master", - "meta": { - "name": "aten", - "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Aten", - "branch": "master" - }, - "git": { - "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Aten", - "rev": "b99537fdad41291afb4f1bb8b2e2aa4081c71fae", - "sha256": "15mlyik6zivxwry6zc906bqnivxhby27yr8kj4lg5n68pvb877dn", - "fetchSubmodules": true - } -} 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 @@ { environment ? "prod" , varDir ? "/var/lib/aten_${environment}" -, mylibs, composerEnv, fetchgit, runCommand, nodejs, jq, libsass, python, fetchurl, yarn2nix-moretea }: +, composerEnv, fetchgit, runCommand, nodejs, jq, libsass, python, fetchurl, yarn2nix-moretea, sources }: let - packagesource = mylibs.fetchedGitPrivate ./aten.json; + packagesource = sources.websites-isabelle-aten; packagejson = runCommand "package.json" { buildInputs = [ jq ]; } '' - cat ${packagesource.src}/package.json | jq -r '.version = "v1.0.0"|.name="aten"' > $out + cat ${packagesource}/package.json | jq -r '.version = "v1.0.0"|.name="aten"' > $out ''; yarnModules = yarn2nix-moretea.mkYarnModules rec { name = "aten-yarn"; pname = name; version = "v1.0.0"; packageJSON = packagejson; - yarnLock = "${packagesource.src}/yarn.lock"; + yarnLock = "${packagesource}/yarn.lock"; yarnNix = ./yarn-packages.nix; pkgConfig = { node-sass = { @@ -30,8 +30,11 @@ let }; app = composerEnv.buildPackage ( import ./php-packages.nix { inherit composerEnv fetchurl fetchgit; } // - packagesource // rec { + version = packagesource.version; + pname = "aten"; + name = "${pname}-${version}"; + src = packagesource; noDev = (environment == "prod"); preInstall = '' 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 @@ { environment ? "prod" , varDir ? "/var/lib/iridologie_${environment}" -, spip, stdenv, mylibs, sassc }: +, spip, stdenv, sassc, sources }: let - siteDir = stdenv.mkDerivation (mylibs.fetchedGitPrivate ./iridologie.json // rec { + siteDir = stdenv.mkDerivation rec { + version = sources.websites-isabelle-iridologie.version; + pname = "iridologie"; + name = "${pname}-${version}"; + src = sources.websites-isabelle-iridologie; installPhase = '' cp -a . $out ''; - }); + }; in spip.override { 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 @@ -{ - "tag": "2f2ec6b-master", - "meta": { - "name": "iridologie", - "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Iridologie", - "branch": "master" - }, - "git": { - "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Iridologie", - "rev": "2f2ec6b003f4de97e9f8651db540c9114ac877c2", - "fetchSubmodules": true - } -} 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 @@ { environment ? "prod" , varDir ? "/var/lib/ludivinecassal_${environment}" , secretsPath ? "/var/secrets/webapps/${environment}-ludivinecassal" -, composerEnv, fetchurl, fetchgit, imagemagick, sass, ruby, mylibs }: +, composerEnv, fetchurl, fetchgit, imagemagick, sass, ruby, sources }: let app = composerEnv.buildPackage ( import ./php-packages.nix { inherit composerEnv fetchurl fetchgit; } // - mylibs.fetchedGitPrivate ./ludivinecassal.json // rec { + name = "${pname}-${version}"; + pname = "ludivinecassal"; + version = sources.websites-ludivine-app.version; + src = sources.websites-ludivine-app; noDev = (environment == "prod"); preInstall = '' 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 @@ -{ - "tag": "0dacc32-master", - "meta": { - "name": "ludivinecassal", - "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Ludivine", - "branch": "master" - }, - "git": { - "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Ludivine", - "rev": "0dacc320ea052b69f79861c84bceaa89be53de60", - "sha256": "10khg1fq9ixly3xak591n3v0rv3f2hn91rd46d75yv3wjxaj1c2d", - "fetchSubmodules": true - } -} 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 @@ { environment ? "prod" , varDir ? "/var/lib/piedsjaloux_${environment}" , secretsPath ? "/var/secrets/webapps/${environment}-piedsjaloux" -, composerEnv, fetchurl, fetchgit, mylibs }: +, composerEnv, fetchurl, fetchgit, sources }: let app = composerEnv.buildPackage ( import ./php-packages.nix { inherit composerEnv fetchurl fetchgit; } // - mylibs.fetchedGitPrivate ./piedsjaloux.json // rec { + version = sources.websites-piedsjaloux-app.version; + pname = "piedsjaloux"; + name = "${pname}-${version}"; + src = sources.websites-piedsjaloux-app; noDev = (environment == "prod"); preInstall = '' 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 @@ -{ - "tag": "4ee4538-master", - "meta": { - "name": "piedsjaloux", - "url": "ssh://gitolite@git.immae.eu/Pieds_jaloux/NewSite", - "branch": "master" - }, - "git": { - "url": "ssh://gitolite@git.immae.eu/Pieds_jaloux/NewSite", - "rev": "4ee45386ad9ec9c081234a2fbde66e5b0c3294be", - "sha256": "10a41chh4crn95z6lk6nhkx27089djkngypa9m76bg7ph508mvnq", - "fetchSubmodules": true - } -} 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 @@ let cfg = config.myServices.websites.richie.production; vardir = "/var/lib/richie_production"; - richieSrc = pkgs.stdenv.mkDerivation (pkgs.mylibs.fetchedGitPrivate ./richie.json // { + richieSrc = pkgs.stdenv.mkDerivation rec { + version = pkgs.sources.websites-richie-app.version; + pname = "richie"; + name = "${pname}-${version}"; + src = pkgs.sources.websites-richie-app; phases = "installPhase"; installPhase = '' cp -a $src $out @@ -12,7 +16,7 @@ let ln -sf ${vardir}/photos $out/ sed -i "s@localedef --list-archive@localedef --list-archive /run/current-system/sw/lib/locale/locale-archive@" $out/admin/parametres.php ''; - }); + }; webappdir = config.services.websites.webappDirsPaths.richie_production; secretPath = config.secrets.fullPaths."websites/richie/production"; 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 @@ -{ - "tag": "11490d4-master", - "meta": { - "name": "richie", - "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Richie", - "branch": "master" - }, - "git": { - "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Richie", - "rev": "11490d4591034deca7681aae8d9a22ca6cd8da4a", - "sha256": "1rlq5qkbaw9n7yxhyvvimrizwkpqlhhsc8mhipzxlwk1si81fci1", - "fetchSubmodules": true - } -} 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 @@ { - "ldapvi": { + "buildbot-cours-deps": { "ref": "master", - "repo": "http://www.lichteblau.com/git/ldapvi.git", - "rev": "f1d42bad66cc4623d1ff21fbd5dddbf5009d3e40", + "repo": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Cours", + "rev": "33f139f2e2ea0a16b8ed813c5436e5a5bb506f6d", + "type": "git" + }, + "buildbot-cours-nixpkgs": { + "branch": "nixos-unstable", + "description": "Frozen nixpkgs snapshot for texlive", + "homepage": "https://github.com/NixOS/nixpkgs", + "owner": "NixOS", + "repo": "nixpkgs-channels", + "rev": "fce7562cf46727fdaf801b232116bc9ce0512049", + "sha256": "14rvi69ji61x3z88vbn17rg5vxrnw2wbnanxb7y0qzyqrj7spapx", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs-channels/archive/fce7562cf46727fdaf801b232116bc9ce0512049.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, + "buildbot-normalesup-deps": { + "ref": "master", + "repo": "ssh://gitolite@git.immae.eu/perso/Immae/Projets/Sites/Normalesup", + "rev": "de294da4027e80a7b8bf7ec8c393ca0b60218575", "type": "git" }, + "buildbot-normalesup-nixpkgs": { + "description": "Frozen nixpkgs snapshot for texlive", + "revision": "173017.85f820d6e41", + "sha256": "0fs390gvz8d3n7v4zj538gf3n1b14sikbf0ijrxgxib5i0704mdb", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/19.03/nixos-19.03.173017.85f820d6e41/nixexprs.tar.xz", + "url_template": "https://releases.nixos.org/nixos//nixos-./nixexprs.tar.xz", + "version": "19.03" + }, + "buildbot-plugin-buildslist": { + "ref": "master", + "repo": "https://git.immae.eu/perso/Immae/Projets/Buildbot/buildslist", + "rev": "fb8641f2badcec9f232cc5f727009911fc1c89b0", + "type": "git", + "version": "f1d42ba-master" + }, "niv": { "branch": "master", "description": "Easy dependency management for Nix projects", @@ -23,30 +57,12 @@ "homepage": "https://github.com/NixOS/nixpkgs", "owner": "NixOS", "repo": "nixpkgs-channels", - "rev": "ae6bdcc53584aaf20211ce1814bea97ece08a248", - "sha256": "0hjhznns1cxgl3hww2d5si6vhy36pnm53hms9h338v6r633dcy77", + "rev": "fce7562cf46727fdaf801b232116bc9ce0512049", + "sha256": "14rvi69ji61x3z88vbn17rg5vxrnw2wbnanxb7y0qzyqrj7spapx", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs-channels/archive/ae6bdcc53584aaf20211ce1814bea97ece08a248.tar.gz", + "url": "https://github.com/NixOS/nixpkgs-channels/archive/fce7562cf46727fdaf801b232116bc9ce0512049.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, - "nixpkgs-buildbot-cours": { - "description": "Frozen nixpkgs snapshot for texlive", - "revision": "173017.85f820d6e41", - "sha256": "0fs390gvz8d3n7v4zj538gf3n1b14sikbf0ijrxgxib5i0704mdb", - "type": "tarball", - "url": "https://releases.nixos.org/nixos/19.03/nixos-19.03.173017.85f820d6e41/nixexprs.tar.xz", - "url_template": "https://releases.nixos.org/nixos//nixos-./nixexprs.tar.xz", - "version": "19.03" - }, - "nixpkgs-buildbot-normalesup": { - "description": "Frozen nixpkgs snapshot for texlive", - "revision": "173017.85f820d6e41", - "sha256": "0fs390gvz8d3n7v4zj538gf3n1b14sikbf0ijrxgxib5i0704mdb", - "type": "tarball", - "url": "https://releases.nixos.org/nixos/19.03/nixos-19.03.173017.85f820d6e41/nixexprs.tar.xz", - "url_template": "https://releases.nixos.org/nixos//nixos-./nixexprs.tar.xz", - "version": "19.03" - }, "nixpkgs-nixops": { "branch": "nixos-unstable", "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to", @@ -82,5 +98,96 @@ "type": "tarball", "url": "https://github.com/NixOS/nixpkgs-channels/archive/34c7eb7545d155cc5b6f499b23a7cb1c96ab4d59.tar.gz", "url_template": "https://github.com///archive/.tar.gz" + }, + "overlays-ldapvi": { + "ref": "master", + "repo": "http://www.lichteblau.com/git/ldapvi.git", + "rev": "f1d42bad66cc4623d1ff21fbd5dddbf5009d3e40", + "type": "git", + "version": "f1d42ba-master" + }, + "overlays-pass": { + "ref": "master", + "repo": "https://git.zx2c4.com/password-store/", + "rev": "d29a389a40524c684595f51bb937f66958bc14ea", + "type": "git", + "version": "d29a389-master" + }, + "webapps-mediagoblin": { + "ref": "stable", + "repo": "git://git.savannah.gnu.org/mediagoblin.git", + "rev": "cd465ebfec837a75a44c4ebd727dffe2fff6d850", + "type": "git", + "version": "cd465eb-stable" + }, + "webapps-surfer": { + "ref": "master", + "repo": "https://git.immae.eu/perso/Immae/Projets/Nodejs/Surfer.git", + "rev": "476177380452c9c7c5b1624805feedc824c5995e", + "type": "git", + "version": "4761773-master" + }, + "webapps-ttrss": { + "ref": "master", + "repo": "https://git.tt-rss.org/fox/tt-rss.git", + "rev": "986ca251f995f7754a0470d3e0c44538a545081f", + "type": "git", + "version": "986ca25-master" + }, + "websites-chloe-app": { + "ref": "master", + "repo": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Chloe", + "rev": "882f166999a59081ad896f26318e6a04db9f9f43", + "type": "git", + "version": "882f166-master" + }, + "websites-connexionswing-app": { + "ref": "master", + "repo": "ssh://gitolite@git.immae.eu/perso/Immae/Projets/Connexionswing", + "rev": "ed5874396d35766e0810a6d4e78e1a8f6b170835", + "type": "git", + "version": "ed58743-master" + }, + "websites-florian-app": { + "ref": "master", + "repo": "ssh://gitolite@git.immae.eu/perso/florian_telles/stabilo", + "rev": "1793d5c7912d1b20ad1df1ac59be9d7f1220e919", + "type": "git", + "version": "1793d5c-master" + }, + "websites-isabelle-aten": { + "ref": "master", + "repo": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Aten", + "rev": "b99537fdad41291afb4f1bb8b2e2aa4081c71fae", + "type": "git", + "version": "b99537f-master" + }, + "websites-isabelle-iridologie": { + "ref": "master", + "repo": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Iridologie", + "rev": "2f2ec6b003f4de97e9f8651db540c9114ac877c2", + "type": "git", + "version": "2f2ec6b-master" + }, + "websites-ludivine-app": { + "ref": "master", + "repo": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Ludivine", + "rev": "0dacc320ea052b69f79861c84bceaa89be53de60", + "type": "git", + "version": "0dacc32-master" + }, + "websites-piedsjaloux-app": { + "ref": "master", + "repo": "ssh://gitolite@git.immae.eu/Pieds_jaloux/NewSite", + "rev": "4ee45386ad9ec9c081234a2fbde66e5b0c3294be", + "type": "git", + "version": "4ee4538-master" + }, + "websites-richie-app": { + "ref": "master", + "repo": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Richie", + "rev": "11490d4591034deca7681aae8d9a22ca6cd8da4a", + "type": "git", + "version": "11490d4-master" } } 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 @@ self: super: { ldapvi = super.ldapvi.overrideAttrs (old: rec { name = "ldapvi-${version}"; - version = "${builtins.substring 0 7 self.sources.ldapvi.rev}-${self.sources.ldapvi.ref}"; - src = self.sources.ldapvi; + version = self.sources.overlays-ldapvi.version; + src = self.sources.overlays-ldapvi; }); } 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 @@ self: super: { - pass = super.pass.overrideAttrs (old: - self.mylibs.fetchedGit ./pass.json // { - patches = old.patches ++ [ ./pass-fix-pass-init.patch ]; - } - ); - + pass = super.pass.overrideAttrs (old: rec { + pname = "password-store"; + name = "${pname}-${version}"; + version = self.sources.overlays-pass.version; + src = self.sources.overlays-pass; + patches = old.patches ++ [ ./pass-fix-pass-init.patch ]; + }); } 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 @@ -{ - "tag": "d29a389-master", - "meta": { - "name": "password-store", - "url": "https://git.zx2c4.com/password-store/", - "branch": "master" - }, - "git": { - "url": "https://git.zx2c4.com/password-store/", - "rev": "d29a389a40524c684595f51bb937f66958bc14ea", - "sha256": "17g43i0if9nggcq6005iyxxy9my8s15ihc2nzwjgqzhy3svh5xvn", - "fetchSubmodules": true - } -} 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 @@ -{ - "tag": "fb8641f-master", - "meta": { - "name": "buildslist", - "url": "https://git.immae.eu/perso/Immae/Projets/Buildbot/buildslist", - "branch": "master" - }, - "git": { - "url": "https://git.immae.eu/perso/Immae/Projets/Buildbot/buildslist", - "rev": "fb8641f2badcec9f232cc5f727009911fc1c89b0", - "sha256": "0hgz5yaq0mz9lvfywbkbjap7z55839k18vfyg1yhx6l1mvvbq8zc", - "fetchSubmodules": true - } -} 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 @@ -{ mylibs, stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, fetchurl, jq, yarn, nodejs, yarn2nix-moretea }: +{ stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, fetchurl, jq, yarn, nodejs, yarn2nix-moretea, sources }: let - buildslist_src = mylibs.fetchedGit ./buildslist.json; + buildslist_src = sources.buildbot-plugin-buildslist; packagejson = runCommand "package.json" { buildInputs = [ jq ]; } '' - cat ${buildslist_src.src}/package.json | jq -r '.version = "${pythonPackages.buildbot-pkg.version}"|.license= "MIT"' > $out + cat ${buildslist_src}/package.json | jq -r '.version = "${pythonPackages.buildbot-pkg.version}"|.license= "MIT"' > $out ''; nodeHeaders = fetchurl { url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz"; @@ -13,7 +13,7 @@ let pname = name; inherit (pythonPackages.buildbot-pkg) version; packageJSON = packagejson; - yarnLock = "${buildslist_src.src}/yarn.lock"; + yarnLock = "${buildslist_src}/yarn.lock"; yarnNix = ./yarn-packages.nix; pkgConfig = { node-sass = { @@ -28,7 +28,7 @@ let buildslist_bower = buildBowerComponents { name = "buildslist"; generated = ./bower.nix; - src = "${buildslist_src.src}/guanlecoja/"; + src = "${buildslist_src}/guanlecoja/"; }; # the buildbot-pkg calls yarn and screws up everything... fakeYarn = writeScriptBin "yarn" '' @@ -57,5 +57,5 @@ pythonPackages.buildPythonPackage rec { buildInputs = [ buildslist_yarn buildslist_bower ]; doCheck = false; - src = buildslist_src.src; + src = buildslist_src; } 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 @@ -{ mylibs, callPackage, python }: +{ callPackage, python }: { buildslist = callPackage ./buildslist { - inherit mylibs; pythonPackages = python.pkgs; }; } 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 @@ { mylibs, callPackage, python }: { apprise = callPackage ./apprise { inherit mylibs; pythonPackages = python.pkgs; }; - buildbot-plugins = callPackage ./buildbot/plugins { inherit mylibs python; }; + buildbot-plugins = callPackage ./buildbot/plugins { inherit python; }; wokkel = callPackage ./wokkel.nix { pythonPackages = python.pkgs; }; pymilter = callPackage ./pymilter.nix { pythonPackages = python.pkgs; }; } 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 { spip = callPackage ./spip {}; surfer = callPackage ./surfer { inherit mylibs; }; taskwarrior-web = callPackage ./taskwarrior-web { inherit mylibs; }; - ttrss = callPackage ./ttrss { inherit mylibs; }; + ttrss = callPackage ./ttrss {}; wallabag = callPackage ./wallabag { inherit composerEnv; }; yourls = callPackage ./yourls { inherit mylibs; }; } 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 @@ -{ makeWrapper, stdenv, writeScript, fetchurl, buildBowerComponents, mylibs, which, python36, gst_all_1, automake, autoconf, nodejs, nodePackages, lib, callPackage }: +{ makeWrapper, stdenv, writeScript, fetchurl, buildBowerComponents, mylibs, which, python36, gst_all_1, automake, autoconf, nodejs, nodePackages, lib, callPackage, sources }: let overridePython = let packageOverrides = self: super: { @@ -108,10 +108,11 @@ let load_entry_point('mediagoblin', 'console_scripts', 'gmg')() ) ''; + mediagoblinSrc = sources.webapps-mediagoblin; bowerComponents = buildBowerComponents { name = "mediagoblin-bower-components"; generated = ./bower-packages.nix; - src = (mylibs.fetchedGit ./mediagoblin.json).src; + src = mediagoblinSrc; }; pluginNames = [ "basicsearch" ]; allPlugins = lib.attrsets.genAttrs pluginNames @@ -129,7 +130,11 @@ let passthru = toPassthru newMediagoblin; }); in newMediagoblin; - package = stdenv.mkDerivation (mylibs.fetchedGit ./mediagoblin.json // rec { + package = stdenv.mkDerivation rec { + pname = "mediagoblin"; + name = "${pname}-${version}"; + version = mediagoblinSrc.version; + src = mediagoblinSrc; preConfigure = '' # ./bootstrap.sh aclocal -I m4 --install @@ -178,5 +183,5 @@ let buildInputs = [ makeWrapper automake autoconf which nodePackages.bower nodejs python ]; propagatedBuildInputs = with gst_all_1; [ python gst-libav gst-plugins-good gst-plugins-bad gst-plugins-ugly gstreamer ]; passthru = toPassthru package; - }); + }; in 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 @@ -{ - "tag": "cd465eb-stable", - "meta": { - "name": "mediagoblin", - "url": "git://git.savannah.gnu.org/mediagoblin.git", - "branch": "stable" - }, - "git": { - "url": "git://git.savannah.gnu.org/mediagoblin.git", - "rev": "cd465ebfec837a75a44c4ebd727dffe2fff6d850", - "sha256": "1yz4i4i97z3rxl534a6psaybyjbyp5nnc52v3nvbpzc4pd2s69mx", - "fetchSubmodules": true - } -} 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 @@ -{ - "tag": "4761773-master", - "meta": { - "name": "Surfer", - "url": "https://git.immae.eu/perso/Immae/Projets/Nodejs/Surfer.git", - "branch": "master" - }, - "git": { - "url": "https://git.immae.eu/perso/Immae/Projets/Nodejs/Surfer.git", - "rev": "476177380452c9c7c5b1624805feedc824c5995e", - "sha256": "0ibg7hbilvlq7dw4ayawdcjhfl2nkgzfc4ra6n73y7hjasxrnm07", - "fetchSubmodules": true - } -} 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 @@ -{ callPackage, mylibs }: +{ callPackage, mylibs, sources }: # built using node2nix -l package-lock.json # and changing "./." to "src" (callPackage ./node-packages.nix { - inherit (mylibs) fetchedGit; + src = sources.webapps-surfer; nodeEnv = callPackage mylibs.nodeEnv {}; }).package.overrideAttrs(old: { 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 @@ # This file has been generated by node2nix 1.8.0. Do not edit! -{nodeEnv, fetchedGit, fetchurl, fetchgit, globalBuildInputs ? []}: +{nodeEnv, src, fetchurl, fetchgit, globalBuildInputs ? []}: let sources = { @@ -2061,7 +2061,7 @@ let name = "cloudron-surfer"; packageName = "cloudron-surfer"; version = "5.10.0"; - src = (fetchedGit ./Surfer.json).src; + inherit src; dependencies = [ (sources."accepts-1.3.4" // { 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 @@ { ttrss_config ? "/etc/ttrss/config.php" , varDir ? "/var/lib/ttrss" -, stdenv, mylibs, lib, callPackage }: +, stdenv, lib, callPackage, sources }: let pluginNames = [ "auth_ldap" "af_feedmod" "feediron" "ff_instagram" "tumblr_gdpr_ua" ]; allPlugins = lib.attrsets.genAttrs pluginNames @@ -19,7 +19,11 @@ let passthru = toPassthru newTtrss (pkg.plugins ++ plugins); }); in newTtrss; - package = stdenv.mkDerivation (mylibs.fetchedGit ./tt-rss.json // rec { + package = stdenv.mkDerivation rec { + pname = "tt-rss"; + version = sources.webapps-ttrss.version; + name = "${pname}-${version}"; + src = sources.webapps-ttrss; buildPhase = '' rm -rf lock feed-icons cache ln -sf ${varDir}/{lock,feed-icons,cache} . @@ -29,5 +33,5 @@ let ln -s ${ttrss_config} $out/config.php ''; passthru = toPassthru package []; - }); + }; in 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 @@ -{ - "tag": "986ca25-master", - "meta": { - "name": "tt-rss", - "url": "https://git.tt-rss.org/fox/tt-rss.git", - "branch": "master" - }, - "git": { - "url": "https://git.tt-rss.org/fox/tt-rss.git", - "rev": "986ca251f995f7754a0470d3e0c44538a545081f", - "sha256": "0xkafkh7l9zazm5d6snlq03kdfxfhkb4c8fdsb32wn8b9bhdzf5s", - "fetchSubmodules": true - } -} -- 2.41.0