BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2020-12-15 06:18:34 +00:00 committed by GitHub
commit 53b5219cc2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/build-support/emacs/wrapper.nix
View file

@ -175,9 +175,9 @@ runCommand
substitute ${./wrapper.sh} $out/Applications/Emacs.app/Contents/MacOS/Emacs \
--subst-var-by bash ${emacs.stdenv.shell} \
--subst-var-by wrapperSiteLisp "$emacs/Applications/Emacs.app/Contents/MacOS/Emacs" \
--subst-var prog
chmod +x $out/bin/$progname
--subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \
--subst-var-by prog "$emacs/Applications/Emacs.app/Contents/MacOS/Emacs"
chmod +x $out/Applications/Emacs.app/Contents/MacOS/Emacs
fi
mkdir -p $out/share

4
pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
View file

@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-datafactory";
version = "0.14.0";
version = "0.15.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "47bb23fa6cc28f3f15dd7a404b7f9d7af469adf78f79a11eb01ff75ca10a75ba";
sha256 = "750a891005c86977c0978cd7231449aad12106d76897075fcdc95ef2e6258b00";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google_cloud_container/default.nix
View file

@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "google-cloud-container";
version = "2.2.0";
version = "2.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "ce641b3ffaef407d5fe9b798955c6c6f2d1bfb58d6e11b4f87eb6fbb745a2711";
sha256 = "0dcd8084dd55c0439ff065d3fb206e2e5c695d3a25effd774b74f8ce43afc911";
};
disabled = pythonOlder "3.6";

4
pkgs/development/python-modules/pytest-html/default.nix
View file

@ -3,12 +3,12 @@
buildPythonPackage rec {
pname = "pytest-html";
version = "3.1.0";
version = "3.1.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "8a7979e2411aac445870d8cad9a251ab3823bc14f77d065e9ce9a5dff86f697d";
sha256 = "3ee1cf319c913d19fe53aeb0bc400e7b0bc2dbeb477553733db1dad12eb75ee3";
};
nativeBuildInputs = [ setuptools_scm ];

6
pkgs/servers/tailscale/default.nix
View file

@ -2,14 +2,14 @@
buildGoModule rec {
pname = "tailscale";
version = "1.2.8";
tagHash = "37adb62a35d818f4af638924d3fc1526bdeaf215"; # from `git rev-parse v1.2.7`
version = "1.2.10";
tagHash = "4b3581abed6c2db79b61eb1b53e29645df12a833"; # from `git rev-parse v1.2.10`
src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
sha256 = "0305n5gwp2w36z3yh0w8x3ma8a074zr913cx3y73szln56jz88hg";
sha256 = "09m4xhnjpnkic9jy5dwnmpl40r92xa8fcx4xhpadv6hjpx9k4xx5";
};
nativeBuildInputs = [ makeWrapper ];

2
pkgs/top-level/all-packages.nix
View file

@ -23860,7 +23860,7 @@ in
inherit (gnome2) libart_lgpl;
};
scribusUnstable = libsForQt514.callPackage ../applications/office/scribus/unstable.nix { };
scribusUnstable = libsForQt5.callPackage ../applications/office/scribus/unstable.nix { };
seafile-client = libsForQt514.callPackage ../applications/networking/seafile-client { };