diff --git a/preserves-nim/default.nix b/preserves-nim/default.nix index 30435d8..f0625aa 100644 --- a/preserves-nim/default.nix +++ b/preserves-nim/default.nix @@ -1,12 +1,11 @@ -{ lib, stdenv, buildNimPackage, fetchFromGitea, fetchFromGitHub, preserves }: +{ lib, stdenv, buildNimPackage, fetchFromGitea, fetchFromGitHub, runCommand +, nim-unwrapped, preserves }: let - compiler = fetchFromGitHub { - owner = "nim-lang"; - repo = "nim"; - rev = "v1.6.0"; - hash = "sha256-C9oveXIufv0HqMQw6eNmLbku4Sd7r28PKcRILvKYzn0="; - }; + compiler = runCommand "compiler.nimble" { inherit (nim-unwrapped) src; } '' + mkdir -p $out + tar xf $src --strip-components=1 -C $out + ''; npeg = fetchFromGitHub { owner = "zevv"; @@ -17,13 +16,13 @@ let in buildNimPackage rec { pname = "preserves"; - version = "3.3.1"; + version = "20220625"; src = fetchFromGitea { domain = "git.syndicate-lang.org"; owner = "ehmry"; repo = "${pname}-nim"; - rev = "nim-${pname}-${version}"; - sha256 = "sha256-xliHep/00EYWK9Y7bxhW6I/at3pbSJX7BCtngVo9UtY="; + rev = version; + sha256 = "sha256-ZNgBlIOKyWD0R5wZvGb/0K5tUpz5q5QpET4Qa/kxhkA="; }; propagatedBuildInputs = [ compiler npeg ]; diff --git a/xdg_open_ng/default.nix b/xdg_open_ng/default.nix index 7d97f0e..0a0d371 100644 --- a/xdg_open_ng/default.nix +++ b/xdg_open_ng/default.nix @@ -2,15 +2,15 @@ buildNimPackage rec { pname = "xdg_open_ng"; - version = "0.4.0"; + version = "20220625"; nimBinOnly = true; src = fetchFromGitea { domain = "git.syndicate-lang.org"; owner = "ehmry"; repo = pname; - rev = "${pname}-${version}"; - hash = "sha256-8Ox6ypxbn3X+Yj0VIaHF5JLvoTknPoYf/xYIMwyyfWg="; + rev = version; + hash = "sha256-yOuR4KYAMxlRc4AIr3ud0HzidHDQPeIiN3dzlnphLug="; }; propagatedBuildInputs = [ syndicate ]; @@ -20,7 +20,6 @@ buildNimPackage rec { desktopName = "Syndicate URI dispatcher (xdg-open)"; exec = "${name} %U"; mimeTypes = [ - "all/all" "application/xhtml+xml" "text/html" "text/xml"