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" {} ''
mkdir -p $out/share/icons
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;
}} $out/share/icons/${name}
''

View file

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

View file

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

View file

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

View file

@ -5,48 +5,47 @@
makeWrapper,
zstd,
dotnetCorePackages,
postgres,
}: let
version = "v2025.1-beta5.patch2.security1";
in
stdenv.mkDerivation {
pname = "iceshrimp";
version = "2025.1";
postgresql,
version,
}:
stdenv.mkDerivation {
pname = "iceshrimp";
version = version.version;
src = fetchurl {
url = "https://iceshrimp.dev/iceshrimp/Iceshrimp.NET/releases/download/v2025.1-beta5.patch2.security1/Iceshrimp.NET-${version}-linux-amd64-glibc.tar.zst";
hash = "sha256-Uwstie81M3kM9CjukIG+wXpxp91uTuXFMB/fZlFWsMk=";
};
src = fetchurl {
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 = version.hash;
};
nativeBuildInputs = [
stdenv.cc.cc.lib
zstd
autoPatchelfHook
makeWrapper
];
nativeBuildInputs = [
stdenv.cc.cc.lib
zstd
autoPatchelfHook
makeWrapper
];
buildInputs = [
dotnetCorePackages.sdk_9_0
postgres
];
buildInputs = [
dotnetCorePackages.sdk_9_0
postgresql
];
unpackPhase = ''
runHook preUnpack
unpackPhase = ''
runHook preUnpack
mkdir -p $out $out/lib $out/etc
mkdir -p $out $out/lib $out/etc
tar xf $src
tar xf $src
cp -r Iceshrimp.NET-${version}-linux-amd64-glibc/* $out/lib
mv $out/lib/configuration.ini $out/etc
cp -r Iceshrimp.NET-${version.version}-linux-amd64-glibc/* $out/lib
mv $out/lib/configuration.ini $out/etc
runHook postUnpack
'';
runHook postUnpack
'';
postFixup = ''
makeWrapper $out/lib/Iceshrimp.Backend $out/bin/iceshrimp \
--set DOTNET_ROOT ${dotnetCorePackages.sdk_9_0}/share/dotnet/ \
--set ICESHRIMP_CONFIG $out/etc/configuration.ini \
--set ICESHRIMP_CONFIG_OVERRIDES $out/etc/configuration.overrides.ini
'';
}
postFixup = ''
makeWrapper $out/lib/Iceshrimp.Backend $out/bin/iceshrimp \
--set DOTNET_ROOT ${dotnetCorePackages.sdk_9_0}/share/dotnet/ \
--set ICESHRIMP_CONFIG $out/etc/configuration.ini \
--set ICESHRIMP_CONFIG_OVERRIDES $out/etc/configuration.overrides.ini
'';
}

View file

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

View file

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

View file

@ -8,9 +8,25 @@ in {
options = {
versions = {
rosepine-cursor = {
version = mkVersion "v1.0.1";
version = mkVersion "1.0.1";
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=";
};
};
};
}