commit ff813e64ea515d4bda53da1e4914eeaafecdbd33
parent f2d42e645a4b3c42ee965bd9bd979018886c9764
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Wed, 15 May 2024 21:08:18 +0400
Up
Diffstat:
8 files changed, 21 insertions(+), 77 deletions(-)
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -225,8 +225,8 @@ lib.makeScope newScope (
morecantile = callPackage ./geospatial/morecantile { };
orbisgis = callPackage ./geospatial/orbisgis { jre = pkgs.jre8; };
ossim = callPackage ./geospatial/ossim { };
- pmtiles = callPackage ./geospatial/pmtiles { };
pipfile = callPackage ./geospatial/pipfile { };
+ pmtiles = callPackage ./geospatial/pmtiles { };
polyvectorization = libsForQt5.callPackage ./geospatial/polyvectorization { };
py-staticmaps = callPackage ./geospatial/py-staticmaps { };
pysheds = callPackage ./geospatial/pysheds { };
diff --git a/pkgs/misc/pvs-studio/default.nix b/pkgs/misc/pvs-studio/default.nix
@@ -10,13 +10,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "pvs-studio";
- version = "7.28.78353.377";
+ version = "7.30.81094.390";
src = fetchurl {
url = "https://cdn.pvs-studio.com/pvs-studio-${finalAttrs.version}-${suffix}.tgz";
hash = {
- x86_64-linux = "sha256-XZFehz46Fkka5J2tYE66yxZhUzDYSwYhT6M9QnumFac=";
- x86_64-darwin = "sha256-S8Tb5g+Dod9OAsL1+sv2CNt1a+aF6WfCUV4YeOIYp1k=";
+ x86_64-linux = "sha256-lUmNWB3dckCKV7EFZDPGZJseqfXksYtRwCXuIE3Jt64=";
+ x86_64-darwin = "sha256-4ws+3ya+vvRWJwZw7sfygIe7d/h80ynoe2EMeCBdtks=";
}.${system} or throwSystem;
};
diff --git a/pkgs/misc/rhttp/default.nix b/pkgs/misc/rhttp/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "rhttp";
- version = "0-unnstable-2024-04-22";
+ version = "0-unstable-2024-04-22";
src = fetchFromGitHub {
owner = "1buran";
diff --git a/pkgs/suckless/dtree/default.nix b/pkgs/suckless/dtree/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromSourcehut, redo-apenwarr }:
+{ lib, stdenv, fetchFromSourcehut }:
stdenv.mkDerivation (finalAttrs: {
pname = "dtree";
@@ -11,20 +11,9 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-yBu9nckWOt/EMPJbjyzWslGX7KivdR9fr+5laOpRmHM=";
};
- nativeBuildInputs = [ redo-apenwarr ];
+ FALLBACKVER = finalAttrs.version;
- buildPhase = ''
- runHook preBuild
- export FALLBACKVER=${finalAttrs.version}
- redo all
- runHook postBuild
- '';
-
- installPhase = ''
- runHook preInstall
- PREFIX=$out redo install
- runHook postInstall
- '';
+ installFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "Command line program to draw trees";
diff --git a/pkgs/suckless/poe/default.nix b/pkgs/suckless/poe/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromSourcehut, redo-apenwarr }:
+{ lib, stdenv, fetchFromSourcehut }:
stdenv.mkDerivation (finalAttrs: {
pname = "poe";
@@ -11,21 +11,9 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-fQSn/nm9N8RFz/MPKtEU/aCHTGy3J9W0oSGH+siVDmg=";
};
- nativeBuildInputs = [ redo-apenwarr ];
+ FALLBACKVER = finalAttrs.version;
- buildPhase = ''
- runHook preBuild
- export FALLBACKVER=${finalAttrs.version}
- export FALLBACKDATE=1970-01-01
- POE_CC=$CC redo all
- runHook postBuild
- '';
-
- installPhase = ''
- runHook preInstall
- PREFIX=$out redo install
- runHook postInstall
- '';
+ installFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = ".po file editor";
diff --git a/pkgs/suckless/sled/default.nix b/pkgs/suckless/sled/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromSourcehut, redo-apenwarr }:
+{ lib, stdenv, fetchFromSourcehut }:
stdenv.mkDerivation (finalAttrs: {
pname = "sled";
@@ -11,21 +11,9 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-7x3siICVeB/ZKeopOWtcdBEwvWYcTm4bcnuPsIsWm5Y=";
};
- nativeBuildInputs = [ redo-apenwarr ];
+ FALLBACKVER = finalAttrs.version;
- buildPhase = ''
- runHook preBuild
- export FALLBACKVER=${finalAttrs.version}
- export FALLBACKDATE=1970-01-01
- redo all
- runHook postBuild
- '';
-
- installPhase = ''
- runHook preInstall
- PREFIX=$out redo install
- runHook postInstall
- '';
+ installFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "Simple text editor";
@@ -35,5 +23,6 @@ stdenv.mkDerivation (finalAttrs: {
platforms = platforms.linux;
skip.ci = stdenv.isDarwin;
mainProgram = "sled";
+ broken = true;
};
})
diff --git a/pkgs/suckless/ste/default.nix b/pkgs/suckless/ste/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromSourcehut, redo-apenwarr }:
+{ lib, stdenv, fetchFromSourcehut }:
stdenv.mkDerivation (finalAttrs: {
pname = "ste";
@@ -11,20 +11,9 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-rtwM2UZ+ncA5SPg5yt1HlacasdhTov6emiUnByE6VHM=";
};
- nativeBuildInputs = [ redo-apenwarr ];
+ FALLBACKVER = finalAttrs.version;
- buildPhase = ''
- runHook preBuild
- export FALLBACKVER=${finalAttrs.version}
- redo all
- runHook postBuild
- '';
-
- installPhase = ''
- runHook preInstall
- PREFIX=$out redo install
- runHook postInstall
- '';
+ installFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "Simple table editor";
diff --git a/pkgs/suckless/table/default.nix b/pkgs/suckless/table/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromSourcehut, redo-apenwarr }:
+{ lib, stdenv, fetchFromSourcehut }:
stdenv.mkDerivation (finalAttrs: {
pname = "table";
@@ -11,20 +11,9 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-uXGeHowit5Yfweq+/64gP3O9QrITLn7in3R85UPdb1Y=";
};
- nativeBuildInputs = [ redo-apenwarr ];
+ FALLBACKVER = finalAttrs.version;
- buildPhase = ''
- runHook preBuild
- export FALLBACKVER=${finalAttrs.version}
- redo all
- runHook postBuild
- '';
-
- installPhase = ''
- runHook preInstall
- PREFIX=$out redo install
- runHook postInstall
- '';
+ installFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "Command line utility to format and display CSV";
