diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 463e2b8d90b..d88f88f9fda 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -3188,7 +3188,19 @@ let systemd.contents."/etc/systemd/networkd.conf" = renderConfig cfg.config; - systemd.services.systemd-networkd.wantedBy = [ "initrd.target" ]; + systemd.services.systemd-networkd = { + wantedBy = [ "initrd.target" ]; + # These before and conflicts lines can be removed when this PR makes it into a release: + # https://github.com/systemd/systemd/pull/27791 + before = ["initrd-switch-root.target"]; + conflicts = ["initrd-switch-root.target"]; + }; + systemd.sockets.systemd-networkd = { + wantedBy = [ "initrd.target" ]; + before = ["initrd-switch-root.target"]; + conflicts = ["initrd-switch-root.target"]; + }; + systemd.services.systemd-network-generator.wantedBy = [ "sysinit.target" ]; systemd.storePaths = [ diff --git a/nixos/tests/systemd-initrd-networkd.nix b/nixos/tests/systemd-initrd-networkd.nix index 00ecbec5613..8376276d8f6 100644 --- a/nixos/tests/systemd-initrd-networkd.nix +++ b/nixos/tests/systemd-initrd-networkd.nix @@ -12,6 +12,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { systemd.services.check-flush = { requiredBy = ["multi-user.target"]; before = ["network-pre.target" "multi-user.target"]; + wants = ["network-pre.target"]; unitConfig.DefaultDependencies = false; serviceConfig.Type = "oneshot"; path = [ pkgs.iproute2 pkgs.iputils pkgs.gnugrep ]; diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix index 02d17a4889a..3e485e9de4c 100644 --- a/pkgs/applications/audio/sidplayfp/default.nix +++ b/pkgs/applications/audio/sidplayfp/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "sidplayfp"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "sidplayfp"; rev = "v${version}"; - sha256 = "sha256-15KG+LkPkCLFsnWHUAQpQbqol/izAn/HRinszVRB5Ao="; + sha256 = "sha256-ECHtHJrkJ5Y0YvDNdMM3VB+s7I/8JCPZiwsPYLM/oig="; }; nativeBuildInputs = [ autoreconfHook perl pkg-config ]; diff --git a/pkgs/applications/misc/slweb/default.nix b/pkgs/applications/misc/slweb/default.nix index 445da783b0f..ace4db26bdc 100644 --- a/pkgs/applications/misc/slweb/default.nix +++ b/pkgs/applications/misc/slweb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "slweb"; - version = "0.5.6"; + version = "0.6.1"; src = fetchFromSourcehut { owner = "~strahinja"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2jvHgFPnI/Uoa5s+MF3BLTA2I3WXYrsEi+XyImxx6BA="; + sha256 = "sha256-TZxnJEBodRdZzL96Ichs+oiXVltF2HXVUKDETBQcIaI="; }; nativeBuildInputs = [ redo-apenwarr ]; diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index 5a076c0bffd..753005a118f 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -78,12 +78,12 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "12.0.6"; + version = "12.0.7"; sources = { x86_64-linux = fetchurl { url = "https://cdn.mullvad.net/browser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz"; - hash = "sha256-XE6HFU38FhnikxGHRHxIGS3Z3Y2JNWH0yq2NejqbROI="; + hash = "sha256-8TcC39A9VFyhFb+pfefzvwJqXq1yF7C2YDcbCyEa0yo="; }; }; @@ -233,7 +233,7 @@ stdenv.mkDerivation rec { description = "Privacy-focused browser made in a collaboration between The Tor Project and Mullvad"; homepage = "https://mullvad.net/en/browser"; platforms = attrNames sources; - maintainers = with maintainers; [ felschr ]; + maintainers = with maintainers; [ felschr panicgh ]; # MPL2.0+, GPL+, &c. While it's not entirely clear whether # the compound is "libre" in a strict sense (some components place certain # restrictions on redistribution), it's free enough for our purposes. diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 63828aa0d60..75ed7dde526 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.9.18"; + version = "0.9.19"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-Pu5kWvIbIYKnjv9p6atsrmjUnnaeX6E0Wkk/HSIfW8g="; + sha256 = "sha256-JJFfUndoyFn2J0ktT/JJLi4tDjEkv+DX8vAZ5Jdn99Q="; }; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/hubble/default.nix b/pkgs/applications/networking/cluster/hubble/default.nix index 06596c9a392..1755cb57a8b 100644 --- a/pkgs/applications/networking/cluster/hubble/default.nix +++ b/pkgs/applications/networking/cluster/hubble/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hubble"; - version = "0.11.5"; + version = "0.11.6"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OqL0L0VyYeg3Vk46LouuqHWpwYTu1vphJSVd6/hWsvA="; + sha256 = "sha256-6ZUzwZ12/pon2IQwyw1JvXHIjOht3gbAg7Yz5yfH4CQ="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 94ea173fece..49279d7595b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -73,13 +73,13 @@ "vendorHash": "sha256-LSAxibOYXxyIAsprMzbW+mnUXX7gHtYjMZYaUrGLtD4=" }, "argocd": { - "hash": "sha256-orABx+1OgvlKaLhUNYALJl9pbKHag/oFDALx5S0XdLs=", + "hash": "sha256-/QIBJicObzeCLh/v+/0Q2g9kQT3xLtuLJEAfwqAfTNY=", "homepage": "https://registry.terraform.io/providers/oboukili/argocd", "owner": "oboukili", "repo": "terraform-provider-argocd", - "rev": "v5.4.0", + "rev": "v5.5.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-j1KRzH3KZ8UFvfpNJOBCcq/Gfg9OKX6KWs5xQGyk6jU=" + "vendorHash": "sha256-4b96zHSdokE/MiVtdRCNosFhJJ6L5sOlHRRMBqJ4n4M=" }, "auth0": { "hash": "sha256-6wJvBwZ7PY1Jqx/r5YrZ0P4uHLiMvrFvsm3OEByrYyQ=", @@ -110,13 +110,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-DbBS2gEUqG3YjGfLIj3YvQUCTyp+nRH7d4htTUkUNHQ=", + "hash": "sha256-hu4+FAqub+dah9is4iCyy784L8kIiFqkyrcZzll8LoU=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v5.1.0", + "rev": "v5.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-0LH3zYIdqgxpKtxQBEuTxRivHf0yvmwUTUo+vAAmdaY=" + "vendorHash": "sha256-y4JNZ4cMqXwvRNys+llQNGw91EuU/dzGY6Ifs/0cX8c=" }, "azuread": { "hash": "sha256-wBNS2a6O1QJgssbAWhSRSfxaVZ35zgT/qNdpE++NQ8U=", @@ -128,11 +128,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-Zyv4il6co+TcMkN+Hl7znGT1uN5Xohe8zFv5ghkeZP8=", + "hash": "sha256-OEybd46MRwtxnE11oy6KKg9uEqkzzUxrrMwbF0RkjUg=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.59.0", + "rev": "v3.60.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1098,11 +1098,11 @@ "vendorHash": "sha256-GNSKSlaFBj2P+z40U+0uwPSOuQBy+9vOVFfPe8p0A24=" }, "tencentcloud": { - "hash": "sha256-oi4QYCH2it6ic8/5UuIz3kh4hQEINeSyQjT2YOncjQo=", + "hash": "sha256-vnUPxI3H3bD3kQgNXapOaNPZxn6+1O+LcW41REbaC3k=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.5", + "rev": "v1.81.6", "spdx": "MPL-2.0", "vendorHash": null }, diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 89ed1dde94c..f3ce1d58e6c 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -18,14 +18,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "23.6.0"; + version = "23.6.4"; in stdenv.mkDerivation { inherit pname appname version; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; - hash = "sha256-g8sWnc0b+DciEu6ZtQsPTUUfcudWKCNSQc6K67tLsYg="; + hash = "sha256-4uH76/zLgNcuX6nI6YtTxGB9cYj3jHla/B3w9w6CUx4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index 9780dac344b..ed4d529ebd5 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -106,6 +106,7 @@ in stdenv.mkDerivation { meta = with lib; { homepage = "https://www.azul.com/products/zulu/"; + sourceProvenance = with sourceTypes; [ binaryBytecode binaryNativeCode ]; license = licenses.gpl2; description = "Certified builds of OpenJDK"; longDescription = '' diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index b4338738f89..045aa4e5aba 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -111,6 +111,7 @@ in stdenv.mkDerivation { meta = with lib; { homepage = "https://www.azul.com/products/zulu/"; + sourceProvenance = with sourceTypes; [ binaryBytecode binaryNativeCode ]; license = licenses.gpl2; description = "Certified builds of OpenJDK"; longDescription = '' diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index f6bdc39eec3..d63227ef9fc 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "qtutilities"; - version = "6.12.0"; + version = "6.12.2"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - hash = "sha256-zkuVD6TH3eHFMu31PmKF2qlQ3itwWHMzVp0ZjdspWTk="; + hash = "sha256-YYuTDUBTNKLmieb/pDljiN0T8NdaOb2aRmwkD85ZF38="; }; buildInputs = [ qtbase cpp-utilities ]; diff --git a/pkgs/development/python-modules/etuples/default.nix b/pkgs/development/python-modules/etuples/default.nix index 2ad6c2a4ae6..a78cb3dc989 100644 --- a/pkgs/development/python-modules/etuples/default.nix +++ b/pkgs/development/python-modules/etuples/default.nix @@ -6,17 +6,21 @@ , py , pytestCheckHook , pytest-html +, pythonOlder }: buildPythonPackage rec { pname = "etuples"; - version = "0.3.8"; + version = "0.3.9"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pythological"; repo = "etuples"; rev = "refs/tags/v${version}"; - hash = "sha256-wEgam2IoI3z75bN45/R9o+0JmL3g0YmtsuJ4TnZjhi8="; + hash = "sha256-dl+exar98PnqEiCNX+Ydllp7aohsAYrFtxb2Q1Lxx6Y="; }; propagatedBuildInputs = [ @@ -35,12 +39,14 @@ buildPythonPackage rec { "--self-contained-html" ]; - pythonImportsCheck = [ "etuples" ]; + pythonImportsCheck = [ + "etuples" + ]; meta = with lib; { description = "Python S-expression emulation using tuple-like objects"; homepage = "https://github.com/pythological/etuples"; - changelog = "https://github.com/pythological/etuples/releases"; + changelog = "https://github.com/pythological/etuples/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ Etjean ]; }; diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 69be7cdf735..b8d6bee573c 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.18.1"; + version = "2.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Qdb3AnwHS2nho3ld0oehVkORAy+F3xzEqHuSJQb18OI="; + hash = "sha256-EebMccj9DmrPj+/GCECLkqplq3bSmRkNqlI3gYq0qzo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix index 476c3f1815c..ec00f9cb644 100644 --- a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "sphinxcontrib-katex"; - version = "0.9.4"; + version = "0.9.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Mcn+gcP6ywhVlguCggJkH4SA6n1ikmviRbah7LejDZE="; + hash = "sha256-ZNNi5qIKRyuPbXfFGhkAIvRFzuhsXcY73apIqOp8dJQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index bf2d6db0ad4..a3d159000ab 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "tldextract"; - version = "3.4.2"; + version = "3.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mONrCqOm2P0ITYDXWuE3LaAgJ++1VsFGpZ39FEVwcbo="; + hash = "sha256-X+MhDFd0Y1RRkdRa1SLT1eeNVSGM6XIV6CAE3K4eEjQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/rust/cargo-workspaces/default.nix b/pkgs/development/tools/rust/cargo-workspaces/default.nix index f473dc5a127..1d9d88ff85d 100644 --- a/pkgs/development/tools/rust/cargo-workspaces/default.nix +++ b/pkgs/development/tools/rust/cargo-workspaces/default.nix @@ -16,14 +16,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-workspaces"; - version = "0.2.35"; + version = "0.2.42"; src = fetchCrate { inherit pname version; - sha256 = "sha256-MHoVeutoMaHHl1uxv52NOuvXsssqDuyfHTuyTqg9y+U="; + sha256 = "sha256-2jP1p53sKqt7p8DQ9fzIH9L9NuzQ4uc/qisZcfOo7fw="; }; - cargoSha256 = "sha256-wUVNsUx7JS5icjxbz3CV1lNUvuuL+gTL2QzuE+030WU="; + cargoHash = "sha256-5jcyXbS5C/jxUWSJJ8fCVR/hwPOqNJz8otWnOgirJCA="; # needed to get libssh2/libgit2 to link properly LIBGIT2_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index 9d0d89ecd71..54443f8c4f1 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "EventStore"; - version = "22.10.0"; + version = "22.10.2"; src = fetchFromGitHub { owner = "EventStore"; repo = "EventStore"; rev = "oss-v${version}"; - sha256 = "sha256-gw9t+g0Y/Mrrw4nQagBzQZf9aB1hILvm2nKyUqirZH0="; + sha256 = "sha256-CYI1VE+6bR3UFx98IquS8rgucKmQqcHh74Jf/9CGE0k="; leaveDotGit = true; }; diff --git a/pkgs/servers/nosql/eventstore/deps.nix b/pkgs/servers/nosql/eventstore/deps.nix index d032e3bc5b1..b49ee16e485 100644 --- a/pkgs/servers/nosql/eventstore/deps.nix +++ b/pkgs/servers/nosql/eventstore/deps.nix @@ -7,7 +7,7 @@ (fetchNuGet { pname = "dotnet-retire"; version = "4.0.1"; sha256 = "0zqyivj00mjagzhhkvzckdk5d5ldxhxhv7qk985pis9krfkgzhww"; }) (fetchNuGet { pname = "Esprima"; version = "2.1.2"; sha256 = "15gvrak3qqm7s943nx7fzpsjjcjygwvwjjjvypw42gjvj8pcywaq"; }) (fetchNuGet { pname = "EventStore.Client"; version = "21.2.0"; sha256 = "1crnk0nbwcz4l2dv3ia96skmfn274nbyh5j1p0g9rjbzyy7kzf5j"; }) - (fetchNuGet { pname = "EventStore.Plugins"; version = "22.10.0"; sha256 = "1am4z6wisx2ysg4mxvl75565060f3y0wfn2wp5hspqcy2pjmk739"; }) + (fetchNuGet { pname = "EventStore.Plugins"; version = "22.10.1"; sha256 = "018q2awlmvbw4wjphiqfjs0gws7ydxrcipb9v9cfmiw4g8wifan1"; }) (fetchNuGet { pname = "GitHubActionsTestLogger"; version = "2.0.1"; sha256 = "155d1fmnxlq7p7wk4v74b8v8h36nq0i6bq1vhdjf8sbq7f95fj0f"; }) (fetchNuGet { pname = "GitInfo"; version = "2.0.26"; sha256 = "050l74vkamvbsp8f02b8aknizcknk4fr26dvwvw86mm8iw1dlvrv"; }) (fetchNuGet { pname = "Google.Protobuf"; version = "3.21.6"; sha256 = "1mjal5h5dn3ncf3cmx0d85qilfj984d5sbr8vs1l1jb14j0r45xz"; }) @@ -97,7 +97,7 @@ (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) (fetchNuGet { pname = "NUnit"; version = "3.13.3"; sha256 = "0wdzfkygqnr73s6lpxg5b1pwaqz9f414fxpvpdmf72bvh4jaqzv6"; }) diff --git a/pkgs/tools/text/tml/default.nix b/pkgs/tools/text/tml/default.nix index 839ac8b0ce1..3f1a6477851 100644 --- a/pkgs/tools/text/tml/default.nix +++ b/pkgs/tools/text/tml/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tml"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "liamg"; repo = "tml"; rev = "v${version}"; - hash = "sha256-92GumJGdbqxhcIj1gdkiamUA4peDG/Ar6GEimj/E7lg="; + hash = "sha256-y9iv6s+ShKLxd+SOBQxwvPwuEL1kepJL6ukA4aoV9Z8="; }; - vendorHash = "sha256-YsEmxhyDMuvq48vdHFvgsIqbqDZbg8beS0nL7lsaFJ0="; + vendorHash = "sha256-CHZS1SpPko8u3tZAYbf+Di882W55X9Q/zd4SmFCRgKM="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/typesetting/typst-live/default.nix b/pkgs/tools/typesetting/typst-live/default.nix new file mode 100644 index 00000000000..f9d0e2cd18c --- /dev/null +++ b/pkgs/tools/typesetting/typst-live/default.nix @@ -0,0 +1,42 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, darwin +, makeWrapper +, typst +}: + +rustPlatform.buildRustPackage { + pname = "typst-live"; + version = "unstable-2023-05-27"; + + src = fetchFromGitHub { + owner = "ItsEthra"; + repo = "typst-live"; + rev = "10a2da57b93f8d6e4eaa0bfcec1e68e46b916868"; + hash = "sha256-42QzqbyIjPn0C4coCU81gtlI7v5XJStlsDZvnLlwpYs="; + }; + + cargoHash = "sha256-M5jYSLw5oquAq2gGWZOJvx5/CGAl2Rg+G94V6ivAOzc="; + + nativeBuildInputs = [ + makeWrapper + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices + ]; + + postInstall = '' + wrapProgram $out/bin/typst-live \ + --suffix PATH : ${lib.makeBinPath [ typst ]} + ''; + + meta = with lib; { + description = "Hot reloading for your typst files"; + homepage = "https://github.com/ItsEthra/typst-live"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d63b86bc4b4..ba860579ce4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13398,6 +13398,8 @@ with pkgs; typst-fmt = callPackage ../tools/typesetting/typst-fmt { }; + typst-live = callPackage ../tools/typesetting/typst-live { }; + tz = callPackage ../tools/misc/tz { }; u9fs = callPackage ../servers/u9fs { };