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

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Vladimír Čunát 2022-05-06 16:07:25 +02:00
commit 8ad52489e9
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
15 changed files with 104 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
maintainers/team-list.nix
View File

@ -445,6 +445,19 @@ with lib.maintainers; {
enableFeatureFreezePing = true;
};
numtide = {
members = [
mic92
flokli
jfroche
tazjin
zimbatm
];
enableFeatureFreezePing = true;
scope = "Group registration for Numtide team members who collectively maintain packages.";
shortName = "Numtide team";
};
openstack = {
members = [
emilytrau

1
nixos/tests/kernel-generic.nix
View File

@ -30,6 +30,7 @@ let
linux_5_4_hardened
linux_5_10_hardened
linux_5_15_hardened
linux_5_17_hardened
linux_testing;
};

9
pkgs/applications/graphics/rnote/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, alsa-lib
, appstream-glib
, desktop-file-utils
, gio-sharp
@ -21,19 +22,20 @@
stdenv.mkDerivation rec {
pname = "rnote";
version = "0.4.0";
version = "0.5.0-hotfix-2";
src = fetchFromGitHub {
owner = "flxzt";
repo = "rnote";
rev = "v${version}";
sha256 = "sha256-J7IW329rWFEoB+44762DAkWA8Hq4IVmXgc+QoDQaxV0=";
fetchSubmodules = true;
hash = "sha256-8sv7GQopUbKv8JS1/UXRFeK++UZKk3CJBOzUMx9vZDU=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-elXaikB/RemMxA4OXyZNQOgP1alImQMJHng5oX2j480=";
hash = "sha256-N0qsph68FAkwOpyr9QUw0bDQKn7t22Hbz9BYYOs4pCM=";
};
nativeBuildInputs = [
@ -51,6 +53,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
alsa-lib
gio-sharp
glib
gstreamer

19
pkgs/applications/misc/remnote/default.nix Normal file
View File

@ -0,0 +1,19 @@
{ lib, fetchurl, appimageTools }:
appimageTools.wrapType2 rec {
pname = "remnote";
version = "1.7.6";
src = fetchurl {
url = "https://download.remnote.io/RemNote-${version}.AppImage";
sha256 = "sha256-yRUpLev/Fr3mOamkFgevArv2UoXgV4e6zlyv7FaQ4RM=";
};
meta = with lib; {
description = "A note-taking application focused on learning and productivity";
homepage = "https://remnote.com/";
maintainers = with maintainers; [ max-niederman ];
license = licenses.unfree;
platforms = platforms.linux;
};
}

7
pkgs/applications/networking/cluster/terraform/default.nix
View File

@ -63,11 +63,10 @@ let
kalbasit
marsam
maxeaubrey
timstott
zimbatm
zowoq
techknowlogick
];
timstott
zowoq
] ++ teams.numtide.members;
};
} // attrs');

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

@ -24,7 +24,7 @@ let
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "5.39.0"; # Please backport all updates to the stable channel.
version = "5.42.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "sha256-Dy5orMKZvvnHZu/2U5YIJdDR4eDM3SBjXVGHuBv0kgc=";
sha256 = "sha256-xjSj7eKaDV8WB0SiPb4orxKK8mV2a2EWiMBK7BE8mgU=";
};
nativeBuildInputs = [

2
pkgs/development/tools/treefmt/default.nix
View File

@ -16,6 +16,6 @@ rustPlatform.buildRustPackage rec {
description = "one CLI to format the code tree";
homepage = "https://github.com/numtide/treefmt";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ zimbatm ];
maintainers = lib.teams.numtide.members;
};
}

60
pkgs/os-specific/linux/kernel/hardened/patches.json
View File

