nicer versioning for easier updates i think

This commit is contained in:
twoneis 2025-03-23 22:01:12 +01:00
parent 0733f4d2d1
commit 12bc14657e
8 changed files with 68 additions and 54 deletions

View file

@ -8,7 +8,7 @@
runCommand "rosepine-cursor" {} '' runCommand "rosepine-cursor" {} ''
mkdir -p $out/share/icons mkdir -p $out/share/icons
ln -s ${fetchzip { ln -s ${fetchzip {
url = "https://github.com/rose-pine/cursor/releases/download/${version.version}/BreezeX-RosePine-Linux.tar.xz"; url = "https://github.com/rose-pine/cursor/releases/download/v${version.version}/BreezeX-RosePine-Linux.tar.xz";
hash = version.hash; hash = version.hash;
}} $out/share/icons/${name} }} $out/share/icons/${name}
'' ''

View file

@ -2,18 +2,17 @@
stdenvNoCC, stdenvNoCC,
fetchurl, fetchurl,
unzip, unzip,
version,
}: }:
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
pname = "blobfox"; pname = "blobfox";
version = "2020.09.04"; version = version.version;
src = fetchurl { src = fetchurl {
url = "https://volpeon.ink/emojis/blobfox/blobfox.zip"; url = "https://volpeon.ink/emojis/blobfox/blobfox.zip";
hash = "sha256-b+mSyEdVjXldW/UQJaWy2cn0aF/NAd/RBRoW/K0v2bY="; hash = version.hash;
}; };
sourceRoot = ".";
nativeBuildInputs = [unzip]; nativeBuildInputs = [unzip];
installPhase = '' installPhase = ''

View file

@ -5,13 +5,14 @@
... ...
}: let }: let
inherit (lib) mkIf; inherit (lib) mkIf;
inherit (config) versions;
inherit ((pkgs.formats.elixirConf {}).lib) mkMap; inherit ((pkgs.formats.elixirConf {}).lib) mkMap;
cfg = config.conf.fedi; cfg = config.conf.fedi;
akkoma-fe = pkgs.callPackage ./akkoma-fe.nix {}; akkoma-fe = pkgs.callPackage ./akkoma-fe.nix {};
neocat = pkgs.callPackage ./neocat.nix {}; neocat = pkgs.callPackage ./neocat.nix {version = versions.neocat;};
neofox = pkgs.callPackage ./neofox.nix {}; neofox = pkgs.callPackage ./neofox.nix {version = versions.neofox;};
blobfox = pkgs.callPackage ./blobfox.nix {}; blobfox = pkgs.callPackage ./blobfox.nix {version = versions.blobfox;};
blobhaj = pkgs.callPackage ./blobhaj.nix {}; blobhaj = pkgs.callPackage ./blobhaj.nix {};
blobhajFlags = pkgs.callPackage ./blobhajFlags.nix {}; blobhajFlags = pkgs.callPackage ./blobhajFlags.nix {};
favicon = pkgs.callPackage ./favicon.nix {}; favicon = pkgs.callPackage ./favicon.nix {};

View file

