diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-01 00:18:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-01 00:18:04 +0000 |
| commit | 12c7638d2962171b48867bb94d4df4d1c1d52229 (patch) | |
| tree | 5285a53546619677aa74be7b5d2d386e8abe64bd | |
| parent | bbdeb9e2fcab1033bc802db37d25b5bcac54fb4f (diff) | |
| parent | 91b674b211f7575c2fd24787310aef023d4c145c (diff) | |
Merge staging-next-22.05 into staging-22.05staging-22.05
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/pacparser/default.nix | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index c57366ab9d6d..196d40a23365 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -45,13 +45,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-55"; + version = "7.1.0-56"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - hash = "sha256-V0poyS1QnHhnSc3QbHHE+BctCBv2knriK0ihMF565d8="; + hash = "sha256-21gzq7VqjJndgkMIOk5ym6PEyIjMGpBfZiPDfkuqOYQ="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/tools/networking/pacparser/default.nix b/pkgs/tools/networking/pacparser/default.nix index ce639a4cbc79..c55a0dae34c3 100644 --- a/pkgs/tools/networking/pacparser/default.nix +++ b/pkgs/tools/networking/pacparser/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "pacparser"; - version = "1.3.7"; + version = "1.4.0"; - src = fetchurl { - url = "https://github.com/manugarg/pacparser/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "0jfjm8lqyhdy9ny8a8icyd4rhclhfn608cr1i15jml82q8pyqj7b"; + src = fetchFromGitHub { + owner = "manugarg"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-XtYXUqmBnsqI+0b7Dnynni544d49z1eGH8ihAAqQe7Q="; }; makeFlags = [ "NO_INTERNET=1" ]; @@ -21,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A library to parse proxy auto-config (PAC) files"; - homepage = "http://pacparser.manugarg.com/"; + homepage = "https://pacparser.manugarg.com/"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; |