@ -2,51 +2,61 @@
"4.14": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-4.14.276-hardened1.patch",
"sha256": "1q0w8fqn9z32r35s3lil9dllkykydnpfp1dkhgvmy5rggbm801ay",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.276-hardened1/linux-hardened-4.14.276-hardened1.patch"
"name": "linux-hardened-4.14.277-hardened1.patch",
"sha256": "1jjbywmwglnsj80dbic14bip6wfllsgqgw7lcn9s8n12mdr42ps2",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.277-hardened1/linux-hardened-4.14.277-hardened1.patch"
},
"sha256": "1rxksrmkh5raz930y9khfg85dglgphrgcvkj21n86m333pajs4mf",
"version": "4.14.276"
"sha256": "058vzn1gcsc194hgwrj78afawz2anm7ga8a1x5m5i4cw8p1arp73",
"version": "4.14.277"
},
"4.19": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-4.19.239-hardened1.patch",
"sha256": "1w0h47av90aapz5g5ldny1vrq21n22kxag24byk4b43ndg6q0ksc",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.239-hardened1/linux-hardened-4.19.239-hardened1.patch"
"name": "linux-hardened-4.19.240-hardened1.patch",
"sha256": "1qhrwpjfy5c75zcpvp1b0xb460vyjv04iml2inqrhnj9zcz1kgp8",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.240-hardened1/linux-hardened-4.19.240-hardened1.patch"
},
"sha256": "0fsr9jy8d1rpg6ixp7av01pqz3vq50rgfcjd7vj16ccsdk15sz5z",
"version": "4.19.239"
"sha256": "1hj6vngynx6kjaczjl77jjwqq0kh0lm6jdqjvakd1cgrppaizb3j",
"version": "4.19.240"
},
"5.10": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.112-hardened1.patch",
"sha256": "1sryrhl7bblx4r0smvlzw7p4xhc4l8bsqgwzlj2x8qamj544w464",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.112-hardened1/linux-hardened-5.10.112-hardened1.patch"
"name": "linux-hardened-5.10.113-hardened1.patch",
"sha256": "0v6blapny74fkhsm5rksxg632hv3chh81wgc96l6ql4sy7p19riv",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.113-hardened1/linux-hardened-5.10.113-hardened1.patch"
},
"sha256": "19aa7fq8n75gh0vv01mpxg4cxkfpr5lj0sv6lxiyzcgbc71isv4c",
"version": "5.10.112"
"sha256": "1z3dd5hrdbn2axsi2n70n41q1dq2dvg7s8aph1p6yiajpc16llc2",
"version": "5.10.113"
},
"5.15": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.15.35-hardened1.patch",
"sha256": "10x2q01bckmfmgdzfg01khj43pav1drzzp3fr20hk718ywikvgax",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.35-hardened1/linux-hardened-5.15.35-hardened1.patch"
"name": "linux-hardened-5.15.36-hardened1.patch",
"sha256": "1y52bayw2n1lc1vp9jz8a39fz32x81ivaw24kc6hdr23yg0a8q5g",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.36-hardened1/linux-hardened-5.15.36-hardened1.patch"
},
"sha256": "1n05c4c4ish25x483a2p5177zgda8pq7g4752n1b7chfygi5l6ha",
"version": "5.15.35"
"sha256": "1466557034q1fzvpy8vwj8ps3cv2q8s7z76af9y1jz4kgaqmsd1n",
"version": "5.15.36"
},
"5.17": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.17.5-hardened1.patch",
"sha256": "1cv43sp2amai7r75dw07bd2ys6fz1ri9pfra3kaajap55sbalsw0",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.17.5-hardened1/linux-hardened-5.17.5-hardened1.patch"
},
"sha256": "11z95wsgmj97pg77yck26l0383gncbla0zwpzv4gjdj4p62x3g4v",
"version": "5.17.5"
},
"5.4": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.190-hardened1.patch",
"sha256": "0z4w05fq20pmiyxf4bip61ywy5xg96klbnj62yxiaha68pfwlm29",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.190-hardened1/linux-hardened-5.4.190-hardened1.patch"
"name": "linux-hardened-5.4.191-hardened1.patch",
"sha256": "117v9xb9y3bmppxmrbya5a4d869fh6l7map25g5n03sca56g7c32",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.191-hardened1/linux-hardened-5.4.191-hardened1.patch"
},
"sha256": "157ifcl59xxj721r302hg82vmbqzx5hjrlihrc5s4maxfw3ygm41",
"version": "5.4.190"
"sha256": "0fharjqasvq76pciwci6qamdadpfjh2n8gdyri8fj65drmgsi318",
"version": "5.4.191"
}
}

