commit d2914e825117545a893b4fdf12b8025b995c67df
parent 5113deb5aa9174002d4c882a73683fed66ca1521
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date: Thu, 25 Mar 2021 13:23:16 +0300
Up
Diffstat:
14 files changed, 30 insertions(+), 253 deletions(-)
diff --git a/nix/sources.json b/nix/sources.json
@@ -373,21 +373,6 @@
"url": "https://github.com/irdvo/gpxlib/archive/43df92be29412b7f3b58e63ebea516df9f15b883.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
- "gpxsee": {
- "branch": "master",
- "builtin": false,
- "changelog": "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes",
- "date": "2021-03-07T11:00:53Z",
- "description": "GPS log file viewer and analyzer",
- "homepage": "https://www.gpxsee.org",
- "owner": "tumic0",
- "repo": "GPXSee",
- "rev": "3ba684aafc24b54e4138f77f0f79089897da56c3",
- "sha256": "1dzvv3jkyd65s5rzl807i5q0jn294aw76hv6917p1hxkckdzkcad",
- "type": "tarball",
- "url": "https://github.com/tumic0/GPXSee/archive/3ba684aafc24b54e4138f77f0f79089897da56c3.tar.gz",
- "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
- },
"gpxsee-maps": {
"branch": "master",
"builtin": false,
@@ -640,20 +625,6 @@
"url": "https://github.com/wladich/map-tiler/archive/1dc5be65e58638f5899cd6cdc2010e00ce5e62d4.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
- "mapper": {
- "branch": "master",
- "builtin": false,
- "date": "2021-03-03T05:25:51Z",
- "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": "b86983bc5ad983324addfb2e66fd4bb167779f27",
- "sha256": "0rf0cf4mzqlaa9z7dgcq2hhz1g5n3irn0bycyjdsyarg2fzs2hqx",
- "type": "tarball",
- "url": "https://github.com/OpenOrienteering/mapper/archive/b86983bc5ad983324addfb2e66fd4bb167779f27.tar.gz",
- "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
- },
"maprec": {
"branch": "master",
"builtin": false,
diff --git a/pkgs/applications/gis/openorienteering-mapper/add-nakarte-link.patch b/pkgs/applications/gis/openorienteering-mapper/add-nakarte-link.patch
@@ -1,24 +0,0 @@
-diff --git i/src/gui/georeferencing_dialog.cpp w/src/gui/georeferencing_dialog.cpp
-index 51fd0086..d04f7b0e 100644
---- i/src/gui/georeferencing_dialog.cpp
-+++ w/src/gui/georeferencing_dialog.cpp
-@@ -392,15 +392,12 @@ void GeoreferencingDialog::projectionChanged()
- double longitude = latlon.longitude();
- setValueIfChanged(lat_edit, latitude);
- setValueIfChanged(lon_edit, longitude);
-- QString osm_link =
-- QString::fromLatin1("https://www.openstreetmap.org/?mlat=%1&mlon=%2&zoom=18&layers=M").
-- arg(latitude, 0, 'g', 10).arg(longitude, 0, 'g', 10);
-- QString worldofo_link =
-- QString::fromLatin1("http://maps.worldofo.com/?zoom=15&lat=%1&lng=%2").
-+ QString nakarte_link =
-+ QString::fromLatin1("https://nakarte.me/#m=18/%1/%2&l=O/U/R").
- arg(latitude).arg(longitude);
- link_label->setText(
-- tr("<a href=\"%1\">OpenStreetMap</a> | <a href=\"%2\">World of O Maps</a>").
-- arg(osm_link, worldofo_link)
-+ tr("<a href=\"%1\">nakarte.me</a>").
-+ arg(nakarte_link)
- );
-
- QString error = georef->getErrorText();
diff --git a/pkgs/applications/gis/openorienteering-mapper/bin.nix b/pkgs/applications/gis/openorienteering-mapper/bin.nix
@@ -1,30 +1,31 @@
-{ lib, stdenv, fetchfromgh, undmg, sources }:
+{ lib, stdenv, fetchfromgh, undmg }:
stdenv.mkDerivation rec {
pname = "Openorienteering-Mapper-bin";
- version = "20201227.4";
+ version = "0.9.5";
src = fetchfromgh {
owner = "OpenOrienteering";
repo = "mapper";
- version = "master-v${version}";
- name = "OpenOrienteering-Mapper-master_v${version}-macOS.dmg";
- sha256 = "0pm1f532prb4dgqycn1lpsw1qz22bi19kcb4zmgsp3pnhgvza067";
+ version = "v${version}";
+ name = "OpenOrienteering-Mapper-${version}-macOS.dmg";
+ sha256 = "1fy65svhrjdzp3wghz7maxwpl2ql0crw0z1qapinf8rv5xa309nr";
};
preferLocalBuild = true;
nativeBuildInputs = [ undmg ];
- sourceRoot = "Mapper.app";
+ sourceRoot = ".";
installPhase = ''
- mkdir -p $out/Applications/Mapper.app
- cp -r . $out/Applications/Mapper.app
+ mkdir -p $out/Applications
+ cp -r *.app $out/Applications
'';
meta = with lib; {
- inherit (sources.mapper) description homepage;
+ description = "OpenOrienteering Mapper is a software for creating maps for the orienteering sport";
+ homepage = "https://www.openorienteering.org/apps/mapper/";
license = licenses.gpl3Plus;
maintainers = [ maintainers.sikmir ];
platforms = [ "x86_64-darwin" ];
diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix
@@ -1,86 +0,0 @@
-{ stdenv
-, mkDerivation
-, lib
-, gdal
-, cmake
-, ninja
-, proj
-, clipper
-, zlib
-, qttools
-, qtlocation
-, qtsensors
-, qttranslations
-, doxygen
-, cups
-, wrapQtAppsHook
-, qtimageformats
-, sources
-, substituteAll
-}:
-
-mkDerivation rec {
- pname = "OpenOrienteering-Mapper-unstable";
- version = lib.substring 0 10 sources.mapper.date;
-
- src = sources.mapper;
-
- patches = [
- (substituteAll {
- # See https://github.com/NixOS/nixpkgs/issues/86054
- src = ./fix-qttranslations-path.patch;
- inherit qttranslations;
- })
- # See https://github.com/OpenOrienteering/mapper/issues/1042
- ./add-nakarte-link.patch
- ];
-
- buildInputs = [
- gdal
- qtlocation
- qtimageformats
- qtsensors
- clipper
- zlib
- proj
- cups
- ];
-
- nativeBuildInputs = [ cmake doxygen ninja qttools ];
-
- cmakeFlags = [
- # Building the manual and bundling licenses fails
- # See https://github.com/NixOS/nixpkgs/issues/85306
- "-DLICENSING_PROVIDER:BOOL=OFF"
- "-DMapper_MANUAL_QTHELP:BOOL=OFF"
- "-DMapper_VERSION_DISPLAY=${version}"
- ] ++ lib.optionals stdenv.isDarwin [
- # FindGDAL is broken and always finds /Library/Framework unless this is
- # specified
- "-DGDAL_INCLUDE_DIR=${gdal}/include"
- "-DGDAL_CONFIG=${gdal}/bin/gdal-config"
- "-DGDAL_LIBRARY=${gdal}/lib/libgdal.dylib"
- # Don't bundle libraries
- "-DMapper_PACKAGE_PROJ=0"
- "-DMapper_PACKAGE_QT=0"
- "-DMapper_PACKAGE_ASSISTANT=0"
- "-DMapper_PACKAGE_GDAL=0"
- ];
-
- postInstall = lib.optionalString stdenv.isDarwin ''
- mkdir -p $out/Applications
- mv $out/Mapper.app $out/Applications
- # Fixes "This application failed to start because it could not find or load the Qt
- # platform plugin "cocoa"."
- wrapQtApp $out/Applications/Mapper.app/Contents/MacOS/Mapper
- mkdir -p $out/bin
- ln -s $out/Applications/Mapper.app/Contents/MacOS/Mapper $out/bin/mapper
- '';
-
- meta = with lib; {
- inherit (sources.mapper) description homepage;
- license = licenses.gpl3Plus;
- maintainers = [ maintainers.sikmir ];
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/applications/gis/openorienteering-mapper/fix-qttranslations-path.patch b/pkgs/applications/gis/openorienteering-mapper/fix-qttranslations-path.patch
@@ -1,13 +0,0 @@
-diff --git i/src/util/translation_util.cpp w/src/util/translation_util.cpp
-index da03d216..c1f12751 100644
---- i/src/util/translation_util.cpp
-+++ w/src/util/translation_util.cpp
-@@ -103,7 +103,7 @@ TranslationUtil::TranslationUtil(const QString& code, QString translation_file)
- }
-
- QString translation_name = QLatin1String("qt_") + language.code;
-- if (!qt_translator.load(translation_name, QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
-+ if (!qt_translator.load(translation_name, QLatin1String("@qttranslations@/translations")))
- load(qt_translator, translation_name);
-
- load(app_translator, translation_file);
diff --git a/pkgs/applications/gpxsee/bin.nix b/pkgs/applications/gpxsee/bin.nix
@@ -1,12 +1,12 @@
-{ lib, stdenv, fetchurl, undmg, sources }:
+{ lib, stdenv, fetchurl, undmg }:
stdenv.mkDerivation rec {
pname = "gpxsee-bin";
- version = "8.8";
+ version = "8.9";
src = fetchurl {
url = "mirror://sourceforge/gpxsee/GPXSee-${version}.dmg";
- sha256 = "1m0cnxa923pbj5n45n5bjza8nksfcicra4dhd7sphlsclmpm0i1m";
+ sha256 = "0sm65shma9ll69y9g5zwn7pbw2qjj7ha1l3wfb2rqp3s6kf9p90n";
};
preferLocalBuild = true;
@@ -21,7 +21,9 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
- inherit (sources.gpxsee) description homepage changelog;
+ description = "GPS log file viewer and analyzer";
+ homepage = "https://www.gpxsee.org";
+ changelog = "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes";
license = licenses.gpl3Only;
maintainers = [ maintainers.sikmir ];
platforms = [ "x86_64-darwin" ];
diff --git a/pkgs/applications/gpxsee/default.nix b/pkgs/applications/gpxsee/default.nix
@@ -1,50 +0,0 @@
-{ stdenv
-, mkDerivation
-, lib
-, qmake
-, qtbase
-, qttools
-, qttranslations
-, sources
-, substituteAll
-, withI18n ? true
-}:
-
-mkDerivation rec {
- pname = "gpxsee-unstable";
- version = lib.substring 0 10 sources.gpxsee.date;
-
- src = sources.gpxsee;
-
- patches = (substituteAll {
- # See https://github.com/NixOS/nixpkgs/issues/86054
- src = ./fix-qttranslations-path.patch;
- inherit qttranslations;
- });
-
- postPatch = ''
- sed -i "s/\(VERSION = \).*/\1${version}/" gpxsee.pro
- '';
-
- nativeBuildInputs = [ qmake ] ++ (lib.optional withI18n qttools);
- buildInputs = [ qtbase ];
-
- preConfigure = lib.optionalString withI18n ''
- lrelease gpxsee.pro
- '';
-
- postInstall = lib.optionalString stdenv.isDarwin ''
- mkdir -p $out/Applications
- mv GPXSee.app $out/Applications
- wrapQtApp $out/Applications/GPXSee.app/Contents/MacOS/GPXSee
- mkdir -p $out/bin
- ln -s $out/Applications/GPXSee.app/Contents/MacOS/GPXSee $out/bin/gpxsee
- '';
-
- meta = with lib; {
- inherit (sources.gpxsee) description homepage changelog;
- license = licenses.gpl3Only;
- maintainers = [ maintainers.sikmir ];
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/applications/gpxsee/fix-qttranslations-path.patch b/pkgs/applications/gpxsee/fix-qttranslations-path.patch
@@ -1,18 +0,0 @@
-diff --git i/src/GUI/app.cpp w/src/GUI/app.cpp
-index 37e9d3f..d4a065c 100644
---- i/src/GUI/app.cpp
-+++ w/src/GUI/app.cpp
-@@ -35,11 +35,10 @@ App::App(int &argc, char **argv) : QApplication(argc, argv)
- installTranslator(gpxsee);
-
- QTranslator *qt = new QTranslator(this);
--#if defined(Q_OS_WIN32) || defined(Q_OS_MAC)
-+#if defined(Q_OS_WIN32)
- if (qt->load(QLocale::system(), "qt", "_", ProgramPaths::translationsDir()))
- #else // Q_OS_WIN32 || Q_OS_MAC
-- if (qt->load(QLocale::system(), "qt", "_", QLibraryInfo::location(
-- QLibraryInfo::TranslationsPath)))
-+ if (qt->load(QLocale::system(), "qt", "_", QLatin1String("@qttranslations@/translations")))
- #endif // Q_OS_WIN32 || Q_OS_MAC
- installTranslator(qt);
-
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -12,9 +12,6 @@ lib.makeScope newScope (
gpxlab = libsForQt5.callPackage ./applications/gpxlab {
inherit sources;
};
- gpxsee = libsForQt5.callPackage ./applications/gpxsee {
- inherit sources;
- };
gpxsee-bin = callPackage ./applications/gpxsee/bin.nix { };
i18n-editor-bin = callPackage ./applications/i18n-editor { jre = pkgs.jdk11; };
iterm2-bin = callPackage ./applications/iterm2/bin.nix { };
@@ -25,9 +22,6 @@ lib.makeScope newScope (
librewolf = callPackage ./applications/networking/librewolf { };
macpass-bin = callPackage ./applications/macpass/bin.nix { };
nnn-plugins = callPackage ./applications/nnn-plugins { };
- openorienteering-mapper = libsForQt5.callPackage ./applications/gis/openorienteering-mapper {
- inherit sources;
- };
openorienteering-mapper-bin = callPackage ./applications/gis/openorienteering-mapper/bin.nix { };
qutebrowser-bin = callPackage ./applications/networking/qutebrowser/bin.nix { };
synwrite-bin = callPackage ./applications/synwrite/bin.nix { };
diff --git a/pkgs/suckless/imscript/default.nix b/pkgs/suckless/imscript/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "imscript";
- version = "2021-02-11";
+ version = "2021-03-25";
src = fetchFromSourcehut {
owner = "~coco";
repo = pname;
- rev = "f7d57e6dc707724056eddb2355b92b0da9d2d20a";
- sha256 = "05sfkrd9543qmrx3r7s649fa9gixjjsiywiab36msarz3034xbr9";
+ rev = "e5aff3bdf04cb4324b203d218f3853c6374f4399";
+ sha256 = "1pqy5qcbpk40bsi4r70grgb5bg3pqjfz7gnrqw7060xm3r4239p9";
};
buildInputs = [ libpng libjpeg libtiff fftwFloat libX11 gsl ];
diff --git a/pkgs/suckless/quark/default.nix b/pkgs/suckless/quark/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation {
pname = "quark";
- version = "2021-01-24";
+ version = "2021-02-22";
src = fetchgit {
url = "git://git.suckless.org/quark";
- rev = "87ae2e9212c5cc7309eefa2a3f49a758862db6c7";
- sha256 = "08gwb9rmj0d6z5p15vk5r7jv0wm80143mkzkq3cmmpd96mm689yw";
+ rev = "68b4f733b2755762e43df90f73db5a6ec8d14104";
+ sha256 = "141v7x7p54443z6s0xm34c60qsz6lrbrvxlymf7fwxy7jz6bknr6";
};
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/suckless/saait/default.nix b/pkgs/suckless/saait/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation {
pname = "saait";
- version = "2020-11-15";
+ version = "2020-12-24";
src = fetchgit {
url = "git://git.codemadness.org/saait";
- rev = "f242e6ade5979fd153b0b2a97a252912fa91b842";
- sha256 = "1pbynkkqa3pi80jqdvrah9j4y1sydj6v2fy24wvxckayh56v8k38";
+ rev = "134ff98c58a8cca78caf918cc6dddc3a24155490";
+ sha256 = "0a7i0lsi40551krwxm0maqpnacm1imx8vdx4j3rm67h0ab3ba7bg";
};
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/suckless/sfeed/default.nix b/pkgs/suckless/sfeed/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "sfeed";
- version = "0.9.20";
+ version = "0.9.22";
src = fetchgit {
url = "git://git.codemadness.org/sfeed";
rev = version;
- sha256 = "17bs31wns71fx7s06rdzqkghkgv86r9d9i3814rznyzi9484c7aq";
+ sha256 = "1wgsghc07k5mndfz1bzk2ziiw63x5zg5d5qxnxqg8r74f6lj9g9l";
};
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/suckless/sfm/default.nix b/pkgs/suckless/sfm/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "sfm";
- version = "2021-02-18";
+ version = "2021-03-13";
src = fetchFromGitHub {
owner = "afify";
repo = "sfm";
- rev = "55ec310062f3e27dd95ac9d5fcb134f25a100ba9";
- sha256 = "1wldb0y2i5jrj427z4q4m4n3v1myfizc0b2wkbmvnms2fvqw05vb";
+ rev = "b6063fd0a91a0ee976a09c79cbeb097ba26bfd21";
+ sha256 = "198ij2bdm8i8izpgcl8vckrfw2f5pj11mzal3h7aqp3igargq55m";
};
installFlags = [ "PREFIX=$(out)" ];
