diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-03 06:00:57 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-03 06:00:57 +0000 |
commit | 2e1f9ebefbac3a1038815f64f23f45166e65563b (patch) | |
tree | 96800093a3703ca05d8637f8c220dc473f6d4a63 | |
parent | 8490868860c9a411ab2629789fb0bed0da229879 (diff) | |
parent | d816b5ab44187a2dd84806630ce77a733724f95f (diff) |
Merge master into staging-next
33 files changed, 317 insertions, 286 deletions
diff --git a/pkgs/applications/audio/music-player/default.nix b/pkgs/applications/audio/music-player/default.nix index 0a59f568f2bda..e44963090a1f6 100644 --- a/pkgs/applications/audio/music-player/default.nix +++ b/pkgs/applications/audio/music-player/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "music-player"; - version = "0.2.0-alpha.13"; + version = "0.2.0-alpha.14"; src = fetchFromGitHub { owner = "tsirysndr"; repo = "music-player"; rev = "v${version}"; - hash = "sha256-LuO64E5kJdMgd5h0+Sb8Wg7hxUmS8E7bKT3NIyd9+Lc="; + hash = "sha256-l8Y1fc5v0YDm87b+d3DuMgKFiem6WFfJEASplHoqva0="; }; - cargoHash = "sha256-Xn0OUHMgKxzDvhO+xRv5jMa50OzEtl6yhHbJ1R/a56Y="; + cargoHash = "sha256-nnOHuAn+eGf+iiX3QbDTH4zHMQ6KV4QP6RnyBhLMrEc="; nativeBuildInputs = [ protobuf diff --git a/pkgs/applications/gis/spatialite-tools/default.nix b/pkgs/applications/gis/spatialite-tools/default.nix index b336c41862e79..b05b3949aef6e 100644 --- a/pkgs/applications/gis/spatialite-tools/default.nix +++ b/pkgs/applications/gis/spatialite-tools/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "spatialite-tools"; - version = "5.1.0"; + version = "5.1.0a"; src = fetchurl { url = "https://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/spatialite-tools-${version}.tar.gz"; - hash = "sha256-3zAwNnwInKkPpmMIl/PxooB4TaKeG6Y080DbpLCFg7U="; + hash = "sha256-EZ40dY6AiM27Q+2BtKbq6ojHZLC32hkAGlUUslRVAc4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/misc/waylock/default.nix b/pkgs/applications/misc/waylock/default.nix index ba2a97534d36b..9445ed8f1f921 100644 --- a/pkgs/applications/misc/waylock/default.nix +++ b/pkgs/applications/misc/waylock/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A small screenlocker for Wayland compositors"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ jordanisaacs ]; + mainProgram = "waylock"; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/applications/misc/yambar-hyprland-wses/default.nix b/pkgs/applications/misc/yambar-hyprland-wses/default.nix new file mode 100644 index 0000000000000..e64e8e13dec1f --- /dev/null +++ b/pkgs/applications/misc/yambar-hyprland-wses/default.nix @@ -0,0 +1,27 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "yambar-hyprland-wses"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "jonhoo"; + repo = "yambar-hyprland-wses"; + rev = "v${version}"; + hash = "sha256-furHj1AAFgNiNHP9RBsVrIvrDckSKU8FXilzH9TQ99c="; + }; + + cargoHash = "sha256-/ewEgrBxRw5Xii5PX1GLKzBrZjgnzYc/Hz+M1pJpncQ="; + + meta = { + description = "Enable Yambar to show Hyprland workspaces"; + homepage = "https://github.com/jonhoo/yambar-hyprland-wses"; + license = with lib.licenses; [ asl20 mit ]; + maintainers = with lib.maintainers; [ ludovicopiero ]; + mainProgram = "yambar-hyprland-wses"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/networking/cluster/acorn/default.nix b/pkgs/applications/networking/cluster/acorn/default.nix index c362bb157c4b8..4b6e44ab020f4 100644 --- a/pkgs/applications/networking/cluster/acorn/default.nix +++ b/pkgs/applications/networking/cluster/acorn/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "acorn"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "acorn-io"; repo = pname; rev = "v${version}"; - hash = "sha256-ERB9RwvBcZ+G+UqR0Wv+HCkrc8tJQdamIeg7ZfKx8jQ="; + hash = "sha256-ZS3YxXgMSu8+eRnpqrtaBTQIlSY3cscudcTbztiRsbM="; }; - vendorHash = "sha256-iiyWYGoW0vno/C5qZVvtYypbVpjJwWydMo4+HxXy8IM="; + vendorHash = "sha256-jkkzlMc2y8HvPZjpmRIQz64JK5yjhdoJevE0dclBHvA="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/terraform-compliance/default.nix b/pkgs/applications/networking/cluster/terraform-compliance/default.nix index 3f58f2487e484..669af001e54fc 100644 --- a/pkgs/applications/networking/cluster/terraform-compliance/default.nix +++ b/pkgs/applications/networking/cluster/terraform-compliance/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "terraform-compliance"; - version = "1.3.43"; + version = "1.3.44"; format = "setuptools"; src = fetchFromGitHub { owner = "terraform-compliance"; repo = "cli"; rev = "refs/tags/${version}"; - sha256 = "sha256-Otz0jXSqqg8u8jVnqHTpPW/oyb+Qq2NywgxYPtIAKEc="; + sha256 = "sha256-eE9bqu9ipuas+rdcJpn09V6nkdoYPOpChHgPH8U0rNw="; }; postPatch = '' @@ -55,6 +55,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/terraform-compliance/cli"; changelog = "https://github.com/terraform-compliance/cli/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ kalbasit ]; + maintainers = with maintainers; [ kalbasit kashw2 ]; }; } diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index cfc92f26953f8..9962b94597edc 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.50.6"; + version = "0.50.12"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-h6Qz27zWAN0mxDok2dpxlE0qLP2ECwMjiCZxg+9T/dw="; + hash = "sha256-NAilGvA0S4GEQgqKKQMddemZmyFBnKE4+R689kAyoMg="; }; - vendorHash = "sha256-ZpLQcWi3qYTsy6BUZbHFFmhWG6CWqcb/NuzPLOUtKfs="; + vendorHash = "sha256-wQ5jxOTuYkiW5zHcduByKZ+vHPKn/1ELL3DskKze+UI="; doCheck = false; diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index 6ad5b5ddc1539..4965369ef5f74 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -33,16 +33,16 @@ let in buildNpmPackage rec { pname = "deltachat-desktop"; - version = "1.40.0"; + version = "1.40.1"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; rev = "v${version}"; - hash = "sha256-QvSBM2zR/LcQ2wtkh6mtlU8iqYmZfv6U5bRyMYjLZhE="; + hash = "sha256-UmRI1aYPAz8I6Th+L5N1YXbvaIOS6m2jEKFl6MdCUVA="; }; - npmDepsHash = "sha256-lxyXfPNu5U+0cge+cwcXHIJv+gVXCSzc5t/2c4IQxNM="; + npmDepsHash = "sha256-zk7Zc/I8uK8CXo0nHMg1CPG28OHRoL1fh1MLOsIr3ao="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/development/libraries/libdeltachat/Cargo.lock b/pkgs/development/libraries/libdeltachat/Cargo.lock index f2528c30384e9..1f09a5f93eda6 100644 --- a/pkgs/development/libraries/libdeltachat/Cargo.lock +++ b/pkgs/development/libraries/libdeltachat/Cargo.lock @@ -221,13 +221,13 @@ dependencies = [ [[package]] name = "async-imap" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da93622739d458dd9a6abc1abf0e38e81965a5824a3b37f9500437c82a8bb572" +checksum = "b538b767cbf9c162a6c5795d4b932bd2c20ba10b5a91a94d2b2b6886c1dce6a8" dependencies = [ "async-channel", "base64 0.21.2", - "byte-pool", + "bytes", "chrono", "futures", "imap-proto", @@ -545,16 +545,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] -name = "byte-pool" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f1b21189f50b5625efa6227cf45e9d4cfdc2e73582df2b879e9689e78a7158" -dependencies = [ - "crossbeam-queue", - "stable_deref_trait", -] - -[[package]] name = "bytemuck" version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -925,16 +915,6 @@ dependencies = [ ] [[package]] -name = "crossbeam-queue" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] name = "crossbeam-utils" version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1123,7 +1103,7 @@ dependencies = [ [[package]] name = "deltachat" -version = "1.119.1" +version = "1.120.0" dependencies = [ "ansi_term", "anyhow", @@ -1199,7 +1179,7 @@ dependencies = [ [[package]] name = "deltachat-jsonrpc" -version = "1.119.1" +version = "1.120.0" dependencies = [ "anyhow", "async-channel", @@ -1223,7 +1203,7 @@ dependencies = [ [[package]] name = "deltachat-repl" -version = "1.119.1" +version = "1.120.0" dependencies = [ "ansi_term", "anyhow", @@ -1238,7 +1218,7 @@ dependencies = [ [[package]] name = "deltachat-rpc-server" -version = "1.119.1" +version = "1.120.0" dependencies = [ "anyhow", "deltachat", @@ -1263,7 +1243,7 @@ dependencies = [ [[package]] name = "deltachat_ffi" -version = "1.119.1" +version = "1.120.0" dependencies = [ "anyhow", "deltachat", @@ -4597,12 +4577,6 @@ dependencies = [ ] [[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 96ef2f6cd4274..f99e76416da82 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.119.1"; + version = "1.120.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = "v${version}"; - hash = "sha256-LP5h99qldf9QoRDmo581H+sUx1QsD6nOGt1ES3Fr/6E="; + hash = "sha256-q2Va0NbWwte8wZQWhXiORlYGoFDvuWmQShSRtlwbA6Y="; }; patches = [ diff --git a/pkgs/development/python-modules/ipyvue/default.nix b/pkgs/development/python-modules/ipyvue/default.nix index e71c3e845424b..aba6a22ea168f 100644 --- a/pkgs/development/python-modules/ipyvue/default.nix +++ b/pkgs/development/python-modules/ipyvue/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "ipyvue"; - version = "1.9.2"; + version = "1.10.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-2j8qYRXR8nmV5++g4OJn65dq3lypgqo9oxBscNb4eNs="; + hash = "sha256-XPmrGg0SCTiZKMeTCeJywuKaa5ByY9FQTBy+THSJSiQ="; }; propagatedBuildInputs = [ ipywidgets ]; @@ -23,8 +23,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "ipyvue" ]; meta = with lib; { - description = "Jupyter widgets base for Vue libraries."; - homepage = "https://github.com/mariobuikhuizen/ipyvuetify"; + description = "Jupyter widgets base for Vue libraries"; + homepage = "https://github.com/mariobuikhuizen/ipyvue"; license = licenses.mit; maintainers = with maintainers; [ drewrisinger ]; }; diff --git a/pkgs/development/python-modules/pkutils/default.nix b/pkgs/development/python-modules/pkutils/default.nix index e626c9bd587c3..e3957533ea994 100644 --- a/pkgs/development/python-modules/pkutils/default.nix +++ b/pkgs/development/python-modules/pkutils/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, nose +, nose3 , pythonOlder , pythonRelaxDepsHook , semver @@ -34,7 +34,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - nose + nose3 ]; checkPhase = '' diff --git a/pkgs/development/python-modules/xcffib/default.nix b/pkgs/development/python-modules/xcffib/default.nix index b4def14ff47c6..b0b00da0dc320 100644 --- a/pkgs/development/python-modules/xcffib/default.nix +++ b/pkgs/development/python-modules/xcffib/default.nix @@ -1,37 +1,36 @@ { lib , buildPythonPackage -, fetchPypi -, fetchpatch -, xorg , cffi +, fetchPypi , pytestCheckHook +, pythonOlder +, xorg }: buildPythonPackage rec { - version = "1.2.0"; pname = "xcffib"; + version = "1.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8yMCFEf55zB40hu5KMSPTavq6z87N+gDxta5hzXoFIM="; + hash = "sha256-qVyUZfL5e0/O3mBr0eCEB6Mt9xy3YP1Xv+U2d9tpGsw="; }; - patches = [ - (fetchpatch { - name = "remove-leftover-six-import.patch"; - url = "https://github.com/tych0/xcffib/commit/8a488867d30464913706376ca3a9f4c98ca6c5cf.patch"; - hash = "sha256-wEms0gC7tVqtmKMjjpH/34kdQ6HUV0h67bUGbgijlqw="; - }) - ]; - postPatch = '' # Hardcode cairo library path sed -e 's,ffi\.dlopen(,&"${xorg.libxcb.out}/lib/" + ,' -i xcffib/__init__.py ''; - propagatedBuildInputs = [ cffi ]; + propagatedNativeBuildInputs = [ + cffi + ]; - propagatedNativeBuildInputs = [ cffi ]; + propagatedBuildInputs = [ + cffi + ]; nativeCheckInputs = [ pytestCheckHook @@ -44,11 +43,14 @@ buildPythonPackage rec { rm -r xcffib ''; - pythonImportsCheck = [ "xcffib" ]; + pythonImportsCheck = [ + "xcffib" + ]; meta = with lib; { description = "A drop in replacement for xpyb, an XCB python binding"; homepage = "https://github.com/tych0/xcffib"; + changelog = "https://github.com/tych0/xcffib/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ kamilchm ]; }; diff --git a/pkgs/development/tools/misc/protox/default.nix b/pkgs/development/tools/misc/protox/default.nix index 6875292d241b1..82849b6d9478e 100644 --- a/pkgs/development/tools/misc/protox/default.nix +++ b/pkgs/development/tools/misc/protox/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "protox"; - version = "0.4.1"; + version = "0.5.0"; src = fetchCrate { inherit pname version; - hash = "sha256-n72Fvdo6LLk8pzYS2/5zk+dbsLRPAm6NZ5DsMRyHCTY="; + hash = "sha256-U9+7k7dQ6YFfsKMfFMg34g42qLvn+mcSRlAAys3eXNo="; }; - cargoHash = "sha256-wW4UcC3QAtriLEiXPndP+tZATftWP7ySavpIV6cGVCA="; + cargoHash = "sha256-sNOw19gxj+cEctxhXNWI8u15VJYlN8nSNl6Ha9sB/eE="; buildFeatures = [ "bin" ]; diff --git a/pkgs/development/tools/misc/rsonpath/default.nix b/pkgs/development/tools/misc/rsonpath/default.nix index 960c889e6b64f..7a1e9ac6d4e78 100644 --- a/pkgs/development/tools/misc/rsonpath/default.nix +++ b/pkgs/development/tools/misc/rsonpath/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "rsonpath"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "v0ldek"; repo = "rsonpath"; rev = "v${version}"; - hash = "sha256-3ncaO7B3e4F2LFj1IjHvOyoWXBYQM69vPfPnsBr+tKI="; + hash = "sha256-VzHp5xMzAzo8ZCQyFCb1Igb0deJuZX+PIfs/oIy/zR0="; }; - cargoHash = "sha256-EjifSABhowk3PSQTuAm8+xRYbc0OwdqHMb9o/z1yuP0="; + cargoHash = "sha256-bnG95BgK41YJABqEGAbxg+gHoOksWc9nTChK7aCFK2E="; buildNoDefaultFeatures = !withSimd; diff --git a/pkgs/development/tools/rust/specr-transpile/default.nix b/pkgs/development/tools/rust/specr-transpile/default.nix index 567dfcf8d2c30..10a1acfac7576 100644 --- a/pkgs/development/tools/rust/specr-transpile/default.nix +++ b/pkgs/development/tools/rust/specr-transpile/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "specr-transpile"; - version = "0.1.24"; + version = "0.1.25"; src = fetchCrate { inherit pname version; - hash = "sha256-+7NjB87pfFh8472gOV4HoKIqSiHnTCFOEVdKYBsn1qg="; + hash = "sha256-yB4b7VaZ22zk8jhQijBOWRks22TV19q9IQNlVXyBlss="; }; - cargoHash = "sha256-VgEyXm1uSsNJVjUYx66A35vLNxYErTrC8qBhYVlYyH4="; + cargoHash = "sha256-pD+Llzt4ekkQgKGidEL6jIbbFpuqjuFTmQM29FtReTY="; meta = with lib; { description = "Converts Specr lang code to Rust"; diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 78bfd893062bf..0b9020416d3bf 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "skaffold"; - version = "2.6.3"; + version = "2.7.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - hash = "sha256-Jguy1h1Gb94cHGfXpiUF6A9MsRPA8lg99ej5uDtRp1s="; + hash = "sha256-uKrHWFyHuGX5dzrEvl7x305QgFOraS0L6J7gAFloUYc="; }; vendorHash = null; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index bafe5c20de769..7bc41ad694b36 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.1.71"; + version = "0.1.84"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-0VgXcWWJxm3VBG+GJitL22tHUfXf2pI9MAepqqTVSYo="; + hash = "sha256-StcakZFJxHRY36xuxZm/W9xoEye4HRPfC4dtczeT7nk="; }; - vendorHash = "sha256-h06iAJN3ZkcV1TN2iEY8DEZyu4DEgF+7nF4IXq6fD/4="; + vendorHash = "sha256-cfgI/kJOtH1Ptd1MUHvt+e2ErU5wL+8Xm4cfQ64iAhc="; subPackages = [ "." ]; diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix index e2c714100f903..12c42444f1834 100644 --- a/pkgs/test/texlive/default.nix +++ b/pkgs/test/texlive/default.nix @@ -373,7 +373,7 @@ rec { # (1) binaries requiring --help or -h help = [ "arlatex" "bundledoc" "cachepic" "checklistings" "dvipos" "extractres" "fig4latex" "fragmaster" "kpsewhere" "latex-git-log" "ltxfileinfo" "mendex" "perltex" "pn2pdf" "psbook" "psnup" "psresize" "purifyeps" - "simpdftex" "tex2xindy" "texluac" "texluajitc" "urlbst" "yplan" ]; + "simpdftex" "tex2xindy" "texluac" "texluajitc" "upmendex" "urlbst" "yplan" ]; shortHelp = [ "adhocfilelist" "authorindex" "bbl2bib" "bibdoiadd" "bibmradd" "biburl2doi" "bibzbladd" "ctanupload" "disdvi" "dvibook" "dviconcat" "getmapdl" "latex2man" "listings-ext.sh" "pygmentex" ]; # (2) binaries that return non-zero exit code even if correctly asked for help diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index c2465ea95914e..ee3d19be604ce 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -23,14 +23,14 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.13.13"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.13.15"; # N.B: if you change this, check if overrides are still up-to-date format = "pyproject"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = "refs/tags/${version}"; - hash = "sha256-0Wx/Ze6W0Fa8OzM79PFu2liSxl1UwuUqIoYT0WhTk5k="; + hash = "sha256-wxuuEya2uUquRmRmh9M2wJ6dcvCx8kyzk71og9OAJ+c="; }; postPatch = '' diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix index 90090d5f7ca33..26c0acdef4d01 100644 --- a/pkgs/tools/misc/infracost/default.nix +++ b/pkgs/tools/misc/infracost/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "infracost"; - version = "0.10.28"; + version = "0.10.29"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-Gh/3uPkFEW6HBF4vbmZ00qaWD3FGTs7GUHRlfP3G5fY="; + sha256 = "sha256-xtxTIC7DNTvcDMXtFJOJkJGn78HdzCWVrBMS5Ksmtcc="; }; - vendorHash = "sha256-mT214puF9gdrw0mfMPQQtZBdErW6MEJBIilKVo2ym30="; + vendorHash = "sha256-ZKRtUlrEk/W2qZSbsh0ddwmspH6quzzY0cFSQmO0i10="; ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ]; @@ -62,6 +62,6 @@ buildGoModule rec { compare different deployment options upfront. ''; license = licenses.asl20; - maintainers = with maintainers; [ davegallant jk ]; + maintainers = with maintainers; [ davegallant jk kashw2 ]; }; } diff --git a/pkgs/tools/misc/shopware-cli/default.nix b/pkgs/tools/misc/shopware-cli/default.nix index b553ab269d7c6..c04ae27e99194 100644 --- a/pkgs/tools/misc/shopware-cli/default.nix +++ b/pkgs/tools/misc/shopware-cli/default.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "shopware-cli"; - version = "0.2.6"; + version = "0.2.8"; src = fetchFromGitHub { repo = "shopware-cli"; owner = "FriendsOfShopware"; rev = version; - hash = "sha256-Ut/SKdnaJM4B6jXXcRS6UJ1qCEgnZy977qlZbH8S6qU="; + hash = "sha256-ThjSp7WBAWBUXDRN0mJvIb7uWTjYtVa53b+BoWCPuvo="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; nativeCheckInputs = [ git ]; - vendorHash = "sha256-luA+tSePY8V+BQBTykv236mq4z3wQjLrjeYH2KQ0Mrc="; + vendorHash = "sha256-JRzF2eYHnFO/2Tqnc4DMMGSV8gDKDiu8ZjELcn/Wur0="; postInstall = '' export HOME="$(mktemp -d)" diff --git a/pkgs/tools/networking/calendar-cli/default.nix b/pkgs/tools/networking/calendar-cli/default.nix index fa920247180a2..45b3afbf895e2 100644 --- a/pkgs/tools/networking/calendar-cli/default.nix +++ b/pkgs/tools/networking/calendar-cli/default.nix @@ -1,23 +1,25 @@ { lib , python3 , fetchFromGitHub +, nixosTests }: python3.pkgs.buildPythonApplication rec { pname = "calendar-cli"; - version = "0.14.1"; + version = "1.0.1"; src = fetchFromGitHub { owner = "tobixen"; repo = "calendar-cli"; rev = "v${version}"; - hash = "sha256-VVE4+qoUam2szbMsdWetq6hyhXoE1V3Pw5j/bYbfGVQ="; + hash = "sha256-w35ySLnfxXZR/a7BrPLYqXs2kqkuYhh5PcgNxJqjDtE="; }; propagatedBuildInputs = with python3.pkgs; [ icalendar caldav pytz + pyyaml tzlocal click six @@ -26,6 +28,10 @@ python3.pkgs.buildPythonApplication rec { # tests require networking doCheck = false; + passthru.tests = { + inherit (nixosTests) radicale; + }; + meta = with lib; { description = "Simple command-line CalDav client"; homepage = "https://github.com/tobixen/calendar-cli"; diff --git a/pkgs/tools/system/ttop/default.nix b/pkgs/tools/system/ttop/default.nix index 20b28fa7dd0ca..67edfe27274dc 100644 --- a/pkgs/tools/system/ttop/default.nix +++ b/pkgs/tools/system/ttop/default.nix @@ -1,4 +1,4 @@ -{ lib, nimPackages, fetchFromGitHub }: +{ lib, nimPackages, fetchFromGitHub, testers }: nimPackages.buildNimPackage (finalAttrs: { pname = "ttop"; @@ -14,11 +14,22 @@ nimPackages.buildNimPackage (finalAttrs: { buildInputs = with nimPackages; [ asciigraph illwill jsony parsetoml zippy ]; - meta = with lib; - finalAttrs.src.meta // { - description = "Top-like system monitoring tool"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ sikmir ]; + nimFlags = [ + "-d:NimblePkgVersion=${finalAttrs.version}" + ]; + + passthru.tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; }; + }; + + meta = with lib; { + description = "Top-like system monitoring tool"; + homepage = "https://github.com/inv2004/ttop"; + changelog = "https://github.com/inv2004/ttop/releases/tag/${finalAttrs.src.rev}"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ figsoda sikmir ]; + }; }) diff --git a/pkgs/tools/text/gtree/default.nix b/pkgs/tools/text/gtree/default.nix index 17e04df844536..8ed61465d8a62 100644 --- a/pkgs/tools/text/gtree/default.nix +++ b/pkgs/tools/text/gtree/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gtree"; - version = "1.9.6"; + version = "1.9.7"; src = fetchFromGitHub { owner = "ddddddO"; repo = "gtree"; rev = "v${version}"; - hash = "sha256-eU5mMUDUh5eMzd4oLc0XOHapt1hhODWXQJ+OJAy3tWc="; + hash = "sha256-FXcR8MlLXvfLta0XKw5+AOf5f/mLTL3LiYn6Rm49el8="; }; vendorHash = "sha256-QxcDa499XV43p8fstENOtfe3iZ176R5/Ub5iovXlYIM="; diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index dd1822de4925e..ff4adcb78d283 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -7,6 +7,7 @@ , brotli, cairo, pixman, xorg, clisp, biber, woff2, xxHash , makeWrapper, shortenPerlShebang, useFixedHashes, asymptote , biber-ms +, tlpdb }: # Useful resource covering build options: @@ -22,6 +23,20 @@ let assertFixedHash = name: src: if ! useFixedHashes || src ? outputHash then src else throw "The TeX Live package '${src.pname}' must have a fixed hash before building '${name}'."; + # list of packages whose binaries are built in core, core-big + # generated manually by inspecting ${core}/bin + corePackages = [ "afm2pl" "aleph" "autosp" "axodraw2" "bibtex" "cjkutils" + "ctie" "cweb" "detex" "dtl" "dvi2tty" "dvicopy" "dvidvi" "dviljk" + "dviout-util" "dvipdfmx" "dvipos" "dvips" "fontware" "gregoriotex" + "gsftopk" "hitex" "kpathsea" "lacheck" "lcdftypetools" "m-tx" "makeindex" + "mfware" "musixtnt" "omegaware" "patgen" "pdftex" "pdftosrc" "pmx" + "ps2eps" "ps2pk" "psutils" "ptex" "seetexk" "synctex" "t1utils" "tex" + "tex4ht" "texlive-scripts-extra" "texware" "tie" "tpic2pdftex" "ttfutils" + "uptex" "velthuis" "vlna" "web" "xml2pmx" ]; + coreBigPackages = [ "metafont" "mflua" "metapost" "luatex" "luahbtex" + "xetex" ] ++ lib.optional withLuaJIT "luajittex"; + binPackages = lib.getAttrs (corePackages ++ coreBigPackages) tlpdb; + common = { src = fetchurl { urls = [ @@ -53,21 +68,42 @@ let configureFlags = [ "--with-banner-add=/nixos.org" - "--disable-missing" "--disable-native-texlive-build" + "--disable-missing" # terminate if a requested program or feature must be + # disabled, e.g., due to missing libraries + "--disable-native-texlive-build" # do not build for the TeX Live binary distribution "--enable-shared" # "--enable-cxx-runtime-hack" # static runtime "--enable-tex-synctex" + "--disable-texlive" # do not build the texlive (TeX Live scripts) package + "--disable-linked-scripts" # do not install the linked scripts "-C" # use configure cache to speed up ] ++ withSystemLibs [ # see "from TL tree" vs. "Using installed" in configure output "zziplib" "mpfr" "gmp" "pixman" "potrace" "gd" "freetype2" "libpng" "libpaper" "zlib" - ]; - - # clean broken links to stuff not built - cleanBrokenLinks = '' - for f in "$out"/bin/*; do - if [[ ! -x "$f" ]]; then rm "$f"; fi + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + "BUILDCC=${buildPackages.stdenv.cc.targetPrefix}cc"; + + # move binaries to corresponding split outputs, based on content of texlive.tlpdb + binToOutput = lib.listToAttrs + (lib.concatMap + (n: map (v: { name = v; value = builtins.replaceStrings [ "-" ] [ "_" ] n; }) binPackages.${n}.binfiles or [ ]) + (builtins.attrNames binPackages)); + + moveBins = '' + for bin in "$out/bin"/* ; do + bin="''${bin##*/}" + package="''${binToOutput[$bin]}" + if [[ -n "$package" ]] ; then + if [[ -z "''${!package}" ]] ; then + echo "WARNING: missing output '$package' for binary '$bin', leaving in 'out'" + else + mkdir -p "''${!package}"/bin + mv "$out/bin/$bin" "''${!package}"/bin/ + fi + else + echo "WARNING: no output known for binary '$bin', leaving in 'out'" + fi done ''; }; @@ -76,7 +112,6 @@ let withLuaJIT = !(stdenv.hostPlatform.isPower && stdenv.hostPlatform.is64bit) && !stdenv.hostPlatform.isRiscV; in rec { # un-indented -inherit (common) cleanBrokenLinks; texliveYear = year; @@ -84,18 +119,21 @@ core = stdenv.mkDerivation rec { pname = "texlive-bin"; inherit version; - inherit (common) src prePatch; + __structuredAttrs = true; + + inherit (common) binToOutput src prePatch; - outputs = [ "out" "doc" "dev" ]; + outputs = [ "out" "dev" "man" "info" ] + ++ (builtins.map (builtins.replaceStrings [ "-" ] [ "_" ]) corePackages); nativeBuildInputs = [ pkg-config - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) (with texlive.bin.core; [ # configure: error: tangle was not found but is required when cross-compiling. # dev (himktables) is used when building hitex to generate the additional source file hitables.c - texlive.bin.core - texlive.bin.core.dev - ]; + web/*tangle*/ cweb/*ctangle*/ omegaware/*otangle*/ tie/*tie*/ # see "Building TeX Live" 6.4.2 Cross problems + dev/*himktables*/ + ]); buildInputs = [ /*teckit*/ zziplib mpfr gmp @@ -113,7 +151,9 @@ core = stdenv.mkDerivation rec { preConfigure = '' rm -r libs/{cairo,freetype2,gd,gmp,graphite2,harfbuzz,icu,libpaper,libpng} \ - libs/{lua53,luajit,mpfr,pixman,zlib,zziplib} + libs/{lua53,luajit,mpfr,pixman,pplib,teckit,zlib,zziplib} \ + texk/{bibtex-x,chktex,dvipng,dvisvgm,upmendex,xdvik} \ + utils/{asymptote,texdoctk,xindy,xpdfopen} mkdir WorkDir cd WorkDir ''; @@ -122,7 +162,6 @@ core = stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; configureFlags = common.configureFlags - ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "BUILDCC=${buildPackages.stdenv.cc.targetPrefix}cc" ] ++ [ "--without-x" ] # disable xdvik and xpdfopen ++ map (what: "--disable-${what}") [ "chktex" @@ -137,53 +176,18 @@ core = stdenv.mkDerivation rec { doCheck = false; # triptest fails, likely due to missing TEXMF tree preCheck = "patchShebangs ../texk/web2c"; - installTargets = [ "install" "texlinks" ]; + installTargets = [ "install" ]; # TODO: perhaps improve texmf.cnf search locations postInstall = - /* links format -> engine will be regenerated in texlive.combine - note: for unlinking, the texlinks patch is irrelevant, so we use - the included texlinks.sh to avoid the dependency on bin.texlinks */ '' - PATH="$out/bin:$PATH" sh ../texk/texlive/linked_scripts/texlive-extra/texlinks.sh --cnffile "$out/share/texmf-dist/web2c/fmtutil.cnf" --unlink "$out/bin" - '' + /* a few texmf-dist files are useful; take the rest from pkgs */ '' - mv "$out/share/texmf-dist/web2c/texmf.cnf" . - rm -r "$out/share/texmf-dist" - mkdir -p "$out"/share/texmf-dist/{web2c,scripts/texlive/TeXLive} - mv ./texmf.cnf "$out/share/texmf-dist/web2c/" - cp ../texk/tests/TeXLive/*.pm "$out/share/texmf-dist/scripts/texlive/TeXLive/" - cp ../texk/texlive/linked_scripts/scripts.lst "$out/share/texmf-dist/scripts/texlive/" - '' + - (let extraScripts = - '' - tex4ht/ht.sh - tex4ht/htcontext.sh - tex4ht/htcopy.pl - tex4ht/htlatex.sh - tex4ht/htmex.sh - tex4ht/htmove.pl - tex4ht/httex.sh - tex4ht/httexi.sh - tex4ht/htxelatex.sh - tex4ht/htxetex.sh - tex4ht/mk4ht.pl - tex4ht/xhlatex.sh - ''; - in - '' - echo -e 'texmf_scripts="$texmf_scripts\n${extraScripts}"' \ - >> "$out/share/texmf-dist/scripts/texlive/scripts.lst" - '') - + /* doc location identical with individual TeX pkgs */ '' - mkdir -p "$doc/doc" - mv "$out"/share/{man,info} "$doc"/doc - '' + /* remove manpages for utils that live in texlive.texlive-scripts to avoid a conflict in buildEnv */ '' - (cd "$doc"/doc/man/man1; rm {fmtutil-sys.1,fmtutil.1,mktexfmt.1,mktexmf.1,mktexpk.1,mktextfm.1,texhash.1,updmap-sys.1,updmap.1}) + /* remove redundant texmf-dist (content provided by TeX Live packages) */ + '' + rm -fr "$out"/share/texmf-dist '' + /* install himktables in separate output for use in cross compilation */ '' mkdir -p $dev/bin cp texk/web2c/.libs/himktables $dev/bin/himktables - '' + cleanBrokenLinks; + '' + common.moveBins; - setupHook = ./setup-hook.sh; # TODO: maybe texmf-nix -> texmf (and all references) passthru = { inherit version buildInputs; }; meta = with lib; { @@ -196,12 +200,15 @@ core = stdenv.mkDerivation rec { }; -inherit (core-big) metafont mflua metapost luatex luahbtex luajittex xetex; -core-big = stdenv.mkDerivation { #TODO: upmendex +inherit (core-big) metafont mflua metapost luatex luahbtex xetex; +luajittex = core.big.luajittex or null; +core-big = stdenv.mkDerivation { pname = "texlive-core-big.bin"; inherit version; - inherit (common) src prePatch; + __structuredAttrs = true; + + inherit (common) binToOutput src prePatch; patches = [ # improves reproducibility of fmt files. This patch has been proposed upstream, @@ -241,92 +248,46 @@ core-big = stdenv.mkDerivation { #TODO: upmendex inherit (core) nativeBuildInputs depsBuildBuild; buildInputs = core.buildInputs ++ [ core cairo harfbuzz icu graphite2 libX11 ]; + /* deleting the unused packages speeds up configure by a considerable margin + and ensures we do not rebuild existing libraries by mistake */ + preConfigure = '' + rm -r libs/{cairo,freetype2,gd,gmp,graphite2,harfbuzz,icu,libpaper,libpng} \ + libs/{mpfr,pixman,xpdf,zlib,zziplib} \ + texk/{afm2pl,bibtex-x,chktex,cjkutils,detex,dtl,dvi2tty,dvidvi,dviljk,dviout-util} \ + texk/{dvipdfm-x,dvipng,dvipos,dvipsk,dvisvgm,gregorio,gsftopk,kpathsea} \ + texk/{lcdf-typetools,makeindexk,makejvf,mendexk,musixtnt,ps2pk,psutils,ptexenc} \ + texk/{seetexk,tex4htk,texlive,ttf2pk2,ttfdump,xdvik} \ + utils/{asymptote,autosp,axodraw2,devnag,lacheck,m-tx,pmx,ps2eps,t1utils,texdoctk} \ + utils/{tpic2pdftex,vlna,xindy,xml2pmx,xpdfopen} + mkdir WorkDir + cd WorkDir + ''; + configureFlags = common.configureFlags ++ withSystemLibs [ "kpathsea" "ptexenc" "cairo" "harfbuzz" "icu" "graphite2" ] ++ map (prog: "--disable-${prog}") # don't build things we already have - ([ "tex" "ptex" "eptex" "uptex" "euptex" "aleph" "pdftex" + # list from texk/web2c/configure + ([ "tex" "ptex" "eptex" "uptex" "euptex" "aleph" "hitex" "pdftex" "web-progs" "synctex" - ] ++ lib.optionals (!withLuaJIT) [ "luajittex" "luajithbtex" "mfluajit" ]); - - configureScript = ":"; + ] ++ lib.optionals (!withLuaJIT) [ "luajittex" "luajithbtex" "mfluajit" ]) + /* disable all packages, re-enable upmendex, web2c packages */ + ++ [ "--disable-all-pkgs" "--enable-upmendex" "--enable-web2c" ] + /* kpathsea requires specifying the kpathsea location manually */ + ++ [ "--with-kpathsea-includes=${core.dev}/include" ]; - # we use static libtexlua, because it's only used by a single binary - postConfigure = let - luajit = lib.optionalString withLuaJIT ",luajit"; - in - lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) - # without this, the native builds attempt to use the binary - # ${target-triple}-gcc, but we need to use the wrapper script. - '' - export BUILDCC=${buildPackages.stdenv.cc}/bin/cc - '' - + - '' - mkdir ./WorkDir && cd ./WorkDir - for path in libs/{pplib,teckit,lua53${luajit}} texk/web2c; do - ( - if [[ "$path" =~ "libs/lua" ]]; then - extraConfig="--enable-static --disable-shared" - else - extraConfig="" - fi - '' + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) - # results of the tests performed by the configure scripts are - # toolchain-dependent, so native components and cross components cannot use - # the same cached test results. - # Disable the caching for components with native subcomponents. - '' - if [[ "$path" =~ "libs/luajit" ]] || [[ "$path" =~ "texk/web2c" ]]; then - extraConfig="$extraConfig --cache-file=/dev/null" - fi - '' - + - '' - mkdir -p "$path" && cd "$path" - "../../../$path/configure" $configureFlags $extraConfig - - if [[ "$path" =~ "libs/luajit" ]] || [[ "$path" =~ "libs/pplib" ]]; then - # ../../../texk/web2c/mfluadir/luapeg/lpeg.h:29:10: fatal error: 'lua.h' file not found - # ../../../texk/web2c/luatexdir/luamd5/md5lib.c:197:10: fatal error: 'utilsha.h' file not found - make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES}} - fi - ) - done - ''; + configureScript = "../configure"; - preBuild = "cd texk/web2c"; enableParallelBuilding = true; doCheck = false; # fails - # now distribute stuff into outputs, roughly as upstream TL - # (uninteresting stuff remains in $out, typically duplicates from `core`) - outputs = [ - "out" - "metafont" - "mflua" - "metapost" - "luatex" - "luahbtex" - "luajittex" - "xetex" - ]; - postInstall = '' - for output in $(getAllOutputNames); do - mkdir -p "''${!output}/bin" - done - - mv "$out/bin"/{inimf,mf,mf-nowin} "$metafont/bin/" - mv "$out/bin"/mflua{,-nowin} "$mflua/bin/" - mv "$out/bin"/{*tomp,mfplain,*mpost} "$metapost/bin/" - mv "$out/bin"/{luatex,texlua,texluac} "$luatex/bin/" - mv "$out/bin"/luahbtex "$luahbtex/bin/" - mv "$out/bin"/xetex "$xetex/bin/" - cp ../../libs/teckit/teckit_compile "$xetex/bin/" - '' + lib.optionalString withLuaJIT '' - mv "$out/bin"/mfluajit{,-nowin} "$mflua/bin/" - mv "$out/bin"/{luajittex,luajithbtex,texluajit,texluajitc} "$luajittex/bin/" - '' ; + outputs = [ "out" "dev" "man" "info" ] + ++ (builtins.map (builtins.replaceStrings [ "-" ] [ "_" ]) coreBigPackages) + # some outputs of metapost, omegaware are for ptex/uptex + ++ [ "ptex" "uptex" ] + # unavoidable duplicates from core + ++ [ "ctie" "cweb" "omegaware" "texlive_scripts_extra" "tie" "web" ]; + postInstall = common.moveBins; }; diff --git a/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix b/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix index 2e9572f168a5e..c1e98d710b95a 100644 --- a/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix +++ b/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix @@ -118,8 +118,13 @@ let { passthru = commonPassthru // { tlType = "bin"; }; inherit meta; - # shebang interpreters - buildInputs = (args.extraBuildInputs or [ ]) ++ [ bash perl ] ++ (lib.attrVals (args.scriptExts or [ ]) extToInput); + # shebang interpreters and compiled binaries + buildInputs = let outName = builtins.replaceStrings [ "-" ] [ "_" ] pname; in + [ texliveBinaries.core.${outName} or null + texliveBinaries.${pname} or null + texliveBinaries.core-big.${outName} or null ] + ++ (args.extraBuildInputs or [ ]) ++ [ bash perl ] + ++ (lib.attrVals (args.scriptExts or [ ]) extToInput); nativeBuildInputs = extraNativeBuildInputs; # absolute scripts folder scriptsFolder = lib.optionalString (run ? outPath) (run.outPath + "/scripts/" + args.scriptsFolder or pname); @@ -127,8 +132,6 @@ let inherit (args) binfiles; binlinks = builtins.attrNames (args.binlinks or { }); bintargets = builtins.attrValues (args.binlinks or { }); - binfolders = [ (lib.getBin texliveBinaries.core) ] ++ - lib.optional (texliveBinaries ? ${pname}) (lib.getBin texliveBinaries.${pname}); # build scripts patchScripts = ./patch-scripts.sed; makeBinContainers = ./make-bin-containers.sh; diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 96bc6f61e4f0e..60e7043e332d3 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -19,6 +19,7 @@ let withIcu = true; withGraphite2 = true; }; inherit useFixedHashes; + tlpdb = overriddenTlpdb; }; # function for creating a working environment from a set of TL packages @@ -36,7 +37,7 @@ let overriddenTlpdb = let overrides = import ./tlpdb-overrides.nix { inherit - lib bin tlpdb tlpdbxz tl + stdenv lib bin tlpdb tlpdbxz tl installShellFiles coreutils findutils gawk getopt ghostscript_headless gnugrep gnumake gnupg gnused gzip ncurses perl python3 ruby zip; diff --git a/pkgs/tools/typesetting/tex/texlive/make-bin-containers.sh b/pkgs/tools/typesetting/tex/texlive/make-bin-containers.sh index c293970ac7f99..af49ae22e19fb 100644 --- a/pkgs/tools/typesetting/tex/texlive/make-bin-containers.sh +++ b/pkgs/tools/typesetting/tex/texlive/make-bin-containers.sh @@ -20,14 +20,12 @@ for binname in $binfiles ; do output="$out/bin/$binname" - # look for existing binary from bin.core or bin.${pname} - for folder in $binfolders ; do - target="$folder"/bin/"$binname" - if [[ -f "$target" && -x "$target" ]] ; then - ln -s "$(realpath "$target")" "$output" - continue 2 - fi - done + # look for existing binary from bin.* + target="$(PATH="$HOST_PATH" command -v "$binname" || :)" + if [[ -n "$target" && -x "$target" ]] ; then + ln -s "$(realpath "$target")" "$output" + continue + fi # look for scripts # the explicit list of extensions avoid non-scripts such as $binname.cmd, $binname.jar, $binname.pm diff --git a/pkgs/tools/typesetting/tex/texlive/setup-hook.sh b/pkgs/tools/typesetting/tex/texlive/setup-hook.sh deleted file mode 100644 index 5faef7fe5df5e..0000000000000 --- a/pkgs/tools/typesetting/tex/texlive/setup-hook.sh +++ /dev/null @@ -1,7 +0,0 @@ -addTeXMFPath () { - if test -d "$1/share/texmf-nix"; then - export TEXINPUTS="${TEXINPUTS}${TEXINPUTS:+:}$1/share/texmf-nix//:" - fi -} - -addEnvHooks "$targetOffset" addTeXMFPath diff --git a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix index 4d2ce46ed4757..6b974c7214379 100644 --- a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix +++ b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix @@ -1,4 +1,4 @@ -{ lib, tlpdb, bin, tlpdbxz, tl +{ stdenv, lib, tlpdb, bin, tlpdbxz, tl , installShellFiles , coreutils, findutils, gawk, getopt, ghostscript_headless, gnugrep , gnumake, gnupg, gnused, gzip, ncurses, perl, python3, ruby, zip @@ -13,7 +13,9 @@ let # so we remove them from binfiles, and add back the ones texlinks purposefully ignore (e.g. mptopdf) removeFormatLinks = lib.mapAttrs (_: attrs: if (attrs ? formats && attrs ? binfiles) - then let formatLinks = lib.catAttrs "name" (lib.filter (f: f.name != f.engine) attrs.formats); + # TLPDB reports erroneously that various metafont binaries like "mf" are format links to engines + # like "mf-nowin"; core-big provides both binaries and links so we simply skip them here + then let formatLinks = lib.catAttrs "name" (lib.filter (f: f.name != f.engine && ! lib.hasSuffix "-nowin" f.engine) attrs.formats); binNotFormats = lib.subtractLists formatLinks attrs.binfiles; in if binNotFormats != [] then attrs // { binfiles = binNotFormats; } else removeAttrs attrs [ "binfiles" ] else attrs); @@ -104,10 +106,6 @@ in lib.recursiveUpdate orig rec { # remove man texlive-scripts.binfiles = lib.remove "man" orig.texlive-scripts.binfiles; - - # upmendex is "TODO" in bin.nix - uptex.binfiles = lib.remove "upmendex" orig.uptex.binfiles; - # xindy is broken on some platforms unfortunately xindy.binfiles = if bin ? xindy then lib.subtractLists [ "xindy.mem" "xindy.run" ] orig.xindy.binfiles @@ -122,12 +120,6 @@ in lib.recursiveUpdate orig rec { epstopdf.binlinks.repstopdf = "epstopdf"; pdfcrop.binlinks.rpdfcrop = "pdfcrop"; - ptex.binlinks = { - pdvitomp = bin.metapost + "/bin/pdvitomp"; - pmpost = bin.metapost + "/bin/pmpost"; - r-pmpost = bin.metapost + "/bin/r-pmpost"; - }; - texdef.binlinks = { latexdef = "texdef"; }; @@ -143,13 +135,6 @@ in lib.recursiveUpdate orig rec { kpsexpand = "kpsetool"; }; - # metapost binaries are in bin.metapost instead of bin.core - uptex.binlinks = { - r-upmpost = bin.metapost + "/bin/r-upmpost"; - updvitomp = bin.metapost + "/bin/updvitomp"; - upmpost = bin.metapost + "/bin/upmpost"; - }; - #### add PATH dependencies without wrappers # TODO deduplicate this code a2ping.postFixup = '' @@ -340,6 +325,11 @@ in lib.recursiveUpdate orig rec { #### misc + # RISC-V: https://github.com/LuaJIT/LuaJIT/issues/628 + luajittex.binfiles = lib.optionals + (!(stdenv.hostPlatform.isPower && stdenv.hostPlatform.is64bit) && !stdenv.hostPlatform.isRiscV) + orig.luajittex.binfiles; + # tlpdb lists license as "unknown", but the README says lppl13: http://mirrors.ctan.org/language/arabic/arabi-add/README arabi-add.license = [ "lppl13c" ]; @@ -362,7 +352,7 @@ in lib.recursiveUpdate orig rec { mkdir -p support/texdoc touch support/texdoc/NEWS - TEXMFCNF="${bin.core}"/share/texmf-dist/web2c TEXMF="$out" TEXDOCS=. TEXMFVAR=. \ + TEXMFCNF="${lib.head tl.kpathsea.pkgs}/web2c" TEXMF="$out" TEXDOCS=. TEXMFVAR=. \ "${bin.luatex}"/bin/texlua "$out"/scripts/texdoc/texdoc.tlu \ -c texlive_tlpdb=texlive.tlpdb -lM texdoc @@ -372,7 +362,7 @@ in lib.recursiveUpdate orig rec { # install zsh completion postFixup = '' - TEXMFCNF="${bin.core}"/share/texmf-dist/web2c TEXMF="$scriptsFolder/../.." \ + TEXMFCNF="${lib.head tl.kpathsea.pkgs}"/web2c TEXMF="$scriptsFolder/../.." \ texlua "$out"/bin/texdoc --print-completion zsh > "$TMPDIR"/_texdoc substituteInPlace "$TMPDIR"/_texdoc \ --replace 'compdef __texdoc texdoc' '#compdef texdoc' \ diff --git a/pkgs/tools/wayland/wleave/default.nix b/pkgs/tools/wayland/wleave/default.nix new file mode 100644 index 0000000000000..74d1c0b3bc58a --- /dev/null +++ b/pkgs/tools/wayland/wleave/default.nix @@ -0,0 +1,60 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, at-spi2-atk +, pkg-config +, glib +, gtk3 +, gtk-layer-shell +, installShellFiles +, scdoc +}: + +rustPlatform.buildRustPackage rec { + pname = "wleave"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "AMNatty"; + repo = "wleave"; + rev = version; + hash = "sha256-qo9HnaWYsNZH1J8lAyKSwAOyvlCvIsh9maioatjtGkg="; + }; + + cargoHash = "sha256-6Gppf1upWoMi+gcRSeQ1txSglAaBbpOXKs2LoJhslPQ="; + + nativeBuildInputs = [ + pkg-config + installShellFiles + scdoc + ]; + + buildInputs = [ + at-spi2-atk + gtk3 + gtk-layer-shell + glib + ]; + + postInstall = '' + for f in man/*.scd; do + local page="man/$(basename "$f" .scd)" + scdoc < "$f" > "$page" + installManPage "$page" + done + + installShellCompletion --cmd wleave \ + --bash <(cat completions/wleave.bash) \ + --fish <(cat completions/wleave.fish) \ + --zsh <(cat completions/_wleave) + ''; + + meta = with lib; { + description = "A Wayland-native logout script written in GTK3"; + homepage = "https://github.com/AMNatty/wleave"; + license = licenses.mit; + mainProgram = "wleave"; + maintainers = with maintainers; [ ludovicopiero ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 917ae0baa3d4c..cfba8304fb891 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4798,6 +4798,8 @@ with pkgs; wl-screenrec = callPackage ../tools/wayland/wl-screenrec { }; + wleave = callPackage ../tools/wayland/wleave { }; + wlogout = callPackage ../tools/wayland/wlogout { }; wlopm = callPackage ../tools/wayland/wlopm { }; @@ -34382,6 +34384,8 @@ with pkgs; yambar = callPackage ../applications/misc/yambar { }; + yambar-hyprland-wses = callPackage ../applications/misc/yambar-hyprland-wses { }; + polyphone = libsForQt5.callPackage ../applications/audio/polyphone { }; portfolio = callPackage ../applications/office/portfolio { |