commit 9869b485c77edae3fc97557f866b87f372b3b9aa
parent d42dc49ca91957834801cc068b525a2150d2b3ef
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Mon, 9 Oct 2023 12:48:35 +0400
Up
Diffstat:
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/pkgs/applications/synwrite/bin.nix b/pkgs/applications/synwrite/bin.nix
@@ -1,8 +1,8 @@
{ lib, stdenv, fetchurl, unzip, wine, makeWrapper, withExLexer ? true }:
let
- plugins = fetchurl {
- url = "http://uvviewsoft.com/synwrite/files/SynWrite_saved_plugins.zip";
- hash = "sha256-bWc3/fvc++nSVExC1iO1g+DjlXEal5CZQkc4gZB0xU0=";
+ exlexer = fetchurl {
+ url = "mirror://sourceforge/synwrite-addons/PyPlugins/plugin.Alexey.ExLexer.zip";
+ hash = "sha256-O9wOglJp4XExWV8ODoVra3VyaqRmhB51/tupRmqDdqY=";
};
in
stdenv.mkDerivation rec {
@@ -29,8 +29,7 @@ stdenv.mkDerivation rec {
--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 -j ${plugins} SynWrite_saved_plugins/PyPlugins/plugin.Alexey.ExLexer.zip
- unzip plugin.Alexey.ExLexer.zip -d $out/opt/synwrite/Py/syn_exlexer
+ unzip ${exlexer} -d $out/opt/synwrite/Py/syn_exlexer
'';
preferLocalBuild = true;
diff --git a/pkgs/geospatial/sasplanet/bin.nix b/pkgs/geospatial/sasplanet/bin.nix
@@ -12,8 +12,8 @@
let
maps = fetchgit {
url = "http://parasite.kicks-ass.org:3000/sasgis/maps.git";
- rev = "950e1b8a02ae7ac84a6ba55e93b57d63cd064688";
- hash = "sha256-Zz9//kVxqrNhDvgq3YNDRwRUd+mebFgVcXsSmEx1KzQ=";
+ rev = "10221f2959ece3d430326adbc2daaf11c302f858";
+ hash = "sha256-6j4KZlAKbBYoFr2ZBcfW0j8kmUTRbnzsaT1UNGXyKIo=";
};
extremum = fetchgdrive {
id = "12PM_mEE8Xck036vXd5TAzPsUZeCnztJ5";
diff --git a/pkgs/misc/wik/default.nix b/pkgs/misc/wik/default.nix
@@ -3,7 +3,7 @@
python3Packages.buildPythonApplication rec {
pname = "wik";
version = "2023-03-12";
- format = "flit";
+ format = "pyproject";
src = fetchFromGitHub {
owner = "yashsinghcodes";
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
hash = "sha256-aJnBY33JB4xsH8AIcQGVli8OuIqbTulB26t7uj2GzVk=";
};
- nativeBuildInputs = with python3Packages; [ flit-core ];
+ nativeBuildInputs = with python3Packages; [ flit ];
propagatedBuildInputs = with python3Packages; [ beautifulsoup4 requests ];