nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-03 13:30:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-18.09' into ktouch-backport

Browse Source
This commit is contained in:
Trolli Schmittlauch
2019-01-13 19:52:58 +01:00
parent 61f0e7fddf 919e0ada69
commit 8ccb60b9ea
10 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
maintainers/maintainer-list.nix
View File

@@ -3636,6 +3636,10 @@
github = "fkz";
name = "Fabian Schmitthenner";
};
schmittlauch = {
email = "t.schmittlauch+nixos@orlives.de";
github = "schmittlauch";
};
schneefux = {
email = "schneefux+nixos_pkg@schneefux.xyz";
github = "schneefux";

2
nixos/lib/test-driver/Machine.pm
View File

@@ -250,7 +250,7 @@ sub connect {
$self->start;
local $SIG{ALRM} = sub { die "timed out waiting for the VM to connect\n"; };
alarm 300;
alarm 600;
readline $self->{socket} or die "the VM quit before connecting\n";
alarm 0;

8
pkgs/applications/editors/vscode/default.nix
View File

@@ -12,9 +12,9 @@ let
}.${stdenv.hostPlatform.system};
sha256 = {
"i686-linux" = "1xadkgqfwsl53blm2f0kdvczwmag47585dswa1hpafzc8i86009b";
"x86_64-linux" = "0h77kc6z9c5bkkb8svjxjabnbbv0lb835kzd1c2yypamkhag9j4a";
"x86_64-darwin" = "1f8grgav5capd2mm1nx0416na8c6qjh91680cfvf1jh4pjihs6g4";
"i686-linux" = "1g73fay6fxlqhalkqq5m6rjbp68k9npk0rrxrkhdj8mw0cz74dpm";
"x86_64-linux" = "0mil8n5i2ajdyrgq862wq59ajy2122rvvn7m7mxq4ab92sk26rix";
"x86_64-darwin" = "07r52scs1sgafzxqal39r8vf9p9qqvwwx8f6z09gqcf6clr6k48q";
}.${stdenv.hostPlatform.system};
archive_fmt = if stdenv.hostPlatform.system == "x86_64-darwin" then "zip" else "tar.gz";
@@ -31,7 +31,7 @@ let
in
stdenv.mkDerivation rec {
name = "vscode-${version}";
version = "1.30.1";
version = "1.30.2";
src = fetchurl {
name = "VSCode_${version}_${plat}.${archive_fmt}";

1
pkgs/applications/kde/default.nix
View File

@@ -93,6 +93,7 @@ let
kcalc = callPackage ./kcalc.nix {};
kcalcore = callPackage ./kcalcore.nix {};
kcalutils = callPackage ./kcalutils.nix {};
kcharselect = callPackage ./kcharselect.nix {};
kcolorchooser = callPackage ./kcolorchooser.nix {};
kcontacts = callPackage ./kcontacts.nix {};
kdav = callPackage ./kdav.nix {};

19
pkgs/applications/kde/kcharselect.nix Normal file
View File

@@ -0,0 +1,19 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
kbookmarks, kconfig, kconfigwidgets, kcrash, kcoreaddons, ki18n, kwidgetsaddons, kxmlgui
}:
mkDerivation {
name = "kcharselect";
meta = {
license = lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.schmittlauch ];
description = "A tool to select special characters from all installed fonts and copy them into the clipboard";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kbookmarks kconfig kconfigwidgets kcoreaddons kcrash ki18n kwidgetsaddons kxmlgui
];
enableParallelBuilding = true;
}

4
pkgs/applications/networking/irc/irssi/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl }:
stdenv.mkDerivation rec {
version = "1.1.1";
version = "1.1.2";
name = "irssi-${version}";
src = fetchurl {
url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz";
sha256 = "09a9p1yfg0m3w7n2a4axvn8874002ly8x0b543sxihzqk29radpa";
sha256 = "0jbhd4aad3bn61svnb2rwa4dwj8qyrb2dmzribi2hfn1f719wzfv";
};
nativeBuildInputs = [ pkgconfig ];

4
pkgs/servers/nextcloud/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "nextcloud-${version}";
version = "15.0.0";
version = "15.0.2";
src = fetchurl {
url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
sha256 = "0y7bk1588n5rmmranmmrkajh50074460hr4v052ahg9mf60wbc2v";
sha256 = "1shgr81hhxr2k45hqlx06qhyayhbqdi0ndvpcyzdv54rwcrwrx61";
};
installPhase = ''

4
pkgs/tools/misc/youtube-dl/default.nix
View File

@@ -19,11 +19,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2018.12.17";
version = "2019.01.10";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "1nd4zr3wd35vldm775m9wcgbzma2013yyj134lcz19ipjs38isrk";
sha256 = "07r1y06697vhbkbf8pix4cnybaqmlf1wb2df5glj2xv8nl6f51gd";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/tools/security/tor/default.nix
View File

@@ -14,11 +14,11 @@
}:
stdenv.mkDerivation rec {
name = "tor-0.3.4.9";
name = "tor-0.3.4.10";
src = fetchurl {
url = "https://dist.torproject.org/${name}.tar.gz";
sha256 = "0jhnvnp08hsfrzgsvg5xnfxyaw3nzgg9h24cwbwnz6iby20i05qs";
sha256 = "12i51i6swkdpnbcpa6f1csc00q177sbjnw2x31j53glxshmwpv5d";
};
outputs = [ "out" "geoip" ];

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

@@ -17235,9 +17235,9 @@ with pkgs;
inherit (kdeApplications)
akonadi akregator ark dolphin dragon ffmpegthumbs filelight gwenview k3b
kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf kdialog keditbookmarks
kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole kpkpass kitinerary
kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular spectacle;
kaddressbook kate kcachegrind kcalc kcharselect kcolorchooser kcontacts kdenlive kdf kdialog
keditbookmarks kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole
kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular spectacle;
okteta = libsForQt5.callPackage ../applications/editors/okteta { };