kookie
/
nomicon
1
0
Fork 0
Code Issues Projects Releases 1 Activity

Merge master into staging-next

Browse Source
main
github-actions[bot] 2 years ago committed by GitHub
parent 437813752b 0416895145
commit d4bfb57f40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 158 additions and 63 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 76
      pkgs/applications/audio/cardinal/default.nix
  2. 4
      pkgs/applications/audio/vmpk/default.nix
  3. 12
      pkgs/applications/networking/browsers/chromium/upstream-info.json
  4. 4
      pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
  5. 4
      pkgs/applications/science/chemistry/jmol/default.nix
  6. 19
      pkgs/development/libraries/expat/default.nix
  7. 50
      pkgs/os-specific/linux/kernel/hardened/patches.json
  8. 4
      pkgs/os-specific/linux/kernel/linux-4.14.nix
  9. 4
      pkgs/os-specific/linux/kernel/linux-4.19.nix
  10. 4
      pkgs/os-specific/linux/kernel/linux-4.9.nix
  11. 4
      pkgs/os-specific/linux/kernel/linux-5.10.nix
  12. 4
      pkgs/os-specific/linux/kernel/linux-5.15.nix
  13. 4
      pkgs/os-specific/linux/kernel/linux-5.16.nix
  14. 4
      pkgs/os-specific/linux/kernel/linux-5.4.nix
  15. 4
      pkgs/servers/jackett/default.nix
  16. 6
      pkgs/tools/admin/syft/default.nix
  17. 4
      pkgs/tools/networking/minio-client/default.nix
  18. 4
      pkgs/tools/system/btop/default.nix
  19. 4
      pkgs/tools/video/svt-av1/default.nix
  20. 2
      pkgs/top-level/all-packages.nix

76
pkgs/applications/audio/cardinal/default.nix
Unescape View File

@ -0,0 +1,76 @@
{
stdenv
, fetchFromGitHub
, fetchpatch
, fetchurl
, fetchzip
, freetype
, jansson
, lib
, libGL
, libX11
, libXcursor
, libXext
, libXrandr
, libarchive
, liblo
, libsamplerate
, mesa
, pkg-config
, python3
, speexdsp
}:
stdenv.mkDerivation rec {
name = "cardinal-${version}";
version = "22.02";
src = fetchurl {
url =
"https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal-${version}.tar.xz";
sha256 = "sha256-IVlAROFGFffTEU00NCmv74w1DRb7dNMp20FeBVoDrdM=";
};
patches = [
# see https://github.com/DISTRHO/Cardinal/issues/151#issuecomment-1041886260
(fetchpatch {
url =
"https://github.com/DISTRHO/Cardinal/commit/13e9ef37c5dd35d77a54b1cb006767be7a72ac69.patch";
sha256 = "sha256-NYUYLbLeBX1WEzjPi0s/T1N+EXQKyi0ifbPxgBYDjRs=";
})
];
prePatch = ''
patchShebangs ./dpf/utils/generate-ttl.sh
'';
enableParallelBuilding = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [
freetype
jansson
libGL
libX11
libXcursor
libXext
libXrandr
libXrandr
libarchive
liblo
libsamplerate
mesa
python3
speexdsp
];
makeFlags = [ "SYSDEPS=true" "PREFIX=$(out)" ];
meta = {
description = "Plugin wrapper around VCV Rack";
homepage = "https://github.com/DISTRHO/cardinal";
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.magnetophon ];
platforms = lib.platforms.all;
};
}

4
pkgs/applications/audio/vmpk/default.nix
Unescape View File

@ -5,11 +5,11 @@
mkDerivation rec {
pname = "vmpk";
version = "0.8.5";
version = "0.8.6";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.bz2";
sha256 = "sha256-SPome4UKGOWQLT9RMoGZ0wUdwodG8mSIaGFCg0i5CmY=";
sha256 = "sha256-cwfJJVeUokyZI1iGvqBvXjcBR36VGodzrUx5Atv3POM=";
};
nativeBuildInputs = [ cmake pkg-config qttools docbook-xsl-nons ];

12
pkgs/applications/networking/browsers/chromium/upstream-info.json
Unescape View File

