From db343436f0e678ef3a97e6f8ac559ffa0507e422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sun, 10 May 2020 19:10:05 +0200 Subject: Migrate mylibs to niv (work in progress) --- .../buildbot/plugins/buildslist/buildslist.json | 14 -------------- .../buildbot/plugins/buildslist/default.nix | 12 ++++++------ pkgs/python-packages/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 -------------- 12 files changed, 29 insertions(+), 77 deletions(-) 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 (limited to 'pkgs') 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 - } -} -- cgit v1.2.3