diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 26f0f1d48d4..8b21f98409e 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -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 diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index f34d5d60794..1e60198abdd 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -30,6 +30,7 @@ let linux_5_4_hardened linux_5_10_hardened linux_5_15_hardened + linux_5_17_hardened linux_testing; }; diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix index ccccca8d65c..a496c4221a3 100644 --- a/pkgs/applications/graphics/rnote/default.nix +++ b/pkgs/applications/graphics/rnote/default.nix @@ -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 diff --git a/pkgs/applications/misc/remnote/default.nix b/pkgs/applications/misc/remnote/default.nix new file mode 100644 index 00000000000..d19d27153fa --- /dev/null +++ b/pkgs/applications/misc/remnote/default.nix @@ -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; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 73f618cb029..b4191bbd78c 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -63,11 +63,10 @@ let kalbasit marsam maxeaubrey + techknowlogick timstott - zimbatm zowoq - techknowlogick - ]; + ] ++ teams.numtide.members; }; } // attrs'); diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index c96fb1b58a9..6afccfaaa07 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -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 = [ diff --git a/pkgs/development/tools/treefmt/default.nix b/pkgs/development/tools/treefmt/default.nix index bd297154cc3..f9cef54564f 100644 --- a/pkgs/development/tools/treefmt/default.nix +++ b/pkgs/development/tools/treefmt/default.nix @@ -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; }; } diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index cb73bbed557..16b0ac27fc6 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -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" } } diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index c03c5d5afd2..2e1f98af3e2 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -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 {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 44438676ae3..007258e7336 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -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 { })) diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index 4ef8fe9575f..8e676b5022a 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -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" ]; }; diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 624236462c2..92f32a215a5 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -49,6 +49,6 @@ buildGoModule rec { ''; homepage = "https://direnv.net"; license = licenses.mit; - maintainers = with maintainers; [ zimbatm ]; + maintainers = teams.numtide.members; }; } diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix index e7b6b3adf1f..b8810ad36df 100644 --- a/pkgs/tools/package-management/morph/default.nix +++ b/pkgs/tools/package-management/morph/default.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2febdae0b36..5de4b02ecfc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 9743acce4b6..454e1cdca76 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -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);