commit b5e9b31ad914f81b814b5bf90ca53d31c4c54df1 parent 0a930c0a59aad7c138f6e3b1a743c67e3bb0d41a Author: Nikolay Korotkiy <sikmir@disroot.org> Date: Tue, 23 Jan 2024 21:07:51 +0400 Up Diffstat:
29 files changed, 305 insertions(+), 279 deletions(-)
diff --git a/pkgs/applications/goldencheetah/bin.nix b/pkgs/applications/goldencheetah/bin.nix @@ -29,6 +29,7 @@ let meta = with lib; { description = "Performance software for cyclists, runners and triathletes"; homepage = "https://www.goldencheetah.org/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3; maintainers = [ maintainers.sikmir ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/applications/synwrite/bin.nix b/pkgs/applications/synwrite/bin.nix @@ -1,45 +0,0 @@ -{ lib, stdenv, fetchurl, unzip, wine, makeWrapper, withExLexer ? true }: -let - exlexer = fetchurl { - url = "mirror://sourceforge/synwrite-addons/PyPlugins/plugin.Alexey.ExLexer.zip"; - hash = "sha256-O9wOglJp4XExWV8ODoVra3VyaqRmhB51/tupRmqDdqY="; - }; -in -stdenv.mkDerivation rec { - pname = "synwrite-bin"; - version = "6.41.2780"; - - src = fetchurl { - urls = [ - "mirror://sourceforge/synwrite/Release/SynWrite.${version}.zip" - "http://uvviewsoft.com/synwrite/files/SynWrite.${version}.zip" - ]; - hash = "sha256-/WleyQoo98RLX1MJGVjjlPmZJHxiCV4ulrb1eqNHOZ8="; - }; - - sourceRoot = "."; - - nativeBuildInputs = [ unzip makeWrapper ]; - - installPhase = '' - mkdir -p $out/opt/synwrite - cp -r . $out/opt/synwrite - - makeWrapper ${wine}/bin/wine $out/bin/synwrite \ - --run "[ -d \$HOME/.synwrite ] || { cp -r $out/opt/synwrite \$HOME/.synwrite && chmod -R +w \$HOME/.synwrite; }" \ - --add-flags "\$HOME/.synwrite/Syn.exe" - '' + lib.optionalString withExLexer '' - unzip ${exlexer} -d $out/opt/synwrite/Py/syn_exlexer - ''; - - preferLocalBuild = true; - - meta = with lib; { - description = "Advanced text editor for programmers and Notepad replacement"; - homepage = "http://uvviewsoft.com/synwrite/"; - license = licenses.mpl11; - maintainers = [ maintainers.sikmir ]; - platforms = platforms.all; - skip.ci = true; - }; -} diff --git a/pkgs/applications/synwrite/default.nix b/pkgs/applications/synwrite/default.nix @@ -0,0 +1,46 @@ +{ lib, stdenv, fetchurl, unzip, wine, makeWrapper, withExLexer ? true }: +let + exlexer = fetchurl { + url = "mirror://sourceforge/synwrite-addons/PyPlugins/plugin.Alexey.ExLexer.zip"; + hash = "sha256-O9wOglJp4XExWV8ODoVra3VyaqRmhB51/tupRmqDdqY="; + }; +in +stdenv.mkDerivation rec { + pname = "synwrite"; + version = "6.41.2780"; + + src = fetchurl { + urls = [ + "mirror://sourceforge/synwrite/Release/SynWrite.${version}.zip" + "http://uvviewsoft.com/synwrite/files/SynWrite.${version}.zip" + ]; + hash = "sha256-/WleyQoo98RLX1MJGVjjlPmZJHxiCV4ulrb1eqNHOZ8="; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ unzip makeWrapper ]; + + installPhase = '' + mkdir -p $out/opt/synwrite + cp -r . $out/opt/synwrite + + makeWrapper ${wine}/bin/wine $out/bin/synwrite \ + --run "[ -d \$HOME/.synwrite ] || { cp -r $out/opt/synwrite \$HOME/.synwrite && chmod -R +w \$HOME/.synwrite; }" \ + --add-flags "\$HOME/.synwrite/Syn.exe" + '' + lib.optionalString withExLexer '' + unzip ${exlexer} -d $out/opt/synwrite/Py/syn_exlexer + ''; + + preferLocalBuild = true; + + meta = with lib; { + description = "Advanced text editor for programmers and Notepad replacement"; + homepage = "http://uvviewsoft.com/synwrite/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.mpl11; + maintainers = [ maintainers.sikmir ]; + platforms = platforms.all; + skip.ci = true; + }; +} diff --git a/pkgs/darwin/amethyst/bin.nix b/pkgs/darwin/amethyst/bin.nix @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchfromgh, unzip }: - -stdenv.mkDerivation (finalAttrs: { - pname = "Amethyst-bin"; - version = "0.16.0"; - - src = fetchfromgh { - owner = "ianyh"; - repo = "Amethyst"; - version = "v${finalAttrs.version}"; - name = "Amethyst.zip"; - hash = "sha256-pghX74T0JsAWkxAaAaQ5NIhYqj89fo0ZqRtxPThJZ/M="; - }; - - sourceRoot = "."; - - nativeBuildInputs = [ unzip ]; - - installPhase = '' - mkdir -p $out/Applications - cp -r *.app $out/Applications - ''; - - preferLocalBuild = true; - - meta = with lib; { - description = "Automatic tiling window manager for macOS à la xmonad"; - homepage = "https://ianyh.com/amethyst/"; - license = licenses.mit; - maintainers = [ maintainers.sikmir ]; - platforms = [ "x86_64-darwin" ]; - skip.ci = true; - }; -}) diff --git a/pkgs/darwin/amethyst/default.nix b/pkgs/darwin/amethyst/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchfromgh, unzip }: + +stdenv.mkDerivation (finalAttrs: { + pname = "Amethyst"; + version = "0.20.0"; + + src = fetchfromgh { + owner = "ianyh"; + repo = "Amethyst"; + version = "v${finalAttrs.version}"; + name = "Amethyst.zip"; + hash = "sha256-GYorvoCDLOd/xYStIGkSBqF5QjVR3PHL30b/Hm+CnAk="; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out/Applications + cp -r *.app $out/Applications + ''; + + preferLocalBuild = true; + + meta = with lib; { + description = "Automatic tiling window manager for macOS à la xmonad"; + homepage = "https://ianyh.com/amethyst/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.mit; + maintainers = [ maintainers.sikmir ]; + platforms = [ "x86_64-darwin" ]; + skip.ci = true; + }; +}) diff --git a/pkgs/darwin/cudatext/bin.nix b/pkgs/darwin/cudatext/bin.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { inherit (cudatext.meta) description homepage changelog license; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = [ "aarch64-darwin" "x86_64-darwin" ]; maintainers = [ maintainers.sikmir ]; skip.ci = true; diff --git a/pkgs/darwin/darktable/bin.nix b/pkgs/darwin/darktable/bin.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; darktable.meta // { + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = [ maintainers.sikmir ]; platforms = [ "x86_64-darwin" ]; skip.ci = true; diff --git a/pkgs/darwin/macpass/bin.nix b/pkgs/darwin/macpass/bin.nix @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchfromgh, unzip }: - -stdenv.mkDerivation (finalAttrs: { - pname = "MacPass-bin"; - version = "0.8.1"; - - src = fetchfromgh { - owner = "MacPass"; - repo = "MacPass"; - name = "MacPass-${finalAttrs.version}.zip"; - hash = "sha256-LQ073JRbQsDB/nmx63Tllptfdo/8VqoobXPTSShzsXM="; - inherit (finalAttrs) version; - }; - - sourceRoot = "."; - - nativeBuildInputs = [ unzip ]; - - installPhase = '' - mkdir -p $out/Applications - cp -r *.app $out/Applications - ''; - - preferLocalBuild = true; - - meta = with lib; { - description = "A native OS X KeePass client"; - homepage = "https://macpassapp.org/"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.sikmir ]; - platforms = [ "x86_64-darwin" ]; - skip.ci = true; - }; -}) diff --git a/pkgs/darwin/macpass/default.nix b/pkgs/darwin/macpass/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchfromgh, unzip }: + +stdenv.mkDerivation (finalAttrs: { + pname = "MacPass"; + version = "0.8.1"; + + src = fetchfromgh { + owner = "MacPass"; + repo = "MacPass"; + name = "MacPass-${finalAttrs.version}.zip"; + hash = "sha256-LQ073JRbQsDB/nmx63Tllptfdo/8VqoobXPTSShzsXM="; + inherit (finalAttrs) version; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out/Applications + cp -r *.app $out/Applications + ''; + + preferLocalBuild = true; + + meta = with lib; { + description = "A native OS X KeePass client"; + homepage = "https://macpassapp.org/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.gpl3Plus; + maintainers = [ maintainers.sikmir ]; + platforms = [ "x86_64-darwin" ]; + skip.ci = true; + }; +}) diff --git a/pkgs/darwin/macsvg/default.nix b/pkgs/darwin/macsvg/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchfromgh, unzip, makeWrapper }: stdenv.mkDerivation (finalAttrs: { - pname = "macsvg-bin"; + pname = "macsvg"; version = "1.2.0"; src = fetchfromgh { @@ -27,6 +27,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "An open-source macOS app for designing HTML5 SVG"; homepage = "https://macsvg.org/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = [ "aarch64-darwin" "x86_64-darwin" ]; diff --git a/pkgs/darwin/marta/default.nix b/pkgs/darwin/marta/default.nix @@ -1,7 +1,7 @@ { lib, stdenvNoCC, fetchurl, undmg, makeWrapper }: stdenvNoCC.mkDerivation (finalAttrs: { - pname = "marta-bin"; + pname = "marta"; version = "0.8.1"; src = fetchurl { @@ -24,6 +24,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = with lib; { description = "File Manager for macOS"; homepage = "https://marta.sh/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.free; maintainers = [ maintainers.sikmir ]; platforms = [ "x86_64-darwin" ]; diff --git a/pkgs/darwin/qtcreator/bin.nix b/pkgs/darwin/qtcreator/bin.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; qtcreator.meta // { + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = [ maintainers.sikmir ]; platforms = [ "x86_64-darwin" ]; skip.ci = true; diff --git a/pkgs/darwin/qutebrowser/bin.nix b/pkgs/darwin/qutebrowser/bin.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; qutebrowser.meta // { + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = [ maintainers.sikmir ]; platforms = [ "x86_64-darwin" ]; skip.ci = true; diff --git a/pkgs/darwin/sequel-ace/default.nix b/pkgs/darwin/sequel-ace/default.nix @@ -1,7 +1,7 @@ { lib, stdenvNoCC, fetchfromgh, unzip }: stdenvNoCC.mkDerivation (finalAttrs: { - pname = "sequel-ace-bin"; + pname = "sequel-ace"; version = "4.0.13-20062"; src = fetchfromgh { @@ -24,6 +24,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = with lib; { description = "MySQL/MariaDB database management for macOS"; homepage = "https://sequel-ace.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.free; maintainers = [ maintainers.sikmir ]; platforms = [ "x86_64-darwin" ]; diff --git a/pkgs/darwin/sloth/default.nix b/pkgs/darwin/sloth/default.nix @@ -1,7 +1,7 @@ { lib, stdenvNoCC, fetchfromgh, unzip, makeWrapper }: stdenvNoCC.mkDerivation (finalAttrs: { - pname = "sloth-bin"; + pname = "sloth"; version = "3.2"; src = fetchfromgh { @@ -27,6 +27,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = with lib; { description = "Nice GUI for lsof"; homepage = "https://sveinbjorn.org/sloth"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.bsd3; maintainers = [ maintainers.sikmir ]; platforms = [ "x86_64-darwin" ]; diff --git a/pkgs/default.nix b/pkgs/default.nix @@ -14,7 +14,7 @@ lib.makeScope newScope ( goldencheetah-bin = callPackage ./applications/goldencheetah/bin.nix { }; klogg = libsForQt5.callPackage ./applications/misc/klogg { }; klogg-bin = callPackage ./applications/misc/klogg/bin.nix { }; - synwrite-bin = callPackage ./applications/synwrite/bin.nix { }; + synwrite = callPackage ./applications/synwrite { }; ### BUILD SUPPORT @@ -25,23 +25,23 @@ lib.makeScope newScope ( ### DARWIN - amethyst-bin = callPackage ./darwin/amethyst/bin.nix { }; + amethyst = callPackage ./darwin/amethyst { }; cudatext-bin = callPackage ./darwin/cudatext/bin.nix { }; darktable-bin = callPackage ./darwin/darktable/bin.nix { }; finch = callPackage ./darwin/finch { buildGoModule = pkgs.buildGo120Module; }; - macpass-bin = callPackage ./darwin/macpass/bin.nix { }; - macsvg-bin = callPackage ./darwin/macsvg { }; - marta-bin = callPackage ./darwin/marta { }; + macpass = callPackage ./darwin/macpass { }; + macsvg = callPackage ./darwin/macsvg { }; + marta = callPackage ./darwin/marta { }; pinentry-touchid = callPackage ./darwin/pinentry-touchid { inherit (darwin.apple_sdk.frameworks) LocalAuthentication; }; podman-desktop-bin = callPackage ./darwin/podman-desktop/bin.nix { }; qtcreator-bin = callPackage ./darwin/qtcreator/bin.nix { }; qutebrowser-bin = callPackage ./darwin/qutebrowser/bin.nix { }; - sequel-ace-bin = callPackage ./darwin/sequel-ace { }; - sloth-bin = callPackage ./darwin/sloth { }; + sequel-ace = callPackage ./darwin/sequel-ace { }; + sloth = callPackage ./darwin/sloth { }; ### DATA @@ -218,7 +218,7 @@ lib.makeScope newScope ( mbutiles = callPackage ./geospatial/mbutiles { }; mobroute = callPackage ./geospatial/mobroute { }; morecantile = callPackage ./geospatial/morecantile { }; - orbisgis-bin = callPackage ./geospatial/orbisgis/bin.nix { jre = pkgs.jre8; }; + orbisgis = callPackage ./geospatial/orbisgis { jre = pkgs.jre8; }; ossim = callPackage ./geospatial/ossim { }; pmtiles = callPackage ./geospatial/pmtiles { }; pipfile = callPackage ./geospatial/pipfile { }; @@ -243,7 +243,7 @@ lib.makeScope newScope ( rio-mucho = callPackage ./geospatial/rio-mucho { }; rio-stac = callPackage ./geospatial/rio-stac { }; rio-tiler = callPackage ./geospatial/rio-tiler { }; - sasplanet-bin = callPackage ./geospatial/sasplanet/bin.nix { }; + sasplanet = callPackage ./geospatial/sasplanet { }; server-thread = callPackage ./geospatial/server-thread { }; starlette-cramjam = callPackage ./geospatial/starlette-cramjam { }; supermercado = callPackage ./geospatial/supermercado { }; @@ -310,7 +310,7 @@ lib.makeScope newScope ( goldendict-bin = callPackage ./linguistics/goldendict/bin.nix { }; gt-bash-client = callPackage ./linguistics/gt-bash-client { }; gt4gd = callPackage ./linguistics/gt4gd { }; - i18n-editor-bin = callPackage ./linguistics/i18n-editor { jre = pkgs.jdk11; }; + i18n-editor = callPackage ./linguistics/i18n-editor { jre = pkgs.jdk11; }; lsdreader = callPackage ./linguistics/lsdreader { }; mikatools = callPackage ./linguistics/mikatools { }; odict = callPackage ./linguistics/odict { }; @@ -462,7 +462,7 @@ lib.makeScope newScope ( imposm = callPackage ./osm/imposm { }; map-machine = callPackage ./osm/map-machine { }; map-stylizer = callPackage ./osm/map-stylizer { }; - maperitive-bin = callPackage ./osm/maperitive/bin.nix { }; + maperitive = callPackage ./osm/maperitive { }; memphis = callPackage ./osm/memphis { }; osm-3s = callPackage ./osm/osm-3s { }; osm-area-tools = callPackage ./osm/osm-area-tools { }; diff --git a/pkgs/gemini/gplaces/default.nix b/pkgs/gemini/gplaces/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gplaces"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "dimkr"; repo = "gplaces"; rev = "v${finalAttrs.version}"; - hash = "sha256-6b/SqkY/C45NAsHzRyoMv5vSXOTiVisXO2GCIL7reN4="; + hash = "sha256-d5HGgHknht3wLzY8yQ62odU8oZdBgKgv6I2Z0RU+ouk="; fetchSubmodules = true; }; diff --git a/pkgs/gemini/tootik/default.nix b/pkgs/gemini/tootik/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tootik"; - version = "0.5.11"; + version = "0.6.0"; src = fetchFromGitHub { owner = "dimkr"; repo = "tootik"; rev = version; - hash = "sha256-PmBj48JoCTv1S9QjdJK34m/WBPLyXc8ewjMFEfdigAQ="; + hash = "sha256-3QqZXy3Mv7IR/+4DZm6+1riW2NRq3mPs1ViD+7WwjtM="; }; - vendorHash = "sha256-uxY+mdUm67a7dEBezs6VWcsb+RUs1zsoFeU9DXek+Lg="; + vendorHash = "sha256-2ZJ1WRrnt4aW3SC+cGgcavQqyOdgMNOLr3/f2lPeQYg="; nativeBuildInputs = [ openssl ]; @@ -19,6 +19,8 @@ buildGoModule rec { go generate ./migrations ''; + tags = [ "fts5" ]; + meta = with lib; { description = "A federated nanoblogging service with a Gemini frontend"; inherit (src.meta) homepage; diff --git a/pkgs/geospatial/orbisgis/bin.nix b/pkgs/geospatial/orbisgis/bin.nix @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchfromgh, unzip, rsync, makeWrapper, jre }: - -stdenv.mkDerivation (finalAttrs: { - pname = "orbisgis-bin"; - version = "5.1.0"; - - src = fetchfromgh { - owner = "orbisgis"; - repo = "orbisgis"; - name = "orbisgis-bin.zip"; - version = "${finalAttrs.version}-SNAPSHOT"; - hash = "sha256-e7SSn+P8rF5eSbl4Z/zp1mHNN2rAi4ZoMvkoy360hGM="; - }; - - nativeBuildInputs = [ unzip rsync makeWrapper ]; - - postPatch = '' - sed -i "s#/usr/bin/orbisgis#$out/bin/orbisgis#" orbisgis.desktop - sed -i "s#/usr/lib/OrbisGIS#$out/opt/OrbisGIS#" orbisgis orbisgis.desktop - sed -i "s#java -jar#${jre}/bin/java -jar#" orbisgis.sh orbisgis_safemode.sh - ''; - - installPhase = '' - mkdir -p $out/{bin,opt/OrbisGIS} - rsync -r --exclude '*.bat' . $out/opt/OrbisGIS - - chmod +x $out/opt/OrbisGIS/orbisgis - makeWrapper $out/opt/OrbisGIS/orbisgis $out/bin/orbisgis \ - --set JAVA_HOME "${jre}" - ''; - - meta = with lib; { - homepage = "http://orbisgis.org/"; - description = "An opensource GIS software"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.gpl3; - maintainers = [ maintainers.sikmir ]; - platforms = jre.meta.platforms; - skip.ci = true; - }; -}) diff --git a/pkgs/geospatial/orbisgis/default.nix b/pkgs/geospatial/orbisgis/default.nix @@ -0,0 +1,41 @@ +{ lib, stdenv, fetchfromgh, unzip, rsync, makeWrapper, jre }: + +stdenv.mkDerivation (finalAttrs: { + pname = "orbisgis"; + version = "5.1.0"; + + src = fetchfromgh { + owner = "orbisgis"; + repo = "orbisgis"; + name = "orbisgis-bin.zip"; + version = "${finalAttrs.version}-SNAPSHOT"; + hash = "sha256-e7SSn+P8rF5eSbl4Z/zp1mHNN2rAi4ZoMvkoy360hGM="; + }; + + nativeBuildInputs = [ unzip rsync makeWrapper ]; + + postPatch = '' + sed -i "s#/usr/bin/orbisgis#$out/bin/orbisgis#" orbisgis.desktop + sed -i "s#/usr/lib/OrbisGIS#$out/opt/OrbisGIS#" orbisgis orbisgis.desktop + sed -i "s#java -jar#${jre}/bin/java -jar#" orbisgis.sh orbisgis_safemode.sh + ''; + + installPhase = '' + mkdir -p $out/{bin,opt/OrbisGIS} + rsync -r --exclude '*.bat' . $out/opt/OrbisGIS + + chmod +x $out/opt/OrbisGIS/orbisgis + makeWrapper $out/opt/OrbisGIS/orbisgis $out/bin/orbisgis \ + --set JAVA_HOME "${jre}" + ''; + + meta = with lib; { + homepage = "http://orbisgis.org/"; + description = "An opensource GIS software"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + license = licenses.gpl3; + maintainers = [ maintainers.sikmir ]; + platforms = jre.meta.platforms; + skip.ci = true; + }; +}) diff --git a/pkgs/geospatial/sasplanet/bin.nix b/pkgs/geospatial/sasplanet/bin.nix @@ -1,62 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchgit -, fetchgdrive -, unzip -, wine -, makeWrapper -, withMaps ? true -, withExtremum ? false -}: -let - maps = fetchgit { - url = "http://parasite.kicks-ass.org:3000/sasgis/maps.git"; - rev = "10221f2959ece3d430326adbc2daaf11c302f858"; - hash = "sha256-6j4KZlAKbBYoFr2ZBcfW0j8kmUTRbnzsaT1UNGXyKIo="; - }; - extremum = fetchgdrive { - id = "12PM_mEE8Xck036vXd5TAzPsUZeCnztJ5"; - hash = "sha256-6ZF4PsEFEGYt85umWJ/ToBW3JdeKEF4n6uU73hU8oLs="; - name = "Extremum.zip"; - }; -in -stdenv.mkDerivation (finalAttrs: { - pname = "sasplanet-bin"; - version = "230909"; - - src = fetchurl { - url = "http://www.sasgis.org/programs/sasplanet/SASPlanet_${finalAttrs.version}.zip"; - hash = "sha256-tW82sjpiJqkbKpAI+5uvBfgI7Uqtii3Rn8ulnY3MxQM="; - }; - - nativeBuildInputs = [ unzip makeWrapper ]; - - # Post install regedit: - # * increase font size: https://askubuntu.com/a/1313810 - # * dark theme: https://gist.github.com/Zeinok/ceaf6ff204792dde0ae31e0199d89398 - installPhase = '' - mkdir -p $out/opt/sasplanet - cp -r . $out/opt/sasplanet - - makeWrapper ${wine}/bin/wine $out/bin/sasplanet \ - --run "[ -d \$HOME/.sasplanet ] || { cp -r $out/opt/sasplanet \$HOME/.sasplanet && chmod -R +w \$HOME/.sasplanet; }" \ - --add-flags "\$HOME/.sasplanet/SASPlanet.exe" - '' + lib.optionalString withMaps '' - cp -r ${maps}/* $out/opt/sasplanet/Maps/sas.maps - '' + lib.optionalString withExtremum '' - unzip ${extremum} -d $out/opt/sasplanet/Maps/sas.maps - ''; - - preferLocalBuild = true; - - meta = with lib; { - description = "SAS.Planet is a program designed for viewing and downloading high-resolution satellite imagery and conventional maps"; - homepage = "http://www.sasgis.org/sasplaneta/"; - changelog = "http://www.sasgis.org/mantis/changelog_page.php"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.sikmir ]; - platforms = platforms.all; - skip.ci = true; - }; -}) diff --git a/pkgs/geospatial/sasplanet/default.nix b/pkgs/geospatial/sasplanet/default.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, fetchurl +, fetchgit +, fetchgdrive +, unzip +, wine +, makeWrapper +, withMaps ? true +, withExtremum ? false +}: +let + maps = fetchgit { + url = "http://parasite.kicks-ass.org:3000/sasgis/maps.git"; + rev = "10221f2959ece3d430326adbc2daaf11c302f858"; + hash = "sha256-6j4KZlAKbBYoFr2ZBcfW0j8kmUTRbnzsaT1UNGXyKIo="; + }; + extremum = fetchgdrive { + id = "12PM_mEE8Xck036vXd5TAzPsUZeCnztJ5"; + hash = "sha256-6ZF4PsEFEGYt85umWJ/ToBW3JdeKEF4n6uU73hU8oLs="; + name = "Extremum.zip"; + }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "sasplanet"; + version = "230909"; + + src = fetchurl { + url = "http://www.sasgis.org/programs/sasplanet/SASPlanet_${finalAttrs.version}.zip"; + hash = "sha256-tW82sjpiJqkbKpAI+5uvBfgI7Uqtii3Rn8ulnY3MxQM="; + }; + + nativeBuildInputs = [ unzip makeWrapper ]; + + # Post install regedit: + # * increase font size: https://askubuntu.com/a/1313810 + # * dark theme: https://gist.github.com/Zeinok/ceaf6ff204792dde0ae31e0199d89398 + installPhase = '' + mkdir -p $out/opt/sasplanet + cp -r . $out/opt/sasplanet + + makeWrapper ${wine}/bin/wine $out/bin/sasplanet \ + --run "[ -d \$HOME/.sasplanet ] || { cp -r $out/opt/sasplanet \$HOME/.sasplanet && chmod -R +w \$HOME/.sasplanet; }" \ + --add-flags "\$HOME/.sasplanet/SASPlanet.exe" + '' + lib.optionalString withMaps '' + cp -r ${maps}/* $out/opt/sasplanet/Maps/sas.maps + '' + lib.optionalString withExtremum '' + unzip ${extremum} -d $out/opt/sasplanet/Maps/sas.maps + ''; + + preferLocalBuild = true; + + meta = with lib; { + description = "SAS.Planet is a program designed for viewing and downloading high-resolution satellite imagery and conventional maps"; + homepage = "http://www.sasgis.org/sasplaneta/"; + changelog = "http://www.sasgis.org/mantis/changelog_page.php"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.gpl3Plus; + maintainers = [ maintainers.sikmir ]; + platforms = platforms.all; + skip.ci = true; + }; +}) diff --git a/pkgs/linguistics/goldendict/bin.nix b/pkgs/linguistics/goldendict/bin.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A feature-rich dictionary lookup program"; homepage = "http://goldendict.org/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Plus; maintainers = [ maintainers.sikmir ]; platforms = [ "x86_64-darwin" ]; diff --git a/pkgs/linguistics/i18n-editor/default.nix b/pkgs/linguistics/i18n-editor/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchfromgh, unzip, jre, makeWrapper }: stdenv.mkDerivation (finalAttrs: { - pname = "i18n-editor-bin"; + pname = "i18n-editor"; version = "2.0.0-beta.1"; src = fetchfromgh { diff --git a/pkgs/misc/serial-studio/bin.nix b/pkgs/misc/serial-studio/bin.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Multi-purpose serial data visualization & processing program"; homepage = "https://serial-studio.github.io/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = [ "aarch64-darwin" "x86_64-darwin" ]; diff --git a/pkgs/mqtt/influxdb-cxx/default.nix b/pkgs/mqtt/influxdb-cxx/default.nix @@ -1,26 +1,34 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libcpr, boost, catch2, trompeloeil }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, catch2_3, libcpr, trompeloeil }: stdenv.mkDerivation (finalAttrs: { pname = "influxdb-cxx"; - version = "0.7.0"; + version = "0.7.2"; src = fetchFromGitHub { owner = "offa"; repo = "influxdb-cxx"; rev = "v${finalAttrs.version}"; - hash = "sha256-ALv6RnWcvonNfoFJfbjVyUdPZ3FWBavGXhvppr5UdWM="; + hash = "sha256-DFslPrbgqS3JGx62oWlsC+AN5J2CsFjGcDaDRCadw7E="; }; + patches = [ + # Fix unclosed test case tag + (fetchpatch { + url = "https://github.com/offa/influxdb-cxx/commit/b31f94982fd1d50e89ce04f66c694bec108bf470.patch"; + hash = "sha256-oSdpNlWV744VpzfiWzp0ziNKaReLTlyfJ+SF2qyH+TU="; + }) + ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ libcpr boost ] - ++ lib.optionals finalAttrs.doCheck [ catch2 trompeloeil ]; + buildInputs = [ boost libcpr ] + ++ lib.optionals finalAttrs.doCheck [ catch2_3 trompeloeil ]; cmakeFlags = [ (lib.cmakeBool "INFLUXCXX_TESTING" finalAttrs.doCheck) ]; - doCheck = false; + doCheck = true; meta = with lib; { description = "InfluxDB C++ client library"; diff --git a/pkgs/mqtt/ioxy/default.nix b/pkgs/mqtt/ioxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ioxy"; - version = "2022-11-25"; + version = "2023-08-20"; src = fetchFromGitHub { owner = "NVISOsecurity"; repo = "IOXY"; - rev = "023e9e64cc3e9fe6a330c640fc56f7abb985c64e"; - hash = "sha256-bhJgWnscT+qEVZHXQb9l72pm0q4NTBFnWmTqnhA6PSM="; + rev = "6f1d0ffc02cde306caa837713f9a9f81352f13cf"; + hash = "sha256-j3qKlR0dwu0ZHc38JMGUjwVpN2s16ZIiRU8W+lI/X0s="; }; sourceRoot = "${src.name}/ioxy"; diff --git a/pkgs/osm/maperitive/bin.nix b/pkgs/osm/maperitive/bin.nix @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, unzip, mono, gtk2, makeWrapper }: - -stdenv.mkDerivation (finalAttrs: { - pname = "maperitive-bin"; - version = "2.4.3"; - - src = fetchurl { - url = "http://maperitive.net/download/Maperitive-${finalAttrs.version}.zip"; - hash = "sha256-yhslRj4CjUY0kviQTI7z8LvSiWvjf7K8+tDMeA9zNEk="; - }; - - nativeBuildInputs = [ unzip makeWrapper ]; - - installPhase = '' - mkdir -p $out/opt/maperitive - cp -r . $out/opt/maperitive - - makeWrapper ${mono}/bin/mono $out/bin/maperitive \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk2 ]} \ - --run "[ -d \$HOME/.maperitive ] || { cp -r $out/opt/maperitive \$HOME/.maperitive && chmod -R +w \$HOME/.maperitive; }" \ - --add-flags "--desktop \$HOME/.maperitive/Maperitive.exe" - ''; - - meta = with lib; { - description = "Desktop application for drawing maps based on OpenStreetMap and GPS data"; - homepage = "http://maperitive.net/"; - changelog = "http://maperitive.net/updates.xml"; - license = licenses.free; - maintainers = [ maintainers.sikmir ]; - platforms = platforms.linux; - skip.ci = true; - }; -}) diff --git a/pkgs/osm/maperitive/default.nix b/pkgs/osm/maperitive/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchurl, unzip, mono, gtk2, makeWrapper }: + +stdenv.mkDerivation (finalAttrs: { + pname = "maperitive"; + version = "2.4.3"; + + src = fetchurl { + url = "http://maperitive.net/download/Maperitive-${finalAttrs.version}.zip"; + hash = "sha256-yhslRj4CjUY0kviQTI7z8LvSiWvjf7K8+tDMeA9zNEk="; + }; + + nativeBuildInputs = [ unzip makeWrapper ]; + + installPhase = '' + mkdir -p $out/opt/maperitive + cp -r . $out/opt/maperitive + + makeWrapper ${mono}/bin/mono $out/bin/maperitive \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk2 ]} \ + --run "[ -d \$HOME/.maperitive ] || { cp -r $out/opt/maperitive \$HOME/.maperitive && chmod -R +w \$HOME/.maperitive; }" \ + --add-flags "--desktop \$HOME/.maperitive/Maperitive.exe" + ''; + + meta = with lib; { + description = "Desktop application for drawing maps based on OpenStreetMap and GPS data"; + homepage = "http://maperitive.net/"; + changelog = "http://maperitive.net/updates.xml"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.free; + maintainers = [ maintainers.sikmir ]; + platforms = platforms.linux; + skip.ci = true; + }; +})