@ -32,15 +32,15 @@
}
},
"dev": {
"version": "100.0.4896.20",
"sha256": "0g16xzimp39vk5b27bj12rh14520wihj4m4mwxf387rv0yp03cnr",
"sha256bin64": "1hyqsqpmhxdja6jzvmq0cwwcg4nq72w0zdpa0xh24n5g4cd9xz04",
"version": "101.0.4919.0",
"sha256": "01dp3pkpf2m6r6vfyqgcg99xcii0qi3qm0g69r3nnj2hrs7ziqv2",
"sha256bin64": "1x7bfcnhrbakcbdyp1sc79jx6qysnnyj1by6qnl7gyffh8xyb95g",
"deps": {
"gn": {
"version": "2022-01-21",
"version": "2022-03-01",
"url": "https://gn.googlesource.com/gn",
"rev": "0725d7827575b239594fbc8fd5192873a1d62f44",
"sha256": "1dzdvcn2r5c9giknvasf3y5y4901kav7igivjvrpww66ywsj8fzr"
"rev": "d7c2209cebcfe37f46dba7be4e1a7000ffc342fb",
"sha256": "0b024mr8bdsnkkd3qkh097a7w0gpicarijnsbpfgkf6imnkccg5w"
}
}
},

4
pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
Unescape 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.80.0.143";
version = "8.81.0.268";
rpath = lib.makeLibraryPath [
alsa-lib
@ -68,7 +68,7 @@ let
"https://mirror.cs.uchicago.edu/skype/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 = "sha256-SLypP+ZRHMWeB3KuvmmYb0Y1T3ipSpWNiYYQIzMCDDY=";
sha256 = "sha256-MqXLK+AdYkQVTeTjul9Dru78597FuThRUVq7/y9FYUU=";
}
else
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";

4
pkgs/applications/science/chemistry/jmol/default.nix
Unescape View File