4
pkgs/os-specific/linux/kernel/linux-4.19.nix
View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.19.240";
version = "4.19.241";
# 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/v4.x/linux-${version}.tar.xz";
sha256 = "1hj6vngynx6kjaczjl77jjwqq0kh0lm6jdqjvakd1cgrppaizb3j";
sha256 = "04zyi22c2d91k7v2w0s8v112cqqf24km599mn18k2nafq79njqjc";
};
} // (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.36";
version = "5.15.37";
# 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;
@ -15,6 +15,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1466557034q1fzvpy8vwj8ps3cv2q8s7z76af9y1jz4kgaqmsd1n";
sha256 = "09n0l9ly111r6jbpgz1kw2q4n4mmcv5jxfhs5bcsiyjp44d0kgqq";
};
} // (args.argsOverride or { }))

14
pkgs/servers/nosql/victoriametrics/default.nix
View File

@ -2,17 +2,25 @@
buildGoModule rec {
pname = "VictoriaMetrics";
version = "1.59.0";
version = "1.77.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-2i9rmk9aAnjTJY+w/NKJOaLX+tpkt3vG07iLCsSGzdU=";
sha256 = "sha256-Ike3yO93q/bna/cnHv1sg+gR7iS9cVmNzLViBsfFdVs=";
};
vendorSha256 = null;
postPatch = ''
# main module (github.com/VictoriaMetrics/VictoriaMetrics) does not contain package
# github.com/VictoriaMetrics/VictoriaMetrics/app/vmui/packages/vmui/web
#
# This appears to be some of test server for development purposes only.
rm -f app/vmui/packages/vmui/web/{go.mod,main.go}
'';
ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ];
passthru.tests = { inherit (nixosTests) victoriametrics; };
@ -21,7 +29,7 @@ buildGoModule rec {
homepage = "https://victoriametrics.com/";
description = "fast, cost-effective and scalable time series database, long-term remote storage for Prometheus";
license = licenses.asl20;
maintainers = [ maintainers.yorickvp ];
maintainers = with maintainers; [ yorickvp ivan ];
changelog = "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v${version}";
platforms = [ "x86_64-linux" ];
};

2
pkgs/tools/misc/direnv/default.nix
View File

@ -49,6 +49,6 @@ buildGoModule rec {
'';
homepage = "https://direnv.net";
license = licenses.mit;
maintainers = with maintainers; [ zimbatm ];
maintainers = teams.numtide.members;
};
}

13
pkgs/tools/package-management/morph/default.nix
View File

@ -1,28 +1,25 @@
{ buildGoModule, fetchFromGitHub, go-bindata, openssh, makeWrapper, lib }:
{ buildGoModule, fetchFromGitHub, lib, makeWrapper, openssh }:
buildGoModule rec {
pname = "morph";
version = "1.6.0";
version = "1.7.0";
src = fetchFromGitHub {
owner = "dbcdk";
repo = "morph";
rev = "v${version}";
sha256 = "0aibs4gsb9pl21nd93bf963kdzf0661qn0liaw8v8ak2xbz7nbs8";
sha256 = "sha256-0CHmjqPxBgALGZYjfJFLoLBnoI0U7oZ8WyCtu1bkzZg=";
};
vendorSha256 = "08zzp0h4c4i5hk4whz06a3da7qjms6lr36596vxz0d8q0n7rspr9";
nativeBuildInputs = [ makeWrapper go-bindata ];
nativeBuildInputs = [ makeWrapper ];
ldflags = [
"-X main.version=${version}"
"-X main.assetRoot=${placeholder "lib"}"
];
postPatch = ''
go-bindata -pkg assets -o assets/assets.go data/
'';
postInstall = ''
mkdir -p $lib
cp -v ./data/*.nix $lib

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

@ -29292,6 +29292,8 @@ with pkgs;
rednotebook = python3Packages.callPackage ../applications/editors/rednotebook { };
remnote = callPackage ../applications/misc/remnote { };
remotebox = callPackage ../applications/virtualization/remotebox { };
restique = libsForQt5.callPackage ../applications/backup/restique { };

1
pkgs/top-level/linux-kernels.nix
View File

@ -541,6 +541,7 @@ in {
});
linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { });
linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { });
linux_5_17_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_17 { });
linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);
linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx);