Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-07-09 12:01:24 +00:00 committed by GitHub
commit 30ff0457a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
41 changed files with 744 additions and 467 deletions

View file

@ -63,17 +63,25 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
return "su - ${user} -c " + shlex.quote(cmd)
def get_browser_binary():
"""Returns the name of the browser binary."""
def get_browser_call():
"""Returns the name of the browser binary as well as CLI options."""
# Determine the name of the binary:
pname = "${getName chromiumPkg.name}"
if pname.find("chromium") != -1:
return "chromium" # Same name for all channels and ungoogled-chromium
if pname == "google-chrome":
return "google-chrome-stable"
if pname == "google-chrome-dev":
return "google-chrome-unstable"
# For google-chrome-beta and as fallback:
return pname
binary = "chromium" # Same name for all channels and ungoogled-chromium
elif pname == "google-chrome":
binary = "google-chrome-stable"
elif pname == "google-chrome-dev":
binary = "google-chrome-unstable"
else: # For google-chrome-beta and as fallback:
binary = pname
# Add optional CLI options:
options = ""
major_version = "${versions.major (getVersion chromiumPkg.name)}"
if major_version > "91":
# To avoid a GPU crash:
options += "--use-gl=angle --use-angle=swiftshader"
return f"{binary} {options}"
def create_new_win():
@ -135,9 +143,9 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
machine.wait_for_x()
url = "file://${startupHTML}"
machine.succeed(ru(f'ulimit -c unlimited; "{get_browser_binary()}" "{url}" & disown'))
machine.succeed(ru(f'ulimit -c unlimited; {get_browser_call()} "{url}" & disown'))
if get_browser_binary().startswith("google-chrome"):
if get_browser_call().startswith("google-chrome"):
# Need to click away the first window:
machine.wait_for_text("Make Google Chrome the default browser")
machine.screenshot("google_chrome_default_browser_prompt")

View file

@ -29,5 +29,5 @@ builtins.listToAttrs (
};
}
)
[ "nginxStable" "nginxMainline" "nginxShibboleth" "openresty" "tengine" ]
[ "nginxStable" "nginxMainline" "nginxQuic" "nginxShibboleth" "openresty" "tengine" ]
)

View file

