diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-23 19:27:14 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-23 19:27:14 +0100 |
| commit | 50ac037864dc0bedcea2bd6f8d420f71fa1e7347 (patch) | |
| tree | e4942eb779306ab89563dbfa5be423f4409e0a51 /pkgs/misc | |
| parent | b89ab32c60373ae4c8ca7b6604ea3445afabca85 (diff) | |
| parent | 6518480c1b6c3720eb899a5a1860fdb89c5735ec (diff) | |
| download | nixlib-50ac037864dc0bedcea2bd6f8d420f71fa1e7347.tar nixlib-50ac037864dc0bedcea2bd6f8d420f71fa1e7347.tar.gz nixlib-50ac037864dc0bedcea2bd6f8d420f71fa1e7347.tar.bz2 nixlib-50ac037864dc0bedcea2bd6f8d420f71fa1e7347.tar.lz nixlib-50ac037864dc0bedcea2bd6f8d420f71fa1e7347.tar.xz nixlib-50ac037864dc0bedcea2bd6f8d420f71fa1e7347.tar.zst nixlib-50ac037864dc0bedcea2bd6f8d420f71fa1e7347.zip | |
Merge master into x-updates
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/themes/gtk2/oxygen-gtk/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/misc/vim-plugins/default.nix | 18 |
2 files changed, 19 insertions, 3 deletions
diff --git a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix index 3a619220bcf8..fb51985afd1e 100644 --- a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix +++ b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix @@ -2,12 +2,12 @@ cmake, dbus_glib, glib, gtk, gdk_pixbuf, pkgconfig, xorg }: stdenv.mkDerivation rec { - version = "1.3.4"; + version = "1.4.1"; name = "oxygen-gtk2-${version}"; src = fetchurl { url = "mirror://kde/stable/oxygen-gtk2/${version}/src/${name}.tar.bz2"; - sha256 = "02q46kq0hhrmzwbjngg31ydl2198ls5bxgnz2si4amdmqii1nlmj"; + sha256 = "13vrdlzg8h5gxn04f488f65yfy9m0amqpqdbs9l304yxgm7mkawd"; }; buildInputs = [ cmake dbus_glib glib gtk gdk_pixbuf diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 01ce5f423c35..40a0d7af4968 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, python, cmake, vim, perl, ruby, unzip, which }: +{ fetchurl, stdenv, python, cmake, vim, perl, ruby, unzip, which, fetchgit }: /* About Vim and plugins @@ -197,6 +197,22 @@ in rec }; }; + golang = simpleDerivation { + name = "vim-golang-20131127"; + src = fetchgit { + url = "https://github.com/jnwhiteh/vim-golang.git"; + rev = "832d64e5a813511ed52217aa24f0255c49671bab"; + }; + path = "golang"; + meta = with stdenv.lib; { + description = "Vim plugins for Go"; + homepage = https://github.com/jnwhiteh/vim-golang; + license = licenses.publicDomain; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + }; + }; + ipython = simpleDerivation { name = "vim-ipython-ff8f88f3fe518851a91dc88aaa5a75f8f352a960"; src = fetchurl { |