@ -25,14 +25,14 @@ let
};
in
stdenv.mkDerivation rec {
version = "14.32.24";
version = "14.32.28";
pname = "jmol";
src = let
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
in fetchurl {
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
sha256 = "sha256-YxYNb2fS7KiUkZDSRx4FN+ZeMMNpfTaElitRE4RtD0g=";
sha256 = "sha256-J5m18pHjm3mbMwmCR1v9ycPNFwJdewp6zP4pxCZ+lF0=";
};
patchPhase = ''

19
pkgs/development/libraries/expat/default.nix
Unescape View File

@ -1,4 +1,13 @@
{ stdenv, fetchurl, lib }:
{ lib
, stdenv
, fetchurl
# for passthru.tests
, python3
, perlPackages
, haskellPackages
, luaPackages
, ocamlPackages
}:
# Note: this package is used for bootstrapping fetchurl, and thus
# cannot use fetchpatch! All mutable patches (generated by GitHub or
@ -34,6 +43,14 @@ stdenv.mkDerivation rec {
--replace "$"'{_IMPORT_PREFIX}' $out
'';
passthru.tests = {
inherit python3;
inherit (haskellPackages) hexpat;
inherit (perlPackages) XMLSAXExpat XMLParser;
inherit (luaPackages) luaexpat;
inherit (ocamlPackages) ocaml_expat;
};
meta = with lib; {
homepage = "https://libexpat.github.io/";
description = "A stream-oriented XML parser library written in C";

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

@ -2,51 +2,51 @@
"4.14": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-4.14.267-hardened1.patch",
"sha256": "0fd3x22j8i3w3knilh8v6sadw3pvl03vfzg9dpi2mgy6kxxxb3qv",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.267-hardened1/linux-hardened-4.14.267-hardened1.patch"
"name": "linux-hardened-4.14.269-hardened1.patch",
"sha256": "1hj3yn70aifprcfz4k088pj0lbr92cl5y840g08p0cqz3f3jvf24",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.269-hardened1/linux-hardened-4.14.269-hardened1.patch"
},
"sha256": "13hq4hcq686gdragjcgmz3m0kkk8abz5lna0ildaa9gybj43yd4c",
"version": "4.14.267"
"sha256": "1lhqq3va468k8w5f4hhsq1rgjcfrgi5l8lnrikfy9jisbi05z9h3",
"version": "4.14.269"
},
"4.19": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-4.19.230-hardened1.patch",
"sha256": "1yf65n69rlhl0cdgaaj45ylsjf8x4xrbvj0wfxfwd2kxwbjxp9jr",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.230-hardened1/linux-hardened-4.19.230-hardened1.patch"
"name": "linux-hardened-4.19.232-hardened1.patch",
"sha256": "195gbiial5rpiak4mszw3kn1dmm38npk2bchyb9lfvk1f26h2ybc",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.232-hardened1/linux-hardened-4.19.232-hardened1.patch"
},
"sha256": "107sqv4izdnazscwhyam88vbinsvnd33z8agn4awc42hkqh9l20p",
"version": "4.19.230"
"sha256": "0b520cwwqr5b1skc3gbq35hfjqpidxcl3gq7x5bdqqqdg0afiksg",
"version": "4.19.232"
},
"5.10": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.101-hardened1.patch",
"sha256": "1nhxkzkhqff97lhc0piczn8v02hyva5gm004l79v31xklxhpc9r0",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.101-hardened1/linux-hardened-5.10.101-hardened1.patch"
"name": "linux-hardened-5.10.103-hardened1.patch",
"sha256": "0i70cya9llz6nnhf4d5zz3f8xhj21si8capymmzcjczz0378argj",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.103-hardened1/linux-hardened-5.10.103-hardened1.patch"
},
"sha256": "13hwpb85dynbayghxs3ln3hbyh8djgl5fj63vxwc8izfny62aj87",
"version": "5.10.101"
"sha256": "02jq126r8dgqrhgdg8dym2v8xgp9jkjm8kf9zgj440s3wrasvf2g",
"version": "5.10.103"
},
"5.15": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.15.24-hardened1.patch",
"sha256": "1lz4p2rvp1q9c4s6czqvwlhb2gkcix8vmg9gcyd4vpzjmd0dhws4",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.24-hardened1/linux-hardened-5.15.24-hardened1.patch"
"name": "linux-hardened-5.15.26-hardened1.patch",
"sha256": "14pdmiqnn06by8mvxw4gklqfrnngrimyz1ag76pr60iz6ka6y5g8",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.26-hardened1/linux-hardened-5.15.26-hardened1.patch"
},
"sha256": "0zx9big7n8gh6y14c05llxsqh543q0czjdrq906m8cc7r01yp5pl",
"version": "5.15.24"
"sha256": "0fmydc5v51iacd5ys7p1m1k2318p47prj8xv02rcngv1y8s224jq",
"version": "5.15.26"
},
"5.4": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.180-hardened1.patch",
"sha256": "1cjxi6i8l5s2q54jiqpki4m25w9wp91yrbck86sxfr2ljhll0j1c",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.180-hardened1/linux-hardened-5.4.180-hardened1.patch"
"name": "linux-hardened-5.4.182-hardened1.patch",
"sha256": "0hcxy2hn836mivydmrbqrpvm4bfdsgf9xpx0iyz92rhd91ipgcyq",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.182-hardened1/linux-hardened-5.4.182-hardened1.patch"
},
"sha256": "07ckmgcqpr39bzpp8v60b2vkb03p8931k7sl3ywg6f00lvcbaf8n",
"version": "5.4.180"
"sha256": "03gly4ivsdahixmshi021al48ycsalx30vsxr3iyj47hchgj1wdj",
"version": "5.4.182"
}
}

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

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.14.268";
version = "4.14.269";
# 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 = "1xdn247j5n3xzm93wr9ff75rg9hbp64ypfp5sf78hnkzm8m44qng";
sha256 = "1lhqq3va468k8w5f4hhsq1rgjcfrgi5l8lnrikfy9jisbi05z9h3";
};
} // (args.argsOverride or {}))

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

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.19.231";
version = "4.19.232";
# 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 = "0cc1ipar37gvzr1xdbda5hghnvjmy8pk8an8hs2jspmhnfrj6cb7";
sha256 = "0b520cwwqr5b1skc3gbq35hfjqpidxcl3gq7x5bdqqqdg0afiksg";
};
} // (args.argsOverride or {}))

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

@ -1,12 +1,12 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec {
version = "4.9.303";
version = "4.9.304";
extraMeta.branch = "4.9";
extraMeta.broken = stdenv.isAarch64;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1r8s28ckmg0av9716350hadn99q738k2slciw8pzxw1xq47hbsa5";
sha256 = "099bkypbkb8an8jsl49f83kg6ic1yw9ssfc1qksaji1jparlnpi9";
};
} // (args.argsOverride or {}))

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

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.10.102";
version = "5.10.103";
# 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 = "0yg3y2cb3lb0whxkdrgbdig0kwjf5c71ci473aj0dr62n6alhhg6";
sha256 = "02jq126r8dgqrhgdg8dym2v8xgp9jkjm8kf9zgj440s3wrasvf2g";
};
} // (args.argsOverride or {}))

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

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.15.25";
version = "5.15.26";
# 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 = "0y9qahkya5dfnr6g04w5ym0p6h9ixmcdhvgz9g2b64aaaazgz6a3";
sha256 = "0fmydc5v51iacd5ys7p1m1k2318p47prj8xv02rcngv1y8s224jq";
};
} // (args.argsOverride or { }))

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

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.16.11";
version = "5.16.12";
# 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 = "08xhm3ngg9157r69v44akp6cj73g33l6wa7073s4sjn4lic6263d";
sha256 = "1wnpn5w0rfniy60m2a25wjm3flvpzvs2z1s4ga01b9qhbbqisnmv";
};
} // (args.argsOverride or { }))

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

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.4.181";
version = "5.4.182";
# 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 = "0awsv38cclk7npp6q7kb5n0dsdic3k8xnqdsz780yl92dh6s0qzw";
sha256 = "03gly4ivsdahixmshi021al48ycsalx30vsxr3iyj47hchgj1wdj";
};
} // (args.argsOverride or {}))

