Merge remote-tracking branch 'gum/master'

This commit is contained in:
lassulus 2021-09-05 20:37:14 +02:00
commit 52d25726c2
8 changed files with 26 additions and 17 deletions

View File

@ -1,7 +1,9 @@
{ config, pkgs, ... }:
let
light-shack-src = pkgs.fetchgit {
url = "https://git.shackspace.de/rz/standby.shack";
light-shack-src =
pkgs.fetchFromGitHub {
owner = "shackspace";
repo = "standby.shack";
rev = "e1b90a0a";
sha256 = "07fmz63arc5rxa0a3778srwz0jflp4ad6xnwkkc56hwybby0bclh";
};

View File

@ -2,8 +2,9 @@
let
pkg = pkgs.callPackage (
pkgs.fetchgit {
url = "https://git.shackspace.de/rz/muell_mail";
pkgs.fetchFromGitHub {
owner = "shackspace";
repo = "muell_mail";
rev = "c3e43687879f95e01a82ef176fa15678543b2eb8";
sha256 = "0hgchwam5ma96s2v6mx2jfkh833psadmisjbm3k3153rlxp46frx";
}) { mkYarnPackage = pkgs.yarn2nix-moretea.mkYarnPackage; };

View File

@ -2,8 +2,9 @@
let
pkg = pkgs.callPackage (
pkgs.fetchgit {
url = "https://git.shackspace.de/rz/muellshack";
pkgs.fetchFromGitHub {
owner = "shackspace";
repo = "muellshack";
rev = "dc80cf1edaa3d86ec2bebae8596ad1d4c4e3650a";
sha256 = "1yipr66zhrg5m20pf3rzvgvvl78an6ddkq6zc45rxb2r0i7ipkyh";

View File

@ -2,8 +2,9 @@
let
pkg = pkgs.callPackage (
pkgs.fetchgit {
url = "https://git.shackspace.de/rz/node-light.git";
pkgs.fetchFromGitHub {
owner = "shackspace";
repo = "node-light";
rev = "90a9347b73af3a9960bd992e6293b357226ef6a0";
sha256 = "1av9w3w8aknlra25jw6gqxzbb01i9kdlfziy29lwz7mnryjayvwk";
}) { };

View File

@ -6,8 +6,9 @@
let
influx-url = "http://influx.shack:8086";
pkg = pkgs.python3.pkgs.callPackage (
pkgs.fetchgit {
url = "https://git.shackspace.de/rz/powermeter.git";
pkgs.fetchFromGitHub {
owner = "shackspace";
repo = "powermeter";
rev = "438b08f";
sha256 = "0c5czmrwlw985b7ia6077mfrvbf2fq51iajb481pgqbywgxqis5m";
}) {};

View File

@ -2,8 +2,9 @@
let
pkg = pkgs.callPackage (
pkgs.fetchgit {
url = "https://git.shackspace.de/rz/s3-power";
pkgs.fetchFromGitHub {
owner = "shackspace";
repo = "s3-power";
rev = "0687ab64";
sha256 = "1m8h4bwykv24bbgr5v51mam4wsbp5424xcrawhs4izv563jjf130";
}) { mkYarnPackage = pkgs.yarn2nix-moretea.mkYarnPackage; };

View File

@ -1,9 +1,10 @@
{ config, lib, pkgs, ... }:
let
pkg =
pkgs.fetchgit {
url = "https://git.shackspace.de/rz/shackdns";
pkg =
pkgs.fetchFromGitHub {
owner = "shackspace";
repo = "shackdns";
rev = "e55cc906c734b398683f9607b93f1ad6435d8575";
sha256 = "1hkwhf3hqb4fz06b1ckh7sl0zcyi4da5fgdlksian8lxyd19n8sq";
};

View File

@ -4,8 +4,9 @@ with import <stockholm/lib>;
let
pkg = pkgs.stdenv.mkDerivation {
name = "worlddomination-2020-12-01";
src = pkgs.fetchgit {
url = "https://git.shackspace.de/rz/worlddomination.git";
src = pkgs.fetchFromGitHub {
owner = "shackspace";
repo = "worlddomination";
rev = "c7aedcde7cd1fcb870b5356a6125e1a384b0776c";
sha256 = "0y6haz5apwa33lz64l7b2x78wrrckbw39j4wzyd1hfk46478xi2y";
};