Upgrade nixos

6 files changed, 17 insertions, 5 deletions

diff --git a/overlays/databases/mysql/default.nix b/overlays/databases/mysql/default.nix
index 5e402841..797332bb 100644
--- a/overlays/databases/mysql/default.nix
+++ b/overlays/databases/mysql/default.nix
@@ -3,6 +3,12 @@ self: super: rec {
   mariadbPAM = super.mariadb.overrideAttrs(old: {
     cmakeFlags = old.cmakeFlags ++ [ "-DWITH_AUTHENTICATION_PAM=ON" ];
     buildInputs = old.buildInputs ++ [ self.pam ];
+    postInstall = old.postInstall + ''
+      # FIXME: hack because mariadb cannot find dialog.so
+      # fixed in 20.03: https://github.com/NixOS/nixpkgs/pull/80768
+      ln -s /nix $out/nix
+      cp "$dev"/lib/mysql/plugin/{caching_sha2_password.so,dialog.so,mysql_clear_password.so,sha256_password.so} "$out"/lib/mysql/plugin
+      '';
   }) // (with super.mariadb; {
     inherit client;
     servier = super.mariadb;
diff --git a/overlays/databases/postgresql/default.nix b/overlays/databases/postgresql/default.nix
index 8d1405e3..ae589877 100644
--- a/overlays/databases/postgresql/default.nix
+++ b/overlays/databases/postgresql/default.nix
@@ -4,8 +4,5 @@ self: super: 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
-    ];
   });
 }
diff --git a/overlays/default.nix b/overlays/default.nix
index 9fd0117f..b488fd73 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -31,5 +31,6 @@
   ympd = import ./ympd;
   doing = import ./doing;
   xmr-stak = import ./xmr-stak;
+  simp_le = import ./simp_le;
 }
 // import ./python-packages
diff --git a/overlays/gitweb/default.nix b/overlays/gitweb/default.nix
index aa17d22f..2b9c0f6b 100644
--- a/overlays/gitweb/default.nix
+++ b/overlays/gitweb/default.nix
@@ -1,6 +1,6 @@
 self: super: {
   gitweb = super.gitweb.overrideAttrs(old: {
-    installPhase = old.installPhase + ''
+    postInstall = old.postInstall or "" + ''
       cp -r ${./theme} $out/gitweb-theme;
       '';
   });
diff --git a/overlays/shaarli/default.nix b/overlays/shaarli/default.nix
index c2fb9cce..3b37ee8a 100644
--- a/overlays/shaarli/default.nix
+++ b/overlays/shaarli/default.nix
@@ -1,5 +1,10 @@
 self: super: {
-  shaarli = varDir: super.shaarli.overrideAttrs (old: {
+  shaarli = varDir: super.shaarli.overrideAttrs (old: rec {
+    version = "0.10.2";
+    src = self.fetchurl {
+      url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz";
+      sha256 = "0h8sspj7siy3vgpi2i3gdrjcr5935fr4dfwq2zwd70sjx2sh9s78";
+    };
     patchPhase = "";
     patches = (old.patches or []) ++ [ ./shaarli_ldap.patch ];
     installPhase = (old.installPhase or "") + ''
diff --git a/overlays/simp_le/default.nix b/overlays/simp_le/default.nix
new file mode 100644
index 00000000..76891eda
--- /dev/null
+++ b/overlays/simp_le/default.nix
@@ -0,0 +1,3 @@
+self: super: {
+  simp_le = self.simp_le_0_17;
+}