From 4ef17ed1a21b4ff07db0d647855b3cbad45ae32a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= <tm@tlater.net>
Date: Thu, 10 Feb 2022 22:17:37 +0000
Subject: [PATCH 1/2] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Flake lock file changes:
• Updated input 'flake-utils':
'github:numtide/flake-utils/74f7e4319258e287b0f9cb95426c9853b282730b' (2021-11-28)
→ 'github:numtide/flake-utils/3cecb5b042f7f209c56ffd8371b2711a290ec797' (2022-02-07)
• Updated input 'nixos-hardware':
'github:nixos/nixos-hardware/2a7063461c3751d83869a2a0a8ebc59e34bec5b2' (2021-12-11)
→ 'github:nixos/nixos-hardware/9886a06e4745edb31587d0e9481ad82d35f0d593' (2022-02-04)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/573095944e7c1d58d30fc679c81af63668b54056' (2021-12-10)
→ 'github:nixos/nixpkgs/521e4d7d13b09bc0a21976b9d19abd197d4e3b1e' (2022-02-07)
---
flake.lock | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/flake.lock b/flake.lock
index 11de3e3..91b61ea 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
"nodes": {
"flake-utils": {
"locked": {
- "lastModified": 1638122382,
- "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
+ "lastModified": 1644229661,
+ "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
+ "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
"type": "github"
},
"original": {
@@ -38,11 +38,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1639240632,
- "narHash": "sha256-BAXhgnPOW1COIfZ9EOOFTdolalYS73MFHSRajgrSdZw=",
+ "lastModified": 1643980037,
+ "narHash": "sha256-RdVHt2mD408WXMjQIOLvUzy8cSUHu8NAbilDmPVxf7E=",
"owner": "nixos",
"repo": "nixos-hardware",
- "rev": "2a7063461c3751d83869a2a0a8ebc59e34bec5b2",
+ "rev": "9886a06e4745edb31587d0e9481ad82d35f0d593",
"type": "github"
},
"original": {
@@ -54,11 +54,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1639161226,
- "narHash": "sha256-75Y08ynJDTq6HHGIF+8IADBJSVip0UyWQH7jqSFnRR8=",
+ "lastModified": 1644193793,
+ "narHash": "sha256-ggCI5LCXwkUJQwjpkr9qDFbQMiK3JvAfeNR4Uy0ny5Q=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "573095944e7c1d58d30fc679c81af63668b54056",
+ "rev": "521e4d7d13b09bc0a21976b9d19abd197d4e3b1e",
"type": "github"
},
"original": {
From 1721785d1ce63b461ac862706cae4bed19df096e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= <tm@tlater.net>
Date: Sun, 26 Dec 2021 19:01:56 +0000
Subject: [PATCH 2/2] Update forge server sha
---
pkgs/minecraft/forge-server.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/minecraft/forge-server.nix b/pkgs/minecraft/forge-server.nix
index 2dea39a..e26a7a5 100644
--- a/pkgs/minecraft/forge-server.nix
+++ b/pkgs/minecraft/forge-server.nix
@@ -9,7 +9,7 @@ let
url = "${mirror}/${version}/forge-${version}-installer.jar";
curlOpts = "--globoff";
# Forge doesn't seem to like newer shas
- sha1 = "e97821e5431bdcaa46e12048769922e2cdb5e2e1";
+ sha1 = "sha1-oHNpyrgHluRrAXWZJg9j+OInAwA=";
};
unpackCmd = "mkdir -p src; cp $curSrc src/forge-${version}-installer.jar";