4
pkgs/servers/jackett/default.nix
Unescape View File

@ -9,13 +9,13 @@
buildDotnetModule rec {
pname = "jackett";
version = "0.20.643";
version = "0.20.660";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "EdAUF42R1CISzN8LmzmYyHjAxWQlQv8NUKSInMkSZUA=";
sha256 = "9k9v5/5zlpQJgBPlBYmCxUoucKL6D2vBFhjisvIAM4A=";
};
projectFile = "src/Jackett.Server/Jackett.Server.csproj";

6
pkgs/tools/admin/syft/default.nix
Unescape View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "syft";
version = "0.38.0";
version = "0.39.3";
src = fetchFromGitHub {
owner = "anchore";
repo = pname;
rev = "v${version}";
sha256 = "sha256-YJQ0gWhhcB+jkVzu1KP+QMOiiCOyQnSuQ4rSfVGMOCU=";
sha256 = "sha256-tPjODqBJ85B9uEFExs8z2T/RNKuIvphxX8U1tQLRr+A=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@ -22,7 +22,7 @@ buildGoModule rec {
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
};
vendorSha256 = "sha256-dT+MPuMQoA8Spx8CkF3OBhWdXXssg62ZHIZBrokUkp4=";
vendorSha256 = "sha256-fHrKg1+9428feTv3wngV2EjJEUqE5ItbwFu7DxXmkCw=";
nativeBuildInputs = [ installShellFiles ];

4
pkgs/tools/networking/minio-client/default.nix
Unescape View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "minio-client";
version = "2022-02-26T03-58-31Z";
version = "2022-03-03T21-12-24Z";
src = fetchFromGitHub {
owner = "minio";
repo = "mc";
rev = "RELEASE.${version}";
sha256 = "sha256-9JA9xwg+U8BQa66xPVghaGZQO5+efwG8/CqAXm2kg3Q=";
sha256 = "sha256-z+t8aMyGlqXcooCzJgn0xxOhuS+p3/qMTBJByDJPd40=";
};
vendorSha256 = "sha256-mk0ga3o6LeZ4uwV3vlP6qyFXLiORwNQLhXoCxSmvXsU=";

4
pkgs/tools/system/btop/default.nix
Unescape View File

@ -8,8 +8,8 @@
stdenv.mkDerivation rec {
pname = "btop";
version = "1.2.3";
hash = "sha256-vH167BL2ekWwxIhQWXkgJxl8z77S8SkmHVclW6XGc+8=";
version = "1.2.4";
hash = "sha256-IFuDpqRtsim2dfSTODuNK62xaLvKKcB5YBNHSQI6q44=";
src = fetchFromGitHub {
owner = "aristocratos";

4
pkgs/tools/video/svt-av1/default.nix
Unescape View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "svt-av1";
version = "0.9.0";
version = "0.9.1";
src = fetchFromGitLab {
owner = "AOMediaCodec";
repo = "SVT-AV1";
rev = "v${version}";
sha256 = "sha256-kmFyJ5b0EiesWUN71rbULF2cQt2pICF0P/MeZ+h7W9U=";
sha256 = "sha256-PIr2bCEKj1dXKiGWloZv2v+ed6JdHK3z+p11ugWGzAk=";
};
nativeBuildInputs = [ cmake nasm ];

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

@ -24868,6 +24868,8 @@ with pkgs;
carddav-util = callPackage ../tools/networking/carddav-util { };
cardinal = callPackage ../applications/audio/cardinal { };
carla = libsForQt5.callPackage ../applications/audio/carla { };
castor = callPackage ../applications/networking/browsers/castor { };

Write Preview
Loading…
Cancel
Save