From 72300eb8116c960935a462564d96db6fac355bca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Wed, 25 Mar 2020 11:57:48 +0100 Subject: Upgrade nixos --- ..._19eb79ebf9250e5f339675319902458c40ed1755.patch | 26 ---------------------- pkgs/webapps/davical/default.nix | 5 ++--- pkgs/webapps/diaspora/default.nix | 4 ---- pkgs/webapps/mediagoblin/default.nix | 10 +++++++++ pkgs/webapps/peertube/default.nix | 6 ++--- 5 files changed, 15 insertions(+), 36 deletions(-) delete mode 100644 pkgs/webapps/davical/davical_19eb79ebf9250e5f339675319902458c40ed1755.patch (limited to 'pkgs/webapps') diff --git a/pkgs/webapps/davical/davical_19eb79ebf9250e5f339675319902458c40ed1755.patch b/pkgs/webapps/davical/davical_19eb79ebf9250e5f339675319902458c40ed1755.patch deleted file mode 100644 index 2a08a5c1..00000000 --- a/pkgs/webapps/davical/davical_19eb79ebf9250e5f339675319902458c40ed1755.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/inc/ui/collection-edit.php b/inc/ui/collection-edit.php -index 3af9edd3b8c4ad9074113273175098841af6a28e..8c1d84012b035f7bc7faedcb24916581a02a5d3e 100644 ---- a/inc/ui/collection-edit.php -+++ b/inc/ui/collection-edit.php -@@ -190,7 +190,7 @@ $privilege_xlate = array( - * @param dbrow $row The row object we read from the database. - * @return string The formatted privileges. - */ --function collection_privilege_format_function( $value, $column, $row ) { -+function collection_privilege_format_function( $value, $column = NULL, $row = NULL ) { - global $privilege_xlate; - - $privs = bits_to_privilege($value, 'calendar'); -diff --git a/inc/ui/principal-edit.php b/inc/ui/principal-edit.php -index 20dee7fa4ca2235ff2f74be0dfb52cbe937ef822..2e37cd596b597bcce1e59d7c02a1c5fc2a7f88ce 100644 ---- a/inc/ui/principal-edit.php -+++ b/inc/ui/principal-edit.php -@@ -454,7 +454,7 @@ EOTEMPLATE; - * @param dbrow $row The row object we read from the database. - * @return string The formatted privileges. - */ --function principal_privilege_format_function( $value, $column, $row ) { -+function principal_privilege_format_function( $value, $column = NULL, $row = NULL ) { - global $privilege_xlate; - - $privs = bits_to_privilege($value,'*'); diff --git a/pkgs/webapps/davical/default.nix b/pkgs/webapps/davical/default.nix index 52d87366..67355539 100644 --- a/pkgs/webapps/davical/default.nix +++ b/pkgs/webapps/davical/default.nix @@ -1,16 +1,15 @@ { davical_config ? "/etc/davical/config.php", stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { - version = "1.1.7"; + version = "1.1.9.2"; name = "davical-${version}"; src = fetchurl { url = "https://www.davical.org/downloads/davical_${version}.orig.tar.xz"; - sha256 = "1ar5m2dxr92b204wkdi8z33ir9vz2jbh5k1p74icpv9ywifvjjp9"; + sha256 = "133p7fl544df2rqw1nbnj5nj6bvb9kng9q0c3iqrqlpawq3a6ilh"; }; unpackCmd = '' tar --one-top-level -xf $curSrc ''; makeFlags = "all"; - patches = [ ./davical_19eb79ebf9250e5f339675319902458c40ed1755.patch ]; installPhase = '' mkdir -p $out cp -ra config dba docs htdocs inc locale po scripts testing zonedb $out diff --git a/pkgs/webapps/diaspora/default.nix b/pkgs/webapps/diaspora/default.nix index eff8d271..b435347a 100644 --- a/pkgs/webapps/diaspora/default.nix +++ b/pkgs/webapps/diaspora/default.nix @@ -15,10 +15,6 @@ let }); gems = bundlerEnv { name = "diaspora-env"; - # https://git.immae.eu/mantisbt/view.php?id=131 - ruby = ruby_2_4.overrideAttrs(old: { - postInstall = builtins.replaceStrings [" --destdir $GEM_HOME"] [""] old.postInstall; - }); gemfile = "${diaspora_src}/Gemfile"; lockfile = "${diaspora_src}/Gemfile.lock"; gemset = if ldap then ./gemset_ldap.nix else ./gemset.nix; diff --git a/pkgs/webapps/mediagoblin/default.nix b/pkgs/webapps/mediagoblin/default.nix index 643daedf..f6393fe3 100644 --- a/pkgs/webapps/mediagoblin/default.nix +++ b/pkgs/webapps/mediagoblin/default.nix @@ -2,6 +2,15 @@ let overridePython = let packageOverrides = self: super: { + pybcrypt = super.buildPythonPackage rec { + pname = "pybcrypt"; + version = "0.4"; + + src = self.fetchPypi { + inherit pname version; + sha256 = "5fa13bce551468350d66c4883694850570f3da28d6866bb638ba44fe5eabda78"; + }; + }; celery = super.celery.overridePythonAttrs(old: rec { version = "3.1.26.post2"; src = self.fetchPypi { @@ -45,6 +54,7 @@ let inherit (old) pname; sha256 = "8b0ec71af9291191ba83a91c03d157b19ab3e7119e27da97932a4773a3f664a9"; }; + doCheck = false; }); tempita_5_3_dev = super.buildPythonPackage (mylibs.fetchedGithub ./tempita.json // rec { buildInputs = with self; [ nose ]; diff --git a/pkgs/webapps/peertube/default.nix b/pkgs/webapps/peertube/default.nix index a04d4908..89954192 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 = "16f20ya3ys6w5w6y6l4536f7jrgk4gz46bf71w1r1xxb26a54m32"; + sha256 = "1g6zi96k8sbim8wa8rzskxy44mgpcv1mn2bs8p4mq36w3kwglwyj"; }; patchedPackages = stdenv.mkDerivation (mylibs.fetchedGithub ./peertube.json // rec { patches = if ldap then [ ./ldap.patch ././yarn_fix_bluebird_ldap.patch ] else [ ./yarn_fix_bluebird.patch ]; @@ -33,8 +33,8 @@ let buildInputs = [ nodePackages.node-pre-gyp ]; postInstall = let bcrypt_lib = fetchurl { - url = "https://github.com/kelektiv/node.bcrypt.js/releases/download/v3.0.2/bcrypt_lib-v3.0.2-node-v57-linux-x64-glibc.tar.gz"; - sha256 = "04bj3yn1wi8a6izihskyks0bb4nls3mndgb2yj12iraiv5dmg097"; + url = "https://github.com/kelektiv/node.bcrypt.js/releases/download/v3.0.2/bcrypt_lib-v3.0.2-node-v64-linux-x64-glibc.tar.gz"; + sha256 = "0i0dx4h52fqi3mda2zzqrxp2fh7spbvf7h88mjk218h8d7vl53yx"; }; in '' -- cgit v1.2.3