From d0faef2f53e2e5195b2acc7cc7bba898bd7cd05b Mon Sep 17 00:00:00 2001 From: Tim Keller Date: Thu, 21 Nov 2024 21:21:19 -0600 Subject: update lowbat and pavolctld derivations to use tagged releases and dl tar files instead of using git --- derivations/lowbat/default.nix | 11 +++++------ derivations/pavolctld/default.nix | 11 +++++------ modules/hosts/T495/configuration.nix | 1 + modules/hosts/T495/games.nix | 6 ++++++ 4 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 modules/hosts/T495/games.nix diff --git a/derivations/lowbat/default.nix b/derivations/lowbat/default.nix index 2d699a2..02ff111 100644 --- a/derivations/lowbat/default.nix +++ b/derivations/lowbat/default.nix @@ -1,13 +1,12 @@ { pkgs ? import {} }: -pkgs.stdenv.mkDerivation { +pkgs.stdenv.mkDerivation rec { pname = "lowbat"; - version = "1.0"; + version = "1.2.1"; - src = pkgs.fetchgit { - url = "https://git.tjkeller.xyz/lowbat"; - rev = "17e0bbaecb917b7cb42453afa9cd7e80e092c087"; - sha256 = "sha256-wh1/QZmbVcEsbCYJxzcswN2QFjO5qkrJCQsba3wf1h8="; + src = pkgs.fetchzip { + url = "https://git.tjkeller.xyz/${pname}/snapshot/${pname}-${version}.tar.xz"; + sha256 = "sha256-xsUHdmicHX/fQQgojVjWfzI82e4NezkmlACOpdPxLE0="; }; nativeBuildInputs = [ pkgs.pkg-config ]; diff --git a/derivations/pavolctld/default.nix b/derivations/pavolctld/default.nix index 9f6471d..c78e3fe 100644 --- a/derivations/pavolctld/default.nix +++ b/derivations/pavolctld/default.nix @@ -1,13 +1,12 @@ { pkgs ? import {} }: -pkgs.stdenv.mkDerivation { +pkgs.stdenv.mkDerivation rec { pname = "pavolctld"; - version = "1.0"; + version = "1.0.0"; - src = pkgs.fetchgit { - url = "https://git.tjkeller.xyz/pavolctld"; - rev = "079cf8b96a629313ebf1f579601aadccd0e6c424"; - sha256 = "sha256-UIWh+Um/wdUKslyai5685wm6uMSl+zwwDsom6OL1CyU="; + src = pkgs.fetchzip { + url = "https://git.tjkeller.xyz/${pname}/snapshot/${pname}-${version}.tar.xz"; + sha256 = "sha256-eJ5njP2wu2kxsNgDdULOaATJJarLh+LkM5M9+kujRt4="; }; buildInputs = [ pkgs.libpulseaudio ]; diff --git a/modules/hosts/T495/configuration.nix b/modules/hosts/T495/configuration.nix index fdd2930..31b93f1 100644 --- a/modules/hosts/T495/configuration.nix +++ b/modules/hosts/T495/configuration.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: { imports = [ ./hardware-configuration.nix + ./games.nix ./wg.nix ]; networking.hostName = "T495"; diff --git a/modules/hosts/T495/games.nix b/modules/hosts/T495/games.nix new file mode 100644 index 0000000..f596fa8 --- /dev/null +++ b/modules/hosts/T495/games.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: { + nixpkgs.config.allowUnfree = true; + environment.systemPackages = with pkgs; [ + vintagestory + ]; +} -- cgit v1.2.3