@ -18,14 +18,14 @@
stdenv.mkDerivation rec {
pname = "squeekboard";
version = "1.13.0";
version = "1.14.0";
src = fetchFromGitLab {
domain = "source.puri.sm";
owner = "Librem5";
repo = pname;
rev = "v${version}";
sha256 = "0xyd6ickbaqvrr8a7ak6j1ziqjk05jlnganjrdv43p74nnjyqr8y";
sha256 = "1ayap40pgzcpmfydk5pbf3gwhh26m3cmbk6lyly4jihr9qw7dgb0";
};
cargoDeps = rustPlatform.fetchCargoTarball {
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
cat Cargo.toml.in Cargo.deps > Cargo.toml
'';
name = "${pname}-${version}";
sha256 = "096skk7vmr93axcf0qj7kyr8hm1faj0nkmd349g8mnzwd68a9npz";
sha256 = "0148ynzmapxfrlccikf20ikmi0ssbkn9fl5wi6nh6azflv50pzzn";
};
nativeBuildInputs = [

View file

@ -18,9 +18,9 @@
}
},
"beta": {
"version": "92.0.4515.80",
"sha256": "142v8y275mysgksvfprc83a7r1dlcnb5rqi8a451fmfnj6wrsq8i",
"sha256bin64": "0sz2fvg6l7q7syc5pysa246p03sganmgjdfvind42i8cqxw8gycp",
"version": "92.0.4515.93",
"sha256": "077i1rw84cgcmg2k0p1ycg5pwvnhgsa3qdfsr7icrn7gmagagqd0",
"sha256bin64": "1gf4qv8wvaagdgsinf2gprx9wcfgm8jql6870k50bi26mjqv9800",
"deps": {
"gn": {
"version": "2021-05-07",

View file

@ -0,0 +1,32 @@
{ lib, stdenv, gfortran, fetchFromGitHub, cmake } :
stdenv.mkDerivation rec {
pname = "dkh";
version = "1.2";
src = fetchFromGitHub {
owner = "psi4";
repo = pname;
rev = "v${version}";
sha256= "1wb4qmb9f8rnrwnnw1gdhzx1fmhy628bxfrg56khxy3j5ljxkhck";
};
nativeBuildInputs = [
gfortran
cmake
];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
hardeningDisable = [
"format"
];
meta = with lib; {
description = "Arbitrary-order scalar-relativistic Douglas-Kroll-Hess module";
license = licenses.lgpl3Only;
homepage = "https://github.com/psi4/dkh";
platforms = platforms.unix;
maintainers = [ maintainers.sheepforce ];
};
}

View file

@ -227,6 +227,7 @@
, {"tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7"}
, "teck-programmer"
, "tern"
, "terser"
, "textlint"
, "textlint-plugin-latex"
, "textlint-rule-abbr-within-parentheses"

File diff suppressed because it is too large Load diff

View file

@ -4,13 +4,13 @@
buildDunePackage rec {
pname = "alcotest";
version = "1.3.0";
version = "1.4.0";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-mirage-${version}.tbz";
sha256 = "sha256-efnevbyolTdNb91zr4pHDcvgaLQQSD01wEu2zMM+iaw=";
sha256 = "sha256:1h9yp44snb6sgm5g1x3wg4gwjscic7i56jf0j8jr07355pxwrami";
};
propagatedBuildInputs = [ astring cmdliner fmt uuidm re stdlib-shims uutf ];

View file

@ -12,6 +12,12 @@ buildDunePackage rec {
sha256 = "0086h9qkvnqfm8acrxqbki54z619nj73x7f0d01v5vg2naznx7w9";
};
# Make tests compatible with alcotest 1.4.0
postPatch = ''
substituteInPlace test/wycheproof/test.ml --replace \
'Printf.ksprintf Alcotest.fail' 'Printf.ksprintf (fun s -> Alcotest.fail s)'
'';
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ bigarray-compat cstruct eqaf hex ];
checkInputs = [ alcotest asn1-combinators benchmark

View file

@ -13,6 +13,11 @@ buildDunePackage rec {
sha256 = "cc0e814fd54efe7a5b7a8c5eb1c04e2dece751b7d8dee2d95908a0768896e8af";
};
# Make tests compatible with alcotest 1.4.0
postPatch = ''
substituteInPlace test/tests.ml --replace 'Fmt.kstrf Alcotest.fail' 'Fmt.kstrf (fun s -> Alcotest.fail s)'
'';
minimumOCamlVersion = "4.06";
propagatedBuildInputs = [ io-page mirage-block ];

View file

@ -14,6 +14,11 @@ buildDunePackage rec {
sha256 = "0wmb2zhiyp8n78xgcspcsyd19bhcml3kyli2caw3778wc1gyvfpc";
};
# Make tests compatible with alcotest 1.4.0
postPatch = ''
substituteInPlace test/test_channel.ml --replace 'Fmt.kstrf Alcotest.fail' 'Fmt.kstrf (fun s -> Alcotest.fail s)'
'';
propagatedBuildInputs = [ cstruct logs lwt mirage-flow ];
doCheck = true;

View file

@ -6,6 +6,11 @@ buildDunePackage {
inherit (mirage-flow) version useDune2 src;
# Make tests compatible with alcotest 1.4.0
postPatch = ''
substituteInPlace test/test.ml --replace 'Fmt.kstrf Alcotest.fail' 'Fmt.kstrf (fun s -> Alcotest.fail s)'
'';
propagatedBuildInputs = [ fmt logs mirage-flow ocaml_lwt cstruct ];
doCheck = true;

View file

@ -26,6 +26,14 @@ buildDunePackage rec {
./makefile-no-opam.patch
];
# Make tests compatible with alcotest 1.4.0
postPatch = ''
for p in common.ml test_tcp_options.ml
do
substituteInPlace test/$p --replace 'Fmt.kstrf Alcotest.fail' 'Fmt.kstrf (fun s -> Alcotest.fail s)'
done
'';
nativeBuildInputs = [
bisect_ppx
ppx_cstruct

View file

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "nexia";
version = "0.9.7";
version = "0.9.8";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "bdraco";
repo = pname;
rev = version;
sha256 = "sha256-1oBrDr8QAUe6LLBliR/sNwDlLuisxOWPeI9sxuJtGxU=";
sha256 = "sha256-KjA3AnrMg4ySKSY2FDHVo0Zh9GoLUWiQDuUzo8d5At8=";
};
propagatedBuildInputs = [

View file

@ -1,52 +1,57 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, attrs
, buildPythonPackage
, cattrs
, fetchFromGitHub
, itsdangerous
, requests
, url-normalize
, poetry-core
, pytestCheckHook
, pythonOlder
, pyyaml
, requests
, requests-mock
, rich
, timeout-decorator
, ujson
, url-normalize
}:
buildPythonPackage rec {
pname = "requests-cache";
version = "0.6.4";
version = "0.7.0";
disabled = pythonOlder "3.6";
format = "pyproject";
src = fetchFromGitHub {
owner = "reclosedev";
repo = "requests-cache";
rev = "v${version}";
sha256 = "10rvs611j16kakqx38kpqpc1v0dfb9rmbz2whpskswb1lsksv3j9";
sha256 = "sha256-P7JzImidUXOD4DUMdfy3sgM5RISti23wNnLwDHPoiTA=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
attrs
cattrs
itsdangerous
pyyaml
requests
ujson
url-normalize
];
checkInputs = [
pytestCheckHook
requests-mock
rich
timeout-decorator
];
disabledTestPaths = [
# connect to database on localhost
"tests/integration/test_cache.py"
"tests/integration/test_dynamodb.py"
"tests/integration/test_gridfs.py"
"tests/integration/test_mongodb.py"
"tests/integration/test_redis.py"
];
# Integration tests require local DBs
pytestFlagsArray = [ "tests/unit" ];
pythonImportsCheck = [ "requests_cache" ];
@ -54,5 +59,6 @@ buildPythonPackage rec {
description = "Persistent cache for requests library";
homepage = "https://github.com/reclosedev/requests-cache";
license = licenses.bsd3;
maintainers = with maintainers; [ fab ];
};
}

View file

@ -3,7 +3,6 @@
, pythonOlder
, fetchFromGitHub
, poetry-core
, fetchpatch
, pytestCheckHook
, pycodestyle
, pyyaml
@ -11,7 +10,7 @@
buildPythonPackage rec {
pname = "tinydb";
version = "4.4.0";
version = "4.5.0";
disabled = pythonOlder "3.5";
format = "pyproject";
@ -19,22 +18,13 @@ buildPythonPackage rec {
owner = "msiemens";
repo = pname;
rev = "v${version}";
sha256 = "sha256-3FbsnLU7G4VVhI5NYRqCEQgo51zDeAkEhH69H52zr/w=";
sha256 = "sha256-rJVJfsPhGTQpE6p0kzN6GDR0r9M71ADa67Oi5jLgeWY=";
};
nativeBuildInputs = [
poetry-core
];
patches = [
# Switch to poetry-core, https://github.com/msiemens/tinydb/pull/391
(fetchpatch {
name = "switch-to-peotry-core.patch";
url = "https://github.com/msiemens/tinydb/commit/5b547c18e7ce9f5925d5943dfa47d408435a0da5.patch";
sha256 = "19ma9ib020b82sn1mcr7sfysqbj8h6nbb365bih1x1wn3ym8xlbc";
})
];
postPatch = ''
substituteInPlace pytest.ini \
--replace "--cov-append --cov-report term --cov tinydb" ""

View file

@ -26,6 +26,7 @@ buildPythonPackage rec {
homepage = "https://github.com/dbr/tvdb_api";
license = licenses.unlicense;
maintainers = with maintainers; [ peterhoeg ];
# https://github.com/dbr/tvdb_api/issues/94
broken = true;
};
}

View file

@ -95,33 +95,33 @@ rec {
headers = "01x6a0r2jawjpl09ixgzap3g0z6znj34hsnnhzanavkbds0ri4k6";
};
electron_11 = mkElectron "11.4.9" {
x86_64-linux = "c18ed2e16e60ca1eddd01ab2e4fff2bbfd9f197ab17b7577155f05687297d7be";
x86_64-darwin = "ec34759ae768e55449c23244283c8af3dc5d5ab533d64cea0231be0a0878ebdd";
i686-linux = "ef9125268e03f2f1d13c2b2505ba2529af88a8397cad640bd35116caae7ab296";
armv7l-linux = "b43c00f4a0b4cf8affa09cedff93066d23d57a6148af383a8fc9f6d25b63d449";
aarch64-linux = "3df038538056fc4a918afe07138052b1f53648c411add47c3a18abe8a30e6f71";
aarch64-darwin = "acf880cfaea9ca382831df165fa7ef7e0b442c663d5a586cdfe0baa1aea4e17c";
headers = "1wfhc22g680pvv85rq8d8lw4vphpr700fmzs3nwxixxnzhp1sb79";
electron_11 = mkElectron "11.4.10" {
x86_64-linux = "bad6af91183bcb27428a258fba3fab24ef3e8435402d6cb2d500fe215b8c920c";
x86_64-darwin = "aaa11e61697ec2eec99950082a68eef32bc1231e51ac77cde6d96a12837f5b73";
i686-linux = "8e956bad6a6c5f85fe5a53304ffe878191c670ffbc13176fbe01911ba7d6da0f";
armv7l-linux = "c9e3873316416426151fbff9a190526e40a3e311d0f348ee6965a8c7948cb9c1";
aarch64-linux = "4ee0dab2af08f0d8f0d141a165744c949b068a8a6537ef5ff7973b63266c2abf";
aarch64-darwin = "53f96ba6099617c219ca75bde1682abb9e961927e5a3645b38dee11b95517659";
headers = "0c7qms8vbirblg6z86s19p5l472p3h8lw1rj7ckgnwna4b68vn33";
};
electron_12 = mkElectron "12.0.12" {
x86_64-linux = "98e7cc5dd3f161c37cbbd9aef90d55c51531a4bad8221a9d1f92e78014758054";
x86_64-darwin = "3a39933c1c83406e4ddbce2af193e9a6b7b77f418c4f1d5e7b8f9edc348acd15";
i686-linux = "2a06936fa13929342ebb7521d2e3e8b4a7a08ac1d757c0521a047b4cf0a979fc";
armv7l-linux = "c0a2c13d99a1152aa6252fd8237207a6f395b70d0890eba5b7209a03beb9a6ec";
aarch64-linux = "a92e2eaebab75b93eda0bc523ba9262a32db95c7546c095fee93d39a304521a0";
aarch64-darwin = "810a1f36574a2db8d7d4022a042a65cceec3443644487868c5609b16b5dfe29f";
headers = "1qis2k8yc7g1klvhiysjrgl5gclx4idxdz60kh8ldrji5a0lgha1";
electron_12 = mkElectron "12.0.14" {
x86_64-linux = "a75886b5aad27c64232ec0ec47d8c3c1d696ab968007cd8bfa5db87b33e8a5e7";
x86_64-darwin = "03b30610f23be9ef835a78e9d4babc52ff32e29ff33c51218b1b8970c3bd6062";
i686-linux = "0bb86208173da28250f261b162657c3614b859fb561df54cbd25b566d619c75c";
armv7l-linux = "bd743c6eec434aedb80e7e5eef58dfe9f133bc48015d263dc12a119dd1276e32";
aarch64-linux = "1f287496cc61c67db25339f8f79d09ace952edeaca47ea664766425ceaebc2a3";
aarch64-darwin = "50171b32c927ab5b658da5b4459eca5ddb5df89cc655ae753cc6d02b4ed9b30d";
headers = "1znhnily1gl2f58f0ny1fa3yilmm4xn5fcdvqkjh4czv5c12rrbg";
};
electron_13 = mkElectron "13.1.4" {
x86_64-linux = "096909396be9fac888ca35093d16bdb50a965e3200823f2384574c359f15cd4f";
x86_64-darwin = "3d9980f8062766be3cfcfd54b9fd9f469993df06d538a2324c4879eae1284c84";
i686-linux = "73c8b1fc01a89a5f9b12de38ed70bd01686e50a55d817f0cdf5914e953bdc868";
armv7l-linux = "db2fe2f499865ea697cacef992fc0042ac0f75da4c016d64e5c41deae7f5eb72";
aarch64-linux = "4acdd4eae499e1ed42871ed8b744fdef9f608f5613742090cc20e4f6b5314ae8";
aarch64-darwin = "e961b7d361c378e4adab7903211ac7200684cb91044c3b300acde04ca24d0468";
headers = "1h1sr5nk37asbj1fadgjzksgr876wxdmq3b017bb9k5kcgajcmqr";
electron_13 = mkElectron "13.1.6" {
x86_64-linux = "6f28af0a3ccb20b0d2e4f26ea4698d5b89b81e860cbd40a446c2a8223fdf0101";
x86_64-darwin = "e2bde9b3b2ee092b80d18439780c4ecb4620da1ead9fcae00cc603f3a56fda3e";
i686-linux = "7c266148fba83c3eb912c5ccd7cd7c24829bc93b380378cba0480b02c38f5d42";
armv7l-linux = "8d54ec6babc06b118038d2d4f49cab84ec6d5617c645266b88dd829c02354e77";
aarch64-linux = "d24ba0e3f8624ec611fb2e9165c08b227ba799196b0f2787cad8c60f1cc23b5b";
aarch64-darwin = "0fa29c1ba89ab906c5ba20216c505b6d8d3fbccdc58cd397146783bddeff1dd4";
headers = "122ppxayj1fijzfdpnh3wqyi636dq53j8imyf46ik8fkvgmrw2mz";
};
}

View file

@ -2,22 +2,22 @@
stdenv.mkDerivation rec {
pname = "elfkickers";
version = "3.1a";
version = "3.2";
src = fetchurl {
url = "http://www.muppetlabs.com/~breadbox/pub/software/ELFkickers-${version}.tar.gz";
sha256 = "02354yn1lh1dxny35ky2d0b44iq302krsqpwk5grr4glma00hhq6";
url = "https://www.muppetlabs.com/~breadbox/pub/software/ELFkickers-${version}.tar.gz";
sha256 = "sha256-m4HmxT4MlPwZjZiC63NxVvNtVlFS3DIRiJfHewaiaHw=";
};
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc prefix=$(out)" ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "prefix:=${placeholder "out"}" ];
enableParallelBuilding = true;
meta = with lib; {
homepage = "http://www.muppetlabs.com/~breadbox/software/elfkickers.html";
homepage = "https://www.muppetlabs.com/~breadbox/software/elfkickers.html";
description = "A collection of programs that access and manipulate ELF files";
platforms = platforms.linux;
license = licenses.gpl2;
license = licenses.gpl2Plus;
maintainers = [ maintainers.dtzWill ];
};
}

View file

@ -16,12 +16,12 @@ let
];
in stdenv.mkDerivation rec {
pname = "insomnia";
version = "2021.4.0";
version = "2021.4.1";
src = fetchurl {
url =
"https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb";
sha256 = "sha256-lMQWoShlEACTrcGgQtfPGVQ4X8pCG/6SkXtz+rWAOyg=";
sha256 = "sha256-74du6UQB1LfsnYF9tmx41KJNmlEVVL5H2W+YQR720FY=";
};
nativeBuildInputs =

View file

@ -6172,6 +6172,18 @@ final: prev:
meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/";
};
vim-dadbod-ui = buildVimPluginFrom2Nix {
pname = "vim-dadbod-ui";
version = "2021-05-12";
src = fetchFromGitHub {
owner = "kristijanhusak";
repo = "vim-dadbod-ui";
rev = "09fb2f51dcd022a6be20b48a730df493f4b3ca2d";
sha256 = "1bsy8illa9xsawx6lfs67y2xri38fpxdb4xz25ajy43snls41say";
};
meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/";
};
vim-dasht = buildVimPluginFrom2Nix {
pname = "vim-dasht";
version = "2020-07-11";

View file

@ -312,6 +312,7 @@ kristijanhusak/defx-icons
kristijanhusak/deoplete-phpactor
kristijanhusak/vim-carbon-now-sh
kristijanhusak/vim-dadbod-completion
kristijanhusak/vim-dadbod-ui
kristijanhusak/vim-dirvish-git
kristijanhusak/vim-hybrid-material
kshenoy/vim-signature

View file

@ -13,20 +13,20 @@
},
"5.10": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.47-hardened1.patch",
"sha256": "0qkwz3d83p2l5p7lhj3imfx8cr17smciw76xhj00zv171vc3q7xm",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.47-hardened1/linux-hardened-5.10.47-hardened1.patch"
"name": "linux-hardened-5.10.48-hardened1.patch",
"sha256": "1drfh4ljiih4y5fn2bvg15wrmz10s50q5qyhn89r63b5qkb1lp21",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.48-hardened1/linux-hardened-5.10.48-hardened1.patch"
},
"5.12": {
"extra": "-hardened1",
"name": "linux-hardened-5.12.14-hardened1.patch",
"sha256": "0c5zi03j5bjhr706wad1qf5kr4nv0s2bzkx4z5mr6wqgra5dg22v",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.14-hardened1/linux-hardened-5.12.14-hardened1.patch"
"name": "linux-hardened-5.12.15-hardened1.patch",
"sha256": "1d81z67y9659icgmkchj0y2jlcs4nh4grlzf7ppbq6vmrr92xq8x",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.15-hardened1/linux-hardened-5.12.15-hardened1.patch"
},
"5.4": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.129-hardened1.patch",
"sha256": "0b16w4jm22mlhwfvbzbg8bw9z7hp13r1bl5g5rk42vmz07ahknga",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.129-hardened1/linux-hardened-5.4.129-hardened1.patch"
"name": "linux-hardened-5.4.130-hardened1.patch",
"sha256": "0d7q6pkl74hkx65p25jxjjky08zdprsfbcyik9cdlsfrbiidwn53",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.130-hardened1/linux-hardened-5.4.130-hardened1.patch"
}
}

View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.10.47";
version = "5.10.48";
# 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,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1ig1kb10729xyawm2zqzx8slpdbylgwms7b5vkhw3q6iwqpjmd9h";
sha256 = "0pn24bkz9mkphv9f634117zam0ak6q3pbpfwv0l5kf71h0s1klfv";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ];

View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.12.14";
version = "5.12.15";
# 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,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1b3xnb62n53vm6larkvv2vzd9w7cjnqh8zh6jzq9lpcg12c3pjlh";
sha256 = "1nlgwcxfhxzf5wak8c0gamn4k8vpdllzqlpqqn5fa08cdjcymz27";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ];

