b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2022-01-21 06:01:27 +00:00 committed by GitHub
parent fc3ddb8979 b6c9ddd7f9
commit 69b5682348
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 54 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/applications/editors/jove/default.nix
View file

@ -39,5 +39,6 @@ stdenv.mkDerivation rec {
license = licenses.bsd2;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/jove.x86_64-darwin
};
}

4
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View file

@ -70,7 +70,7 @@ let
in
env.mkDerivation rec {
pname = "telegram-desktop";
version = "3.4.3";
version = "3.4.8";
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
# Telegram-Desktop with submodules
@ -79,7 +79,7 @@ env.mkDerivation rec {
repo = "tdesktop";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "0w8llqc4ffhp4gkvk6cyxah16yxm15am0msg3qn39fi2qqnm01x8";
sha256 = "11h2w82i10zn55iz9xda8ihsnv6s8rxm3wkmmmkpa4zfzinryqb4";
};
postPatch = ''

6
pkgs/applications/networking/synology-drive-client/default.nix
View file

@ -8,12 +8,12 @@ let
description = "Desktop application to synchronize files and folders between the computer and the Synology Drive server.";
homepage = "https://www.synology.com/en-global/dsm/feature/drive";
license = licenses.unfree;
maintainers = with maintainers; [ jcouyang ];
maintainers = with maintainers; [ jcouyang MoritzBoehme ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
};
linux = qt5.mkDerivation {
inherit pname version;
inherit pname version meta;
src = fetchurl {
url = "${baseUrl}/${version}-${buildNumber}/Ubuntu/Installer/x86_64/synology-drive-client-${buildNumber}.x86_64.deb";
@ -43,7 +43,7 @@ let
};
darwin = stdenv.mkDerivation {
inherit pname version;
inherit pname version meta;
src = fetchurl {
url = "${baseUrl}/${version}-${buildNumber}/Mac/Installer/synology-drive-client-${buildNumber}.dmg";

45
pkgs/applications/networking/synology-drive/default.nix
View file

@ -1,45 +0,0 @@
{ lib, mkDerivation, fetchurl, autoPatchelfHook, dpkg, glibc, gnome }:
mkDerivation rec {
pname = "synology-drive";
subVersion = "12674";
version = "3.0.1-${subVersion}";
src = fetchurl {
url = "https://global.download.synology.com/download/Utility/SynologyDriveClient/${version}/Ubuntu/Installer/x86_64/synology-drive-client-${subVersion}.x86_64.deb";
sha256 = "1yyv6zgszsym22kf4jvlan7n9lw09fw24fyrh7c8pzbb2029gp8a";
};
nativeBuildInputs = [ autoPatchelfHook dpkg ];
buildInputs = [ glibc gnome.nautilus ];
unpackPhase = ''
mkdir -p $out
dpkg -x $src $out
'';
installPhase = ''
# synology-drive executable
cp -av $out/usr/* $out
rm -rf $out/usr
runHook postInstall
'';
postInstall = ''
substituteInPlace $out/bin/synology-drive --replace /opt $out/opt
'';
meta = with lib; {
homepage = "https://www.synology.com/";
description = "Synchronize files between client and Synology NAS.";
longDescription = ''
Drive for PC, the desktop utility of the DSM add-on package.
Drive, allows you to sync and share files owned by you or shared by others between a centralized Synology NAS and multiple client computers.
'';
license = licenses.unfree;
maintainers = with maintainers; [ MoritzBoehme ];
platforms = [ "x86_64-linux" ];
};
}

6
pkgs/data/misc/v2ray-geoip/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "v2ray-geoip";
version = "202201130034";
version = "202201200035";
src = fetchFromGitHub {
owner = "v2fly";
repo = "geoip";
rev = "68254f88c97e6ac1ec587bcf6491902ccf29a447";
sha256 = "sha256-fpwJpXampcHiP68ABcEW5HawPuLwbcmNOY0aiFSzwcs=";
rev = "8d388b019028fb6fa9f0756b745331ffb9eb7c03";
sha256 = "sha256-ymXaDmmMucTuvJRqjJv6n22e7ONRt1awtOMABFJ+Y/w=";
};
installPhase = ''

4
pkgs/development/libraries/qgnomeplatform/default.nix
View file

@ -15,13 +15,13 @@
mkDerivation rec {
pname = "qgnomeplatform";
version = "0.8.3";
version = "0.8.4";
src = fetchFromGitHub {
owner = "FedoraQt";
repo = "QGnomePlatform";
rev = version;
sha256 = "sha256-950VEcxhJeBPSQToC8KpBx/KSneARN6Y8X7CAuFyRjo=";
sha256 = "sha256-DaIBtWmce+58OOhqFG5802c3EprBAtDXhjiSPIImoOM=";
};
patches = [

2
pkgs/development/node-packages/default.nix
View file

@ -393,7 +393,7 @@ let
nativeBuildInputs = [ pkgs.makeWrapper ];
postInstall = ''
wrapProgram "$out/bin/typescript-language-server" \
--prefix PATH : ${pkgs.lib.makeBinPath [ self.typescript ]}
--suffix PATH : ${pkgs.lib.makeBinPath [ self.typescript ]}
'';
};

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

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "jax";
version = "0.2.26";
version = "0.2.27";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "google";
repo = pname;
rev = "${pname}-v${version}";
sha256 = "155hhwgq6axdrj4x4hw72322qv1wc068n4cv4z2vf5jpl05fg93g";
sha256 = "0r1rs1zn0nzf8wpy6g5wrn2yrgi12gg2i7l285ka5d8wczjnbq47";
};
patches = [

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

@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "wsgi-intercept";
version = "1.9.2";
version = "1.9.3";
src = fetchPypi {
pname = "wsgi_intercept";
inherit version;
sha256 = "1b6251d03jnhqywr54bzj9fnc3qzp2kvz22asxpd27jy984qx21n";
sha256 = "0c4dc31dc7aabdd263ba45338c201b89e3096a3baaa7d8e3260c68ff18016fb4";
};
propagatedBuildInputs = [ six ];

4
pkgs/development/tools/metals/default.nix
View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "metals";
version = "0.11.0";
version = "0.11.1";
deps = stdenv.mkDerivation {
name = "${pname}-deps-${version}";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
'';
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "sha256-sxm4xh4INXz1wtgVkuJ9sJG2k+9OC4ck6wFJjhD37XY==";
outputHash = "sha256-wYIuRTvkPqS4SE5RnkBgmLCwmNv+cYB/iPb9TYip9s0=";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/os-specific/linux/kernel/linux-5.10.nix
View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.10.92";
version = "5.10.93";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0lmvdskxk1r18p6rn2dhw23wj8g3a8blar6xn5x1sgqxln006xfm";
sha256 = "1jxv7can60rc5i2yjgj8frcjvwi1jnba1jl8i3070xmb1d1qqy56";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.15.nix
View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.15.15";
version = "5.15.16";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0nisr3i9sxpp0s25wg6sb45287l0v9vmsgnz6d4igbvih37mfg0x";
sha256 = "150pzxra564z9xaaclmbbd29x4x9il8y78zz7szi50lzx0a0l2ms";
};
} // (args.argsOverride or { }))

4
pkgs/os-specific/linux/kernel/linux-5.16.nix
View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.16.1";
version = "5.16.2";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0i9mfapsyf9lp8j0g329lgwf6kyi61a00al0hdrfd8bf3hikdgy7";
sha256 = "0i1vcv2zi80ixmgjdcq6yk8qhwaqlbbmmrq0prxk41339lx87zh9";
};
} // (args.argsOverride or { }))

4
pkgs/os-specific/linux/kernel/linux-5.4.nix
View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.4.172";
version = "5.4.173";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1r3ci123dmijk0n3z91xqri89rbvnk51hd9d4q430ag8cw5qk7mi";
sha256 = "0ff2jvwxj55547wvwp94a8bsd610s72906d4nsyhiirrn9sy5s4r";
};
} // (args.argsOverride or {}))

25
pkgs/tools/networking/gost/default.nix Normal file
View file

@ -0,0 +1,25 @@
{ lib, fetchFromGitHub, buildGoModule }:
buildGoModule rec {
pname = "gost";
version = "2.11.1";
src = fetchFromGitHub {
owner = "ginuerzh";
repo = "gost";
rev = "v${version}";
sha256 = "1mxgjvx99bz34f132827bqk56zgvh5rw3h2xmc524wvx59k9zj2a";
};
vendorSha256 = "1cgb957ipkiix3x0x84c77a1i8l679q3kqykm1lhb4f19x61dqjh";
# Many tests fail.
doCheck = false;
meta = with lib; {
description = "A simple tunnel written in golang";
homepage = "https://github.com/ginuerzh/gost";
license = licenses.mit;
maintainers = with maintainers; [ pmy ];
};
}

1
pkgs/top-level/aliases.nix
View file

@ -988,6 +988,7 @@ mapAliases ({
swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23
swtpm-tpm2 = swtpm; # added 2021-02-26
syncthing-cli = syncthing; # added 2021-04-06
synology-drive = throw "synology-drive has been superseded by synology-drive-client"; # added 2021-11-26
system_config_printer = system-config-printer; # added 2016-01-03
systemd-cryptsetup-generator = throw "systemd-cryptsetup-generator is now included in the systemd package"; # added 2020-07-12
systemd_with_lvm2 = throw "systemd_with_lvm2 is obsolete, enabled by default via the lvm module"; # added 2020-07-12

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

@ -6014,6 +6014,8 @@ with pkgs;
goreplay = callPackage ../tools/networking/goreplay { };
gost = callPackage ../tools/networking/gost { };
gource = callPackage ../applications/version-management/gource { };
govc = callPackage ../tools/virtualization/govc { };
@ -27589,8 +27591,6 @@ with pkgs;
mlt-qt5 = libsForQt514.mlt;
};
synology-drive = libsForQt5.callPackage ../applications/networking/synology-drive { };
taxi = callPackage ../applications/networking/ftp/taxi { };
librep = callPackage ../development/libraries/librep { };