Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-11-10 06:01:51 +00:00 committed by GitHub
commit a7a66d895a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 198 additions and 153 deletions

View File

@ -3,7 +3,7 @@
, fetchFromGitHub
, nix-update-script
, fetchpatch
, vala_0_54
, vala
, meson
, ninja
, pkg-config
@ -50,6 +50,11 @@ stdenv.mkDerivation rec {
url = "https://git.alpinelinux.org/aports/plain/community/tootle/0003-make-app-entries-private.patch?id=c973e68e3cba855f1601ef010afa9a14578b9499";
sha256 = "sha256-zwU0nxf/haBZl4tOYDmMzwug+HC6lLDT8/12Wt62+S4=";
})
# https://github.com/flathub/com.github.bleakgrey.tootle/pull/22
(fetchpatch {
url = "https://github.com/flathub/com.github.bleakgrey.tootle/raw/6b524dc13143e4827f67628e33dcf161d862af29/Fix-construct-prop.patch";
sha256 = "sha256-zOIMy9+rY2aRcPHcGWU/x6kf/xb7VnuHdsKQ0FO1Cyc=";
})
];
nativeBuildInputs = [
@ -57,11 +62,7 @@ stdenv.mkDerivation rec {
ninja
pkg-config
python3
# Does not build with Vala 0.56.1:
# ../src/Widgets/Status.vala:8.43-8.56: error: construct
# properties not supported for specified property type
# public API.NotificationType? kind { get; construct set; }
vala_0_54
vala
wrapGAppsHook
];
@ -93,6 +94,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/bleakgrey/tootle";
license = licenses.gpl3;
maintainers = with maintainers; [ dtzWill ];
broken = true;
platforms = platforms.linux;
};
}

View File