View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.13";
version = "5.13.1";
# 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,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "sha256-P2uql/N1GEOfUd8uTz1lqCLKX/AWqo5g0sxTuVpsidk=";
sha256 = "140a9ngzlarin84mnnwgx6z3ckw431d578aixxl60ll5853gdakj";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ];

View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.4.129";
version = "5.4.130";
# 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,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1ps64gx85lmbriq445hd2hcv4g4b1d1cwf4r3nd90x6i2cj4c9j4";
sha256 = "0ywwy6g0fd05fxgwsrycz2l6khjljxa3qbi6hywp3rjgmgxp2ak6";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ];

View file

@ -6,7 +6,7 @@
, ... } @ args:
let
version = "5.10.41-rt42"; # updated by ./update-rt.sh
version = "5.10.47-rt45"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@ -18,14 +18,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "0wb739q7dha8nxkd72x42k4in5nw633yw065ppwc8rq7x2fpa17n";
sha256 = "1ig1kb10729xyawm2zqzx8slpdbylgwms7b5vkhw3q6iwqpjmd9h";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "1z8jgsq5fkg486xxawg4c4wk1l9xra7x1cfqaf4grhw0csbbx883";
sha256 = "0s3y636ymrhm8rg6n47wdk1pvvmpsnynmyhyy5681f2pw5z2c1ay";
};
}; in [ rt-patch ] ++ kernelPatches;

