commit c3ac75e0c733eaf05c0b09d6a10ecd2fe173c002
parent 3465bbba271b19ad1c20757e7e3a3add5d328dc3
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Tue, 24 Dec 2024 00:38:00 +0400
Up
Diffstat:
18 files changed, 52 insertions(+), 66 deletions(-)
diff --git a/pkgs/applications/goldencheetah/bin.nix b/pkgs/applications/goldencheetah/bin.nix
@@ -22,7 +22,7 @@ let
src = fetchfromgh {
owner = "GoldenCheetah";
repo = "GoldenCheetah";
- version = "V${version}";
+ tag = "V${version}";
name = "GoldenCheetah_v${version}_${suffix}";
sha256 =
{
diff --git a/pkgs/applications/misc/klogg/bin.nix b/pkgs/applications/misc/klogg/bin.nix
@@ -22,7 +22,7 @@ let
src = fetchfromgh {
owner = "variar";
repo = "klogg";
- version = "v${version}";
+ tag = "v${version}";
name = "klogg-${version}.0.1289-${suffix}";
hash =
{
diff --git a/pkgs/build-support/fetchfromgh/default.nix b/pkgs/build-support/fetchfromgh/default.nix
@@ -3,7 +3,7 @@
{
owner,
repo,
- version,
+ tag,
name,
...
}@args:
@@ -13,12 +13,12 @@ in
(
fetchurl (
{
- url = "${baseUrl}/releases/download/${version}/${name}";
+ url = "${baseUrl}/releases/download/${tag}/${name}";
}
// removeAttrs args [
"owner"
"repo"
- "version"
+ "tag"
"name"
]
)
diff --git a/pkgs/darwin/amethyst/default.nix b/pkgs/darwin/amethyst/default.nix
@@ -7,14 +7,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "Amethyst";
- version = "0.20.0";
+ version = "0.21.2";
src = fetchfromgh {
owner = "ianyh";
repo = "Amethyst";
- version = "v${finalAttrs.version}";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-pqUzcNUP8v3ls68BIzWXggXgUVe1wc/bN5BtXqKHXM4=";
name = "Amethyst.zip";
- hash = "sha256-GYorvoCDLOd/xYStIGkSBqF5QjVR3PHL30b/Hm+CnAk=";
};
sourceRoot = ".";
diff --git a/pkgs/darwin/darktable/bin.nix b/pkgs/darwin/darktable/bin.nix
@@ -8,14 +8,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "darktable-bin";
- version = "4.8.0";
+ version = "5.0.0";
src = fetchfromgh {
owner = "darktable-org";
repo = "darktable";
+ tag = "release-${finalAttrs.version}";
+ hash = "sha256-P0nPtjlYJpuZBlz2tQFnjU5j8kV+4ZFbzX/6Df753P0=";
name = "darktable-${finalAttrs.version}-x86_64.dmg";
- hash = "sha256-ve1phvcq+JAfD6KGhtbQbmt2bYMcKavooBY7WlA6UOY=";
- version = "release-${finalAttrs.version}";
};
sourceRoot = ".";
diff --git a/pkgs/darwin/macpass/default.nix b/pkgs/darwin/macpass/default.nix
@@ -12,9 +12,9 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchfromgh {
owner = "MacPass";
repo = "MacPass";
- name = "MacPass-${finalAttrs.version}.zip";
+ tag = finalAttrs.version;
hash = "sha256-LQ073JRbQsDB/nmx63Tllptfdo/8VqoobXPTSShzsXM=";
- inherit (finalAttrs) version;
+ name = "MacPass-${finalAttrs.version}.zip";
};
sourceRoot = ".";
diff --git a/pkgs/darwin/macsvg/default.nix b/pkgs/darwin/macsvg/default.nix
@@ -13,9 +13,9 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchfromgh {
owner = "dsward2";
repo = "macSVG";
- name = "macSVG-v${lib.versions.majorMinor finalAttrs.version}.zip";
+ tag = "v${finalAttrs.version}";
hash = "sha256-wlEFUzFQ9fnSjmsIrCDzRvSZmfcK9V+go6pNYJOqN+w=";
- version = "v${finalAttrs.version}";
+ name = "macSVG-v${lib.versions.majorMinor finalAttrs.version}.zip";
};
sourceRoot = ".";
diff --git a/pkgs/darwin/podman-desktop/bin.nix b/pkgs/darwin/podman-desktop/bin.nix
@@ -2,39 +2,26 @@
lib,
stdenv,
fetchfromgh,
- undmg,
+ _7zz,
}:
-let
- arch =
- {
- "aarch64-darwin" = "arm64";
- "x86_64-darwin" = "x64";
- }
- .${stdenv.hostPlatform.system};
- hash =
- {
- "aarch64-darwin" = "sha256-3+Lib7gWF03UrIKRcyzHw9aX79aebkCQscAPdKAf6z0=";
- "x86_64-darwin" = "sha256-miIw5xsL6GSHC+sX3JNxktfwhY5tkLrLCNdHHUwdtdY=";
- }
- .${stdenv.hostPlatform.system};
-in
stdenv.mkDerivation (finalAttrs: {
pname = "podman-desktop";
- version = "1.7.0";
+ version = "1.15.0";
src = fetchfromgh {
owner = "containers";
repo = "podman-desktop";
- name = "podman-desktop-${finalAttrs.version}-${arch}.dmg";
- version = "v${finalAttrs.version}";
- inherit hash;
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-TS2232oa7lnDh4E3F3Z3y2IGX2Q/SRV/tWIlvgpBkEU=";
+ name = "podman-desktop-${finalAttrs.version}-x64.dmg";
};
- nativeBuildInputs = [ undmg ];
-
sourceRoot = ".";
+ nativeBuildInputs = [ _7zz ];
+ unpackCmd = "7zz x $curSrc";
+
installPhase = ''
runHook preInstall
mkdir -p $out/Applications
@@ -47,10 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://podman-desktop.io/";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.asl20;
- platforms = [
- "aarch64-darwin"
- "x86_64-darwin"
- ];
+ platforms = [ "x86_64-darwin" ];
maintainers = [ lib.maintainers.sikmir ];
skip.ci = true;
};
diff --git a/pkgs/darwin/qtcreator/bin.nix b/pkgs/darwin/qtcreator/bin.nix
@@ -14,9 +14,9 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchfromgh {
owner = "qt-creator";
repo = "qt-creator";
- name = "qtcreator-macos-universal-${finalAttrs.version}.7z";
+ tag = "v${finalAttrs.version}";
hash = "sha256-4Z5czgLtU9mrc1HKIkuMWv3O3x3Zul9MJNUHjN7mb0k=";
- version = "v${finalAttrs.version}";
+ name = "qtcreator-macos-universal-${finalAttrs.version}.7z";
};
sourceRoot = ".";
diff --git a/pkgs/darwin/qutebrowser/bin.nix b/pkgs/darwin/qutebrowser/bin.nix
@@ -14,9 +14,9 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchfromgh {
owner = "qutebrowser";
repo = "qutebrowser";
- name = "qutebrowser-${finalAttrs.version}-x86_64.dmg";
+ tag = "v${finalAttrs.version}";
hash = "sha256-+UkClMhU9tqQFeOOap16bDXyi2RRsykV/hZrMhUEfdM=";
- version = "v${finalAttrs.version}";
+ name = "qutebrowser-${finalAttrs.version}-x86_64.dmg";
};
sourceRoot = ".";
diff --git a/pkgs/darwin/sequel-ace/default.nix b/pkgs/darwin/sequel-ace/default.nix
@@ -7,14 +7,14 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "sequel-ace";
- version = "4.0.17-20067";
+ version = "4.1.7-20080";
src = fetchfromgh {
owner = "Sequel-Ace";
repo = "Sequel-Ace";
+ tag = "production/${finalAttrs.version}";
+ hash = "sha256-tJh3fLPrHhh1CKTN1iAGQnhqeCoZ5hN5ytL0KwplgHk=";
name = "Sequel-Ace-${lib.head (lib.splitString "-" finalAttrs.version)}.zip";
- hash = "sha256-I1wVmamN9x9il+9XeJxmrsSyG3Y27+3/Jt4Q9P6Q7dI=";
- version = "production/${finalAttrs.version}";
};
sourceRoot = ".";
diff --git a/pkgs/geospatial/orbisgis/default.nix b/pkgs/geospatial/orbisgis/default.nix
@@ -15,9 +15,9 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchfromgh {
owner = "orbisgis";
repo = "orbisgis";
- name = "orbisgis-bin.zip";
- version = "${finalAttrs.version}-SNAPSHOT";
+ tag = "${finalAttrs.version}-SNAPSHOT";
hash = "sha256-e7SSn+P8rF5eSbl4Z/zp1mHNN2rAi4ZoMvkoy360hGM=";
+ name = "orbisgis-bin.zip";
};
nativeBuildInputs = [
diff --git a/pkgs/linguistics/i18n-editor/default.nix b/pkgs/linguistics/i18n-editor/default.nix
@@ -14,9 +14,9 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchfromgh {
owner = "jcbvm";
repo = "i18n-editor";
- name = "i18n-editor-${finalAttrs.version}.zip";
+ tag = finalAttrs.version;
hash = "sha256-koJdCmcM9mH4D4JSyyi0i/zRCUeI6pYdMmS7SaC56aY=";
- inherit (finalAttrs) version;
+ name = "i18n-editor-${finalAttrs.version}.zip";
};
sourceRoot = ".";
diff --git a/pkgs/misc/qstudio/default.nix b/pkgs/misc/qstudio/default.nix
@@ -8,14 +8,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qstudio";
- version = "2.54";
+ version = "4.03";
src = fetchfromgh {
owner = "timeseries";
repo = "qstudio";
+ tag = finalAttrs.version;
+ hash = "sha256-96E+exTt1Vebg2XL/c9c7gUFWYMkxjnAVumxg0U6Gpg=";
name = "qstudio.jar";
- hash = "sha256-NN2pkAjlwTbq25AafD06NMoAaOknW5nimya2zi+aMBQ=";
- version = finalAttrs.version;
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/misc/serial-studio/bin.nix b/pkgs/misc/serial-studio/bin.nix
@@ -13,9 +13,9 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchfromgh {
owner = "Serial-Studio";
repo = "Serial-Studio";
- name = "SerialStudio-${finalAttrs.version}-macOS.zip";
+ tag = "v${finalAttrs.version}";
hash = "sha256-Hl3HoBfDum4APCXpKwQTkrCdTu3UyCnbzHn1omxc9Nc=";
- version = "v${finalAttrs.version}";
+ name = "SerialStudio-${finalAttrs.version}-macOS.zip";
};
sourceRoot = ".";
diff --git a/pkgs/mqtt/mqtt-cli/default.nix b/pkgs/mqtt/mqtt-cli/default.nix
@@ -13,9 +13,9 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchfromgh {
owner = "hivemq";
repo = "mqtt-cli";
- name = "mqtt-cli-${finalAttrs.version}.jar";
+ tag = "v${finalAttrs.version}";
hash = "sha256-jn+dhZa4orcZkus30nScgyih7Oa5/XWI33qR/8XAwGQ=";
- version = "v${finalAttrs.version}";
+ name = "mqtt-cli-${finalAttrs.version}.jar";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/osm/osmosis/default.nix b/pkgs/osm/osmosis/default.nix
@@ -3,21 +3,22 @@
stdenv,
fetchfromgh,
jre,
+ unzip,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "osmosis";
- version = "0.48.3";
+ version = "0.49.2";
src = fetchfromgh {
owner = "openstreetmap";
repo = "osmosis";
- name = "osmosis-${finalAttrs.version}.tgz";
- hash = "sha256-skxgFXjqTLDKiDAr5naP0GAr3obCVKDguQUTWB26Z/8=";
- inherit (finalAttrs) version;
+ tag = finalAttrs.version;
+ hash = "sha256-aVDx39vkM3rRk7BQEwk1FCbEA/q3cAYcndypoorvwm0=";
+ name = "osmosis-${finalAttrs.version}.zip";
};
- sourceRoot = ".";
+ nativeBuildInputs = [ unzip ];
installPhase = ''
mkdir -p $out
@@ -30,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Command line Java application for processing OSM data";
homepage = "http://wiki.openstreetmap.org/wiki/Osmosis";
+ sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.sikmir ];
platforms = jre.meta.platforms;
diff --git a/pkgs/osm/planetiler/default.nix b/pkgs/osm/planetiler/default.nix
@@ -9,14 +9,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "planetiler";
- version = "0.7.0";
+ version = "0.8.3";
src = fetchfromgh {
owner = "onthegomap";
repo = "planetiler";
- version = "v${finalAttrs.version}";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-eUDwcJE3Lq2KfC8fedXVq8kUW6zQNt6HurycXFeoFmw=";
name = "planetiler.jar";
- hash = "sha256-rq5cihkU65xtVkrTvVrT7lPoy+Q92aOawYUWxd5LObI=";
};
dontUnpack = true;
