diff options
Diffstat (limited to 'lass')
| -rw-r--r-- | lass/2configs/websites/domsen.nix | 2 | ||||
| -rw-r--r-- | lass/2configs/weechat.nix | 2 | ||||
| -rw-r--r-- | lass/5pkgs/weechat-matrix/default.nix | 80 | ||||
| -rw-r--r-- | lass/krops.nix | 29 |
4 files changed, 25 insertions, 88 deletions
diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index 90a0a5a72..73508a46d 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -104,7 +104,7 @@ in { services.nextcloud = { enable = true; hostName = "o.xanf.org"; - package = pkgs.nextcloud24; + package = pkgs.nextcloud25; config = { adminpassFile = "/run/nextcloud.pw"; overwriteProtocol = "https"; diff --git a/lass/2configs/weechat.nix b/lass/2configs/weechat.nix index 845a7e3b8..10ca013f8 100644 --- a/lass/2configs/weechat.nix +++ b/lass/2configs/weechat.nix @@ -3,7 +3,7 @@ weechat-configured = pkgs.weechat-declarative.override { config = { scripts = [ - pkgs.weechat-matrix + pkgs.weechatScripts.weechat-matrix pkgs.weechatScripts.wee-slack ]; settings = { diff --git a/lass/5pkgs/weechat-matrix/default.nix b/lass/5pkgs/weechat-matrix/default.nix deleted file mode 100644 index 40848caaa..000000000 --- a/lass/5pkgs/weechat-matrix/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ python3Packages -, lib -, fetchFromGitHub -}: - -with python3Packages; - -let - scriptPython = python.withPackages (ps: with ps; [ - aiohttp - requests - python_magic - ]); - - version = "lassulus-fork"; -in python3Packages.buildPythonPackage { - pname = "weechat-matrix"; - inherit version; - - src = fetchFromGitHub { - owner = "poljar"; - repo = "weechat-matrix"; - rev = version; - hash = "sha256-o4kgneszVLENG167nWnk2FxM+PsMzi+PSyMUMIktZcc="; - }; - # src = ./weechat-matrix; - - propagatedBuildInputs = [ - pyopenssl - webcolors - future - atomicwrites - attrs - Logbook - pygments - matrix-nio - aiohttp - requests - ]; - - passthru.scripts = [ "matrix.py" ]; - - dontBuild = true; - doCheck = false; - - format = "other"; - - installPhase = '' - mkdir -p $out/share $out/bin - cp main.py $out/share/matrix.py - - cp contrib/matrix_upload.py $out/bin/matrix_upload - cp contrib/matrix_decrypt.py $out/bin/matrix_decrypt - cp contrib/matrix_sso_helper.py $out/bin/matrix_sso_helper - substituteInPlace $out/bin/matrix_upload \ - --replace '/usr/bin/env -S python3' '${scriptPython}/bin/python' - substituteInPlace $out/bin/matrix_sso_helper \ - --replace '/usr/bin/env -S python3' '${scriptPython}/bin/python' - substituteInPlace $out/bin/matrix_decrypt \ - --replace '/usr/bin/env python3' '${scriptPython}/bin/python' - - mkdir -p $out/${python.sitePackages} - cp -r matrix $out/${python.sitePackages}/matrix - ''; - - dontPatchShebangs = true; - postFixup = '' - addToSearchPath program_PYTHONPATH $out/${python.sitePackages} - patchPythonScript $out/share/matrix.py - substituteInPlace $out/${python.sitePackages}/matrix/server.py --replace \"matrix_sso_helper\" \"$out/bin/matrix_sso_helper\" - ''; - - meta = with lib; { - description = "A Python plugin for Weechat that lets Weechat communicate over the Matrix protocol"; - homepage = "https://github.com/poljar/weechat-matrix"; - license = licenses.isc; - platforms = platforms.unix; - maintainers = with maintainers; [ tilpner emily ]; - }; -} diff --git a/lass/krops.nix b/lass/krops.nix index c8a5b94b7..81c679c5e 100644 --- a/lass/krops.nix +++ b/lass/krops.nix @@ -5,16 +5,33 @@ pkgs ; - source = { test }: lib.evalSource ([ (krebs-source { test = test; }) { nixos-config.symlink = "stockholm/lass/1systems/${name}/physical.nix"; - nixpkgs-unstable.git = { - url = "https://github.com/nixos/nixpkgs"; - ref = (lib.importJSON ../krebs/nixpkgs-unstable.json).rev; - shallow = true; - }; + nixpkgs = lib.mkForce (if test then { + derivation = let + rev = (lib.importJSON ../krebs/nixpkgs-unstable.json).rev; + sha256 = (lib.importJSON ../krebs/nixpkgs-unstable.json).sha256; + in '' + with import (builtins.fetchTarball { + url = "https://github.com/nixos/nixpkgs/archive/${rev}.tar.gz"; + sha256 = "${sha256}"; + }) {}; + pkgs.fetchFromGitHub { + owner = "nixos"; + repo = "nixpkgs"; + rev = "${rev}"; + sha256 = "${sha256}"; + } + ''; + } else { + git = { + ref = (lib.importJSON ../krebs/nixpkgs.json).rev; + url = https://github.com/NixOS/nixpkgs; + shallow = true; + }; + }); secrets = if test then { file = toString ./2configs/tests/dummy-secrets; } else { |