From 2053ddac783c931053676ebc2b02bc8b82d89399 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sat, 8 Aug 2020 21:40:31 +0200 Subject: Upgrade nixos-unstable --- .../buildbot/plugins/buildslist/default.nix | 14 +++++++---- pkgs/status_engine/worker.nix | 7 +++--- pkgs/webapps/mediagoblin/default.nix | 29 +++++++++++++++++++--- pkgs/webapps/peertube/default.nix | 11 +++++--- 4 files changed, 46 insertions(+), 15 deletions(-) (limited to 'pkgs') 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 @@ -{ stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, fetchurl, jq, yarn, nodejs, yarn2nix-moretea, sources }: +{ stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, fetchurl, jq, yarn, nodejs-10_x, yarn2nix-moretea, sources }: let + yarn2nix-moretea' = yarn2nix-moretea.override({ + yarn = yarn.override({ nodejs = nodejs-10_x; }); + nodejs = nodejs-10_x; + }); buildslist_src = sources.buildbot-plugin-buildslist; packagejson = runCommand "package.json" { buildInputs = [ jq ]; } '' 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"; - sha256 = "1prvrcvbyal39k9axfwjixs4wfgs1m8xy4prsl0kq0s0n7r7nxzj"; + url = "https://nodejs.org/download/release/v${nodejs-10_x.version}/node-v${nodejs-10_x.version}-headers.tar.gz"; + sha256 = "15hkcbs328d3rc1s14rmky8lh8d3rr86l8k0bia0ggxzwl23lj9c"; }; - buildslist_yarn = yarn2nix-moretea.mkYarnModules rec { + buildslist_yarn = yarn2nix-moretea'.mkYarnModules rec { name = "buildslist-yarn-modules"; pname = name; inherit (pythonPackages.buildbot-pkg) version; @@ -53,7 +57,7 @@ pythonPackages.buildPythonPackage rec { (klein.overridePythonAttrs(old: { checkPhase = ""; })) buildbot-pkg ]; - nativeBuildInputs = [ fakeYarn nodejs ]; + nativeBuildInputs = [ fakeYarn nodejs-10_x ]; buildInputs = [ buildslist_yarn buildslist_bower ]; 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 @@ -{ stdenv, mylibs, composerEnv, fetchurl, gearmand, callPackage, php73, php73base, config_file ? "/var/lib/status_engine/ui.yml" }: +{ stdenv, mylibs, composerEnv, fetchurl, gearmand, callPackage, php73, config_file ? "/var/lib/status_engine/ui.yml" }: let - # FIXME: present in php73.buildPecl in latest nixpkgs-unstable - gearman = (callPackage { php = php73base; }) rec { + gearman = php73.buildPecl rec { version = "2.0.6"; pname = "gearman"; src = fetchurl { @@ -13,7 +12,7 @@ let }; in (composerEnv.override { - php = php73.withExtensions(e: php73.enabledExtensions ++ (with php73.extensions; [gearman redis mbstring bcmath json iconv])); + php = php73.withExtensions({ enabled, all }: enabled ++ (with all; [gearman redis mbstring bcmath json iconv])); }).buildPackage (mylibs.fetchedGithub ./worker.json // import ./worker_php_packages.nix { inherit composerEnv fetchurl; } // rec { 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 @@ -{ makeWrapper, stdenv, writeScript, fetchurl, buildBowerComponents, mylibs, which, python36, gst_all_1, automake, autoconf, nodejs, nodePackages, lib, callPackage, sources }: +{ makeWrapper, stdenv, writeScript, fetchurl, buildBowerComponents, mylibs, which, python36, gst_all_1, automake, autoconf, nodejs, nodePackages, lib, callPackage, fetchgit }: let overridePython = let packageOverrides = self: super: { @@ -38,6 +38,7 @@ let inherit (old) pname; sha256 = "2dea4d16d073c902c3b89d9b96620fb6729ac0f7a923bbc777cb4ad827c0c61a"; }; + doCheck = false; }); kombu = super.kombu.overridePythonAttrs(old: rec { version = "3.0.37"; @@ -49,6 +50,14 @@ let propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.anyjson ]; doCheck = false; }); + markdown = super.markdown.overridePythonAttrs(old: rec { + version = "3.1.1"; + src = self.fetchPypi { + inherit version; + inherit (old) pname; + sha256 = "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a"; + }; + }); sqlalchemy = super.sqlalchemy.overridePythonAttrs(old: rec { version = "1.1.18"; src = self.fetchPypi { @@ -74,6 +83,14 @@ let }; propagatedBuildInputs = with self; [ six paste PasteDeploy ]; }); + werkzeug = super.werkzeug.overridePythonAttrs(old: rec { + version = "0.16.1"; + src = self.fetchPypi { + inherit version; + inherit (old) pname; + sha256 = "b353856d37dec59d6511359f97f6a4b2468442e454bd1c98298ddce53cac1f04"; + }; + }); }; in python36.override { inherit packageOverrides; }; @@ -108,7 +125,13 @@ let load_entry_point('mediagoblin', 'console_scripts', 'gmg')() ) ''; - mediagoblinSrc = sources.webapps-mediagoblin; + mediagoblinSrc = fetchgit { + name = "mediagoblin"; + url = "git://git.savannah.gnu.org/mediagoblin.git"; + rev = "cd465ebfec837a75a44c4ebd727dffe2fff6d850"; + sha256 = "1yz4i4i97z3rxl534a6psaybyjbyp5nnc52v3nvbpzc4pd2s69mx"; + fetchSubmodules = true; # important! + }; bowerComponents = buildBowerComponents { name = "mediagoblin-bower-components"; generated = ./bower-packages.nix; @@ -133,7 +156,7 @@ let package = stdenv.mkDerivation rec { pname = "mediagoblin"; name = "${pname}-${version}"; - version = mediagoblinSrc.version; + version = "cd465eb-stable"; src = mediagoblinSrc; preConfigure = '' # ./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 @@ let nodeHeaders = fetchurl { url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz"; - sha256 = "1prvrcvbyal39k9axfwjixs4wfgs1m8xy4prsl0kq0s0n7r7nxzj"; + sha256 = "12415ss4fxxafp3w8rxp2jbb16y0d7f01b7wv72nmy3cwiqxqkhn"; }; source = mylibs.fetchedGithub ./peertube.json; patchedSource = stdenv.mkDerivation (source // rec { @@ -43,12 +43,17 @@ let bcrypt = { buildInputs = [ nodePackages.node-pre-gyp ]; postInstall = let + node_module_version = "72"; bcrypt_lib = fetchurl { - 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"; - sha256 = "0gbq4grhp5wl0f9yqb4y43kjfh8nivfd6y0nkv1x6gfvs2v23wb0"; + 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"; + sha256 = "0kpm9j0yc4lqsafldfsql3m72rr1fapljlb6ddxvy3zi13rb7ppx"; }; in '' + if [ "$(node -e "console.log(process.versions.modules)")" != "${node_module_version}" ]; then + echo "mismatching version with nodejs please update bcrypt derivation" + false + fi mkdir lib && tar -C lib -xf ${bcrypt_lib} patchShebangs ../node-pre-gyp npm run install -- cgit v1.2.3