commit f62e99a9b96f1bb6bea69c0070bc167f600d7c7a
parent 6e0c4f44791cdafe9e6fbceea7a62dbb93e2b544
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Fri, 10 Jun 2022 20:48:18 +0300
Up
Diffstat:
6 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/pkgs/data/themes/qtpbfimageplugin-styles/default.nix b/pkgs/data/themes/qtpbfimageplugin-styles/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
};
installPhase = ''
- install -dm755 $out/share/gpxsee/style
- cp -r Esri Mapbox OpenMapTiles OrdnanceSurvey Tilezen $out/share/gpxsee/style
+ install -dm755 $out
+ cp -r Esri Mapbox OpenMapTiles OrdnanceSurvey Tilezen $out
'';
meta = with lib; {
diff --git a/pkgs/osm/map-machine/default.nix b/pkgs/osm/map-machine/default.nix
@@ -2,14 +2,14 @@
python3Packages.buildPythonApplication rec {
pname = "map-machine";
- version = "2022-05-16";
+ version = "2022-06-07";
disabled = python3Packages.pythonOlder "3.9";
src = fetchFromGitHub {
owner = "enzet";
repo = pname;
- rev = "2b6f2d8968e02d88e1c65b5d87aec787d9756608";
- hash = "sha256-PfFayKH3GdOhxgfoX6jJHgDl95IdRQ9o76p1bs1O2MQ=";
+ rev = "18d475277d50ff47d113630faa0c2be970a642c7";
+ hash = "sha256-zdbTGK1uWlZ2lmcSdHvNA4M3NQHhoiRJ0+eh+r4RQm8=";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/suckless/ffshot/default.nix b/pkgs/suckless/ffshot/default.nix
@@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
pname = "ffshot";
- version = "2020-05-16";
+ version = "2022-05-29";
src = fetchFromGitHub {
owner = "shinyblink";
repo = pname;
- rev = "853b1eb3181affde1b56d6e364fe201f8260d0d0";
- hash = "sha256-sSIpo0JJqJL8BbWDphAEosyfppFd6P+P+vGrA5m1gV8=";
+ rev = "07d86c717d764690cbb765ea658405f14364556c";
+ hash = "sha256-lPHPwieotSgA6qF3EGDZk+lME0rqglOnEreYLk0/oUY=";
};
- buildInputs = [ xorg.xcbutil xorg.xcbutilimage ];
+ buildInputs = [ xorg.libxcb xorg.xcbutilimage ];
installFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/suckless/imscript/default.nix b/pkgs/suckless/imscript/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "imscript";
- version = "2022-04-18";
+ version = "2022-06-09";
src = fetchFromSourcehut {
owner = "~coco";
repo = pname;
- rev = "9241aa67ce6b793f1075aadbee228a57ec552cbe";
- hash = "sha256-TyebKCi3GaylOCfEZWvn1uzxUcUUPWtZiYOgqjByfmM=";
+ rev = "2d9fb483df60a15ca128a9f19a1b679ea48dfa2b";
+ hash = "sha256-hS2OqTCojfxyvdmfGKeR5LiFgPOUN7zEcadFOyn3pNo=";
};
buildInputs = [ libpng libjpeg libtiff libwebp fftwFloat libX11 gsl ];
diff --git a/pkgs/suckless/nextvi/default.nix b/pkgs/suckless/nextvi/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "nextvi";
- version = "2022-04-23";
+ version = "2022-06-04";
src = fetchFromGitHub {
owner = "kyx0r";
repo = pname;
- rev = "6e9433f8837d1fdbf1c33a5462809564a25b7d5f";
- hash = "sha256-6zu6sKLFkfUx+tqR3xtaIRm0H8g5zaH9wVe801zffcw=";
+ rev = "bf25beff4a0fc26b95955f29f7614f3cec855b09";
+ hash = "sha256-BRIZF+D+2nxnLXaVw+e78iAQIgQOt+IHPcn2BN/6TT4=";
};
buildPhase = ''
diff --git a/pkgs/suckless/scc/default.nix b/pkgs/suckless/scc/default.nix
@@ -1,15 +1,23 @@
-{ lib, stdenv, fetchgit }:
+{ lib, stdenv, fetchgit, qbe }:
stdenv.mkDerivation {
pname = "scc";
- version = "2021-05-30";
+ version = "2022-06-06";
src = fetchgit {
url = "git://git.simple-cc.org/scc";
- rev = "cbd81e63f9c872b7817b137e4b66ee4801a18467";
- sha256 = "sha256-VdRZ7VR8Uzl3DYMCDlxzbFW3R9dGmYfWue7uSi58ug0=";
+ rev = "5c0bbb5ff6603cf20c4e3f4ec16dd7b60799cb85";
+ sha256 = "sha256-I/WtGWsYP1Xt0/Sqdx+qBXBY5a8C/IDv+zBnNldBBfg=";
+ fetchSubmodules = true;
};
+ postPatch = ''
+ substituteInPlace src/cmd/Makefile \
+ --replace "git submodule" "#git submodule"
+ '';
+
+ #buildInputs = [ qbe ];
+
makeFlags = [ "PREFIX=$(out)" ];
#doCheck = true;