diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-09 00:02:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-09 00:02:13 +0000 |
| commit | b1d2f20ea8e04d6211bc20d3eb6d4c5c08b7db86 (patch) | |
| tree | b38b1a4f11ea5321148967f02604186c12000bfc /pkgs/applications | |
| parent | 3a3bdc57e48b897441e50e6b877031906dfce6dc (diff) | |
| parent | 707b006bf7ea81dae47511d7008a4c93ff62875a (diff) | |
| download | nixpkgs-b1d2f20ea8e04d6211bc20d3eb6d4c5c08b7db86.tar nixpkgs-b1d2f20ea8e04d6211bc20d3eb6d4c5c08b7db86.tar.gz nixpkgs-b1d2f20ea8e04d6211bc20d3eb6d4c5c08b7db86.tar.bz2 nixpkgs-b1d2f20ea8e04d6211bc20d3eb6d4c5c08b7db86.tar.lz nixpkgs-b1d2f20ea8e04d6211bc20d3eb6d4c5c08b7db86.tar.xz nixpkgs-b1d2f20ea8e04d6211bc20d3eb6d4c5c08b7db86.tar.zst nixpkgs-b1d2f20ea8e04d6211bc20d3eb6d4c5c08b7db86.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications')
4 files changed, 10 insertions, 28 deletions
diff --git a/pkgs/applications/blockchains/chia-plotter/default.nix b/pkgs/applications/blockchains/chia-plotter/default.nix index 39f2e3cb0ed..b576cd2373c 100644 --- a/pkgs/applications/blockchains/chia-plotter/default.nix +++ b/pkgs/applications/blockchains/chia-plotter/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "chia-plotter"; - version = "unstable-2021-07-12"; + version = "1.1.7"; src = fetchFromGitHub { owner = "madMAx43v3r"; repo = "chia-plotter"; - rev = "974d6e5f1440f68c48492122ca33828a98864dfc"; - sha256 = "0dliswvqmi3wq9w8jp0sb0z74n5k37608sig6r60z206g2bwhjja"; + rev = "18cad340858f0dbcc8dafd0bda1ce1af0fe58c65"; + sha256 = "sha256-lXjeqcjn3+LtnVYngdM1T3on7V7wez4oOAZ0RpKJXMM="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 49c43d47741..698a9b7c3b5 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, fetchpatch +{ stdenv, lib, fetchFromGitHub, makeWrapper , pkg-config, which, perl, libXrandr , cairo, dbus, systemd, gdk-pixbuf, glib, libX11, libXScrnSaver , wayland, wayland-protocols diff --git a/pkgs/applications/window-managers/jwm/0001-Fix-Gettext-Requirement.patch b/pkgs/applications/window-managers/jwm/0001-Fix-Gettext-Requirement.patch deleted file mode 100644 index f7b6a4cb9f1..00000000000 --- a/pkgs/applications/window-managers/jwm/0001-Fix-Gettext-Requirement.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 347d325..dce95a0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -489,7 +489,8 @@ fi - ############################################################################ - AM_ICONV - AM_GNU_GETTEXT([external]) --AM_GNU_GETTEXT_VERSION([0.19]) -+AM_GNU_GETTEXT_VERSION([0.19.6]) -+AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.6]) - LDFLAGS="$LDFLAGS $LIBINTL $LIBICONV" - - ############################################################################ diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 3c97c5630b0..2c9461d6388 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -1,21 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, automake, autoconf, libtool, gettext +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, gettext , which, xorg, libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp , libXmu, libpng, libjpeg, expat, xorgproto, librsvg, freetype, fontconfig }: stdenv.mkDerivation rec { pname = "jwm"; - version = "1685"; + version = "2.4.0"; src = fetchFromGitHub { owner = "joewing"; repo = "jwm"; - rev = "s${version}"; - sha256 = "1kyvy022sij898g2hm5spy5vq0kw6aqd7fsnawl2xyh06gwh29wg"; + rev = "v${version}"; + sha256 = "19fnrlw05njib13ljh7pmi48myfclra1xhy4b6hi74c6w6yz2fgj"; }; - patches = [ ./0001-Fix-Gettext-Requirement.patch ]; - - nativeBuildInputs = [ pkg-config automake autoconf libtool gettext which ]; + nativeBuildInputs = [ pkg-config gettext which autoreconfHook ]; buildInputs = [ libX11 @@ -38,12 +36,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preConfigure = "./autogen.sh"; - meta = { homepage = "http://joewing.net/projects/jwm/"; description = "Joe's Window Manager is a light-weight X11 window manager"; - license = lib.licenses.gpl2; + license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.romildo ]; }; |