colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk 2019-12-30 16:25:56 +01:00
commit bfa5af85b7
11 changed files with 92 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/editors/vscode/vscode.nix
View File

@ -11,13 +11,13 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "1ziw2b851kg17jaf713nwhsv5ikbvivq3h01xximhcglv9vzk93l";
x86_64-darwin = "0nndasa130551jf06mfrym593c02c3ypgg9f9rdg1fw5qbyjb8hm";
x86_64-linux = "00b6q3rvf9v993i8d1vh9ckb86s655mz6kqkw0lxg8xmhpm568ra";
x86_64-darwin = "1r4qbjbypdqx9qmycykgkrg8anckicmdmawwwsszgkdd0zd5idgg";
}.${system};
in
callPackage ./generic.nix rec {
version = "1.41.0";
version = "1.41.1";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";

6
pkgs/applications/editors/vscode/vscodium.nix
View File

@ -11,8 +11,8 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "1njxa19mzzydz1jacghwmha3dl4a13m9xzzwsb0rbks5zc9a0v7m";
x86_64-darwin = "0cpd87q0q3i172l4s43s79by42wa9k5pyik3v2z5mq8zpms8qcq4";
x86_64-linux = "0n4wcg072a0b76jjv08cig2kygkmakvwav5vvl0h6ww9sbdcwl1x";
x86_64-darwin = "0xvyh9qypsyzw02vpmnfa0hdszj8ylvf78yjbmg86m4xml0sbj9r";
}.${system};
sourceRoot = {
@ -23,7 +23,7 @@ in
callPackage ./generic.nix rec {
inherit sourceRoot;
version = "1.41.0";
version = "1.41.1";
pname = "vscodium";
executableName = "codium";

23
pkgs/applications/graphics/yeetgif/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ buildGoPackage, fetchFromGitHub, lib }:
buildGoPackage rec {
pname = "yeetgif";
version = "1.23.5";
goPackagePath = "github.com/sgreben/yeetgif";
src = fetchFromGitHub {
owner = "sgreben";
repo = pname;
rev = version;
sha256 = "1yz4pps8g378lvmi92cnci6msjj7fprp9bxqmnsyn6lqw7s2wb47";
};
meta = with lib; {
description = "gif effects CLI. single binary, no dependencies. linux, osx, windows. #1 workplace productivity booster. #yeetgif #eggplant #golang";
homepage = "https://github.com/sgreben/yeetgif";
license = with licenses; [ mit asl20 cc-by-nc-sa-40 ];
maintainers = with maintainers; [ ajs124 ];
platforms = platforms.all;
};
}

4
pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
View File

@ -7,7 +7,7 @@ let
# Please keep the version x.y.0.z and do not update to x.y.76.z because the
# source of the latter disappears much faster.
version = "8.54.0.91";
version = "8.55.0.123";
rpath = stdenv.lib.makeLibraryPath [
alsaLib
@ -63,7 +63,7 @@ let
"https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
"https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
];
sha256 = "1hnha8sqk78zxkjqg62npmg6dymi5fnyj2bmxlwpgi61v3pyxj94";
sha256 = "08dvgqwj7f8k3xv5kv96k6v6ga1v2chif9m7amncg6ppp81hy7nx";
}
else
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";

11
pkgs/applications/version-management/gitless/default.nix
View File

@ -1,13 +1,14 @@
{ fetchFromGitHub, pythonPackages, stdenv }:
{ fetchFromGitHub, python, stdenv }:
pythonPackages.buildPythonApplication rec {
ver = "0.8.6";
name = "gitless-${ver}";
with python.pkgs;
buildPythonApplication rec {
pname = "gitless";
version = "0.8.8";
src = fetchFromGitHub {
owner = "sdg-mit";
repo = "gitless";
rev = "v${ver}";
rev = "v${version}";
sha256 = "1q6y38f8ap6q1livvfy0pfnjr0l8b68hyhc9r5v87fmdyl7y7y8g";
};

2
pkgs/os-specific/linux/kernel/linux-libre.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
rev = "17151";
rev = "17153";
sha256 = "0hyd7wp73w4555d42xcvk4x4nxrfckbzah2ckb4d2aqzxab87789";
}
, ...

14
pkgs/os-specific/linux/wireguard/default.nix
View File

@ -1,11 +1,18 @@
{ stdenv, kernel, wireguard-tools, perl }:
{ stdenv, fetchzip, kernel, perl, wireguard-tools }:
# module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements
assert stdenv.lib.versionAtLeast kernel.version "3.10";
# wireguard upstreamed since 5.6 https://lists.zx2c4.com/pipermail/wireguard/2019-December/004704.html
assert stdenv.lib.versionOlder kernel.version "5.6";
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "wireguard";
inherit (wireguard-tools) src version;
version = "0.0.20191226";
src = fetchzip {
url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz";
sha256 = "1q618h385kqnzxa8xswnw9i1yqrlnl3fglkhbzc8w1181qr4fhra";
};
preConfigure = ''
cd src
@ -27,6 +34,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
inherit (wireguard-tools.meta) homepage license maintainers;
description = "Kernel module for the WireGuard secure network tunnel";
downloadPage = "https://git.zx2c4.com/wireguard-linux-compat/refs/";
platforms = platforms.linux;
};
}

