aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/default.nix9
-rw-r--r--modules/private/websites/isabelle/aten_app/default.nix9
-rw-r--r--pkgs/python-packages/buildbot/plugins/buildslist/default.nix5
-rw-r--r--pkgs/webapps/grocy/default.nix6
-rw-r--r--pkgs/webapps/grocy/yarn.patch15
-rw-r--r--pkgs/webapps/mastodon/default.nix10
6 files changed, 21 insertions, 33 deletions
diff --git a/lib/default.nix b/lib/default.nix
index 86832d4..26557ed 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,15 +1,6 @@
1{ pkgs }: 1{ pkgs }:
2with pkgs; 2with pkgs;
3rec { 3rec {
4 yarn2nixPackage = let
5 src = builtins.fetchGit {
6 url = "git://github.com/moretea/yarn2nix.git";
7 ref = "master";
8 rev = "780e33a07fd821e09ab5b05223ddb4ca15ac663f";
9 };
10 in
11 (callPackage src {}) // { inherit src; };
12
13 nodeEnv = import ./node-env.nix; 4 nodeEnv = import ./node-env.nix;
14 5
15 fetchedGithub = path: 6 fetchedGithub = path:
diff --git a/modules/private/websites/isabelle/aten_app/default.nix b/modules/private/websites/isabelle/aten_app/default.nix
index 9c4e29f..1f54ba2 100644
--- a/modules/private/websites/isabelle/aten_app/default.nix
+++ b/modules/private/websites/isabelle/aten_app/default.nix
@@ -1,12 +1,12 @@
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 }: 3, mylibs, composerEnv, fetchgit, runCommand, nodejs, jq, libsass, python, fetchurl, yarn2nix-moretea }:
4let 4let
5 packagesource = mylibs.fetchedGitPrivate ./aten.json; 5 packagesource = mylibs.fetchedGitPrivate ./aten.json;
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.src}/package.json | jq -r '.version = "v1.0.0"|.name="aten"' > $out
8 ''; 8 '';
9 yarnModules = mylibs.yarn2nixPackage.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";
@@ -14,9 +14,6 @@ let
14 yarnLock = "${packagesource.src}/yarn.lock"; 14 yarnLock = "${packagesource.src}/yarn.lock";
15 yarnNix = ./yarn-packages.nix; 15 yarnNix = ./yarn-packages.nix;
16 pkgConfig = { 16 pkgConfig = {
17 all = {
18 buildInputs = [ mylibs.yarn2nixPackage.src ];
19 };
20 node-sass = { 17 node-sass = {
21 buildInputs = [ libsass python ]; 18 buildInputs = [ libsass python ];
22 postInstall = let 19 postInstall = let
@@ -46,7 +43,7 @@ let
46 rm -rf var/{log,cache} 43 rm -rf var/{log,cache}
47 ln -sf ${varDir}/{log,cache} var/ 44 ln -sf ${varDir}/{log,cache} var/
48 ''; 45 '';
49 buildInputs = [ yarnModules mylibs.yarn2nixPackage.yarn ]; 46 buildInputs = [ yarnModules yarn2nix-moretea.yarn ];
50 passthru = { 47 passthru = {
51 inherit varDir; 48 inherit varDir;
52 inherit environment; 49 inherit environment;
diff --git a/pkgs/python-packages/buildbot/plugins/buildslist/default.nix b/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
index dc6104e..273996e 100644
--- a/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
+++ b/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
@@ -1,4 +1,4 @@
1{ mylibs, stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, fetchurl, jq, yarn, nodejs }: 1{ mylibs, stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, fetchurl, jq, yarn, nodejs, yarn2nix-moretea }:
2let 2let
3 buildslist_src = mylibs.fetchedGit ./buildslist.json; 3 buildslist_src = mylibs.fetchedGit ./buildslist.json;
4 packagejson = runCommand "package.json" { buildInputs = [ jq ]; } '' 4 packagejson = runCommand "package.json" { buildInputs = [ jq ]; } ''
@@ -8,7 +8,7 @@ let
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";
9 sha256 = "1df3yhlwlvai0m9kvjyknjg11hnw0kj0rnhyzbwvsfjnmr6z8r76"; 9 sha256 = "1df3yhlwlvai0m9kvjyknjg11hnw0kj0rnhyzbwvsfjnmr6z8r76";
10 }; 10 };
11 buildslist_yarn = mylibs.yarn2nixPackage.mkYarnModules rec { 11 buildslist_yarn = yarn2nix-moretea.mkYarnModules rec {
12 name = "buildslist-yarn-modules"; 12 name = "buildslist-yarn-modules";
13 pname = name; 13 pname = name;
14 inherit (pythonPackages.buildbot-pkg) version; 14 inherit (pythonPackages.buildbot-pkg) version;
@@ -16,7 +16,6 @@ let
16 yarnLock = "${buildslist_src.src}/yarn.lock"; 16 yarnLock = "${buildslist_src.src}/yarn.lock";
17 yarnNix = ./yarn-packages.nix; 17 yarnNix = ./yarn-packages.nix;
18 pkgConfig = { 18 pkgConfig = {
19 all = { buildInputs = [ mylibs.yarn2nixPackage.src ]; };
20 node-sass = { 19 node-sass = {
21 buildInputs = [ libsass python ]; 20 buildInputs = [ libsass python ];
22 postInstall = 21 postInstall =
diff --git a/pkgs/webapps/grocy/default.nix b/pkgs/webapps/grocy/default.nix
index 3a8e55a..f87f6ec 100644
--- a/pkgs/webapps/grocy/default.nix
+++ b/pkgs/webapps/grocy/default.nix
@@ -1,4 +1,4 @@
1{ varDir ? "/var/lib/grocy", stdenv, callPackage, composerEnv, fetchurl, mylibs, runCommand, git, which, jq }: 1{ varDir ? "/var/lib/grocy", stdenv, callPackage, composerEnv, fetchurl, mylibs, runCommand, git, which, jq, yarn2nix-moretea }:
2let 2let
3 version = "2.6.1-1"; 3 version = "2.6.1-1";
4 packagesource = mylibs.fetchedGithub ./grocy.json; 4 packagesource = mylibs.fetchedGithub ./grocy.json;
@@ -11,7 +11,7 @@ let
11 cp yarn.lock $out/ 11 cp yarn.lock $out/
12 ''; 12 '';
13 }); 13 });
14 yarnModules = mylibs.yarn2nixPackage.mkYarnModules rec { 14 yarnModules = yarn2nix-moretea.mkYarnModules rec {
15 name = "grocy-yarn"; 15 name = "grocy-yarn";
16 pname = name; 16 pname = name;
17 version = version; 17 version = version;
@@ -20,7 +20,7 @@ let
20 yarnNix = ./yarn-packages.nix; 20 yarnNix = ./yarn-packages.nix;
21 pkgConfig = { 21 pkgConfig = {
22 all = { 22 all = {
23 buildInputs = [ git which mylibs.yarn2nixPackage.src ]; 23 buildInputs = [ git which ];
24 }; 24 };
25 }; 25 };
26 }; 26 };
diff --git a/pkgs/webapps/grocy/yarn.patch b/pkgs/webapps/grocy/yarn.patch
index d73bb4e..e6f318d 100644
--- a/pkgs/webapps/grocy/yarn.patch
+++ b/pkgs/webapps/grocy/yarn.patch
@@ -24,10 +24,10 @@ index 1afdf44..8acc985 100644
24 "toastr": "^2.1.4" 24 "toastr": "^2.1.4"
25 } 25 }
26diff --git a/yarn.lock b/yarn.lock 26diff --git a/yarn.lock b/yarn.lock
27index dfb3108..e96bb35 100644 27index dfb3108..7f8d761 100644
28--- a/yarn.lock 28--- a/yarn.lock
29+++ b/yarn.lock 29+++ b/yarn.lock
30@@ -2,18 +2,18 @@ 30@@ -2,18 +2,20 @@
31 # yarn lockfile v1 31 # yarn lockfile v1
32 32
33 33
@@ -35,7 +35,8 @@ index dfb3108..e96bb35 100644
35+"@danielfarrell/bootstrap-combobox@^1.1.8": 35+"@danielfarrell/bootstrap-combobox@^1.1.8":
36 version "1.1.8" 36 version "1.1.8"
37- resolved "https://github.com/berrnd/bootstrap-combobox.git#fcf0110146f4daab94888234c57d198b4ca5f129" 37- resolved "https://github.com/berrnd/bootstrap-combobox.git#fcf0110146f4daab94888234c57d198b4ca5f129"
38+ resolved "https://github.com/berrnd/bootstrap-combobox/archive/fcf0110146f4daab94888234c57d198b4ca5f129.tar.gz" 38+ resolved "https://github.com/berrnd/bootstrap-combobox/archive/fcf0110146f4daab94888234c57d198b4ca5f129.tar.gz#dummy"
39+ integrity sha512-svyqYhH2HYrgJtPhyGF/dydpERR9UIdKo7WUGcXbSnEqwSUQjcCh8ILhn+Ze0eqKf/zQCejrDrWl/578t9rz3Q==
39 40
40 "@fortawesome/fontawesome-free@^5.12.1": 41 "@fortawesome/fontawesome-free@^5.12.1":
41 version "5.12.1" 42 version "5.12.1"
@@ -46,11 +47,12 @@ index dfb3108..e96bb35 100644
46+"TagManager@^3.0.1": 47+"TagManager@^3.0.1":
47 version "3.0.1" 48 version "3.0.1"
48- resolved "https://github.com/max-favilli/tagmanager.git#b43646ef2f2373facaf21c7acc5e3eea61188d76" 49- resolved "https://github.com/max-favilli/tagmanager.git#b43646ef2f2373facaf21c7acc5e3eea61188d76"
49+ resolved "https://github.com/max-favilli/tagmanager/archive/b43646ef2f2373facaf21c7acc5e3eea61188d76.tar.gz" 50+ resolved "https://github.com/max-favilli/tagmanager/archive/b43646ef2f2373facaf21c7acc5e3eea61188d76.tar.gz#dummy"
51+ integrity sha512-lisa2KW8z+7kmPT+QAkR2FC2LGE2rCPmQ4Qt8+hF83hoTuqoc3sqpRha14oqYfCjKufXGGCdH3sQG5xdHABkTA==
50 dependencies: 52 dependencies:
51 jquery "1" 53 jquery "1"
52 54
53@@ -719,9 +719,9 @@ swagger-ui-dist@^3.23.10: 55@@ -719,9 +721,10 @@ swagger-ui-dist@^3.23.10:
54 resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.25.0.tgz#90279cdcc56e591fcfbe7b5240a9d653b989336d" 56 resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.25.0.tgz#90279cdcc56e591fcfbe7b5240a9d653b989336d"
55 integrity sha512-vwvJPPbdooTvDwLGzjIXinOXizDJJ6U1hxnJL3y6U3aL1d2MSXDmKg2139XaLBhsVZdnQJV2bOkX4reB+RXamg== 57 integrity sha512-vwvJPPbdooTvDwLGzjIXinOXizDJJ6U1hxnJL3y6U3aL1d2MSXDmKg2139XaLBhsVZdnQJV2bOkX4reB+RXamg==
56 58
@@ -58,7 +60,8 @@ index dfb3108..e96bb35 100644
58+"tempusdominus-bootstrap-4@^5.1.2": 60+"tempusdominus-bootstrap-4@^5.1.2":
59 version "5.1.2" 61 version "5.1.2"
60- resolved "https://github.com/berrnd/tempusdominus-bootstrap-4.git#2cf725fed9216cb77a298e5ce46762bfe979eaa0" 62- resolved "https://github.com/berrnd/tempusdominus-bootstrap-4.git#2cf725fed9216cb77a298e5ce46762bfe979eaa0"
61+ resolved "https://github.com/berrnd/tempusdominus-bootstrap-4/archive/2cf725fed9216cb77a298e5ce46762bfe979eaa0.tar.gz" 63+ resolved "https://github.com/berrnd/tempusdominus-bootstrap-4/archive/2cf725fed9216cb77a298e5ce46762bfe979eaa0.tar.gz#dummy"
64+ integrity sha512-xYDSn8Gb8GicQHt6Ax9VULKSviPrEm7Fpk5WpSY2qBfX1hQbDiEhBZXcWIlgVBPWQmJoUSPzLpe0B2xbOmjaeg==
62 dependencies: 65 dependencies:
63 bootstrap ">=4.1.2" 66 bootstrap ">=4.1.2"
64 jquery "^3.0" 67 jquery "^3.0"
diff --git a/pkgs/webapps/mastodon/default.nix b/pkgs/webapps/mastodon/default.nix
index 3769b67..ce015c5 100644
--- a/pkgs/webapps/mastodon/default.nix
+++ b/pkgs/webapps/mastodon/default.nix
@@ -1,15 +1,16 @@
1{ varDir ? "/var/lib/mastodon", mylibs, 1{ varDir ? "/var/lib/mastodon", mylibs,
2 stdenv, writeText, runCommand, 2 stdenv, writeText, runCommand,
3 ruby_2_6, bundlerEnv, defaultGemConfig, 3 ruby_2_6, bundlerEnv, defaultGemConfig,
4 jq, protobuf, protobufc, pkgconfig, libidn, pam, nodejs, yarn }: 4 jq, protobuf, protobufc, pkgconfig, libidn, pam, nodejs, yarn, yarn2nix-moretea }:
5let 5let
6 info = mylibs.fetchedGithub ./mastodon.json // { 6 info = mylibs.fetchedGithub ./mastodon.json // {
7 src= runCommand "mastodon-patched" { 7 src = runCommand "mastodon-patched" {
8 source = (mylibs.fetchedGithub ./mastodon.json).src; 8 source = (mylibs.fetchedGithub ./mastodon.json).src;
9 } '' 9 } ''
10 cp -a $source $out 10 cp -a $source $out
11 chmod -R u+w $out 11 chmod -R u+w $out
12 sed -i -e "/fuubar/s/2.4.0/2.4.1/" $out/Gemfile.lock 12 sed -i -e "/fuubar/s/2.4.0/2.4.1/" $out/Gemfile.lock
13 sed -i -e "s/ff00dc470b5b2d9f145a6d6e977a54de5df2b4c9/ff00dc470b5b2d9f145a6d6e977a54de5df2b4c9#4255dc41fa7df9c3a02c1595f058e248bc37b784/" $out/yarn.lock
13 ''; 14 '';
14 }; 15 };
15 gems = bundlerEnv { 16 gems = bundlerEnv {
@@ -45,7 +46,7 @@ let
45 cat ${info.src}/package.json | jq -r '.version = "${info.version}"' > $out 46 cat ${info.src}/package.json | jq -r '.version = "${info.version}"' > $out
46 ''; 47 '';
47 in 48 in
48 mylibs.yarn2nixPackage.mkYarnModules rec { 49 yarn2nix-moretea.mkYarnModules rec {
49 name = "mastodon-yarn"; 50 name = "mastodon-yarn";
50 pname = name; 51 pname = name;
51 version = info.version; 52 version = info.version;
@@ -53,9 +54,6 @@ let
53 yarnLock = "${info.src}/yarn.lock"; 54 yarnLock = "${info.src}/yarn.lock";
54 yarnNix = ./yarn-packages.nix; 55 yarnNix = ./yarn-packages.nix;
55 pkgConfig = { 56 pkgConfig = {
56 all = {
57 buildInputs = [ mylibs.yarn2nixPackage.src ];
58 };
59 uws = { 57 uws = {
60 postInstall = '' 58 postInstall = ''
61 npx node-gyp rebuild > build_log.txt 2>&1 || true 59 npx node-gyp rebuild > build_log.txt 2>&1 || true