diff --git a/pkgs/development/compilers/go/1.16.nix b/pkgs/development/compilers/go/1.16.nix index 61d24b0ee0ce..50fad5efe23a 100644 --- a/pkgs/development/compilers/go/1.16.nix +++ b/pkgs/development/compilers/go/1.16.nix @@ -54,11 +54,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.16.12"; + version = "1.16.13"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-Kv2Dnct20rsILFAsAaClzb/An9YwdXg1NjxP3o4vv+g="; + sha256 = "sha256-sJJmVOrrAe9DgWY49C17FoHy0/QblVnwdzVSK3r61Bo="; }; # perl is used for testing go vet diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 753dcfab3707..76d0dc961c5a 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -1,4 +1,4 @@ -{ go, cacert, git, lib, stdenv, vend }: +{ go, cacert, git, lib, stdenv }: { name ? "${args'.pname}-${args'.version}" , src @@ -106,10 +106,7 @@ let exit 10 fi - ${if runVend then '' - echo "running 'vend' to rewrite vendor folder" - ${vend}/bin/vend - '' else if proxyVendor then '' + ${if proxyVendor then '' mkdir -p "''${GOPATH}/pkg/mod/cache/download" go mod download '' else '' diff --git a/pkgs/development/libraries/pangoxsl/default.nix b/pkgs/development/libraries/pangoxsl/default.nix deleted file mode 100644 index 81c815e562cd..000000000000 --- a/pkgs/development/libraries/pangoxsl/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{lib, stdenv, fetchurl, pkg-config, glib, pango}: - -stdenv.mkDerivation rec { - pname = "pangoxsl"; - version = "1.6.0.3"; - - src = fetchurl { - url = "mirror://sourceforge/pangopdf/pangoxsl-${version}.tar.gz"; - sha256 = "1wcd553nf4nwkrfrh765cyzwj9bsg7zpkndg2hjs8mhwgx04lm8n"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - glib - pango - ]; - - meta = with lib; { - description = "Implements several of the inline properties defined by XSL that are not currently implemented by Pango"; - homepage = "https://sourceforge.net/projects/pangopdf"; - platforms = platforms.unix; - license = licenses.lgpl2; - }; -} diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/tools/typesetting/xmlroff/default.nix index 61355910d599..cd1a97c2da60 100644 --- a/pkgs/tools/typesetting/xmlroff/default.nix +++ b/pkgs/tools/typesetting/xmlroff/default.nix @@ -4,7 +4,6 @@ , libxml2 , libxslt , pango -, pangoxsl , perl , pkg-config , popt @@ -26,7 +25,6 @@ stdenv.mkDerivation rec { libxml2 libxslt pango - pangoxsl gtk2 popt ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05c104dd9078..e9ea07bc6b15 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19256,8 +19256,6 @@ with pkgs; paperkey = callPackage ../tools/security/paperkey { }; - pangoxsl = callPackage ../development/libraries/pangoxsl { }; - pcaudiolib = callPackage ../development/libraries/pcaudiolib { }; pcg_c = callPackage ../development/libraries/pcg-c { };