@ -375,13 +375,13 @@
"version": "0.41.0"
},
"external": {
"hash": "sha256-gImRxsDUgBHmw/5DeKcO9BzB906JB8dUcSGKQj+Vcy0=",
"hash": "sha256-o9vCr3ayqg9Ehi39FgR6vJFZYF1iTcVD4QfYHcs+YbQ=",
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/external",
"repo": "terraform-provider-external",
"rev": "v2.2.2",
"vendorHash": "sha256-1BUFg8epcEsCf6yyJr4E4CdX2o6/3R384opRTxwrsng=",
"version": "2.2.2"
"rev": "v2.2.3",
"vendorHash": "sha256-0t+2ixMSsgDK9zzst3s0YWdnS6p7jO0stHnaKio5lvY=",
"version": "2.2.3"
},
"fastly": {
"hash": "sha256-WxFkJBi87IvO4a/8bmftMKCc/JcfoQILCtklvr9bcuc=",
@ -487,13 +487,13 @@
"version": "1.16.2"
},
"hcloud": {
"hash": "sha256-DWDM3yWKkRV9FJMzKK7JJQdI0WvFILF/bsZFv2CjrvM=",
"hash": "sha256-d/qLN5ev8ywiJr97rrlS9rwfvsEheBD2n8I6D9a7krQ=",
"owner": "hetznercloud",
"provider-source-address": "registry.terraform.io/hetznercloud/hcloud",
"repo": "terraform-provider-hcloud",
"rev": "v1.35.2",
"vendorHash": "sha256-LKngOmB3jfC/wFX398LETSZ8HllfOQA/kGg4uUNlN5A=",
"version": "1.35.2"
"rev": "v1.36.0",
"vendorHash": "sha256-HsWkHoFs/77b5+6HSV7YgLOwpE2BZyxbGNty8p+OBSM=",
"version": "1.36.0"
},
"helm": {
"hash": "sha256-s8ZOzTG3qux+4Yh1wj3ArjB1uJ32bdGhxY9iSL5LOK8=",
@ -623,13 +623,13 @@
"version": "4.0.1"
},
"ksyun": {
"hash": "sha256-62ylxBt5F3J2n7BW8qD5ukE8OJa63E6Qyuuf8dPo9FQ=",
"hash": "sha256-Rye7gKARdbrB6KDEygEJy9m7VqlGw6QeE2F1oa3n8as=",
"owner": "kingsoftcloud",
"provider-source-address": "registry.terraform.io/kingsoftcloud/ksyun",
"repo": "terraform-provider-ksyun",
"rev": "v1.3.57",
"rev": "v1.3.58",
"vendorHash": "sha256-miHKAz+ONXtuC1DNukcyZbbaYReY69dz9Zk6cJdORdQ=",
"version": "1.3.57"
"version": "1.3.58"
},
"kubectl": {
"hash": "sha256-UkUwWi7Z9cSMyZakD6JxMl+qdczAYfZQgwroCUjFIUM=",
@ -795,13 +795,13 @@
"version": "1.4.19"
},
"ns1": {
"hash": "sha256-vw3n1EBKwOThoJ+2hFa4rsMzvWCOnhoYOmJpX8LQKy8=",
"hash": "sha256-qHR3KJa1y10B+iQPgH6lTt/JUqTmiK/60rPCa3gQDP8=",
"owner": "ns1-terraform",
"provider-source-address": "registry.terraform.io/ns1-terraform/ns1",
"repo": "terraform-provider-ns1",
"rev": "v1.12.8",
"vendorHash": "sha256-MaJHCxvD9BM5G8wJbSo06+TIPvJTlXzQ+l9Kdbg0QQw=",
"version": "1.12.8"
"rev": "v1.13.0",
"vendorHash": "sha256-6ePPxdULuTzLdVzzr12BjLu/lBN+5yIUq8U8FVUw/PM=",
"version": "1.13.0"
},
"nsxt": {
"hash": "sha256-TOoRtCKdR1fBjk39dbMgBd7pDJGfjvkQAqfpJzWRwRg=",
@ -1120,13 +1120,13 @@
"version": "0.13.5"
},
"tencentcloud": {
"hash": "sha256-DvH8+Be2AVwsNoDrNlCG8/Uve2EKcuan3qUsJynreHw=",
"hash": "sha256-vVwfKzA6qK6VzRRlYPEqL1QPlpiruD8JZRL6oF/u62w=",
"owner": "tencentcloudstack",
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.78.8",
"rev": "v1.78.9",
"vendorHash": null,
"version": "1.78.8"
"version": "1.78.9"
},
"tfe": {
"hash": "sha256-MDlRwB2iVi/Rv7/UtukI6mIDImz8Gnpm5Qv5R6EDpiU=",

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "nixpacks";
version = "0.12.3";
version = "0.13.0";
src = fetchFromGitHub {
owner = "railwayapp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Hy2QRGuXSidUrJ7kb1AhkaLeaevhhleGE8QvnNZf/L0=";
sha256 = "sha256-uxy0/Ngzzh96YZDR9whLVYNnQOlj3wkCEuuJTQjT6GE=";
};
cargoSha256 = "sha256-5EJGUi74hrd3vifJ3r2vO0Qq2YEt0stXSi+RAGTme2I=";
cargoSha256 = "sha256-99J4ucjE0yTPQSdM6PDTWEjBltJdIU6yEDqhgSfOaJU=";
# skip test due FHS dependency
doCheck = false;

View File

@ -1,6 +1,8 @@
{ lib
, stdenvNoCC
, fetchFromGitHub
, adwaita-icon-theme
, breeze-icons
, gtk3
, hicolor-icon-theme
, jdupes
@ -13,17 +15,17 @@
let
pname = "tela-circle-icon-theme";
in
lib.checkListOfEnum "${pname}: color variants" [ "standard" "black" "blue" "brown" "green" "grey" "orange" "pink" "purple" "red" "yellow" "manjaro" "ubuntu" ] colorVariants
lib.checkListOfEnum "${pname}: color variants" [ "standard" "black" "blue" "brown" "green" "grey" "orange" "pink" "purple" "red" "yellow" "manjaro" "ubuntu" "dracula" "nord" ] colorVariants
stdenvNoCC.mkDerivation rec {
inherit pname;
version = "2022-03-07";
version = "2022-11-06";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "vQeWGZmurvT/UQJ1dx6t+ZeKdJ1Oq9TdHBADw64x18g=";
sha256 = "ybp+r0Ru2lJg1WipFHIowvRO5XjppI0cUxKc6kPn0lM=";
};
nativeBuildInputs = [
@ -32,6 +34,8 @@ stdenvNoCC.mkDerivation rec {
];
propagatedBuildInputs = [
adwaita-icon-theme
breeze-icons
hicolor-icon-theme
];
@ -42,16 +46,18 @@ stdenvNoCC.mkDerivation rec {
dontPatchELF = true;
dontRewriteSymlinks = true;
postPatch = ''
patchShebangs install.sh
'';
installPhase = ''
runHook preInstall
patchShebangs install.sh
./install.sh -d $out/share/icons \
${lib.optionalString circularFolder "-c"} \
${if allColorVariants then "-a" else builtins.toString colorVariants}
jdupes --link-soft --recurse $out/share
jdupes --quiet --link-soft --recurse $out/share
runHook postInstall
'';

View File

@ -1,26 +1,41 @@
{ lib
, stdenv
, stdenvNoCC
, fetchFromGitHub
, gnome-shell
, gtk-engine-murrine
, gtk_engines
, jdupes
, sassc
, gitUpdater
, themeVariants ? [] # default: doder (blue)
, colorVariants ? [] # default: all
, sizeVariants ? [] # default: standard
, tweaks ? []
}:
stdenv.mkDerivation rec {
let
pname = "vimix-gtk-themes";
version = "2022-04-24";
in
lib.checkListOfEnum "${pname}: theme variants" [ "doder" "beryl" "ruby" "amethyst" "grey" ] themeVariants
lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants
lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants
lib.checkListOfEnum "${pname}: tweaks" [ "flat" "grey" "mix" "translucent" ] tweaks
stdenvNoCC.mkDerivation rec {
inherit pname;
version = "2022-10-30";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "0q0ahm060qvr7r9j3x9lxidjnwf032c2g1pcqw9mz93iy7vfn358";
sha256 = "QGKh2Md25VNVqy58w/LBzNnEM+g4gBMUjj0W0IuVZ1U=";
};
nativeBuildInputs = [
gnome-shell # needed to determine the gnome-shell version
jdupes
sassc
];
@ -39,8 +54,14 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
mkdir -p $out/share/themes
name= HOME="$TMPDIR" ./install.sh --all --dest $out/share/themes
name= HOME="$TMPDIR" ./install.sh \
${lib.optionalString (themeVariants != []) "--theme " + builtins.toString themeVariants} \
${lib.optionalString (colorVariants != []) "--color " + builtins.toString colorVariants} \
${lib.optionalString (sizeVariants != []) "--size " + builtins.toString sizeVariants} \
${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} \
--dest $out/share/themes
rm $out/share/themes/*/{AUTHORS,LICENSE}
jdupes --quiet --link-soft --recurse $out/share
runHook postInstall
'';

View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, gitUpdater
, glib
, gnome-shell
, gnome-themes-extra
@ -32,13 +33,13 @@ lib.checkListOfEnum "${pname}: panel size" [ "default" "smaller" "bigger" ] (sin
stdenv.mkDerivation rec {
pname = "whitesur-gtk-theme";
version = "2022-08-26";
version = "2022-10-27";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "sha256-kvu6Zv5vmyDasBt6eOBqexv0n5vi6OzpG5We1eSbW0o=";
sha256 = "sha256-jOrTasnkNExCgvST+09JOQ0iosjoEu3aoj3C1pNHTgY=";
};
nativeBuildInputs = [
@ -83,11 +84,13 @@ stdenv.mkDerivation rec {
${lib.optionalString (panelSize != null) ("--panel-size " + panelSize)} \
--dest $out/share/themes
jdupes --link-soft --recurse $out/share
jdupes --quiet --link-soft --recurse $out/share
runHook postInstall
'';
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "MacOS Big Sur like theme for Gnome desktops";
homepage = "https://github.com/vinceliuice/WhiteSur-gtk-theme";

View File

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "elementary-iconbrowser";
version = "2.0.0";
version = "2.1.1";
src = fetchFromGitHub {
owner = "elementary";
repo = "iconbrowser";
rev = version;
sha256 = "sha256-aXFgL5l9jnOZJJgMOYwiE7W//1sq23CbLEDmhYFJT38=";
sha256 = "sha256-xooZfQmeB4rvlO8zKWnUuXPCFQNCTdjd7C53/j9EoHg=";
};
nativeBuildInputs = [

View File

@ -1,42 +1,44 @@
{ lib
, buildPythonPackage
, fetchPypi
, isPy3k
, fetchpatch
, python
, ipython
, pythonOlder
, fetchFromGitHub
, hatchling
, traitlets
, glibcLocales
, mock
, pytestCheckHook
, nose
}:
buildPythonPackage rec {
pname = "jupyter_core";
version = "4.9.2";
disabled = !isPy3k;
version = "4.11.2";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-1puuuf+xKLjNJlf88nA/icdp0Wc8hRgSEZ46Kg6TrZo=";
format = "pyproject";
src = fetchFromGitHub {
owner = "jupyter";
repo = "jupyter_core";
rev = version;
hash = "sha256-lDhwvhsOxLHBC6CQjCW/rmtHSuMRPC2yaurBd5K3FLc=";
};
checkInputs = [ pytestCheckHook mock glibcLocales nose ];
propagatedBuildInputs = [ ipython traitlets ];
patches = [
# install jupyter_core/*.py files
(fetchpatch {
url = "https://github.com/jupyter/jupyter_core/pull/253/commits/3bbeaebec0a53520523162d5e8d5c6ca02b1b782.patch";
sha256 = "sha256-QeAfj7wLz4egVUPMAgrZ9Wn/Tv60LrIXLgHGVoH41wQ=";
})
./tests_respect_pythonpath.patch
];
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [
traitlets
];
checkInputs = [
pytestCheckHook
];
preCheck = ''
export HOME=$TMPDIR
export LC_ALL=en_US.utf8
'';
disabledTests = [
@ -51,7 +53,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "jupyter_core" ];
meta = with lib; {
description = "Jupyter core package. A base package on which Jupyter projects rely";
description = "Base package on which Jupyter projects rely";
homepage = "https://jupyter.org/";
license = licenses.bsd3;
maintainers = with maintainers; [ fridh ];

View File

@ -1,20 +1,22 @@
diff --git a/jupyter_core/tests/test_command.py b/jupyter_core/tests/test_command.py
index 4ef38cd..08fba22 100644
--- a/jupyter_core/tests/test_command.py
+++ b/jupyter_core/tests/test_command.py
@@ -131,7 +131,7 @@ def test_not_on_path(tmpdir):
witness_src = '#!%s\n%s\n' % (sys.executable, 'print("WITNESS ME")')
@@ -174,7 +174,7 @@ def test_not_on_path(tmpdir):
witness_src = "#!{}\n{}\n".format(sys.executable, 'print("WITNESS ME")')
write_executable(witness, witness_src)
- env = {'PATH': ''}
+ env = {'PATH': '', 'PYTHONPATH': os.environ['PYTHONPATH']}
if 'SYSTEMROOT' in os.environ: # Windows http://bugs.python.org/issue20614
env[str('SYSTEMROOT')] = os.environ['SYSTEMROOT']
if sys.platform == 'win32':
@@ -157,7 +157,7 @@ def test_path_priority(tmpdir):
witness_b_src = '#!%s\n%s\n' % (sys.executable, 'print("WITNESS B")')
- env = {"PATH": ""}
+ env = {"PATH": "", "PYTHONPATH": os.environ["PYTHONPATH"]}
if "SYSTEMROOT" in os.environ: # Windows http://bugs.python.org/issue20614
env["SYSTEMROOT"] = os.environ["SYSTEMROOT"]
if sys.platform == "win32":
@@ -198,7 +198,7 @@ def test_path_priority(tmpdir):
witness_b_src = "#!{}\n{}\n".format(sys.executable, 'print("WITNESS B")')
write_executable(witness_b, witness_b_src)
- env = {'PATH': str(b)}
+ env = {'PATH': str(b), 'PYTHONPATH': os.environ['PYTHONPATH']}
if 'SYSTEMROOT' in os.environ: # Windows http://bugs.python.org/issue20614
env[str('SYSTEMROOT')] = os.environ['SYSTEMROOT']
if sys.platform == 'win32':
- env = {"PATH": str(b)}
+ env = {"PATH": str(b), "PYTHONPATH": os.environ["PYTHONPATH"]}
if "SYSTEMROOT" in os.environ: # Windows http://bugs.python.org/issue20614
env["SYSTEMROOT"] = os.environ["SYSTEMROOT"]
if sys.platform == "win32":

View File

@ -2,6 +2,7 @@
, stdenv
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, GitPython
, isort
, jupyter-client
@ -31,6 +32,13 @@ buildPythonPackage rec {
sha256 = "sha256-DDF4aTLkhEl4xViYh/E0/y6swcwZ9KbeS0qKm+HdFz8=";
};
patches = [
(fetchpatch {
url = "https://github.com/mwouts/jupytext/commit/be9b65b03600227b737b5f10ea259a7cdb762b76.patch";
hash = "sha256-3klx8I+T560EVfsKe/FlrSjF6JzdKSCt6uhAW2cSwtc=";
})
];
buildInputs = [
jupyter-packaging
jupyterlab

View File

@ -21,6 +21,8 @@ buildPythonPackage rec {
};
postPatch = ''
substituteInPlace setup.py \
--replace "nbconvert>=6.2.0,<7.0.0" "nbconvert>=6.2.0"
substituteInPlace mkdocs_jupyter/tests/test_base_usage.py \
--replace "[\"mkdocs\"," "[\"${mkdocs.out}/bin/mkdocs\","
'';

View File

@ -4,78 +4,80 @@
, defusedxml
, fetchPypi
, fetchpatch
, fetchurl
, hatchling
, importlib-metadata
, ipywidgets
, jinja2
, jupyter_core
, jupyterlab-pygments
, lib
, markupsafe
, mistune
, nbclient
, packaging
, pandocfilters
, pygments
, pyppeteer
, pytestCheckHook
, pythonOlder
, tinycss2
, traitlets
}:
buildPythonPackage rec {
let
# see https://github.com/jupyter/nbconvert/issues/1896
style-css = fetchurl {
url = "https://cdn.jupyter.org/notebook/5.4.0/style/style.min.css";
hash = "sha256-WGWmCfRDewRkvBIc1We2GQdOVAoFFaO4LyIvdk61HgE=";
};
in buildPythonPackage rec {
pname = "nbconvert";
version = "6.5.3";
format = "setuptools";
version = "7.2.3";
disabled = pythonOlder "3.7";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-EO1pPEz9PGNYPIfKXDovbth0FFEDWV84JO/Mjfy3Uiw=";
hash = "sha256-eufMxoSVtWXasVNFnufmUDmXCRPrEVBw2m4sZzzw6fg=";
};
# Add $out/share/jupyter to the list of paths that are used to search for
# various exporter templates
patches = [
./templates.patch
# Use mistune 2.x
(fetchpatch {
name = "support-mistune-2.x.patch";
url = "https://github.com/jupyter/nbconvert/commit/e870d9a4a61432a65bee5466c5fa80c9ee28966e.patch";
hash = "sha256-kdOmE7BnkRy2lsNQ2OVrEXXZntJUPJ//b139kSsfKmI=";
excludes = [ "pyproject.toml" ];
})
# patch nbconvert/filters/markdown_mistune.py
(fetchpatch {
name = "clean-up-markdown-parsing.patch";
url = "https://github.com/jupyter/nbconvert/commit/4df1f5451c9c3e8121036dfbc7e07f0095f4d524.patch";
hash = "sha256-O+VWUaQi8UMCpE9/h/IsrenmEuJ2ac/kBkUBq7GFJTY";
})
(fetchpatch {
name = "fix-markdown-table.patch";
url = "https://github.com/jupyter/nbconvert/commit/d3900ed4527f024138dc3a8658c6a1b1dfc43c09.patch";
hash = "sha256-AFE1Zhw29JMLB0Sj17zHcOfy7VEFqLekO8NYbyMLrdI=";
})
];
postPatch = ''
substituteAllInPlace ./nbconvert/exporters/templateexporter.py
# Use mistune 2.x
substituteInPlace setup.py \
--replace "mistune>=0.8.1,<2" "mistune>=2.0.3,<3"
# Equivalent of the upstream patch https://github.com/jupyter/nbconvert/commit/aec39288c9a6c614d659bcaf9f5cb36634d6b37b.patch
substituteInPlace share/jupyter/nbconvert/templates/lab/base.html.j2 \
--replace "{{ output.data['image/svg+xml'] | clean_html }}" "{{ output.data['image/svg+xml'].encode(\"utf-8\") | clean_html }}"
mkdir -p share/templates/classic/static
cp ${style-css} share/templates/classic/static/style.css
'';
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [
beautifulsoup4
bleach
defusedxml
jinja2
jupyter_core
jupyterlab-pygments
markupsafe
mistune
nbclient
packaging
pandocfilters
pygments
tinycss2
traitlets
] ++ lib.optionals (pythonOlder "3.10") [
importlib-metadata
];
preCheck = ''
@ -88,15 +90,13 @@ buildPythonPackage rec {
pytestCheckHook
];
pytestFlagsArray = [
# DeprecationWarning: Support for bleach <5 will be removed in a future version of nbconvert
"-W ignore::DeprecationWarning"
];
disabledTests = [
# Attempts network access (Failed to establish a new connection: [Errno -3] Temporary failure in name resolution)
"test_export"
"test_webpdf_with_chromium"
# ModuleNotFoundError: No module named 'nbconvert.tests'
"test_convert_full_qualified_name"
"test_post_processor"
];
# Some of the tests use localhost networking.

View File

@ -1,50 +1,48 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchPypi
, hatchling
, hatch-nodejs-version
, fastjsonschema
, flit-core
, pytestCheckHook
, glibcLocales
, ipython_genutils
, traitlets
, testpath
, jsonschema
, jupyter_core
, traitlets
, pep440
, pytestCheckHook
, testpath
}:
buildPythonPackage rec {
pname = "nbformat";
version = "5.5.0";
version = "5.7.0";
disabled = pythonOlder "3.7";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-nr4w5sOz5bR9Of8KOJehrPUj0r+vy04tBM23D4pmxQc=";
sha256 = "1d4760c15c1a04269ef5caf375be8b98dd2f696e5eb9e603ec2bf091f9b0d3f3";
};
nativeBuildInputs = [
flit-core
hatchling
hatch-nodejs-version
];
LC_ALL="en_US.utf8";
propagatedBuildInputs = [
fastjsonschema
ipython_genutils
jsonschema
jupyter_core
pep440
testpath
traitlets
];
checkInputs = [ pytestCheckHook glibcLocales ];
preCheck = ''
mkdir tmp
export HOME=tmp
'';
checkInputs = [
pep440
pytestCheckHook
testpath
];
# Some of the tests use localhost networking.
__darwinAllowLocalNetworking = true;

View File

@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
binaryNativeCode
];
license = licenses.mit;
maintainers = with maintainers; [ jshcmpbll ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}

View File

@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
install -Dm644 -t $out/lib/0ad binaries/system/*.so
# Copy icon.
install -D build/resources/0ad.png $out/share/icons/hicolor/128x128/0ad.png
install -D build/resources/0ad.png $out/share/icons/hicolor/128x128/apps/0ad.png
install -D build/resources/0ad.desktop $out/share/applications/0ad.desktop
'';

View File

@ -6,17 +6,17 @@
buildGoModule rec {
pname = "opentelemetry-collector-contrib";
version = "0.63.0";
version = "0.64.0";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-collector-contrib";
rev = "v${version}";
sha256 = "sha256-oZGh80zer2VHGoypcIJ/WZ+DMe349/qRrmlx6UJlZVI=";
sha256 = "sha256-yrm9tLK9no1H4bh2ghQO1ybohYeEo1EzVa+5dgawlxk=";
};
# proxy vendor to avoid hash missmatches between linux and macOS
proxyVendor = true;
vendorSha256 = "sha256-zd6ll30nROV9ORJhyRPPSRqzpw7MJN3xryDSUg8XxPY=";
vendorSha256 = "sha256-Tartb4Qh10UPdVQG2mGbqXW/Mg9XbD28JRrn128d/4k=";
subPackages = [ "cmd/otelcontribcol" ];

View File

@ -12,17 +12,17 @@ let
in
buildGoModule rec {
pname = "opentelemetry-collector";
version = "0.63.1";
version = "0.64.0";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-collector";
rev = "v${version}";
sha256 = "sha256-YeW9A338HZHdW4PQaxUwdAPXwY9kijcFEGos/4NdZek=";
sha256 = "sha256-4EXRmG8HAUybA9+kPNCvlfZf3bfREAqeis7YxmGn33c=";
};
# there is a nested go.mod
sourceRoot = "source/cmd/otelcorecol";
vendorSha256 = "sha256-U3RPRuDdXXoeAQY3RYToply7VhePnlq9hn/79KCrum4=";
vendorSha256 = "sha256-i3pAK9ByXDdd2juenPooStgvhpcemcCOKLT9jjz0hL8=";
preBuild = ''
# set the build version, can't be done via ldflags

View File

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "lychee";
version = "0.10.2";
version = "0.10.3";
src = fetchFromGitHub {
owner = "lycheeverse";
repo = pname;
rev = "v${version}";
sha256 = "sha256-GePP4BvOxaLOyF+UNXqcbCtKWeeIcXYIs6zLi+7efVY=";
sha256 = "sha256-gnHeG1LaW10HmVF/+0OmOgaMz3X4ub4UpBiFQaGIah0=";
};
cargoSha256 = "sha256-QZDoZNY1ZyWRTeIxRdbTNg5NVDzBtEKGroTzaYRWt1w=";
cargoSha256 = "sha256-+hTXkPf4r+PF+k0+miY634sQ9RONHmtyF2hVowl/zuk=";
nativeBuildInputs = [ pkg-config ];

View File

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "mmdoc";
version = "0.12.0";
version = "0.13.0";
src = fetchFromGitHub {
owner = "ryantm";
repo = "mmdoc";
rev = version;
hash = "sha256-wg0wFZMijwTWU6B3PuQ785F98JqObDMvltHaI5ltpx8=";
hash = "sha256-ZPdAMlKGwEO54hxHcQh1xgu6eUGsoX12xD/9JehzRdw=";
};
nativeBuildInputs = [ ninja meson pkg-config xxd ];

View File

@ -26947,7 +26947,9 @@ with pkgs;
theano = callPackage ../data/fonts/theano { };
tela-circle-icon-theme = callPackage ../data/icons/tela-circle-icon-theme { };
tela-circle-icon-theme = callPackage ../data/icons/tela-circle-icon-theme {
inherit (gnome) adwaita-icon-theme;
};
tela-icon-theme = callPackage ../data/icons/tela-icon-theme { };