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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2023-03-31 18:01:35 +00:00
committed by GitHub
parent 4188f49601 22793aa0a2
commit d8f8da95a0
20 changed files with 886 additions and 876 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+401 -401
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+401 -401
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/networking/browsers/firefox/packages.nix
+4 -4
View File
@@ -29,11 +29,11 @@ rec {
firefox-beta = buildMozillaMach rec {
pname = "firefox-beta";
version = "112.0b8";
version = "112.0b9";
applicationName = "Mozilla Firefox Beta";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "6f63380e9b6ccf5d1c17bf4d9ee6997744354c1bc818fad7555cc1761ca798a0493cee5f451c477d32a9acdc04134d8f7bdbc40e83e001d671188e74af1db8d0";
sha512 = "95d17d5c7415d98b24d41b4419c76adb757f552957a69126c0031cb1c8f16a55b765f66b2e7a45531a643d5c713dea883bde4d436b82cb6661b44f113e890127";
};
meta = {
@@ -56,12 +56,12 @@ rec {
firefox-devedition = buildMozillaMach rec {
pname = "firefox-devedition";
version = "112.0b8";
version = "112.0b9";
applicationName = "Mozilla Firefox Developer Edition";
branding = "browser/branding/aurora";
src = fetchurl {
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "a77504bd80022bd0c908d2c6b59781f0d71d65e92be001bce993935b6a55775369bf36829c2979912f4d920e29e63c043b93c5e932669674ff47140e13a9519f";
sha512 = "d798803dca258007d355a181263b803365a13385a1bc09bdada07336add019bd36db197cdfa3749240f563641167a9d9e5c0539e58ecd369f575a219a4064b74";
};
meta = {
pkgs/data/themes/dracula-theme/default.nix
+4 -4
View File
@@ -1,10 +1,10 @@
{ lib, stdenv, fetchFromGitHub, gtk-engine-murrine }:
{ lib, stdenvNoCC, fetchFromGitHub, gtk-engine-murrine }:
let
themeName = "Dracula";
version = "3.0";
version = "4.0.0";
in
stdenv.mkDerivation {
stdenvNoCC.mkDerivation {
pname = "dracula-theme";
inherit version;
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
owner = "dracula";
repo = "gtk";
rev = "v${version}";
sha256 = "sha256-7DUT/DfvCSo9GiJzqhqvegNCARB0eGtPQ6oUQG/Uja0=";
hash = "sha256-q3/uBd+jPFhiVAllyhqf486Jxa0mnCDSIqcm/jwGtJA=";
};
propagatedUserEnvPkgs = [
pkgs/development/interpreters/clojure/default.nix
+2 -2
View File
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "clojure";
version = "1.11.1.1257";
version = "1.11.1.1262";
src = fetchurl {
# https://clojure.org/releases/tools
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "sha256-bZcJFtDOo8S2LQebsdTkgzlBVuZaKJUlUQX4F/qSq9A=";
sha256 = "sha256-k++uGj1CdOjPXYAVERs6UqLnrUXE1Bv/hm1JXRxAHuI=";
};
nativeBuildInputs = [
pkgs/development/python-modules/aws-lambda-builders/default.nix
+10
View File
@@ -2,6 +2,7 @@
, lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, mock
, parameterized
, pyelftools
@@ -28,6 +29,15 @@ buildPythonPackage rec {
six
];
patches = [
# This patch can be removed once https://github.com/aws/aws-lambda-builders/pull/475 has been merged.
(fetchpatch {
name = "setuptools-66-support";
url = "https://patch-diff.githubusercontent.com/raw/aws/aws-lambda-builders/pull/475.patch";
sha256 = "sha256-EkYQ6DNzbSnvkOads0GFwpGzeuBoLVU42THlSZNOHMc=";
})
];
nativeCheckInputs = [
mock
parameterized
pkgs/development/python-modules/pydata-sphinx-theme/default.nix
+4 -2
View File
@@ -7,11 +7,12 @@
, beautifulsoup4
, docutils
, packaging
, typing-extensions
}:
buildPythonPackage rec {
pname = "pydata-sphinx-theme";
version = "0.13.1";
version = "0.13.3";
format = "wheel";
@@ -22,7 +23,7 @@ buildPythonPackage rec {
dist = "py3";
python = "py3";
pname = "pydata_sphinx_theme";
hash = "sha256-zinB3nlh1hbfol9MOpYZgY1LstSpmF7QeDZ68pT7zMI=";
hash = "sha256-v0HKbBxiFukp4og05AS/yQ4IC1GRW751Y7Xm/acDVPA=";
};
propagatedBuildInputs = [
@@ -31,6 +32,7 @@ buildPythonPackage rec {
beautifulsoup4
docutils
packaging
typing-extensions
];
pythonImportsCheck = [
pkgs/development/python-modules/rasterio/default.nix
+3 -3
View File
@@ -26,7 +26,7 @@
buildPythonPackage rec {
pname = "rasterio";
version = "1.3.5";
version = "1.3.6";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "rasterio";
repo = "rasterio";
rev = "refs/tags/${version}";
hash = "sha256-VZE58xbTTAicGqkl8ktYBhN+5tFj8FoUYxg8fi05bmo=";
hash = "sha256-C5jenXcONNYiUNa5GQ7ATBi8m0JWvg8Dyp9+ejGX+Fs=";
};
nativeBuildInputs = [
@@ -98,6 +98,6 @@ buildPythonPackage rec {
homepage = "https://rasterio.readthedocs.io/";
changelog = "https://github.com/rasterio/rasterio/blob/${version}/CHANGES.txt";
license = licenses.bsd3;
maintainers = with maintainers; [ mredaelli ];
maintainers = teams.geospatial.members;
};
}
pkgs/development/python-modules/sphinx-book-theme/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "sphinx-book-theme";
version = "1.0.0";
version = "1.0.1";
format = "wheel";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
dist = "py3";
python = "py3";
pname = "sphinx_book_theme";
hash = "sha256-9rq6eIjVpjMoohDplgp6bpUeljLXTttvzkjJ1djCh2g=";
hash = "sha256-0V+CSLNxippr4LphejLRWR+fo5xhRGm/rOd3uganO3U=";
};
propagatedBuildInputs = [
pkgs/development/tools/language-servers/jdt-language-server/default.nix
+3 -5
View File
@@ -7,12 +7,12 @@
stdenv.mkDerivation rec {
pname = "jdt-language-server";
version = "1.20.0";
timestamp = "202302201605";
version = "1.21.0";
timestamp = "202303161431";
src = fetchurl {
url = "https://download.eclipse.org/jdtls/milestones/${version}/jdt-language-server-${version}-${timestamp}.tar.gz";
sha256 = "sha256-5izNGPZ3jXtJEPWIFzrwZsNi8esxh4PUn7xIWp4TV2U=";
sha256 = "sha256-c8RDSvOgLbl05LDNelKgQXucbJnjJ7GVcut6mVT6GjA=";
};
sourceRoot = ".";
@@ -49,7 +49,6 @@ stdenv.mkDerivation rec {
# -Declipse.application=org.eclipse.jdt.ls.core.id1
# -Dosgi.bundles.defaultStartLevel=4
# -Declipse.product=org.eclipse.jdt.ls.core.product
# -noverify
# --add-modules=ALL-SYSTEM
# --add-opens java.base/java.util=ALL-UNNAMED
# --add-opens java.base/java.lang=ALL-UNNAMED
@@ -85,7 +84,6 @@ stdenv.mkDerivation rec {
--add-flags "-Dosgi.checkConfiguration=true" \
--add-flags "-Dosgi.configuration.cascaded=true" \
--add-flags "-Dlog.level=ALL" \
--add-flags "-noverify" \
--add-flags "\$JAVA_OPTS" \
--add-flags "-jar $launcher" \
--add-flags "--add-modules=ALL-SYSTEM" \
pkgs/development/tools/rust/cargo-public-api/default.nix
+3 -3
View File
@@ -9,14 +9,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-public-api";
version = "0.27.3";
version = "0.28.0";
src = fetchCrate {
inherit pname version;
hash = "sha256-s5aPzaH08XvGm+hZy+dQkvp8rVFcGWoTgniIfOzQk4E=";
hash = "sha256-lItbWIY9CytvcLmASkbbF5wLYKWrXn2Gl9mgccg9J0M=";
};
cargoHash = "sha256-q5Oq9Lg7cNteHvzaAWwzoHThYiXac/x1Y5LyFZjfSCo=";
cargoHash = "sha256-6Eula3fex0KhWhBR53K0Kl0nlbqpfZfD/Y3zrEURPmc=";
nativeBuildInputs = [ pkg-config ];
pkgs/os-specific/linux/kernel/hardened/patches.json
+30 -30
View File
@@ -2,61 +2,61 @@
"4.14": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-4.14.310-hardened1.patch",
"sha256": "1bzxmniyld257xiaickb7rkzr9myg6bzczj6srf0c0wwz6zrdza3",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.310-hardened1/linux-hardened-4.14.310-hardened1.patch"
"name": "linux-hardened-4.14.311-hardened1.patch",
"sha256": "13nv70kpfpp6kv15lsd93mkampab5apzfn1zzwfm3bhvczvflza5",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.311-hardened1/linux-hardened-4.14.311-hardened1.patch"
},
"sha256": "0r91f3jj3y0cca4sfs0xa12lbrc62q2yzgval5ainwr74bk7dwlb",
"version": "4.14.310"
"sha256": "1mbwrgjz575qxg4gwi2fxc94kprmiblwap3jix0mj4887zllqgw0",
"version": "4.14.311"
},
"4.19": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-4.19.278-hardened1.patch",
"sha256": "13vx0xqgfigdyb9x59728z2idzv0nisif6vpx73n08m99gax2y88",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.278-hardened1/linux-hardened-4.19.278-hardened1.patch"
"name": "linux-hardened-4.19.279-hardened1.patch",
"sha256": "0jq342lk7hmlkwwxkfiyb3vl3ac56cm2h53svfjwyshbkqyp320n",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.279-hardened1/linux-hardened-4.19.279-hardened1.patch"
},
"sha256": "0miyadgnd52cgw3bgpmx66kr1pgxh14b2f52fasy57b6wysv0lnv",
"version": "4.19.278"
"sha256": "104qkyflkfkp8iyshpirb9q708vvsgfbxfwgl0dnas3k7nyc6v3k",
"version": "4.19.279"
},
"5.10": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.175-hardened1.patch",
"sha256": "0jxiccf3m0bih5c4sl44pxfnf9vs3fc66jvnp2q2l45a9dqr6ssh",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.175-hardened1/linux-hardened-5.10.175-hardened1.patch"
"name": "linux-hardened-5.10.176-hardened1.patch",
"sha256": "08m65zv25w7wq4a58i0bw87rwjafcy7g0gwz2ml8fimhwniip2jq",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.176-hardened1/linux-hardened-5.10.176-hardened1.patch"
},
"sha256": "1kkv63v5lc0ahkl8sjmwhqxahmwmbxcbf4mfcmkf6d7j50p5cxz2",
"version": "5.10.175"
"sha256": "14zpdrrrpgxx44nxjn0rifrchnmsvvpkzpm1n82kw5q4p9h2q1yf",
"version": "5.10.176"
},
"5.15": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.15.103-hardened1.patch",
"sha256": "1ci35f146qfl6km86ram5qs5v6x41ny7708j5lxz3fhx2533fm82",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.103-hardened1/linux-hardened-5.15.103-hardened1.patch"
"name": "linux-hardened-5.15.104-hardened1.patch",
"sha256": "0gz3csflp34aadrgmlhy4y3sybxdlzvb2wsss9yb9l5zikxm2h1c",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.104-hardened1/linux-hardened-5.15.104-hardened1.patch"
},
"sha256": "01fpipy8skmp4dyxgk8fk9k6hc0w0gvk7mm8f8pm7jhwcf0vlxh8",
"version": "5.15.103"
"sha256": "0m3bscml2mvafbj5k9a3qa8akfxms8wfpzsr687lfblr17735ibi",
"version": "5.15.104"
},
"5.4": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.237-hardened1.patch",
"sha256": "0agnw7p1ylly09p7fvvnp7lgkgfrvbw33wc38ds3y0qhg5gghnby",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.237-hardened1/linux-hardened-5.4.237-hardened1.patch"
"name": "linux-hardened-5.4.238-hardened1.patch",
"sha256": "0fj3q8ykf9fi179hjspi5zq5bzxmn154g5nsdcvnphmizvlzy1qg",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.238-hardened1/linux-hardened-5.4.238-hardened1.patch"
},
"sha256": "09smq8jsbpqfh135snljack2wj41anx8f8i0lmjcqcq5zzhgw25p",
"version": "5.4.237"
"sha256": "07x9ibcshsm451qcpawv3l0z7g8w8jg79h6dfdmbm3jrhpdb58kh",
"version": "5.4.238"
},
"6.1": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-6.1.20-hardened1.patch",
"sha256": "1lz9ms716kzjn3sgrqxqi7q1zdrf6f81wn6xgv5kk1a2mcc3zw4p",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.20-hardened1/linux-hardened-6.1.20-hardened1.patch"
"name": "linux-hardened-6.1.21-hardened1.patch",
"sha256": "04sksmh4zym2z8bjg8hdr1zv1fv1r08z1b5kyl7rm9b1ic3gd39w",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.21-hardened1/linux-hardened-6.1.21-hardened1.patch"
},
"sha256": "1w1iy1i3bpzrs5rhvqbn2awxv5qqgng9n7jd5js66g0sq3l2sckn",
"version": "6.1.20"
"sha256": "0fnr2pw4pi0vnkpv8hfipya09cgdz6ghks7p6vdl2d71dawb2g5k",
"version": "6.1.21"
}
}
pkgs/os-specific/linux/kernel/linux-5.15.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.15.104";
version = "5.15.105";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0m3bscml2mvafbj5k9a3qa8akfxms8wfpzsr687lfblr17735ibi";
sha256 = "0kz4ymaqb1kpniqq2mwv3z8rirz5yyf1c9m648kqblij0djkgd81";
};
} // (args.argsOverride or { }))
pkgs/os-specific/linux/kernel/linux-5.4.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.4.238";
version = "5.4.239";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "07x9ibcshsm451qcpawv3l0z7g8w8jg79h6dfdmbm3jrhpdb58kh";
sha256 = "0nw02lqkvachksyan4n11q0g6jhm1ii7d5zs276n46891ypn80m9";
};
} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-6.1.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "6.1.21";
version = "6.1.22";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
sha256 = "0fnr2pw4pi0vnkpv8hfipya09cgdz6ghks7p6vdl2d71dawb2g5k";
sha256 = "1a7xkjqj13q5dgk1gml27kdzs381p0z203alamd0wkgprr0r3s1b";
};
} // (args.argsOverride or { }))
pkgs/os-specific/linux/kernel/linux-6.2.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "6.2.8";
version = "6.2.9";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
sha256 = "0rgn8k9rhk819bazcaz7fbk5ba1hph02izqrw06ag0rgsj3svl7y";
sha256 = "1xa3znandhyn1ygbfv4cl83mwn33hphj1jdc59s0wgy0ck0ljd4h";
};
} // (args.argsOverride or { }))
pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
+3 -3
View File
@@ -6,7 +6,7 @@
, ... } @ args:
let
version = "5.10.175-rt84"; # updated by ./update-rt.sh
version = "5.10.176-rt86"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@@ -17,14 +17,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "1kkv63v5lc0ahkl8sjmwhqxahmwmbxcbf4mfcmkf6d7j50p5cxz2";
sha256 = "14zpdrrrpgxx44nxjn0rifrchnmsvvpkzpm1n82kw5q4p9h2q1yf";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "13pqr6lhngig7g2s1qb27vq8x9b3wilz7gx820icdlvdxx1mi27p";
sha256 = "0pjf9fdhfh562mp18q8zwk4mbwj736yhmvakj0vr41ax9r3frj0l";
};
}; in [ rt-patch ] ++ kernelPatches;
pkgs/servers/geospatial/martin/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "martin";
version = "0.8.0";
version = "0.8.1";
src = fetchFromGitHub {
owner = "maplibre";
repo = "martin";
rev = "v${version}";
hash = "sha256-gaPq4sEt9MweY91PQJPiZT5DzZ9fQZnPNiFocGVjWTc=";
hash = "sha256-gMIdUqX872TMAS8tyLoKJVWBBAphikhz/s6P+vbZSCw=";
};
cargoHash = "sha256-LfpxPqbLZhq59CjBzTfP4ih+Mj1L/72rkosbp12+bds=";
cargoHash = "sha256-Jt5e4ULLIEta0QwvAkHRx891tMUhbj4eAvnPOXAb9CM=";
nativeBuildInputs = [ pkg-config ];
pkgs/servers/plex/raw.nix
+3 -3
View File
@@ -12,16 +12,16 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
version = "1.31.2.6810-a607d384f";
version = "1.31.3.6868-28fc46b27";
pname = "plexmediaserver";
# Fetch the source
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
sha256 = "sha256-84jBnal+WT1mWwa6lo7SenMqiTV9Gp65K4uael/WlHI=";
sha256 = "0jag3kdxgsqzxgyyhg75g8ig1w2nbh1b9fy45dbj2vdk5gnlwmi0";
} else fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
sha256 = "sha256-Tidu8ZaxPcCbgASNpAG2WOXDkfQAhEIZA40uyNxB4A4=";
sha256 = "1xfz9rj5aacm240lm6lsmlwj1c8xckmp48s5qmi75nyawb0bisxk";
};
outputs = [ "out" "basedb" ];
pkgs/tools/security/gitleaks/default.nix
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "gitleaks";
version = "8.16.1";
version = "8.16.2";
src = fetchFromGitHub {
owner = "zricethezav";
repo = pname;
rev = "v${version}";
hash = "sha256-zidRNnvbjqLxYE0fBRygYWWBf5pS9xLLYFpSB0dtNks=";
hash = "sha256-AR/08O0wUp3clbIF+2Kw0klMQ6UorFkIRsnqfX4Q3SY=";
};
vendorHash = "sha256-Ev0/CSpwJDmc+Dvu/bFDzsgsq80rWImJWXNAUqYHgoE=";