diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-06-25 10:58:39 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-06-25 10:58:39 +0200 |
commit | df587c7f2ec2ab6c81ba30f33d4c1ea17c4fc921 (patch) | |
tree | 95261474169bdc4f6ec708508d1ed3076b12eaab /pkgs/applications/misc | |
parent | 1dd0109c8c8ef61bd3fa985d4fe817e0c3d3c948 (diff) | |
parent | 7c9d95fef59e2bc80fbde535df235a93d6690cc3 (diff) | |
download | nixpkgs-df587c7f2ec2ab6c81ba30f33d4c1ea17c4fc921.tar nixpkgs-df587c7f2ec2ab6c81ba30f33d4c1ea17c4fc921.tar.gz nixpkgs-df587c7f2ec2ab6c81ba30f33d4c1ea17c4fc921.tar.bz2 nixpkgs-df587c7f2ec2ab6c81ba30f33d4c1ea17c4fc921.tar.lz nixpkgs-df587c7f2ec2ab6c81ba30f33d4c1ea17c4fc921.tar.xz nixpkgs-df587c7f2ec2ab6c81ba30f33d4c1ea17c4fc921.tar.zst nixpkgs-df587c7f2ec2ab6c81ba30f33d4c1ea17c4fc921.zip |
Merge master into staging
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/gnss-sdr/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/keepassx/community.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/keepassx/qt511.patch | 15 | ||||
-rw-r--r-- | pkgs/applications/misc/librecad/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/mupdf/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/pcmanx-gtk2/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/pgmanage/default.nix | 4 |
7 files changed, 26 insertions, 7 deletions
diff --git a/pkgs/applications/misc/gnss-sdr/default.nix b/pkgs/applications/misc/gnss-sdr/default.nix index 68b49492791..0bb0926f048 100644 --- a/pkgs/applications/misc/gnss-sdr/default.nix +++ b/pkgs/applications/misc/gnss-sdr/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open source Global Navigation Satellite Systems software-defined receiver"; - homepage = http://gnss-sdr.org/; + homepage = https://gnss-sdr.org/; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 6b37f9b9145..5c5769db1b4 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -47,7 +47,11 @@ stdenv.mkDerivation rec { --replace "/usr/local/share/man" "../share/man" ''; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; - patches = [ ./darwin.patch ]; + + patches = [ + ./darwin.patch + ./qt511.patch + ]; cmakeFlags = [ "-DKEEPASSXC_BUILD_TYPE=Release" diff --git a/pkgs/applications/misc/keepassx/qt511.patch b/pkgs/applications/misc/keepassx/qt511.patch new file mode 100644 index 00000000000..b4d312c8c26 --- /dev/null +++ b/pkgs/applications/misc/keepassx/qt511.patch @@ -0,0 +1,15 @@ +diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp +index 6fd65c1a..e99275b0 100644 +--- a/src/gui/entry/EditEntryWidget.cpp ++++ b/src/gui/entry/EditEntryWidget.cpp +@@ -29,6 +29,7 @@ + #include <QMenu> + #include <QSortFilterProxyModel> + #include <QTemporaryFile> ++#include <QButtonGroup> + #include <QMimeData> + #include <QEvent> + #include <QColorDialog> +-- +2.17.1 + diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index bfb658098b7..ca9a90777e3 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "A 2D CAD package based upon Qt"; - homepage = http://librecad.org; + homepage = https://librecad.org; repositories.git = git://github.com/LibreCAD/LibreCAD.git; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index d78caa24e46..1857c3118dd 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -86,7 +86,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://mupdf.com; + homepage = https://mupdf.com; repositories.git = git://git.ghostscript.com/mupdf.git; description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; license = licenses.agpl3Plus; diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix index 7448b8e6648..7fdfbd84d2f 100644 --- a/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://pcman.ptt.cc; + homepage = https://pcman.ptt.cc; license = licenses.gpl2; description = "Telnet BBS browser with GTK+ interface"; maintainers = [ maintainers.sifmelcara ]; diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix index d08b183d9d0..23ab0f8d34a 100644 --- a/pkgs/applications/misc/pgmanage/default.nix +++ b/pkgs/applications/misc/pgmanage/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pgmanage-${version}"; - version = "10.1.1"; + version = "10.3.0"; src = fetchFromGitHub { owner = "pgManage"; repo = "pgManage"; rev = "v${version}"; - sha256 = "1gv96an1ff9amh16lf71wknshmxl3l4hsl3ga7wb106c10i14zzc"; + sha256 = "105gmwkifq04qmp5kpgybwjyx01528r6m3x1pxbvnfyni8sf74qj"; }; patchPhase = '' |