@ -5,8 +5,9 @@
... ...
}: let }: let
inherit (lib) mkIf; inherit (lib) mkIf;
inherit (config) versions;
cfg = config.conf.fedi.iceshrimp; cfg = config.conf.fedi.iceshrimp;
iceshrimp = pkgs.callPackage ./iceshrimp.nix {}; iceshrimp = pkgs.callPackage ./iceshrimp.nix {version = versions.iceshrimp;};
in in
mkIf cfg.enable { mkIf cfg.enable {
environment.systemPackages = [iceshrimp]; environment.systemPackages = [iceshrimp];

View file

@ -5,17 +5,16 @@
makeWrapper, makeWrapper,
zstd, zstd,
dotnetCorePackages, dotnetCorePackages,
postgres, postgresql,
}: let version,
version = "v2025.1-beta5.patch2.security1"; }:
in
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "iceshrimp"; pname = "iceshrimp";
version = "2025.1"; version = version.version;
src = fetchurl { src = fetchurl {
url = "https://iceshrimp.dev/iceshrimp/Iceshrimp.NET/releases/download/v2025.1-beta5.patch2.security1/Iceshrimp.NET-${version}-linux-amd64-glibc.tar.zst"; url = "https://iceshrimp.dev/iceshrimp/Iceshrimp.NET/releases/download/v2025.1-beta5.patch2.security1/Iceshrimp.NET-v${version.version}-linux-amd64-glibc.tar.zst";
hash = "sha256-Uwstie81M3kM9CjukIG+wXpxp91uTuXFMB/fZlFWsMk="; hash = version.hash;
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -27,7 +26,7 @@ in
buildInputs = [ buildInputs = [
dotnetCorePackages.sdk_9_0 dotnetCorePackages.sdk_9_0
postgres postgresql
]; ];
unpackPhase = '' unpackPhase = ''
@ -37,7 +36,7 @@ in
tar xf $src tar xf $src
cp -r Iceshrimp.NET-${version}-linux-amd64-glibc/* $out/lib cp -r Iceshrimp.NET-${version.version}-linux-amd64-glibc/* $out/lib
mv $out/lib/configuration.ini $out/etc mv $out/lib/configuration.ini $out/etc
runHook postUnpack runHook postUnpack

View file

@ -2,18 +2,17 @@
stdenvNoCC, stdenvNoCC,
fetchurl, fetchurl,
unzip, unzip,
version,
}: }:
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
pname = "neocat"; pname = "neocat";
version = "2023.08.10"; version = version.version;
src = fetchurl { src = fetchurl {
url = "https://volpeon.ink/emojis/neocat/neocat.zip"; url = "https://volpeon.ink/emojis/neocat/neocat.zip";
hash = "sha256-tcyeYfBEi3vahrCQrQOaXXvz/jdHYS8d/bdt4jFSrCo="; hash = version.hash;
}; };
sourceRoot = ".";
nativeBuildInputs = [unzip]; nativeBuildInputs = [unzip];
installPhase = '' installPhase = ''

View file

@ -2,18 +2,17 @@
stdenvNoCC, stdenvNoCC,
fetchurl, fetchurl,
unzip, unzip,
version,
}: }:
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
pname = "neofox"; pname = "neofox";
version = "2023.06.30"; version = version.version;
src = fetchurl { src = fetchurl {
url = "https://volpeon.ink/emojis/neofox/neofox.zip"; url = "https://volpeon.ink/emojis/neofox/neofox.zip";
hash = "sha256-zwc8B+DjzO9RI51yIi/jnASA4jN4noNKkIdANApSslA="; hash = version.hash;
}; };
sourceRoot = ".";
nativeBuildInputs = [unzip]; nativeBuildInputs = [unzip];
installPhase = '' installPhase = ''

View file

@ -8,9 +8,25 @@ in {
options = { options = {
versions = { versions = {
rosepine-cursor = { rosepine-cursor = {
version = mkVersion "v1.0.1"; version = mkVersion "1.0.1";
hash = mkVersion "sha256-t5xwAPGhuQUfGThedLsmtZEEp1Ljjo3Udhd5Ql3O67c="; hash = mkVersion "sha256-t5xwAPGhuQUfGThedLsmtZEEp1Ljjo3Udhd5Ql3O67c=";
}; };
neocat = {
version = mkVersion "2023.08.10";
hash = mkVersion "sha256-tcyeYfBEi3vahrCQrQOaXXvz/jdHYS8d/bdt4jFSrCo=";
};
neofox = {
version = mkVersion "2023.06.30";
hash = mkVersion "sha256-zwc8B+DjzO9RI51yIi/jnASA4jN4noNKkIdANApSslA=";
};
blobfox = {
version = mkVersion "2020.09.04";
hash = mkVersion "sha256-b+mSyEdVjXldW/UQJaWy2cn0aF/NAd/RBRoW/K0v2bY=";
};
iceshrimp = {
version = mkVersion "2025.1-beta5.patch2.security1";
hash = mkVersion "sha256-Uwstie81M3kM9CjukIG+wXpxp91uTuXFMB/fZlFWsMk=";
};
}; };
}; };
} }