aboutsummaryrefslogtreecommitdiff
path: root/pkgs
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/python-packages/buildbot/plugins/buildslist/default.nix14
-rw-r--r--pkgs/status_engine/worker.nix7
-rw-r--r--pkgs/webapps/mediagoblin/default.nix29
-rw-r--r--pkgs/webapps/peertube/default.nix11
4 files changed, 46 insertions, 15 deletions
diff --git a/pkgs/python-packages/buildbot/plugins/buildslist/default.nix b/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
index 3f77f63..4ab4c54 100644
--- a/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
+++ b/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
@@ -1,14 +1,18 @@
1{ stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, fetchurl, jq, yarn, nodejs, yarn2nix-moretea, sources }: 1{ stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, fetchurl, jq, yarn, nodejs-10_x, yarn2nix-moretea, sources }:
2let 2let
3 yarn2nix-moretea' = yarn2nix-moretea.override({
4 yarn = yarn.override({ nodejs = nodejs-10_x; });
5 nodejs = nodejs-10_x;
6 });
3 buildslist_src = sources.buildbot-plugin-buildslist; 7 buildslist_src = sources.buildbot-plugin-buildslist;
4 packagejson = runCommand "package.json" { buildInputs = [ jq ]; } '' 8 packagejson = runCommand "package.json" { buildInputs = [ jq ]; } ''
5 cat ${buildslist_src}/package.json | jq -r '.version = "${pythonPackages.buildbot-pkg.version}"|.license= "MIT"' > $out 9 cat ${buildslist_src}/package.json | jq -r '.version = "${pythonPackages.buildbot-pkg.version}"|.license= "MIT"' > $out
6 ''; 10 '';
7 nodeHeaders = fetchurl { 11 nodeHeaders = fetchurl {
8 url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz"; 12 url = "https://nodejs.org/download/release/v${nodejs-10_x.version}/node-v${nodejs-10_x.version}-headers.tar.gz";
9 sha256 = "1prvrcvbyal39k9axfwjixs4wfgs1m8xy4prsl0kq0s0n7r7nxzj"; 13 sha256 = "15hkcbs328d3rc1s14rmky8lh8d3rr86l8k0bia0ggxzwl23lj9c";
10 }; 14 };
11 buildslist_yarn = yarn2nix-moretea.mkYarnModules rec { 15 buildslist_yarn = yarn2nix-moretea'.mkYarnModules rec {
12 name = "buildslist-yarn-modules"; 16 name = "buildslist-yarn-modules";
13 pname = name; 17 pname = name;
14 inherit (pythonPackages.buildbot-pkg) version; 18 inherit (pythonPackages.buildbot-pkg) version;
@@ -53,7 +57,7 @@ pythonPackages.buildPythonPackage rec {
53 (klein.overridePythonAttrs(old: { checkPhase = ""; })) 57 (klein.overridePythonAttrs(old: { checkPhase = ""; }))
54 buildbot-pkg 58 buildbot-pkg
55 ]; 59 ];
56 nativeBuildInputs = [ fakeYarn nodejs ]; 60 nativeBuildInputs = [ fakeYarn nodejs-10_x ];
57 buildInputs = [ buildslist_yarn buildslist_bower ]; 61 buildInputs = [ buildslist_yarn buildslist_bower ];
58 62
59 doCheck = false; 63 doCheck = false;
diff --git a/pkgs/status_engine/worker.nix b/pkgs/status_engine/worker.nix
index 6c14449..1232303 100644
--- a/pkgs/status_engine/worker.nix
+++ b/pkgs/status_engine/worker.nix
@@ -1,7 +1,6 @@
1{ stdenv, mylibs, composerEnv, fetchurl, gearmand, callPackage, php73, php73base, config_file ? "/var/lib/status_engine/ui.yml" }: 1{ stdenv, mylibs, composerEnv, fetchurl, gearmand, callPackage, php73, config_file ? "/var/lib/status_engine/ui.yml" }:
2let 2let
3 # FIXME: present in php73.buildPecl in latest nixpkgs-unstable 3 gearman = php73.buildPecl rec {
4 gearman = (callPackage <nixpkgs/pkgs/build-support/build-pecl.nix> { php = php73base; }) rec {
5 version = "2.0.6"; 4 version = "2.0.6";
6 pname = "gearman"; 5 pname = "gearman";
7 src = fetchurl { 6 src = fetchurl {
@@ -13,7 +12,7 @@ let
13 }; 12 };
14in 13in
15(composerEnv.override { 14(composerEnv.override {
16 php = php73.withExtensions(e: php73.enabledExtensions ++ (with php73.extensions; [gearman redis mbstring bcmath json iconv])); 15 php = php73.withExtensions({ enabled, all }: enabled ++ (with all; [gearman redis mbstring bcmath json iconv]));
17}).buildPackage (mylibs.fetchedGithub ./worker.json // 16}).buildPackage (mylibs.fetchedGithub ./worker.json //
18 import ./worker_php_packages.nix { inherit composerEnv fetchurl; } // rec { 17 import ./worker_php_packages.nix { inherit composerEnv fetchurl; } // rec {
19 postInstall = '' 18 postInstall = ''
diff --git a/pkgs/webapps/mediagoblin/default.nix b/pkgs/webapps/mediagoblin/default.nix
index 29c1981..22cb292 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, sources }: 1{ makeWrapper, stdenv, writeScript, fetchurl, buildBowerComponents, mylibs, which, python36, gst_all_1, automake, autoconf, nodejs, nodePackages, lib, callPackage, fetchgit }:
2let 2let
3 overridePython = let 3 overridePython = let
4 packageOverrides = self: super: { 4 packageOverrides = self: super: {
@@ -38,6 +38,7 @@ let
38 inherit (old) pname; 38 inherit (old) pname;
39 sha256 = "2dea4d16d073c902c3b89d9b96620fb6729ac0f7a923bbc777cb4ad827c0c61a"; 39 sha256 = "2dea4d16d073c902c3b89d9b96620fb6729ac0f7a923bbc777cb4ad827c0c61a";
40 }; 40 };
41 doCheck = false;
41 }); 42 });
42 kombu = super.kombu.overridePythonAttrs(old: rec { 43 kombu = super.kombu.overridePythonAttrs(old: rec {
43 version = "3.0.37"; 44 version = "3.0.37";
@@ -49,6 +50,14 @@ let
49 propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.anyjson ]; 50 propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.anyjson ];
50 doCheck = false; 51 doCheck = false;
51 }); 52 });
53 markdown = super.markdown.overridePythonAttrs(old: rec {
54 version = "3.1.1";
55 src = self.fetchPypi {
56 inherit version;
57 inherit (old) pname;
58 sha256 = "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a";
59 };
60 });
52 sqlalchemy = super.sqlalchemy.overridePythonAttrs(old: rec { 61 sqlalchemy = super.sqlalchemy.overridePythonAttrs(old: rec {
53 version = "1.1.18"; 62 version = "1.1.18";
54 src = self.fetchPypi { 63 src = self.fetchPypi {
@@ -74,6 +83,14 @@ let
74 }; 83 };
75 propagatedBuildInputs = with self; [ six paste PasteDeploy ]; 84 propagatedBuildInputs = with self; [ six paste PasteDeploy ];
76 }); 85 });
86 werkzeug = super.werkzeug.overridePythonAttrs(old: rec {
87 version = "0.16.1";
88 src = self.fetchPypi {
89 inherit version;
90 inherit (old) pname;
91 sha256 = "b353856d37dec59d6511359f97f6a4b2468442e454bd1c98298ddce53cac1f04";
92 };
93 });
77 }; 94 };
78 in 95 in
79 python36.override { inherit packageOverrides; }; 96 python36.override { inherit packageOverrides; };
@@ -108,7 +125,13 @@ let
108 load_entry_point('mediagoblin', 'console_scripts', 'gmg')() 125 load_entry_point('mediagoblin', 'console_scripts', 'gmg')()
109 ) 126 )
110 ''; 127 '';
111 mediagoblinSrc = sources.webapps-mediagoblin; 128 mediagoblinSrc = fetchgit {
129 name = "mediagoblin";
130 url = "git://git.savannah.gnu.org/mediagoblin.git";
131 rev = "cd465ebfec837a75a44c4ebd727dffe2fff6d850";
132 sha256 = "1yz4i4i97z3rxl534a6psaybyjbyp5nnc52v3nvbpzc4pd2s69mx";
133 fetchSubmodules = true; # important!
134 };
112 bowerComponents = buildBowerComponents { 135 bowerComponents = buildBowerComponents {
113 name = "mediagoblin-bower-components"; 136 name = "mediagoblin-bower-components";
114 generated = ./bower-packages.nix; 137 generated = ./bower-packages.nix;
@@ -133,7 +156,7 @@ let
133 package = stdenv.mkDerivation rec { 156 package = stdenv.mkDerivation rec {
134 pname = "mediagoblin"; 157 pname = "mediagoblin";
135 name = "${pname}-${version}"; 158 name = "${pname}-${version}";
136 version = mediagoblinSrc.version; 159 version = "cd465eb-stable";
137 src = mediagoblinSrc; 160 src = mediagoblinSrc;
138 preConfigure = '' 161 preConfigure = ''
139 # ./bootstrap.sh 162 # ./bootstrap.sh
diff --git a/pkgs/webapps/peertube/default.nix b/pkgs/webapps/peertube/default.nix
index dd3a462..c38cc15 100644
--- a/pkgs/webapps/peertube/default.nix
+++ b/pkgs/webapps/peertube/default.nix
@@ -3,7 +3,7 @@
3let 3let
4 nodeHeaders = fetchurl { 4 nodeHeaders = fetchurl {
5 url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz"; 5 url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz";
6 sha256 = "1prvrcvbyal39k9axfwjixs4wfgs1m8xy4prsl0kq0s0n7r7nxzj"; 6 sha256 = "12415ss4fxxafp3w8rxp2jbb16y0d7f01b7wv72nmy3cwiqxqkhn";
7 }; 7 };
8 source = mylibs.fetchedGithub ./peertube.json; 8 source = mylibs.fetchedGithub ./peertube.json;
9 patchedSource = stdenv.mkDerivation (source // rec { 9 patchedSource = stdenv.mkDerivation (source // rec {
@@ -43,12 +43,17 @@ let
43 bcrypt = { 43 bcrypt = {
44 buildInputs = [ nodePackages.node-pre-gyp ]; 44 buildInputs = [ nodePackages.node-pre-gyp ];
45 postInstall = let 45 postInstall = let
46 node_module_version = "72";
46 bcrypt_lib = fetchurl { 47 bcrypt_lib = fetchurl {
47 url = "https://github.com/kelektiv/node.bcrypt.js/releases/download/v3.0.7/bcrypt_lib-v3.0.7-node-v64-linux-x64-glibc.tar.gz"; 48 url = "https://github.com/kelektiv/node.bcrypt.js/releases/download/v3.0.7/bcrypt_lib-v3.0.7-node-v${node_module_version}-linux-x64-glibc.tar.gz";
48 sha256 = "0gbq4grhp5wl0f9yqb4y43kjfh8nivfd6y0nkv1x6gfvs2v23wb0"; 49 sha256 = "0kpm9j0yc4lqsafldfsql3m72rr1fapljlb6ddxvy3zi13rb7ppx";
49 }; 50 };
50 in 51 in
51 '' 52 ''
53 if [ "$(node -e "console.log(process.versions.modules)")" != "${node_module_version}" ]; then
54 echo "mismatching version with nodejs please update bcrypt derivation"
55 false
56 fi
52 mkdir lib && tar -C lib -xf ${bcrypt_lib} 57 mkdir lib && tar -C lib -xf ${bcrypt_lib}
53 patchShebangs ../node-pre-gyp 58 patchShebangs ../node-pre-gyp
54 npm run install 59 npm run install