diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2021-12-23 10:16:42 -0800 |
---|---|---|
committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-12-23 10:16:42 -0800 |
commit | 182e07f0d94196a8f68fb40d39f46e619d9598c0 (patch) | |
tree | c61d9b37d1919893f92ee33fe29b886eb9500575 /pkgs/development/web | |
parent | 88d66d43080776f2cff363278d2d6b6f43ffa16e (diff) | |
parent | 5ed396a9129123575185dc5410dfda25f330d499 (diff) |
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts: pkgs/development/libraries/webkitgtk/default.nix pkgs/development/python-modules/pylast/default.nix pkgs/development/python-modules/pymavlink/default.nix
Diffstat (limited to 'pkgs/development/web')
-rw-r--r-- | pkgs/development/web/insomnia/default.nix | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 4529285ef52fa..041ceed528811 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, makeWrapper, fetchurl, dpkg, alsa-lib, atk, cairo, cups, dbus, expat -, fontconfig, freetype, gdk-pixbuf, glib, gnome2, pango, mesa, nspr, nss, gtk3, gtk2 +, fontconfig, freetype, gdk-pixbuf, glib, gnome2, pango, mesa, nspr, nss, gtk3 , at-spi2-atk, gsettings-desktop-schemas, gobject-introspection, wrapGAppsHook , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, nghttp2 @@ -12,16 +12,15 @@ let libudev0-shim nghttp2 openssl - stdenv.cc.cc ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "2021.6.0"; + version = "2021.7.2"; src = fetchurl { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb"; - sha256 = "sha256-YvAzO5oxeq7bnYHzKTXqRVjfJXnwrTr0DNrdWS3yrX4="; + sha256 = "sha256-HkQWW4h2+XT5Xi4oiIiMPnrRKw+GIyjGMQ5B1NrBARU="; }; nativeBuildInputs = @@ -41,7 +40,6 @@ in stdenv.mkDerivation rec { glib gnome2.GConf pango - gtk2 gtk3 gsettings-desktop-schemas libX11 @@ -59,7 +57,6 @@ in stdenv.mkDerivation rec { mesa # for libgbm nspr nss - stdenv.cc.cc ]; dontBuild = true; |