diff options
| author | tv <tv@krebsco.de> | 2021-07-29 13:27:27 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2021-07-29 13:27:27 +0200 |
| commit | dfc3a69a141927a2ef9a13129496d1a84de8efeb (patch) | |
| tree | 54e24720d18bfccbb638e10ab8076a5b9763addf /krebs | |
| parent | 34c7d727afd14a82330dd6e53dee3591f01a5462 (diff) | |
| parent | 1380200b30f2fd1dfce55a2ba28dc256fef951c6 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/3modules/krebs/default.nix | 1 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/rss-bridge/default.nix | 6 | ||||
| -rw-r--r-- | krebs/nixpkgs-unstable.json | 8 | ||||
| -rw-r--r-- | krebs/nixpkgs.json | 8 |
4 files changed, 12 insertions, 11 deletions
diff --git a/krebs/3modules/krebs/default.nix b/krebs/3modules/krebs/default.nix index 37b93935..c05409fe 100644 --- a/krebs/3modules/krebs/default.nix +++ b/krebs/3modules/krebs/default.nix @@ -70,6 +70,7 @@ in { ip4.addr = "10.243.77.3"; aliases = [ "hotdog.r" + "agenda.r" "build.r" "build.hotdog.r" "cgit.hotdog.r" diff --git a/krebs/5pkgs/simple/rss-bridge/default.nix b/krebs/5pkgs/simple/rss-bridge/default.nix index bbe5c1bd..e0a927a1 100644 --- a/krebs/5pkgs/simple/rss-bridge/default.nix +++ b/krebs/5pkgs/simple/rss-bridge/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rss-bridge"; - version = "unstable-2021-01-10"; + version = "unstable-2021-04-20"; src = fetchFromGitHub { owner = "RSS-Bridge"; repo = "rss-bridge"; - rev = "98352845a14b9f2eb8925ad7a04a5f6cc6a5af06"; - sha256 = "1nv1f6f17cn057k9mydd3a0bmj2xa5k410fdq7nhw5b7msyxy2qv"; + rev = "716f5ddc0e20c10cb77ded46380cc376913a92fd"; + sha256 = "17aqmj7rz0ysk8nj4kbjvnsjdm47d0xsypfygzzk2vagxfz5w3p8"; }; patchPhase = '' diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json index aaf66e42..967f0b42 100644 --- a/krebs/nixpkgs-unstable.json +++ b/krebs/nixpkgs-unstable.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "fbfb79400a08bf754e32b4d4fc3f7d8f8055cf94", - "date": "2021-06-06T04:54:09-03:00", - "path": "/nix/store/51dsmanfc179xy70kn2rl0qvg45cn6qr-nixpkgs", - "sha256": "0pgyx1l1gj33g5i9kwjar7dc3sal2g14mhfljcajj8bqzzrbc3za", + "rev": "dd14e5d78e90a2ccd6007e569820de9b4861a6c2", + "date": "2021-07-24T08:14:16-04:00", + "path": "/nix/store/0z5nrrjzmjcicjhhdrqb9vgm56zxysk3-nixpkgs", + "sha256": "1zmhwx1qqgl1wrrb9mjkck508887rldrnragvximhd7jrh1ya3fb", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index 37cee658..5086b8af 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "bad3ccd099ebe9a8aa017bda8500ab02787d90aa", - "date": "2021-06-17T20:20:32+00:00", - "path": "/nix/store/2m29isga2dff5x2dzyyr3dql9jpwf5kk-nixpkgs", - "sha256": "07ik6rcfpcvj2zch3mzkxwxjs817iysbvsydkm85f14kn7gnyzp5", + "rev": "91903ceb294dbe63a696759bfba3d23ee667f2dc", + "date": "2021-07-26T09:21:28+02:00", + "path": "/nix/store/2v649741xdh1crybi2dm879bl60zrkhf-nixpkgs", + "sha256": "1hmpwi27r4q0lnspg7ylfzxakwz2fhl3r07vjvq5yalcdqwiain3", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false |