summaryrefslogtreecommitdiffstats
path: root/pkgs/applications
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/misc/mapproxy/default.nix33
-rw-r--r--pkgs/applications/misc/polybar/default.nix4
-rw-r--r--pkgs/applications/misc/ulauncher/default.nix4
-rw-r--r--pkgs/applications/networking/ids/zeek/default.nix5
4 files changed, 12 insertions, 34 deletions
diff --git a/pkgs/applications/misc/mapproxy/default.nix b/pkgs/applications/misc/mapproxy/default.nix
index 41ae683548d0..48e2a3960ee7 100644
--- a/pkgs/applications/misc/mapproxy/default.nix
+++ b/pkgs/applications/misc/mapproxy/default.nix
@@ -1,38 +1,15 @@
{ lib
, pkgs
-, python
+, python3
}:
-let
- py = python.override {
- packageOverrides = self: super: {
- pyproj = super.pyproj.overridePythonAttrs (oldAttrs: rec {
- version = "1.9.6";
- src = pkgs.fetchFromGitHub {
- owner = "pyproj4";
- repo = "pyproj";
- rev = "v${version}rel";
- sha256 = "18v4h7jx4mcc0x2xy8y7dfjq9bzsyxs8hdb6v67cabvlz2njziqy";
- };
- nativeBuildInputs = with python.pkgs; [ cython ];
- patches = [ ];
- checkPhase = ''
- runHook preCheck
- pushd unittest # changing directory should ensure we're importing the global pyproj
- ${python.interpreter} test.py && ${python.interpreter} -c "import doctest, pyproj, sys; sys.exit(doctest.testmod(pyproj)[0])"
- popd
- runHook postCheck
- '';
- });
- };
- };
-in
-with py.pkgs;
+
+with python3.pkgs;
buildPythonApplication rec {
pname = "MapProxy";
- version = "1.12.0";
+ version = "1.13.0";
src = fetchPypi {
inherit pname version;
- sha256 = "622e3a7796ef861ba21e42231b49c18d00d75f03eaf3f01a2b7687be7568e2ec";
+ sha256 = "0qi63ap8yi5g2cas33jv4jsmdrl6yv3qp6bh0zxrfpkb704lcng4";
};
prePatch = ''
substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv"
diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix
index df08de7a4a22..940cd1cdc919 100644
--- a/pkgs/applications/misc/polybar/default.nix
+++ b/pkgs/applications/misc/polybar/default.nix
@@ -27,13 +27,13 @@ assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null;
stdenv.mkDerivation rec {
pname = "polybar";
- version = "3.5.0";
+ version = "3.5.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "1kga98cgllsjcq692l27y01sgl8ii4wxp70kmdcwxkrliylg3dji";
+ sha256 = "1ir8fdnzrba9fkkjfvax5szx5h49lavwgl9pabjzrpbvif328g3x";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix
index ba388e8038b7..d2522360a753 100644
--- a/pkgs/applications/misc/ulauncher/default.nix
+++ b/pkgs/applications/misc/ulauncher/default.nix
@@ -20,13 +20,13 @@
python3Packages.buildPythonApplication rec {
pname = "ulauncher";
- version = "5.8.1";
+ version = "5.9.0";
disabled = python3Packages.isPy27;
src = fetchurl {
url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz";
- sha256 = "1hgzfiwfk3dd50jmp184y754ydzmfv22qcv7z40gxj6pc67ahx3r";
+ sha256 = "sha256-jRCrkJcjUHDd3wF+Hkxg0QaW7YgIh7zM/KZ4TAH84/U=";
};
nativeBuildInputs = with python3Packages; [
diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix
index 713156a66214..336e3be074dd 100644
--- a/pkgs/applications/networking/ids/zeek/default.nix
+++ b/pkgs/applications/networking/ids/zeek/default.nix
@@ -21,11 +21,11 @@ let
in
stdenv.mkDerivation rec {
pname = "zeek";
- version = "3.2.2";
+ version = "3.2.3";
src = fetchurl {
url = "https://download.zeek.org/zeek-${version}.tar.gz";
- sha256 = "00cxz7ad7p62s2glcagzcvwbnsivrv4bmz6rl1vij907jb24hmvc";
+ sha256 = "1in25clpbb2vdhms3iypj6r5sp8d1dxjcfn85c272sh7shnmqagr";
};
nativeBuildInputs = [ cmake flex bison file ];
@@ -56,6 +56,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Powerful network analysis framework much different from a typical IDS";
homepage = "https://www.zeek.org";
+ changelog = "https://github.com/zeek/zeek/blob/v${version}/CHANGES";
license = licenses.bsd3;
maintainers = with maintainers; [ pSub marsam tobim ];
platforms = platforms.unix;