Update nix unstable

diff --git a/.envrc b/.envrc
index 9741a311a705f709db85527186a5fd4af2dee4da..b4859fdbf3bb129203bbec006bc039fe311b1346 100644 (file)
--- a/.envrc
+++ b/.envrc
@@ -1,6 +1,7 @@
 # vim: filetype=bash
 export PASSWORD_STORE_DIR=$(expand_path nixops/secrets)
 export NIX_PATH=nixpkgs=$(cat $(expand_path nix/sources.json) | jq -r '."nixpkgs-nixops".url')
+NIX_PATH=$NIX_PATH:nixpkgs-nix=$(cat $(expand_path nix/sources.json) | jq -r '."nixpkgs-nix".url')
 
 export NIXOPS_ENV_LOADED=1
 

diff --git a/modules/private/websites/tools/peertube/default.nix b/modules/private/websites/tools/peertube/default.nix
index 9c5ef5a99a92cd3b2b75e5f38b975bf6133105de..d2cbe406e1ba1f6397a2ab7ec503b817f1fcd586 100644 (file)
--- a/modules/private/websites/tools/peertube/default.nix
+++ b/modules/private/websites/tools/peertube/default.nix
@@ -43,18 +43,6 @@ in {
           socket: '${env.redis.socket}'
           auth: null
           db: ${env.redis.db}
-        auth:
-          local:
-            enabled: true
-          ldap:
-            enabled: true
-            ldap_only: false
-            url: ldaps://${env.ldap.host}/${env.ldap.base}
-            bind_dn: ${env.ldap.dn}
-            bind_password: ${env.ldap.password}
-            base: ${env.ldap.base}
-            mail_entry: "mail"
-            user_filter: "${env.ldap.filter}"
         smtp:
           transport: sendmail
           sendmail: '/run/wrappers/bin/sendmail'

diff --git a/nix/sources.json b/nix/sources.json
index 854d6c8371a5988e797b1d444e34d80a4fa4ead7..3a8f01639e7ac4ad2765ce2999594c4451fa9e01 100644 (file)
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -105,6 +105,18 @@
         "url": "https://github.com/NixOS/nixpkgs-channels/archive/c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
+    "nixpkgs-nix": {
+        "branch": "nixos-unstable",
+        "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
+        "homepage": "https://github.com/NixOS/nixpkgs",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "891f607d5301d6730cb1f9dcf3618bcb1ab7f10e",
+        "sha256": "1cr39f0sbr0h5d83dv1q34mcpwnkwwbdk5fqlyqp2mnxghzwssng",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/891f607d5301d6730cb1f9dcf3618bcb1ab7f10e.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
     "nixpkgs-nixops": {
         "branch": "nixos-unstable",
         "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",

diff --git a/nixops/secrets b/nixops/secrets
index 00f59f49098d79f0839541fd379e8933e3ddf9d7..c16489e0bcb8785afa2b4c19d2c44e164ef4b7eb 160000 (submodule)
--- a/nixops/secrets
+++ b/nixops/secrets
@@ -1 +1 @@
-Subproject commit 00f59f49098d79f0839541fd379e8933e3ddf9d7
+Subproject commit c16489e0bcb8785afa2b4c19d2c44e164ef4b7eb

diff --git a/shell.nix b/shell.nix
index 93caa0b097ff75e6df588f6202b24b62fec1edd0..3aa03a770a9eaf9d522975db9b76df0c62dabfca 100644 (file)
--- a/shell.nix
+++ b/shell.nix
@@ -1,4 +1,18 @@
-{ pkgs ? import <nixpkgs> { overlays = builtins.attrValues (import ./overlays); } }:
+{ pkgs ? import <nixpkgs> { overlays = builtins.attrValues (import ./overlays); },
+  pkgs-nix ? import <nixpkgs-nix> { overlays = builtins.attrValues (import ./overlays); }
+}:
+let
+  patchedNix = pkgs-nix.nixUnstable.overrideAttrs(old: {
+    patches = old.patches ++ [
+      # Fix the ETag bug. PR merged. Remove when updating to >= 20210125
+      # https://github.com/NixOS/nixpkgs/pull/109309#issuecomment-768331750
+      (pkgs-nix.fetchpatch {
+        url = "https://patch-diff.githubusercontent.com/raw/NixOS/nix/pull/4470.diff";
+        sha256 = "sha256-d4RNOKMxa4NMbFgYcqWRv2ByHt8F/XUWV+6P9qHz7S4=";
+      })
+    ];
+  });
+in
 pkgs.mkShell {
-  buildInputs = [ pkgs.nixUnstable pkgs.morph pkgs.niv pkgs.pass pkgs.curl pkgs.shellcheck pkgs.jq pkgs.gnumake ];
+  buildInputs = [ patchedNix pkgs.morph pkgs.niv pkgs.pass pkgs.curl pkgs.shellcheck pkgs.jq pkgs.gnumake ];
 }