commit 082b9b6ade497906c5daa65cf4197182d2dd839e
parent 3d65fee2fa7b6bbfd0e0cb957df212d9f93c7be3
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date: Sun, 6 Dec 2020 20:30:17 +0300
Up
Diffstat:
12 files changed, 63 insertions(+), 80 deletions(-)
diff --git a/nix/sources.json b/nix/sources.json
@@ -170,15 +170,15 @@
"embox": {
"branch": "master",
"builtin": false,
- "date": "2020-12-02T15:17:42Z",
+ "date": "2020-12-04T09:04:01Z",
"description": "Modular and configurable OS for embedded applications",
"homepage": "http://embox.github.io",
"owner": "embox",
"repo": "embox",
- "rev": "1b09f5d9d56e1d475c2153372e7a3fd21892f17b",
- "sha256": "0a4a6dgw04w4a4zaz5194ip6nkjnyf3js63qa8hr7jj9i6315kw5",
+ "rev": "3fad206aca1fda5b17a30f9a647edb351560d4d0",
+ "sha256": "1d4d5a8ngag5sm7v3ckbq6h6qilvn7400nx429k26w2754rnhnzz",
"type": "tarball",
- "url": "https://github.com/embox/embox/archive/1b09f5d9d56e1d475c2153372e7a3fd21892f17b.tar.gz",
+ "url": "https://github.com/embox/embox/archive/3fad206aca1fda5b17a30f9a647edb351560d4d0.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"foma": {
@@ -377,15 +377,15 @@
"branch": "master",
"builtin": false,
"changelog": "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes",
- "date": "2020-12-02T23:11:49Z",
+ "date": "2020-12-06T18:17:09Z",
"description": "GPS log file viewer and analyzer",
"homepage": "https://www.gpxsee.org",
"owner": "tumic0",
"repo": "GPXSee",
- "rev": "41c8a4d935cad0d41535397cb1d2ebcf1b61c4d7",
- "sha256": "0lmd4g7lvgab41f0kd76ra2nihcsyiv7lqq29pazh6ws663cgz6w",
+ "rev": "10e1b5c4fbb4ad23884ee465af30096e0700f613",
+ "sha256": "0j15fnkfiwx54knijxs4nacd9r0hz6fx22zkcf9j778z41a71l8d",
"type": "tarball",
- "url": "https://github.com/tumic0/GPXSee/archive/41c8a4d935cad0d41535397cb1d2ebcf1b61c4d7.tar.gz",
+ "url": "https://github.com/tumic0/GPXSee/archive/10e1b5c4fbb4ad23884ee465af30096e0700f613.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"gpxsee-maps": {
@@ -475,15 +475,15 @@
"hfst": {
"branch": "master",
"builtin": false,
- "date": "2020-12-01T13:51:17Z",
+ "date": "2020-12-04T11:33:46Z",
"description": "Helsinki Finite-State Technology (library and application suite)",
"homepage": "https://hfst.github.io",
"owner": "hfst",
"repo": "hfst",
- "rev": "c78084b3b8dedacd17d8ee731ba7e107c015cdce",
- "sha256": "12vhrigv2idkbk12ca39gmlxcq9k290ysx8cwaj4nb80j6k5cy3l",
+ "rev": "ed49cfdeb25b835c995e4f0229436989175457ec",
+ "sha256": "1ljrrqms2r5gnr41lyjcl4c8k2gzh0w1nch42z6klrplmw1ygp81",
"type": "tarball",
- "url": "https://github.com/hfst/hfst/archive/c78084b3b8dedacd17d8ee731ba7e107c015cdce.tar.gz",
+ "url": "https://github.com/hfst/hfst/archive/ed49cfdeb25b835c995e4f0229436989175457ec.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"how-to-use-pvs-studio-free": {
@@ -629,15 +629,15 @@
"mapper": {
"branch": "master",
"builtin": false,
- "date": "2020-11-28T07:39:08Z",
+ "date": "2020-12-04T05:24:44Z",
"description": "OpenOrienteering Mapper is a software for creating maps for the orienteering sport",
"homepage": "https://www.openorienteering.org/apps/mapper/",
"owner": "OpenOrienteering",
"repo": "mapper",
- "rev": "cb23db3f080965fd906508392e7c7a610d97b4b7",
- "sha256": "0amp81gp87432zq3mxymk4jmbm3w1qxgk4klcirrg088w07r3077",
+ "rev": "d52eda577cbd57166b2bf09313544f9b36bcbf67",
+ "sha256": "119mfkwn0aw8914ggx8vrppn90xqvxq4lga8r740534a88pwr3h7",
"type": "tarball",
- "url": "https://github.com/OpenOrienteering/mapper/archive/cb23db3f080965fd906508392e7c7a610d97b4b7.tar.gz",
+ "url": "https://github.com/OpenOrienteering/mapper/archive/d52eda577cbd57166b2bf09313544f9b36bcbf67.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"maprec": {
diff --git a/pkgs/applications/gis/qgis/bin.nix b/pkgs/applications/gis/qgis/bin.nix
@@ -5,15 +5,15 @@ assert stdenv.lib.assertOneOf "releaseType" releaseType [ "pr" "ltr" ];
stdenv.mkDerivation rec {
pname = "qgis-bin";
version = {
- pr = "3.14.16";
- ltr = "3.10.10";
+ pr = "3.16.1";
+ ltr = "3.10.12";
}.${releaseType};
src = fetchurl {
url = "https://qgis.org/downloads/macos/qgis-macos-${releaseType}.dmg";
sha256 = {
- pr = "103rrzzpd79klaqjja7cydrwhvpqwdn04wp6ggavnxcgigb7z7z8";
- ltr = "0w41bi1lz7c7c9pylnaqp2r50frzq3fdpqznrq7wzq0hkkf49wzg";
+ pr = "0dbzwdzlxbvy095lxklgxdrpi7kd4j3m08y33ba7h140yh1yw9xs";
+ ltr = "0hzjj3nrd7k54ryim5rlmv40ziy97z505xwzzsdxx3dhpvbkminw";
}.${releaseType};
name = "QGIS-macOS-${version}.dmg";
};
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ undmg ];
- sourceRoot = if releaseType == "pr" then "QGIS3.14.app" else "QGIS3.10.app";
+ sourceRoot = if releaseType == "pr" then "QGIS.app" else "QGIS${stdenv.lib.substring 0 4 version}.app";
installPhase = ''
mkdir -p $out/Applications/QGIS.app
diff --git a/pkgs/applications/networking/qutebrowser/bin.nix b/pkgs/applications/networking/qutebrowser/bin.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "qutebrowser-bin";
- version = "1.14.0";
+ version = "1.14.1";
src = fetchfromgh {
owner = "qutebrowser";
repo = "qutebrowser";
version = "v${version}";
name = "qutebrowser-${version}.dmg";
- sha256 = "03d5bf5lpxyphi0ri6ykh7dr6izsikk22ivh6mh09q0a2y0kdf44";
+ sha256 = "1a4pakpn39pq72bgkqd1f1rik139c0shjfszxh1iqn7fb3dqrqmj";
};
preferLocalBuild = true;
diff --git a/pkgs/data/maps/freizeitkarte-osm/default.nix b/pkgs/data/maps/freizeitkarte-osm/default.nix
@@ -1,24 +1,18 @@
-{ stdenvNoCC, fetchurl, unzip, country ? "FIN", lang ? "en" }:
-
-stdenvNoCC.mkDerivation {
+{ lib, fetchurl, unzip, country ? "FIN", lang ? "en" }:
+let
pname = "freizeitkarte-osm";
- version = "2020-06-26";
-
- src = fetchurl {
- url = "http://download.freizeitkarte-osm.de/garmin/latest/${country}_${lang}_gmapsupp.img.zip";
- sha256 = "0nbp7nw7yi8d4wd19ll33h0wbb7zmz6r4lnxcqzqlnkbvspz8qyb";
- };
-
- unpackPhase = "${unzip}/bin/unzip $src";
-
- dontConfigure = true;
- dontBuild = true;
-
+ version = "2020-09-09";
+in
+fetchurl {
+ name = "${pname}-${version}";
+ url = "http://download.freizeitkarte-osm.de/garmin/latest/${country}_${lang}_gmapsupp.img.zip";
+ sha256 = "09g28v8vrw98kskpf8w8cgdzz7lp6bp6zb6xyz7r9b4ndiyzbip7";
+ downloadToTemp = true;
+ recursiveHash = true;
preferLocalBuild = true;
+ postFetch = "${unzip}/bin/unzip $downloadedFile -d $out";
- installPhase = "install -Dm644 *.img -t $out";
-
- meta = with stdenvNoCC.lib; {
+ meta = with lib; {
description = "Freizeitkarte map with DEM (Digital Elevation Model) and hillshading";
homepage = "https://freizeitkarte-osm.de/";
license = licenses.free;
diff --git a/pkgs/data/maps/opentopomap/default.nix b/pkgs/data/maps/opentopomap/default.nix
@@ -1,24 +1,18 @@
-{ stdenvNoCC, fetchurl, unzip }:
-
-stdenvNoCC.mkDerivation {
+{ lib, fetchurl, unzip }:
+let
pname = "opentopomap";
- version = "2020-08-28";
-
- src = fetchurl {
- url = "http://garmin.opentopomap.org/data/russia-european-part/russia-european-part_garmin.zip";
- sha256 = "130h349ja358qmdszq8lhfi0flskhrjcf65z1f9v4vmhf67wj719";
- };
-
- unpackPhase = "${unzip}/bin/unzip $src";
-
- dontConfigure = true;
- dontBuild = true;
-
+ version = "2020-12-04";
+in
+fetchurl {
+ name = "${pname}-${version}";
+ url = "http://garmin.opentopomap.org/data/russia-european-part/russia-european-part_garmin.zip";
+ sha256 = "03qr10fs4h668v2r92scwmr0a76zacp962rgny4xn9dfhax8bfg7";
+ downloadToTemp = true;
+ recursiveHash = true;
preferLocalBuild = true;
+ postFetch = "${unzip}/bin/unzip $downloadedFile -d $out";
- installPhase = "install -Dm644 *.img -t $out";
-
- meta = with stdenvNoCC.lib; {
+ meta = with lib; {
description = "OpenTopoMap Garmin Edition";
homepage = "http://garmin.opentopomap.org/";
license = licenses.cc-by-nc-sa-40;
diff --git a/pkgs/data/themes/qtpbfimageplugin-styles/default.nix b/pkgs/data/themes/qtpbfimageplugin-styles/default.nix
@@ -6,8 +6,6 @@ stdenv.mkDerivation {
src = sources.qtpbfimageplugin-styles;
- dontBuild = true;
-
installPhase = ''
install -dm755 $out/share/gpxsee/style
cp -r Mapbox OpenMapTiles Tilezen $out/share/gpxsee/style
diff --git a/pkgs/servers/glauth/default.nix b/pkgs/servers/glauth/default.nix
@@ -10,14 +10,9 @@ buildGoModule {
nativeBuildInputs = [ go-bindata ];
- buildFlagsArray = ''
- -ldflags=
- -X main.GitCommit=${sources.glauth.rev}
- '';
-
- preBuild = ''
- go-bindata -pkg=assets -o=pkg/assets/bindata.go assets
- '';
+ buildFlagsArray = [ "-ldflags=-X main.GitCommit=${sources.glauth.rev}" ];
+
+ preBuild = "go-bindata -pkg=assets -o=pkg/assets/bindata.go assets";
doCheck = false;
diff --git a/pkgs/tools/audio/musig/default.nix b/pkgs/tools/audio/musig/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, pkgconfig, portaudio, sources }:
+{ lib, buildGoModule, pkg-config, portaudio, sources }:
buildGoModule rec {
pname = "musig-unstable";
@@ -8,14 +8,15 @@ buildGoModule rec {
vendorSha256 = "0ha1xjdwibm8543b4bx0xrbigngiiakksdc6mnp0mz5y6ai56pg5";
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkg-config ];
buildInputs = [ portaudio ];
- buildFlagsArray = ''
- -ldflags=
- -X main.VERSION=${version}
- '';
+ buildFlagsArray = [ "-ldflags=-X main.VERSION=${version}" ];
+
+ doInstallCheck = true;
+
+ installCheckPhase = "$out/bin/musig --version";
meta = with lib; {
inherit (sources.musig) description homepage;
diff --git a/pkgs/tools/geo/cgpsmapper/default.nix b/pkgs/tools/geo/cgpsmapper/default.nix
@@ -13,11 +13,13 @@ stdenv.mkDerivation {
sourceRoot = ".";
unpackCmd = "gunzip -c $curSrc > cgpsmapper-static";
- dontBuild = true;
dontFixup = true;
+ doInstallCheck = true;
installPhase = "install -Dm755 cgpsmapper-static -t $out/bin";
+ installCheckPhase = "$out/bin/cgpsmapper-static -h";
+
meta = with stdenv.lib; {
description = "GIS converter into GARMIN compatible format maps";
homepage = "https://web.archive.org/web/20160620061746if_/http://www.cgpsmapper.com";
diff --git a/pkgs/tools/geo/gmaptool/default.nix b/pkgs/tools/geo/gmaptool/default.nix
@@ -13,7 +13,6 @@ stdenv.mkDerivation {
stripRoot = false;
};
- dontBuild = true;
dontFixup = true;
installPhase = "install -Dm755 gmt -t $out/bin";
diff --git a/pkgs/tools/geo/sendmap20/default.nix b/pkgs/tools/geo/sendmap20/default.nix
@@ -13,11 +13,13 @@ stdenv.mkDerivation {
sourceRoot = ".";
unpackCmd = "gunzip -c $curSrc > sendmap20";
- dontBuild = true;
dontFixup = true;
+ doInstallCheck = true;
installPhase = "install -Dm755 sendmap20 -t $out/bin";
+ installCheckPhase = "$out/bin/sendmap20 -h";
+
meta = with stdenv.lib; {
description = "Software for uploading maps to your GPS";
homepage = "https://web.archive.org/web/20160620061746if_/http://www.cgpsmapper.com";
diff --git a/pkgs/tools/misc/supload/default.nix b/pkgs/tools/misc/supload/default.nix
@@ -8,8 +8,6 @@ stdenv.mkDerivation {
buildInputs = [ curl file ];
- dontBuild = true;
- dontConfigure = true;
prePatch = ''
substituteInPlace supload.sh \