6
pkgs/tools/misc/ffsend/default.nix
View File

@ -16,16 +16,16 @@ with rustPlatform;
buildRustPackage rec {
pname = "ffsend";
version = "0.2.57";
version = "0.2.58";
src = fetchFromGitLab {
owner = "timvisee";
repo = "ffsend";
rev = "v${version}";
sha256 = "04y3mnh77g8mvcikp3m0a20vz180fzv847z8xjnz97ynhrbp3q94";
sha256 = "0yqigqh5vldzmp7wc1mxi5a4bxzm81xycx5h0ghak74vbjibps49";
};
cargoSha256 = "19w1lwvp54fjl1ll5pay5grfgj4zs2idqiqppxhksf61az6knql9";
cargoSha256 = "1wwdnm6a5g4gpd1f89qii8v4f6mcfc1bif1v6mdlcbrpwax5skh4";
nativeBuildInputs = [ cmake pkgconfig installShellFiles ];
buildInputs = [ openssl ]

29
pkgs/tools/misc/reredirect/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "reredirect";
version = "0.2";
src = fetchFromGitHub {
owner = "jerome-pouiller";
repo = "reredirect";
rev = "v${version}";
sha256 = "0aqzs940kwvw80lhkszx8spcdh9ilsx5ncl9vnp611hwlryfw7kk";
};
makeFlags = [ "PREFIX=${placeholder "out"}" ];
postFixup = ''
substituteInPlace ${placeholder "out"}/bin/relink \
--replace "reredirect" "${placeholder "out"}/bin/reredirect"
'';
meta = with stdenv.lib; {
description = "Tool to dynamicly redirect outputs of a running process";
homepage = "https://github.com/jerome-pouiller/reredirect";
license = licenses.mit;
maintainers = [ maintainers.tobim ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}

12
pkgs/tools/networking/wireguard-tools/default.nix
View File

@ -14,14 +14,14 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "wireguard-tools";
version = "0.0.20191219";
version = "1.0.20191226";
src = fetchzip {
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
sha256 = "1qxpjvj3927xdly022rp2sndbifmr0c2y6ik77v43k95ch94716d";
url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz";
sha256 = "14v5asdjazz0p3bhg8na9w6y66i3jhnn8imxhq8xlix1k4n93l4z";
};
sourceRoot = "source/src/tools";
sourceRoot = "source/src";
nativeBuildInputs = [ makeWrapper ];
buildInputs = optional stdenv.isLinux libmnl;
@ -51,10 +51,10 @@ stdenv.mkDerivation rec {
meta = {
description = "Tools for the WireGuard secure network tunnel";
downloadPage = "https://git.zx2c4.com/WireGuard/refs/";
downloadPage = "https://git.zx2c4.com/wireguard-tools/refs/";
homepage = "https://www.wireguard.com/";
license = licenses.gpl2;
maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 globin ma27 ];
maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 globin ma27 xwvvvvwx ];
platforms = platforms.unix;
};
}

6
pkgs/top-level/all-packages.nix
View File

@ -901,7 +901,7 @@ in
github-commenter = callPackage ../development/tools/github-commenter { };
gitless = callPackage ../applications/version-management/gitless { };
gitless = callPackage ../applications/version-management/gitless { python = python3; };
gitter = callPackage ../applications/networking/instant-messengers/gitter { };
@ -5996,6 +5996,8 @@ in
redsocks = callPackage ../tools/networking/redsocks { };
reredirect = callPackage ../tools/misc/reredirect { };
retext = libsForQt5.callPackage ../applications/editors/retext { };
richgo = callPackage ../development/tools/richgo { };
@ -22401,6 +22403,8 @@ in
yed = callPackage ../applications/graphics/yed {};
yeetgif = callPackage ../applications/graphics/yeetgif { };
inherit (gnome3) yelp;
yelp-tools = callPackage ../development/misc/yelp-tools { };