Merge branch 'master' into staging

* master: (36 commits)
  libipt: set platforms to unix
  licenses: refer to curl using spdx
  qhull: specify spdx license
  ocamlPackages.spacetime_lib: 0.1.0 -> 0.3.0
  ocamlPackages.owee: 0.2 -> 0.3
  nixFlakes: 2.4pre20190913_a25c022 -> 2.4pre20190922_382aa05
  daemon: init at 0.6.4
  k9s: 0.7.13 -> 0.8.4
  cask: Use generated src/version from Melpa
  python.pkgs.flask_oauthlib: remove
  radeon-profile: 20170714 -> 20190903
  radeon-profile: use Qt mkDerivation
  afew: propagate setuptools
  pythonPackages.flask-jwt-extended: 3.17.0 -> 3.23.0
  mutt: 1.12.1 -> 1.12.2
  unit: 1.10.0 -> 1.11.0
  emacsPackages: Update elpa
  emacsPackages: Update melpa
  cask: Fix cask usage
  git-lfs: use buildGoPackage
  ...
This commit is contained in:
Orivej Desh
2019-09-22 21:33:00 +00:00
37 changed files with 2208 additions and 1508 deletions
+3 -3
View File
@@ -1,8 +1,8 @@
{ buildGoModule, fetchFromGitHub, lib
{ buildGoPackage, fetchFromGitHub, lib
, wayland, libX11, xbitmaps, libXcursor, libXmu, libXpm
}:
buildGoModule rec {
buildGoPackage rec {
pname = "wallutils";
version = "5.8.2";
@@ -13,7 +13,7 @@ buildGoModule rec {
sha256 = "1ghvcxsy5prj8l38r4lg39imsqbwmvn1zmiv7004j6skmgpaaawh";
};
modSha256 = "0siw1g3fsk1xjri9k1pb03filax8an5sfza5db52krh80g9xasah";
goPackagePath = "github.com/xyproto/wallutils";
patches = [ ./lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch ];