diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-09 08:48:04 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-09 08:48:04 +0200 |
| commit | 94e608d5877814bea7096d522524d937d6e82ad5 (patch) | |
| tree | e9123549d30d7eacf0bda92c8b20c2f7da7a4343 /pkgs/development | |
| parent | f504af072bc5cf49da008e6970c214255d5f46ed (diff) | |
| parent | 6b573157644352f712b4f5484cff286d9803efb9 (diff) | |
| download | nixlib-94e608d5877814bea7096d522524d937d6e82ad5.tar nixlib-94e608d5877814bea7096d522524d937d6e82ad5.tar.gz nixlib-94e608d5877814bea7096d522524d937d6e82ad5.tar.bz2 nixlib-94e608d5877814bea7096d522524d937d6e82ad5.tar.lz nixlib-94e608d5877814bea7096d522524d937d6e82ad5.tar.xz nixlib-94e608d5877814bea7096d522524d937d6e82ad5.tar.zst nixlib-94e608d5877814bea7096d522524d937d6e82ad5.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/interpreters/duktape/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/agda/agda-stdlib/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/keybinder/default.nix | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/development/interpreters/duktape/default.nix index 46550c835108..2178f859007f 100644 --- a/pkgs/development/interpreters/duktape/default.nix +++ b/pkgs/development/interpreters/duktape/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "duktape-${version}"; - version = "2.2.1"; + version = "2.3.0"; src = fetchurl { url = "http://duktape.org/duktape-${version}.tar.xz"; - sha256 = "1wp7mpkhizknq72ivdbkzps4radi1daqzjcjp1i54c2k4pnjxgis"; + sha256 = "1s5g8lg0dga6x3rcq328a6hsd2sk2vzwq9zfmskjh5h6n8x2yvpd"; }; buildPhase = '' diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix index 331039ec329f..bd4270e8b935 100644 --- a/pkgs/development/libraries/agda/agda-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix @@ -1,14 +1,14 @@ { stdenv, agda, fetchFromGitHub, ghcWithPackages }: agda.mkDerivation (self: rec { - version = "0.15"; + version = "0.16"; name = "agda-stdlib-${version}"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - sha256 = "0c2vfib4fmljy98c3s3s7jmpjlqxvsbv7wf6qxr38kamwzbryrjj"; + sha256 = "0kqfx6742vbyyr8glqm5bkvj0z0y0dkaajlw10p3pzidrc17767r"; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index 5110908e0f27..20ab104874dc 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gnome3 -, gtk-doc, gtk2, python2Packages, lua, libX11, libXext, libXrender, gobjectIntrospection +, gtk-doc, gtk2, python2Packages, lua, gobjectIntrospection }: let - inherit (python2Packages) python pygobject3 pygtk; + inherit (python2Packages) python pygtk; in stdenv.mkDerivation rec { name = "keybinder-${version}"; version = "0.3.0"; @@ -16,8 +16,8 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake libtool gnome3.gnome-common gtk-doc gnome3.gtk3 - python pygobject3 pygtk lua libX11 libXext libXrender gobjectIntrospection gtk2 + autoconf automake libtool gnome3.gnome-common gtk-doc gtk2 + python pygtk lua gobjectIntrospection ]; preConfigure = '' |