From 587b9e340bb5cb14ca55e62a0498295e702b56c5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Mon, 25 Mar 2019 23:30:18 +0100 Subject: [PATCH] Upgrade to latest nixpkgs --- nixops/eldiron.nix | 1 + nixops/modules/buildbot/default.nix | 4 +-- nixops/modules/databases/mysql.nix | 3 +- nixops/modules/databases/postgresql.nix | 33 +++++-------------- nixops/modules/gitolite/default.nix | 13 -------- nixops/modules/task/default.nix | 4 +-- nixops/modules/websites/aten/aten.nix | 2 +- nixops/modules/websites/commons/stats.nix | 6 ---- .../websites/tools/diaspora/default.nix | 4 +-- .../websites/tools/mastodon/default.nix | 4 +-- .../tools/mediagoblin/mediagoblin.nix | 8 ++--- nixops/scripts/nixops_wrap | 4 ++- 12 files changed, 26 insertions(+), 60 deletions(-) diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix index e95110f..752ef0a 100644 --- a/nixops/eldiron.nix +++ b/nixops/eldiron.nix @@ -10,6 +10,7 @@ { _module.args = { pkgsNext = import {}; + pkgsPrevious = import {}; mylibs = import ../libs.nix { nixpkgs = pkgs; }; mypkgs = import ../default.nix; myconfig = { diff --git a/nixops/modules/buildbot/default.nix b/nixops/modules/buildbot/default.nix index 3962e65..3768bde 100644 --- a/nixops/modules/buildbot/default.nix +++ b/nixops/modules/buildbot/default.nix @@ -1,7 +1,5 @@ -{ lib, pkgs, pkgsNext, config, myconfig, mylibs, ... }: +{ lib, pkgs, config, myconfig, mylibs, ... }: let - pkgs = pkgsNext.appendOverlays config.nixpkgs.overlays; - varDir = "/var/lib/buildbot"; buildslist_src = mylibs.fetchedGitPrivate ./buildslist.json; buildslist_yarn = pkgs.yarn2nix.mkYarnModules { diff --git a/nixops/modules/databases/mysql.nix b/nixops/modules/databases/mysql.nix index 39d25d3..635f212 100644 --- a/nixops/modules/databases/mysql.nix +++ b/nixops/modules/databases/mysql.nix @@ -1,6 +1,5 @@ -{ lib, pkgs, pkgsNext, config, myconfig, mylibs, ... }: +{ lib, pkgs, config, myconfig, mylibs, ... }: let - pkgs = pkgsNext.appendOverlays config.nixpkgs.overlays; cfg = config.services.myDatabases; in { options.services.myDatabases = { diff --git a/nixops/modules/databases/postgresql.nix b/nixops/modules/databases/postgresql.nix index 7046b45..673ced8 100644 --- a/nixops/modules/databases/postgresql.nix +++ b/nixops/modules/databases/postgresql.nix @@ -1,6 +1,5 @@ -{ lib, pkgs, pkgsNext, config, myconfig, mylibs, ... }: +{ lib, pkgs, config, myconfig, mylibs, ... }: let - pkgs = pkgsNext.appendOverlays config.nixpkgs.overlays; cfg = config.services.myDatabases; in { options.services.myDatabases = { @@ -17,28 +16,14 @@ in { config = lib.mkIf cfg.enable { nixpkgs.overlays = [ (self: super: rec { postgresql = postgresql_11; - postgresql_11 = if builtins.hasAttr "postgresql_11" super - then super.postgresql_11.overrideAttrs(old: rec { - passthru = old.passthru // { psqlSchema = "11.0"; }; - configureFlags = old.configureFlags ++ [ "--with-pam" ]; - buildInputs = (old.buildInputs or []) ++ [ self.pam ]; - patches = old.patches ++ [ - ./postgresql_run_socket_path.patch - ]; - }) - else super.postgresql100.overrideAttrs(old: rec { - passthru = old.passthru // { psqlSchema = "11.0"; }; - name = "postgresql-11.1"; - src = self.fetchurl { - url = "mirror://postgresql/source/v11.1/${name}.tar.bz2"; - sha256 = "026v0sicsh7avzi45waf8shcbhivyxmi7qgn9fd1x0vl520mx0ch"; - }; - configureFlags = old.configureFlags ++ [ "--with-pam" ]; - buildInputs = (old.buildInputs or []) ++ [ self.pam ]; - patches = old.patches ++ [ - ./postgresql_run_socket_path.patch - ]; - }); + postgresql_11 = super.postgresql_11.overrideAttrs(old: rec { + passthru = old.passthru // { psqlSchema = "11.0"; }; + configureFlags = old.configureFlags ++ [ "--with-pam" ]; + buildInputs = (old.buildInputs or []) ++ [ self.pam ]; + patches = old.patches ++ [ + ./postgresql_run_socket_path.patch + ]; + }); }) ]; networking.firewall.allowedTCPPorts = [ 5432 ]; diff --git a/nixops/modules/gitolite/default.nix b/nixops/modules/gitolite/default.nix index 44442ea..844bd0f 100644 --- a/nixops/modules/gitolite/default.nix +++ b/nixops/modules/gitolite/default.nix @@ -11,19 +11,6 @@ in { }; config = lib.mkIf cfg.enable { - nixpkgs.overlays = [ (self: super: rec { - gitolite = super.gitolite.overrideAttrs(old: rec { - name = "gitolite-${version}"; - version = "3.6.10"; - src = self.fetchFromGitHub { - owner = "sitaramc"; - repo = "gitolite"; - rev = "v${version}"; - sha256 = "0p2697mn6rwm03ndlv7q137zczai82n41aplq1g006ii7f12xy8h"; - }; - }); - }) ]; - networking.firewall.allowedTCPPorts = [ 9418 ]; services.gitDaemon = { diff --git a/nixops/modules/task/default.nix b/nixops/modules/task/default.nix index ac16c62..0b8d2d7 100644 --- a/nixops/modules/task/default.nix +++ b/nixops/modules/task/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, myconfig, mylibs, ... }: +{ lib, pkgs, pkgsPrevious, config, myconfig, mylibs, ... }: let cfg = config.services.myTasks; vardir = config.services.taskserver.dataDir; @@ -40,7 +40,7 @@ let chmod a+x $out/bin/taskserver-user-certs patchShebangs $out/bin/taskserver-user-certs ''; - taskwarrior-web = pkgs.callPackage ./taskwarrior-web.nix { + taskwarrior-web = pkgsPrevious.callPackage ./taskwarrior-web.nix { inherit (mylibs) fetchedGithub; inherit env; }; diff --git a/nixops/modules/websites/aten/aten.nix b/nixops/modules/websites/aten/aten.nix index dc8d25f..b60b00a 100644 --- a/nixops/modules/websites/aten/aten.nix +++ b/nixops/modules/websites/aten/aten.nix @@ -102,7 +102,7 @@ let postInstall = let nodeHeaders = fetchurl { url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz"; - sha256 = "12zzsf8my43b8qnlacp871ih5vqafl2vlpqp51xp6h3gckn2frwy"; + sha256 = "16f20ya3ys6w5w6y6l4536f7jrgk4gz46bf71w1r1xxb26a54m32"; }; in '' diff --git a/nixops/modules/websites/commons/stats.nix b/nixops/modules/websites/commons/stats.nix index 921cde2..8d618c5 100644 --- a/nixops/modules/websites/commons/stats.nix +++ b/nixops/modules/websites/commons/stats.nix @@ -25,12 +25,6 @@ in { nixpkgs.overlays = [ (self: super: rec { goaccess = super.goaccess.overrideAttrs(old: rec { - name = "goaccess-${version}"; - version = "1.3"; - src = self.fetchurl { - url = "https://tar.goaccess.io/${name}.tar.gz"; - sha256 = "16vv3pj7pbraq173wlxa89jjsd279004j4kgzlrsk1dz4if5qxwc"; - }; configureFlags = old.configureFlags ++ [ "--enable-tcb=btree" ]; buildInputs = old.buildInputs ++ [ self.tokyocabinet self.bzip2 ]; }); diff --git a/nixops/modules/websites/tools/diaspora/default.nix b/nixops/modules/websites/tools/diaspora/default.nix index b1cb6f2..7a2af97 100644 --- a/nixops/modules/websites/tools/diaspora/default.nix +++ b/nixops/modules/websites/tools/diaspora/default.nix @@ -1,6 +1,6 @@ -{ lib, pkgs, config, myconfig, mylibs, ... }: +{ lib, pkgs, pkgsPrevious, config, myconfig, mylibs, ... }: let - diaspora = pkgs.callPackage ./diaspora.nix { + diaspora = pkgsPrevious.callPackage ./diaspora.nix { inherit (mylibs) fetchedGithub; env = myconfig.env.tools.diaspora; }; diff --git a/nixops/modules/websites/tools/mastodon/default.nix b/nixops/modules/websites/tools/mastodon/default.nix index b64474c..b0ace56 100644 --- a/nixops/modules/websites/tools/mastodon/default.nix +++ b/nixops/modules/websites/tools/mastodon/default.nix @@ -1,6 +1,6 @@ -{ lib, pkgs, config, myconfig, mylibs, ... }: +{ lib, pkgs, pkgsPrevious, config, myconfig, mylibs, ... }: let - mastodon = pkgs.callPackage ./mastodon.nix { + mastodon = pkgsPrevious.callPackage ./mastodon.nix { inherit (mylibs) fetchedGithub; env = myconfig.env.tools.mastodon; }; diff --git a/nixops/modules/websites/tools/mediagoblin/mediagoblin.nix b/nixops/modules/websites/tools/mediagoblin/mediagoblin.nix index 45bc432..53796d5 100644 --- a/nixops/modules/websites/tools/mediagoblin/mediagoblin.nix +++ b/nixops/modules/websites/tools/mediagoblin/mediagoblin.nix @@ -1,4 +1,4 @@ -{ env, makeWrapper, stdenv, writeText, fetchurl, buildBowerComponents, fetchedGit, fetchedGithub, which, python3, pkgs, automake, autoconf, nodejs, nodePackages, git, cacert }: +{ env, makeWrapper, stdenv, writeText, fetchurl, buildBowerComponents, fetchedGit, fetchedGithub, which, python36, pkgs, automake, autoconf, nodejs, nodePackages, git, cacert }: let plugins = { basicsearch = stdenv.mkDerivation (fetchedGithub ./mediagoblin-plugin-basicsearch.json // rec { @@ -68,11 +68,11 @@ let url = "mirror://pypi/P/PasteScript/${name}.tar.gz"; sha256 = "1h3nnhn45kf4pbcv669ik4faw04j58k8vbj1hwrc532k0nc28gy0"; }; - propagatedBuildInputs = with self; [ six paste PasteDeploy argparse ]; + propagatedBuildInputs = with self; [ six paste PasteDeploy ]; }); }; in - python3.override { inherit packageOverrides; }; + python36.override { inherit packageOverrides; }; pythonEnv = python-pkgs: with python-pkgs; [ waitress alembic dateutil wtforms pybcrypt pytest pytest_xdist werkzeug celery @@ -80,7 +80,7 @@ let sqlalchemy itsdangerous pytz sphinx six oauthlib unidecode jsonschema PasteDeploy requests PyLD exifread - typing pasteScript + typing pasteScript lxml # For images plugin pillow # For video plugin diff --git a/nixops/scripts/nixops_wrap b/nixops/scripts/nixops_wrap index 4cf714c..7b39a26 100755 --- a/nixops/scripts/nixops_wrap +++ b/nixops/scripts/nixops_wrap @@ -30,5 +30,7 @@ nixops set-args --argstr privateFiles "$TEMP" nixpkgsNext="https://releases.nixos.org/nixos/19.03/nixos-19.03beta171832.ff9c3f0f26d/nixexprs.tar.xz" nixpkgs="https://releases.nixos.org/nixos/18.09/nixos-18.09.1834.9d608a6f592/nixexprs.tar.xz" -export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:nixpkgs=$nixpkgs:nixpkgsNext=$nixpkgsNext" +nixpkgs="$nixpkgsNext" +nixpkgsPrevious="https://releases.nixos.org/nixos/18.09/nixos-18.09.1834.9d608a6f592/nixexprs.tar.xz" +export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:nixpkgs=$nixpkgs:nixpkgsNext=$nixpkgsNext:nixpkgsPrevious=$nixpkgsPrevious" nixops "$@" -- 2.41.0