View file

@ -1,6 +1,6 @@
{ callPackage, ... }@args:
callPackage ./generic.nix args {
version = "1.21.0";
sha256 = "0w87zhm5nfx88x9hj6drrvm5f3m02kzbjp39x1lsglrbmi5jl6gy";
version = "1.21.1";
sha256 = "0q2m2pd9x287py54kp49ys5pwnn0j17x7jjl0cx1c5916h8h7fk8";
}

View file

@ -6,8 +6,8 @@
callPackage ./generic.nix args {
src = fetchhg {
url = "https://hg.nginx.org/nginx-quic";
rev = "1fec68e322d0"; # branch=quic
sha256 = "0nr1mjic215yc6liyv1kfwhfdija3q2sw3qdwibds5vkg330vmw8";
rev = "5b0c229ba5fe"; # branch=quic
sha256 = "1bb6n6b4nkc1cfllj75lwr4gjijl8883bkcvq8ncg7r4s5xs7r90";
};
preConfigure = ''

View file

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "telegraf";
version = "1.18.1";
version = "1.19.1";
excludedPackages = "test";
@ -12,10 +12,10 @@ buildGoModule rec {
owner = "influxdata";
repo = "telegraf";
rev = "v${version}";
sha256 = "sha256-iFigbnqUXWQrhDovwQYZsr8llkB9553c5LgcKJ78yZ4=";
sha256 = "sha256-8shyNKwSg3pUxfQsIHBNnIaks/86vHuHN/SroDE3QFU=";
};
vendorSha256 = "sha256-m53S/L71nyioCBbIDDAWEnqStBdqTFGq16y5ozsXq1c=";
vendorSha256 = "sha256-jP6P2NShzlFCptCQ04XY4cIrONNArwthiEONEo32Btw=";
preBuild = ''
buildFlagsArray+=("-ldflags=-w -s -X main.version=${version}")

View file

@ -0,0 +1,35 @@
{ lib
, stdenv
, fetchurl
, makeWrapper
, jre }:
stdenv.mkDerivation rec {
pname = "fabric-installer";
version = "0.7.4";
src = fetchurl {
url = "https://maven.fabricmc.net/net/fabricmc/fabric-installer/${version}/fabric-installer-${version}.jar";
sha256 = "0s3nmwpq1qg90c27qh4anvvsg4yzsgcp6kwsb35fsiaaakxn0b8r";
};
dontUnpack = true;
nativeBuildInputs = [ jre makeWrapper ];
installPhase = ''
mkdir -p $out/{bin,lib/fabric}
cp $src $out/lib/fabric/fabric-installer.jar
makeWrapper ${jre}/bin/java $out/bin/fabric-installer \
--add-flags "-jar $out/lib/fabric/fabric-installer.jar"
'';
meta = with lib; {
homepage = "https://fabricmc.net/";
description = "A lightweight, experimental modding toolchain for Minecraft";
license = licenses.asl20;
maintainers = [ maintainers.ivar ];
platforms = platforms.unix;
};
}

View file

@ -0,0 +1,39 @@
{ lib
, stdenv
, fetchurl
, makeWrapper
, jre }:
stdenv.mkDerivation rec {
pname = "optifine";
version = "1.16.5_HD_U_G8";
src = fetchurl {
url = "https://optifine.net/download?f=OptiFine_${version}.jar";
sha256 = "0ks91d6n4vkgb5ykdrc67br2c69nqjr0xhp7rrkybg24xn8bqxiw";
};
dontUnpack = true;
nativeBuildInputs = [ jre makeWrapper ];
installPhase = ''
mkdir -p $out/{bin,lib/optifine}
cp $src $out/lib/optifine/optifine.jar
makeWrapper ${jre}/bin/java $out/bin/optifine \
--add-flags "-jar $out/lib/optifine/optifine.jar"
'';
meta = with lib; {
homepage = "https://optifine.net/";
description = "A Minecraft optimization mod";
longDescription = ''
OptiFine is a Minecraft optimization mod.
It allows Minecraft to run faster and look better with full support for HD textures and many configuration options.
'';
license = licenses.unfree;
maintainers = [ maintainers.ivar ];
platforms = platforms.unix;
};
}

View file

@ -0,0 +1,33 @@
{ expect, fetchFromGitHub, lib, rustPlatform, stdenv }:
rustPlatform.buildRustPackage rec {
pname = "fcp";
version = "0.2.0";
src = fetchFromGitHub {
owner = "svetlitski";
repo = pname;
rev = "v${version}";
sha256 = "0ahd79dh48hsi4bhs4zs0a7hr55jzsjix9c61lc42ipdbqgifg2d";
};
cargoSha256 = "1arrw4fz3f3wfjy9nb8vm707vhh4x0vv9wv8z2s07b4qcwwih8k4";
nativeBuildInputs = [ expect ];
# character_device fails with "File name too long" on darwin
doCheck = !stdenv.isDarwin;
postPatch = ''
patchShebangs tests/*.exp
'';
meta = with lib; {
description = "A significantly faster alternative to the classic Unix cp(1) command";
homepage = "https://github.com/svetlitski/fcp";
changelog = "https://github.com/svetlitski/fcp/releases/tag/v${version}";
license = licenses.bsd3;
platforms = platforms.unix;
maintainers = with maintainers; [ figsoda ];
};
}

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2021-07-06";
version = "2021-07-09";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = version;
sha256 = "sha256-tRdA3GwU+jko+N+LOCHOA6RqFp3rkhyARwSTXRXoDww=";
sha256 = "sha256-FjiQ+L3eW+od41Vz00t/LhagS3SUT+PA5GvtZ6lhoFU=";
};
installPhase = ''

View file

@ -1,4 +1,4 @@
# frozen_string_literal: true
source "https://rubygems.org"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.51"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.52"

View file

@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
revision: d9aeac3fea255c475f553be4c55f3ae7cefc8542
ref: refs/tags/6.0.51
revision: f376002331f03483d56ade1c19134dbf02ef2cff
ref: refs/tags/6.0.52
specs:
metasploit-framework (6.0.51)
metasploit-framework (6.0.52)
actionpack (~> 5.2.2)
activerecord (~> 5.2.2)
activesupport (~> 5.2.2)
@ -119,23 +119,23 @@ GEM
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.7.0)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
afm (0.2.2)
arel (9.0.0)
arel-helpers (2.12.0)
activerecord (>= 3.1.0, < 7)
aws-eventstream (1.1.1)
aws-partitions (1.473.0)
aws-sdk-core (3.115.0)
aws-partitions (1.475.0)
aws-sdk-core (3.116.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-ec2 (1.246.0)
aws-sdk-ec2 (1.248.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-iam (1.55.0)
aws-sdk-iam (1.56.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-kms (1.44.0)
@ -145,7 +145,7 @@ GEM
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.2.3)
aws-sigv4 (1.2.4)
aws-eventstream (~> 1, >= 1.0.2)
bcrypt (3.1.16)
bcrypt_pbkdf (1.1.0)
@ -173,19 +173,23 @@ GEM
eventmachine (1.2.7)
faker (2.18.0)
i18n (>= 1.6, < 2)
faraday (1.4.3)
faraday (1.5.0)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-httpclient (~> 1.0.1)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.1)
faraday-patron (~> 1.0)
multipart-post (>= 1.2, < 3)
ruby2_keywords (>= 0.0.4)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.1.0)
faraday-patron (1.0.0)
faye-websocket (0.11.1)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
@ -195,7 +199,7 @@ GEM
ed25519 (~> 1.2)
http-cookie (1.0.4)
domain_name (~> 0.5)
http_parser.rb (0.6.0)
http_parser.rb (0.7.0)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
io-console (0.5.9)
@ -208,7 +212,7 @@ GEM
loofah (2.10.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
metasm (1.0.4)
metasm (1.0.5)
metasploit-concern (3.0.2)
activemodel (~> 5.2.2)
activesupport (~> 5.2.2)
@ -293,7 +297,7 @@ GEM
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (13.0.3)
rake (13.0.6)
rb-readline (0.5.5)
recog (2.3.20)
nokogiri
@ -360,7 +364,7 @@ GEM
rubyntlm
windows_error
rubyntlm (0.6.3)
rubyzip (2.3.0)
rubyzip (2.3.2)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)

View file

@ -8,13 +8,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
version = "6.0.51";
version = "6.0.52";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
sha256 = "sha256-ICVF4GVOyCq7dUAvzUUzhG+NuEiHSFvVWbQ8tAqUFFg=";
sha256 = "sha256-JN+ulGd47xZFSR7AdxfvviR5mwCHdfBmFkaAJPdaLJ8=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -54,10 +54,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp";
type = "gem";
};
version = "2.7.0";
version = "2.8.0";
};
afm = {
groups = ["default"];
@ -114,40 +114,40 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1dw05k0l63lm631lwg5b1bx1nhkirds4rbc1v98bliwfjk5wf71a";
sha256 = "0x9d0awfm8s9y025iwn7d5an476f6xq9v99lnynj2vvj1kgya79s";
type = "gem";
};
version = "1.473.0";
version = "1.475.0";
};
aws-sdk-core = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06cs5wj4njb2ivhv06v5d7rgy1i2g67a93c0kxly8h7fkkxh315q";
sha256 = "0vjr1lzddm1pcs5vkpxns1gmrv0l0wb53kcxhh1xdznb7hm8h5km";
type = "gem";
};
version = "3.115.0";
version = "3.116.0";
};
aws-sdk-ec2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0n3m2a8jnk64ai4wb1wh1a77i8c561ncjklvp650w8723avbj5bq";
sha256 = "1s0r1vk39sjxkc5km2ldvcm1l5ac2c4w5z9bvz18jgqis98j6zd5";
type = "gem";
};
version = "1.246.0";
version = "1.248.0";
};
aws-sdk-iam = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03vs5wf96qpjl309vnrnr4d8hy4l8bvnflgc806bm9n130cyvs9m";
sha256 = "0d30abab908434nmfi5j97vmv63466bmcvhvaknma27qc04s53ph";
type = "gem";
};
version = "1.55.0";
version = "1.56.0";
};
aws-sdk-kms = {
groups = ["default"];
@ -174,10 +174,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1d9zhmi3mpfzkkpg7yw7s9r1dwk157kh9875j3c7gh6cy95lmmaw";
sha256 = "0cb9hsg0x9v4yk6sxif8968sg646qphmsjaqy9z8p7y3my5bkrf0";
type = "gem";
};
version = "1.2.3";
version = "1.2.4";
};
bcrypt = {
groups = ["default"];
@ -354,10 +354,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zmdsl6n05khwwq8gjssmfca0ifz6q82wwghf1qyzbxxjdna5mly";
sha256 = "0gwbii45plm9bljk22bwzhzxrc5xid8qx24f54vrm74q3zaz00ah";
type = "gem";
};
version = "1.4.3";
version = "1.5.0";
};
faraday-em_http = {
groups = ["default"];
@ -389,6 +389,16 @@
};
version = "1.1.0";
};
faraday-httpclient = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc";
type = "gem";
};
version = "1.0.1";
};
faraday-net_http = {
groups = ["default"];
platforms = [];
@ -409,6 +419,16 @@
};
version = "1.1.0";
};
faraday-patron = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w";
type = "gem";
};
version = "1.0.0";
};
faye-websocket = {
groups = ["default"];
platforms = [];
@ -464,10 +484,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi";
sha256 = "1xha614fi6l04wryqjj1xmpalzlmhb6lb9qmlh8mmliycdhvcshp";
type = "gem";
};
version = "0.6.0";
version = "0.7.0";
};
i18n = {
groups = ["default"];
@ -544,10 +564,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mbmpc8vsi574s78f23bhiqk07sr6yrrrmk702lfv61ql4ah5l89";
sha256 = "0dpjbkdvi4h6v0g01db7vlcsg15pfiyslkz3zd7wfk04yrc6g7wi";
type = "gem";
};
version = "1.0.4";
version = "1.0.5";
};
metasploit-concern = {
groups = ["default"];
@ -574,12 +594,12 @@
platforms = [];
source = {
fetchSubmodules = false;
rev = "d9aeac3fea255c475f553be4c55f3ae7cefc8542";
sha256 = "0n0ljh5b8g5lb7amnj4792w8svw46d2wsbs0fnxjmj2fcph4a990";
rev = "f376002331f03483d56ade1c19134dbf02ef2cff";
sha256 = "17rcbbvj90262rkg0xc702dpj95yxwbpgh0y952idvvqcyaaxpr4";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
version = "6.0.51";
version = "6.0.52";
};
metasploit-model = {
groups = ["default"];
@ -946,10 +966,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67";
sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w";
type = "gem";
};
version = "13.0.3";
version = "13.0.6";
};
rb-readline = {
groups = ["default"];
@ -1246,10 +1266,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji";
sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz";
type = "gem";
};
version = "2.3.0";
version = "2.3.2";
};
sawyer = {
groups = ["default"];

View file

@ -868,7 +868,7 @@ in
auditwheel = callPackage ../tools/package-management/auditwheel { };
amidst = callPackage ../tools/games/amidst { };
amidst = callPackage ../tools/games/minecraft/amidst { };
gamemode = callPackage ../tools/games/gamemode {
libgamemode32 = pkgsi686Linux.gamemode.lib;
@ -4806,6 +4806,8 @@ in
lp_solve = callPackage ../applications/science/math/lp_solve { };
fabric-installer = callPackage ../tools/games/minecraft/fabric-installer { };
fastlane = callPackage ../tools/admin/fastlane { };
fatresize = callPackage ../tools/filesystems/fatresize {};
@ -7658,6 +7660,8 @@ in
openvswitch-lts = callPackage ../os-specific/linux/openvswitch/lts.nix { };
optifine = callPackage ../tools/games/minecraft/optifine { };
optipng = callPackage ../tools/graphics/optipng {
libpng = libpng12;
};
@ -24042,6 +24046,8 @@ in
fbida = callPackage ../applications/graphics/fbida { };
fcp = callPackage ../tools/misc/fcp { };
fdupes = callPackage ../tools/misc/fdupes { };
feh = callPackage ../applications/graphics/feh { };
@ -29631,6 +29637,8 @@ in
gstreamerSupport = true;
});
dkh = callPackage ../applications/science/chemistry/dkh { };
openmolcas = callPackage ../applications/science/chemistry/openmolcas { };
pymol = callPackage ../applications/science/chemistry/pymol { };