diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 429991d16785..1f3f409c808c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3357,6 +3357,12 @@ githubId = 10799507; name = "Karl Fischer"; }; + fitzgibbon = { + name = "Niall FitzGibbon"; + email = "fitzgibbon.niall@gmail.com"; + github = "fitzgibbon"; + githubId = 617048; + }; Flakebi = { email = "flakebi@t-online.de"; github = "Flakebi"; diff --git a/pkgs/applications/blockchains/bitcoin-unlimited.nix b/pkgs/applications/blockchains/bitcoin-unlimited.nix index 04c906aefb2c..f1825b0cbda8 100644 --- a/pkgs/applications/blockchains/bitcoin-unlimited.nix +++ b/pkgs/applications/blockchains/bitcoin-unlimited.nix @@ -7,13 +7,13 @@ with lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-unlimited-" + version; - version = "1.9.0.1"; + version = "1.9.1.1"; src = fetchFromGitHub { owner = "bitcoinunlimited"; repo = "bitcoinunlimited"; rev = "BCHunlimited${version}"; - sha256 = "018a22zbvjqky0whizmgxzscmna0sh2xqgyw02yjk8qj4yi0zp8c"; + sha256 = "sha256-K15SI1F/xI4SkX4a41QHLn89YaHCgrlv+wcbkpwGKhI="; }; nativeBuildInputs = [ pkg-config autoreconfHook python3 ] diff --git a/pkgs/applications/editors/gnome-inform7/default.nix b/pkgs/applications/editors/gnome-inform7/default.nix new file mode 100644 index 000000000000..534466db8d78 --- /dev/null +++ b/pkgs/applications/editors/gnome-inform7/default.nix @@ -0,0 +1,117 @@ +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, python3, perl, bison +, texinfo, desktop-file-utils, wrapGAppsHook, docbook2x, docbook-xsl-nons +, inform7, gettext, libossp_uuid, gtk3, gobject-introspection, vala, gtk-doc +, webkitgtk, gtksourceview3, gspell, libxml2, goocanvas2, libplist, glib +, gst_all_1 }: + +# Neither gnome-inform7 nor its dependencies ratify and chimara have tagged releases in the GTK3 branch yet. + +let + ratify = (stdenv.mkDerivation { + pname = "ratify"; + version = "unstable-2021-02-21"; + src = fetchFromGitHub { + owner = "ptomato"; + repo = "ratify"; + rev = "f4d2d60ec73d5588e953650b3879e69a727f30ca"; + sha256 = "eRh/9pYvdfbdbdJQ7pYMLq5p91I+rtyb/AqEGfakjKs="; + }; + nativeBuildInputs = [ + meson + ninja + pkg-config + docbook2x + docbook-xsl-nons + ]; + buildInputs = [ + gtk3 + gobject-introspection + vala gtk-doc + wrapGAppsHook + ]; + }); + + chimara = (stdenv.mkDerivation { + pname = "chimara"; + version = "unstable-2021-04-06"; + src = fetchFromGitHub { + owner = "chimara"; + repo = "Chimara"; + rev = "9934b142af508c75c0f1eed597990f39495b1af4"; + sha256 = "aRz1XX8XaSLTBIrMIIMS3QNMm6Msi+slrZ6+KYlyRMo="; + }; + nativeBuildInputs = [ + meson + ninja + pkg-config + perl + bison + texinfo + python3 + glib + wrapGAppsHook + ]; + buildInputs = [ + gtk3 + gobject-introspection + vala + gtk-doc + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + glib + ]; + preConfigure = '' + patchShebangs build-aux/meson_post_install.py + ''; + }); + +in stdenv.mkDerivation { + pname = "gnome-inform7"; + version = "unstable-2021-04-06"; + src = fetchFromGitHub { + owner = "ptomato"; + repo = "gnome-inform7"; + # build from revision in the GTK3 branch as mainline requires webkit-1.0 + rev = "c37e045c159692aae2e4e79b917e5f96cfefa66a"; + sha256 = "Q4xoITs3AYXhvpWaABRAvJaUWTtUl8lYQ1k9zX7FrNw="; + }; + nativeBuildInputs = [ + meson + ninja + pkg-config + inform7 + python3 + desktop-file-utils + wrapGAppsHook + ]; + buildInputs = [ + gettext + libossp_uuid + gtk3 + gtksourceview3 + gspell + webkitgtk + libxml2 + goocanvas2 + libplist + ratify + chimara + ]; + preConfigure = '' + cp ${inform7}/libexec/ni ./src/ni + patchShebangs build-aux/* src/generate-resource-xml.{py,sh} + ''; + + meta = with lib; { + description = "Inform 7 for the Gnome platform"; + longDescription = '' + This version of Inform 7 for the Gnome platform was created by Philip Chimento, based on a design by Graham Nelson and Andrew Hunter. + ''; + homepage = "https://github.com/ptomato/gnome-inform7"; + license = licenses.gpl3Only; + maintainers = [ maintainers.fitzgibbon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 1dfa0bcb5e9e..8bb9114c8771 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "91.0.4472.57", - "sha256": "1kbd5zyi5ndbln5pibdg3yhv65m84arfwfv4v00js3cbr13pyjzv", - "sha256bin64": "1bk30b9kn5bxp4yywdiy3dqd6km5q3rrf2z82kd1qyr9cc45hz8s", + "version": "91.0.4472.69", + "sha256": "0yqc7py5x48wqg5x90j57vp07qfc20w1j0f30rmyxbgl6v346s0z", + "sha256bin64": "1z82i6pq4wbx44d6ij32dkappywdpaxlfp23kl3p7x4x9hv1c0yq", "deps": { "gn": { "version": "2021-04-06", diff --git a/pkgs/applications/video/xscast/default.nix b/pkgs/applications/video/xscast/default.nix index 6501a3990885..d740efe0c9b2 100644 --- a/pkgs/applications/video/xscast/default.nix +++ b/pkgs/applications/video/xscast/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, ffmpeg_3, imagemagick, dzen2, xorg }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, ffmpeg, imagemagick, dzen2, xorg }: stdenv.mkDerivation { pname = "xscast-unstable"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { patchShebangs $out/bin wrapProgram "$out/bin/xscast" \ - --prefix PATH : ${lib.makeBinPath [ ffmpeg_3 dzen2 xorg.xwininfo xorg.xinput xorg.xmodmap imagemagick ]} + --prefix PATH : ${lib.makeBinPath [ ffmpeg dzen2 xorg.xwininfo xorg.xinput xorg.xmodmap imagemagick ]} runHook postInstall ''; diff --git a/pkgs/development/libraries/coordgenlibs/default.nix b/pkgs/development/libraries/coordgenlibs/default.nix index 3121741ca024..9dcfb79f3e3b 100644 --- a/pkgs/development/libraries/coordgenlibs/default.nix +++ b/pkgs/development/libraries/coordgenlibs/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "coordgenlibs"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "schrodinger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BcDqrOotqRPMnzvfjzbeCf8gT3yQzKihywKrpah1D7w="; + sha256 = "sha256-uperQnJ1Q+s15pAlg/f4XR5VJI484ygZ0F6pMvcVDv8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index dc40086ad0a7..2cd480ee0103 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libofx"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "LibOFX"; repo = pname; rev = version; - sha256 = "sha256-QIasZKwSD9YCidHCxT/HOThxE5HEQWD0I2/loDP6mlU="; + sha256 = "sha256-V9FyOVH9CB6UtTxDvXRyX6mWaXq2Y2K3t9lotjigK0M="; }; preConfigure = "./autogen.sh"; diff --git a/pkgs/development/python-modules/mox3/default.nix b/pkgs/development/python-modules/mox3/default.nix index 1883c9c8c011..593d845ad866 100644 --- a/pkgs/development/python-modules/mox3/default.nix +++ b/pkgs/development/python-modules/mox3/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { buildInputs = [ subunit testrepository testtools six ]; propagatedBuildInputs = [ pbr fixtures ]; - # Disabling as several tests depdencies are missing: + # Disabling as several tests dependencies are missing: # https://opendev.org/openstack/mox3/src/branch/master/test-requirements.txt doCheck = false; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index b1491bfa481a..86aef4de9b8e 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -14,21 +14,17 @@ buildGoModule rec { pname = "buildah"; - version = "1.20.1"; + version = "1.21.0"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "sha256-nlZblUPS0678dR0hyp+V9uH/nHL9YH81+O1Zzq8T8Pw="; + sha256 = "sha256-uNb5HCEft1vXASli+2zdKWzFzsAlI9/ILBWa7OQZBwE="; }; outputs = [ "out" "man" ]; - patches = [ - ../../../applications/virtualization/podman/remove-unconfigured-runtime-warn.patch - ]; - vendorSha256 = null; doCheck = false; diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index 7b3390d9fda5..1d6f199480de 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -14,7 +14,7 @@ , SDL2_gfx , SDL2_mixer , SDL2_net, SDL2_ttf -, ffmpeg_3 +, ffmpeg , sqlite , zlib , libX11 @@ -26,7 +26,7 @@ let sharedLibs = [ pcre portaudio freetype SDL2 SDL2_image SDL2_gfx SDL2_mixer SDL2_net SDL2_ttf - sqlite lua zlib libX11 libGLU libGL ffmpeg_3 + sqlite lua zlib libX11 libGLU libGL ffmpeg ]; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/irc/solanum/bandb.patch b/pkgs/servers/irc/solanum/bandb.patch new file mode 100644 index 000000000000..7d204398b991 --- /dev/null +++ b/pkgs/servers/irc/solanum/bandb.patch @@ -0,0 +1,12 @@ +diff --git a/ircd/bandbi.c b/ircd/bandbi.c +index 29a3bfa2..16a40f17 100644 +--- a/ircd/bandbi.c ++++ b/ircd/bandbi.c +@@ -83,7 +83,6 @@ start_bandb(void) + const char *suffix = ""; + #endif + +- rb_setenv("BANDB_DBPATH", ircd_paths[IRCD_PATH_BANDB], 1); + if(bandb_path == NULL) + { + snprintf(fullpath, sizeof(fullpath), "%s%cbandb%s", ircd_paths[IRCD_PATH_LIBEXEC], RB_PATH_SEPARATOR, suffix); diff --git a/pkgs/servers/irc/solanum/default.nix b/pkgs/servers/irc/solanum/default.nix index 1d39526ed1ee..2d9035259a62 100644 --- a/pkgs/servers/irc/solanum/default.nix +++ b/pkgs/servers/irc/solanum/default.nix @@ -1,27 +1,29 @@ { lib, stdenv -, fetchFromGitHub , autoreconfHook -, pkg-config , bison +, fetchFromGitHub , flex -, openssl -, sqlite , lksctp-tools +, openssl +, pkg-config +, sqlite +, util-linux }: stdenv.mkDerivation rec { pname = "solanum"; - version = "unstable-2020-12-14"; + version = "unstable-2021-04-27"; src = fetchFromGitHub { owner = "solanum-ircd"; repo = pname; - rev = "551e5a146eab4948ce4a57d87a7f671f2d7cc02d"; - sha256 = "14cd2cb04w6nwck7q49jw5zvifkzhkmblwhjfskc2nxcdb5x3l96"; + rev = "3ff5a12e75662e9a642f2a4364797bd361eb0925"; + sha256 = "14ywmfdv8cncbyg08y2qdis00kwg8lvhkcgj185is67smh0qf88f"; }; patches = [ ./dont-create-logdir.patch + ./bandb.patch # https://github.com/solanum-ircd/solanum/issues/156 ]; configureFlags = [ @@ -29,9 +31,9 @@ stdenv.mkDerivation rec { "--enable-ipv6" "--enable-openssl=${openssl.dev}" "--with-program-prefix=solanum-" - "--localstatedir=/var/lib/solanum" - "--with-rundir=/run/solanum" - "--with-logdir=/var/log/solanum" + "--localstatedir=/var/lib" + "--with-rundir=/run" + "--with-logdir=/var/log" ] ++ lib.optionals (stdenv.isLinux) [ "--enable-sctp=${lksctp-tools.out}/lib" ]; @@ -41,6 +43,7 @@ stdenv.mkDerivation rec { bison flex pkg-config + util-linux ]; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7100564850a..cfd90035207b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13209,6 +13209,8 @@ in gnome-usage = callPackage ../applications/misc/gnome-usage {}; + gnome-inform7 = callPackage ../applications/editors/gnome-inform7/default.nix { }; + gnome-latex = callPackage ../applications/editors/gnome-latex/default.nix { }; gnome-network-displays = callPackage ../applications/networking/gnome-network-displays { };