diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/misc')
20 files changed, 1129 insertions, 99 deletions
diff --git a/nixpkgs/pkgs/applications/misc/1password/default.nix b/nixpkgs/pkgs/applications/misc/1password/default.nix index 82eb6fce2549..d4dddd861f29 100644 --- a/nixpkgs/pkgs/applications/misc/1password/default.nix +++ b/nixpkgs/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.20.0"; + version = "2.21.0"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-D9cPNtHiofY/Fb2EO+AGexRSqY+AidZm0D9+9W9dCUY=" "zip"; - i686-linux = fetch "linux_386" "sha256-sY8kI4InFGZIFoz5rfvNMxA9C4u6Qcg3vNTsoY7X6OY=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-TkfEh75k3KzvvInPAsYDhS2OIKQpBOCaT6qRIld+wQ8=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-kytAXelvvP+SBaniHlo9JTK1LLRrefgLuWPhC8sC7U8=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-pXGBlduNOvxpPMd/BObHVXXGQ0ZTlIkqZ3jYyoGXnqA=" "zip"; + i686-linux = fetch "linux_386" "sha256-iePA4nzwBtAlYWybmQdV7Zvvnv+jPqrndB4aabf/JMM=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-wevv0KYe01ZL70zL4BNti/oCcAzNJ3EO97QIU1BYQRE=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-AViR53q1/jZtzpFZ7FaBwoZAGuXsGHfULEIuIrTqgSs=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; diff --git a/nixpkgs/pkgs/applications/misc/OSCAR/default.nix b/nixpkgs/pkgs/applications/misc/OSCAR/default.nix index 3d8ea9119544..fee0c79cd5d9 100644 --- a/nixpkgs/pkgs/applications/misc/OSCAR/default.nix +++ b/nixpkgs/pkgs/applications/misc/OSCAR/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, mkDerivation, fetchFromGitLab, qmake, qtbase, qttools, qtserialport, libGLU }: mkDerivation rec { pname = "OSCAR"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitLab { owner = "pholy"; repo = "OSCAR-code"; rev = "v${version}"; - sha256 = "sha256-bgETkpyL0yhCD1FfTVN0s9RNOPkDp88W/1Gdxvu+Ons="; + sha256 = "sha256-eaj2/ioh9dXxWv7X/IZv7m/oVcU6t7r+mK5YrrViF2w="; }; buildInputs = [ qtbase qttools qtserialport libGLU ]; diff --git a/nixpkgs/pkgs/applications/misc/authy/default.nix b/nixpkgs/pkgs/applications/misc/authy/default.nix index 199e89dc0ba5..95a439b67539 100644 --- a/nixpkgs/pkgs/applications/misc/authy/default.nix +++ b/nixpkgs/pkgs/applications/misc/authy/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { pname = "authy"; # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/authy?channel=stable' | jq '.download_url,.version' - version = "2.3.0"; - rev = "19"; + version = "2.4.1"; + rev = "21"; src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_${rev}.snap"; - hash = "sha256-WN/vcY3kfF/HQZ7opyIdDevU5oDYDGjshS7XVU7yrj8="; + hash = "sha256-a5z6Lwdgody88f7has/f2AMg9m9fGWsJSexZM6KUGOY="; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper squashfsTools ]; diff --git a/nixpkgs/pkgs/applications/misc/calibre/default.nix b/nixpkgs/pkgs/applications/misc/calibre/default.nix index ea04a7ea56a1..21c5d7d1c33a 100644 --- a/nixpkgs/pkgs/applications/misc/calibre/default.nix +++ b/nixpkgs/pkgs/applications/misc/calibre/default.nix @@ -32,25 +32,24 @@ stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "6.25.0"; + version = "6.26.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-4ghB2RUImh8AsMGsBCsVeKXgyV+llCLNy24/2LNJwv0="; + hash = "sha256-7UUnDtTRf162xKMUuZoKh+y47oeUtrOsFHUTAvtOryM="; }; - # https://sources.debian.org/patches/calibre/${finalAttrs.version}+dfsg-1 patches = [ # allow for plugin update check, but no calibre version check (fetchpatch { name = "0001-only-plugin-update.patch"; - url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}-1/debian/patches/0001-only-plugin-update.patch"; + url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/0001-only-plugin-update.patch"; hash = "sha256-uL1mSjgCl5ZRLbSuKxJM6XTfvVwog70F7vgKtQzQNEQ="; }) (fetchpatch { name = "0007-Hardening-Qt-code.patch"; - url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}-1/debian/patches/hardening/0007-Hardening-Qt-code.patch"; - hash = "sha256-WBm0dWDXoPT6alEdK5dVMrVTOxG7Z8bq1s0iO2HTy/Q="; + url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/hardening/0007-Hardening-Qt-code.patch"; + hash = "sha256-2V8H6ElvzS5yw1di+XZvMssuokUT5zP3aTzpDpMsMac="; }) ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; diff --git a/nixpkgs/pkgs/applications/misc/camunda-modeler/default.nix b/nixpkgs/pkgs/applications/misc/camunda-modeler/default.nix new file mode 100644 index 000000000000..e42f022df7f2 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/camunda-modeler/default.nix @@ -0,0 +1,71 @@ +{ stdenvNoCC +, lib +, fetchurl +, electron +, makeWrapper +, makeDesktopItem +, copyDesktopItems +}: + +stdenvNoCC.mkDerivation rec { + pname = "camunda-modeler"; + version = "5.13.0"; + + src = fetchurl { + url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz"; + hash = "sha256-/9Af/1ZP2Hkc0PP9yXObNDNmxe6riBNWSv+JaM7O5Vs="; + }; + sourceRoot = "camunda-modeler-${version}-linux-x64"; + + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ + makeWrapper + copyDesktopItems + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/${pname} + cp -a {locales,resources} $out/share/${pname} + install -Dm644 support/mime-types.xml $out/share/mime/packages/${pname}.xml + + for SIZE in 16 48 128; do + install -D -m0644 support/icon_''${SIZE}.png "$out/share/icons/hicolor/''${SIZE}x''${SIZE}/apps/${pname}.png" + done + + runHook postInstall + ''; + + postFixup = '' + makeWrapper ${electron}/bin/electron $out/bin/${pname} \ + --add-flags $out/share/${pname}/resources/app.asar + ''; + + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = pname; + desktopName = "Camunda Modeler"; + icon = pname; + keywords = [ "bpmn" "cmmn" "dmn" "form" "modeler" "camunda"]; + genericName = "Process Modeling Tool"; + comment = meta.description; + mimeTypes = [ "application/bpmn" "application/cmmn" "application/dmn" "application/camunda-form" ]; + extraConfig = { + X-Ayatana-Desktop-Shortcuts = "NewWindow;RepositoryBrowser"; + }; + }) + ]; + + meta = with lib; { + homepage = "https://github.com/camunda/camunda-modeler"; + description = "An integrated modeling solution for BPMN, DMN and Forms based on bpmn.io"; + maintainers = with maintainers; [ n0emis ]; + license = licenses.mit; + inherit (electron.meta) platforms; + }; +} + diff --git a/nixpkgs/pkgs/applications/misc/ghosttohugo/default.nix b/nixpkgs/pkgs/applications/misc/ghosttohugo/default.nix new file mode 100644 index 000000000000..29091a8447c2 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/ghosttohugo/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "ghosttohugo"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "jbarone"; + repo = "ghostToHugo"; + rev = "v${version}"; + hash = "sha256-lYqjwLPvSX9/HaFvSwtkvxbCToTwfDPeVivNfazZwQA="; + }; + + vendorHash = "sha256-/7MsVLVek2nQwf8rVJQywBKiIOCGe72L45CkAElXrMo="; + + meta = with lib; { + description = "Convert Ghost export to Hugo posts"; + homepage = "https://github.com/jbarone/ghostToHugo"; + license = licenses.mit; + maintainers = with maintainers; [ clerie ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/gnome-frog/default.nix b/nixpkgs/pkgs/applications/misc/gnome-frog/default.nix index de12d9751287..6570ea796853 100644 --- a/nixpkgs/pkgs/applications/misc/gnome-frog/default.nix +++ b/nixpkgs/pkgs/applications/misc/gnome-frog/default.nix @@ -11,6 +11,8 @@ , desktop-file-utils , glib , gobject-introspection +, blueprint-compiler +, libxml2 , libnotify , libadwaita , libportal @@ -18,17 +20,18 @@ , librsvg , tesseract5 , zbar +, gst_all_1 }: python3Packages.buildPythonApplication rec { pname = "gnome-frog"; - version = "1.3.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "TenderOwl"; repo = "Frog"; rev = "refs/tags/${version}"; - sha256 = "sha256-ErDHrdD9UZxOIGwgN5eakY6vhNvE6D9SoRYXZhzmYX4="; + sha256 = "sha256-w/ENUhJt7bYy5htBLolb/HysK8/scRaPQX5qEezQcXY="; }; format = "other"; @@ -52,6 +55,8 @@ python3Packages.buildPythonApplication rec { glib wrapGAppsHook4 gobject-introspection + blueprint-compiler + libxml2 ]; buildInputs = [ @@ -61,6 +66,7 @@ python3Packages.buildPythonApplication rec { libportal zbar tesseract5 + gst_all_1.gstreamer ]; propagatedBuildInputs = with python3Packages; [ @@ -68,6 +74,7 @@ python3Packages.buildPythonApplication rec { pillow pytesseract pyzbar + gtts ]; # This is to prevent double-wrapping the package. We'll let @@ -83,6 +90,7 @@ python3Packages.buildPythonApplication rec { description = "Intuitive text extraction tool (OCR) for GNOME desktop"; license = licenses.mit; + mainProgram = "frog"; maintainers = with maintainers; [ foo-dogsquared ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/applications/misc/kuro/default.nix b/nixpkgs/pkgs/applications/misc/kuro/default.nix index 26c8d6bbf11b..50a773b5c518 100644 --- a/nixpkgs/pkgs/applications/misc/kuro/default.nix +++ b/nixpkgs/pkgs/applications/misc/kuro/default.nix @@ -38,7 +38,7 @@ mkYarnPackage rec { yarn --offline run electron-builder \ --dir \ - -c.electronDist=${electron}/lib/electron \ + -c.electronDist=${electron}/libexec/electron \ -c.electronVersion=${electron.version} popd diff --git a/nixpkgs/pkgs/applications/misc/mission-center/Cargo.lock b/nixpkgs/pkgs/applications/misc/mission-center/Cargo.lock index 943ee09302dc..825c48cb4808 100644 --- a/nixpkgs/pkgs/applications/misc/mission-center/Cargo.lock +++ b/nixpkgs/pkgs/applications/misc/mission-center/Cargo.lock @@ -178,11 +178,11 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "cairo-rs" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3603c4028a5e368d09b51c8b624b9a46edcd7c3778284077a6125af73c9f0a" +checksum = "d859b656775a6b1dd078d3e5924884e6ea88aa649a7fdde03d5b2ec56ffcc10b" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.3.3", "cairo-sys-rs", "glib", "libc 0.2.147", @@ -192,9 +192,9 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "691d0c66b1fb4881be80a760cb8fe76ea97218312f9dfe2c9cc0f496ca279cb1" +checksum = "bd4d115132e01c0165e3bf5f56aedee8980b0b96ede4eb000b693c05a8adb8ff" dependencies = [ "glib-sys", "libc 0.2.147", @@ -634,11 +634,10 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "695d6bc846438c5708b07007537b9274d883373dd30858ca881d7d71b5540717" +checksum = "bbc9c2ed73a81d556b65d08879ba4ee58808a6b1927ce915262185d6d547c6f3" dependencies = [ - "bitflags 1.3.2", "gdk-pixbuf-sys", "gio", "glib", @@ -648,9 +647,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9285ec3c113c66d7d0ab5676599176f1f42f4944ca1b581852215bf5694870cb" +checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" dependencies = [ "gio-sys", "glib-sys", @@ -661,11 +660,10 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3abf96408a26e3eddf881a7f893a1e111767137136e347745e8ea6ed12731ff" +checksum = "6982d9815ed6ac95b0467b189e81f29dea26d08a732926ec113e65744ed3f96c" dependencies = [ - "bitflags 1.3.2", "cairo-rs", "gdk-pixbuf", "gdk4-sys", @@ -677,9 +675,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc92aa1608c089c49393d014c38ac0390d01e4841e1fedaa75dbcef77aaed64" +checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -735,11 +733,10 @@ dependencies = [ [[package]] name = "gio" -version = "0.17.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6973e92937cf98689b6a054a9e56c657ed4ff76de925e36fc331a15f0c5d30a" +checksum = "7884cba6b1c5db1607d970cadf44b14a43913d42bc68766eea6a5e2fe0891524" dependencies = [ - "bitflags 1.3.2", "futures-channel", "futures-core", "futures-io", @@ -755,9 +752,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.17.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ccf87c30a12c469b6d958950f6a9c09f2be20b7773f7e70d20b867fdf2628c3" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" dependencies = [ "glib-sys", "gobject-sys", @@ -788,11 +785,11 @@ dependencies = [ [[package]] name = "glib" -version = "0.17.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fad45ba8d4d2cea612b432717e834f48031cd8853c8aaf43b2c79fec8d144b" +checksum = "331156127e8166dd815cf8d2db3a5beb492610c716c03ee6db4f2d07092af0a7" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.3.3", "futures-channel", "futures-core", "futures-executor", @@ -811,24 +808,23 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca5c79337338391f1ab8058d6698125034ce8ef31b72a442437fa6c8580de26" +checksum = "179643c50bf28d20d2f6eacd2531a88f2f5d9747dd0b86b8af1e8bb5dd0de3c0" dependencies = [ - "anyhow", "heck", "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.23", ] [[package]] name = "glib-sys" -version = "0.17.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d80aa6ea7bba0baac79222204aa786a6293078c210abe69ef1336911d4bdc4f0" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" dependencies = [ "libc 0.2.147", "system-deps", @@ -836,9 +832,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd34c3317740a6358ec04572c1bcfd3ac0b5b6529275fae255b237b314bb8062" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" dependencies = [ "glib-sys", "libc 0.2.147", @@ -847,9 +843,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.17.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "def4bb01265b59ed548b05455040d272d989b3012c42d4c1bbd39083cb9b40d9" +checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401" dependencies = [ "glib", "graphene-sys", @@ -858,9 +854,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.17.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1856fc817e6a6675e36cea0bd9a3afe296f5d9709d1e2d3182803ac77f0ab21d" +checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59" dependencies = [ "glib-sys", "libc 0.2.147", @@ -870,11 +866,10 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f01ef44fa7cac15e2da9978529383e6bee03e570ba5bf7036b4c10a15cc3a3c" +checksum = "cc25855255120f294d874acd6eaf4fbed7ce1cdc550e2d8415ea57fafbe816d5" dependencies = [ - "bitflags 1.3.2", "cairo-rs", "gdk4", "glib", @@ -886,9 +881,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07a84fb4dcf1323d29435aa85e2f5f58bef564342bef06775ec7bd0da1f01b0" +checksum = "e1ecf3a63bf1223d68f80f72cc896c4d8c80482fbce1c9a12c66d3de7290ee46" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -902,11 +897,10 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.6.6" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b28a32a04cd75cef14a0983f8b0c669e0fe152a0a7725accdeb594e2c764c88b" +checksum = "a3b095b26f2a2df70be1805d3590eeb9d7a05ecb5be9649b82defc72dc56228c" dependencies = [ - "bitflags 1.3.2", "cairo-rs", "field-offset", "futures-channel", @@ -919,15 +913,14 @@ dependencies = [ "gtk4-macros", "gtk4-sys", "libc 0.2.147", - "once_cell", "pango", ] [[package]] name = "gtk4-macros" -version = "0.6.6" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a4d6b61570f76d3ee542d984da443b1cd69b6105264c61afec3abed08c2500f" +checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f" dependencies = [ "anyhow", "proc-macro-crate", @@ -939,9 +932,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f8283f707b07e019e76c7f2934bdd4180c277e08aa93f4c0d8dd07b7a34e22f" +checksum = "7b0bdde87c50317b4f355bcbb4a9c2c414ece1b7c824fb4ad4ba8f3bdb2c6603" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1122,11 +1115,10 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libadwaita" -version = "0.4.4" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab9c0843f9f23ff25634df2743690c3a1faffe0a190e60c490878517eb81abf" +checksum = "06444f4ca05a60693da6e9e2b591bd40a298e65a118a8d5e830771718b3e0253" dependencies = [ - "bitflags 1.3.2", "gdk-pixbuf", "gdk4", "gio", @@ -1139,9 +1131,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.4.4" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4231cb2499a9f0c4cdfa4885414b33e39901ddcac61150bc0bb4ff8a57ede404" +checksum = "021cfe3d1fcfa82411765a791f7e9b32f35dd98ce88d2e3fa10e7320f5cc8ce7" dependencies = [ "gdk4-sys", "gio-sys", @@ -1281,7 +1273,7 @@ dependencies = [ [[package]] name = "missioncenter" -version = "0.3.1" +version = "0.3.2" dependencies = [ "arrayvec 0.7.4", "drm", @@ -1438,11 +1430,10 @@ dependencies = [ [[package]] name = "pango" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35be456fc620e61f62dff7ff70fbd54dcbaf0a4b920c0f16de1107c47d921d48" +checksum = "06a9e54b831d033206160096b825f2070cf5fda7e35167b1c01e9e774f9202d1" dependencies = [ - "bitflags 1.3.2", "gio", "glib", "libc 0.2.147", @@ -1452,9 +1443,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3da69f9f3850b0d8990d462f8c709561975e95f689c1cdf0fecdebde78b35195" +checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" dependencies = [ "glib-sys", "gobject-sys", diff --git a/nixpkgs/pkgs/applications/misc/mission-center/default.nix b/nixpkgs/pkgs/applications/misc/mission-center/default.nix index 87acab7b3df1..71055e694668 100644 --- a/nixpkgs/pkgs/applications/misc/mission-center/default.nix +++ b/nixpkgs/pkgs/applications/misc/mission-center/default.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation rec { pname = "mission-center"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitLab { owner = "mission-center-devs"; repo = "mission-center"; rev = "v${version}"; - hash = "sha256-fiUF1mvbnguySy2ZXTi4Z61t35FO6fljqm21dMGwQMI="; + hash = "sha256-KuaVivW/i+1Pw6ShpvBYbwPMUHsEJ7FR80is0DBMbXM="; }; cargoDeps = symlinkJoin { diff --git a/nixpkgs/pkgs/applications/misc/mission-center/gatherer-Cargo.lock b/nixpkgs/pkgs/applications/misc/mission-center/gatherer-Cargo.lock index ba0385a515be..cc5dd212ca3e 100644 --- a/nixpkgs/pkgs/applications/misc/mission-center/gatherer-Cargo.lock +++ b/nixpkgs/pkgs/applications/misc/mission-center/gatherer-Cargo.lock @@ -59,6 +59,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + +[[package]] name = "blocking" version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -178,7 +184,7 @@ dependencies = [ [[package]] name = "gatherer" -version = "0.3.1" +version = "0.3.2" dependencies = [ "anyhow", "arrayvec", @@ -186,7 +192,9 @@ dependencies = [ "lazy_static", "libc", "num_cpus", + "raw-cpuid", "rust-ini", + "rustbus", "shared_memory_extended", "thiserror", ] @@ -284,14 +292,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] name = "nix" version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", + "memoffset", + "pin-utils", "static_assertions", ] @@ -334,6 +353,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" [[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -394,6 +419,15 @@ dependencies = [ ] [[package]] +name = "raw-cpuid" +version = "11.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d86a7c4638d42c44551f4791a20e687dbb4c3de1f33c43dd71e355cd429def1" +dependencies = [ + "bitflags 2.4.0", +] + +[[package]] name = "rust-ini" version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -404,6 +438,28 @@ dependencies = [ ] [[package]] +name = "rustbus" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "208e43f29ba67bb31fc726854383be3c358e48df918a0d2d2a7efb710ea3575b" +dependencies = [ + "nix", + "rustbus_derive", + "thiserror", +] + +[[package]] +name = "rustbus_derive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dcb6a55a8a297bb62066b114624aac082ac1a330d90a0d5b336645208e29ae2" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -454,6 +510,17 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" version = "2.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" @@ -480,7 +547,7 @@ checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.27", ] [[package]] diff --git a/nixpkgs/pkgs/applications/misc/nwg-look/default.nix b/nixpkgs/pkgs/applications/misc/nwg-look/default.nix new file mode 100644 index 000000000000..864e94d4e07f --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/nwg-look/default.nix @@ -0,0 +1,72 @@ +{ lib +, stdenv +, fetchFromGitHub +, substituteAll +, buildGoModule +, go +, glib +, pkg-config +, cairo +, gtk3 +, xcur2png +, libX11 +, zlib +}: + +buildGoModule rec { + pname = "nwg-look"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "nwg-piotr"; + repo = "nwg-look"; + rev = "v${version}"; + hash = "sha256-wUI58qYkVYgES87HQ4octciDlOJ10oJldbUkFgxRUd4="; + }; + + vendorHash = "sha256-dev+TV6FITd29EfknwHDNI0gLao7gsC95Mg+3qQs93E="; + + # Replace /usr/ directories with the packages output location + # This means it references the correct path + patches = [ ./fix-paths.patch ]; + + postPatch = '' + substituteInPlace main.go tools.go --replace '@out@' $out + ''; + + ldflags = [ "-s" "-w" ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + cairo + xcur2png + libX11.dev + zlib + gtk3 + ]; + + CGO_ENABLED = 1; + + postInstall = '' + mkdir -p $out/share + mkdir -p $out/share/nwg-look/langs + mkdir -p $out/share/applications + mkdir -p $out/share/pixmaps + cp stuff/main.glade $out/share/nwg-look/ + cp langs/* $out/share/nwg-look/langs + cp stuff/nwg-look.desktop $out/share/applications + cp stuff/nwg-look.svg $out/share/pixmaps + ''; + + meta = with lib; { + homepage = "https://github.com/nwg-piotr/nwg-look"; + description = "Nwg-look is a GTK3 settings editor, designed to work properly in wlroots-based Wayland environment."; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ max-amb ]; + mainProgram = "nwg-look"; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/nwg-look/fix-paths.patch b/nixpkgs/pkgs/applications/misc/nwg-look/fix-paths.patch new file mode 100644 index 000000000000..3b56e0052213 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/nwg-look/fix-paths.patch @@ -0,0 +1,35 @@ +diff --git a/main.go b/main.go +index 23c4756..c52e9c3 100644 +--- a/main.go ++++ b/main.go +@@ -335,7 +335,7 @@ func main() { + + gtkSettings, _ = gtk.SettingsGetDefault() + +- builder, _ := gtk.BuilderNewFromFile("/usr/share/nwg-look/main.glade") ++ builder, _ := gtk.BuilderNewFromFile("@out@/share/nwg-look/main.glade") + win, _ := getWindow(builder, "window") + + win.Connect("destroy", func() { +diff --git a/tools.go b/tools.go +index e6e7665..59d6f35 100644 +--- a/tools.go ++++ b/tools.go +@@ -1034,7 +1034,7 @@ func getDataDirs() []string { + if os.Getenv("XDG_DATA_DIRS") != "" { + xdgDataDirs = os.Getenv("XDG_DATA_DIRS") + } else { +- xdgDataDirs = "/usr/local/share/:/usr/share/" ++ xdgDataDirs = "@out@/local/share/:@out@/share/" + } + + for _, d := range strings.Split(xdgDataDirs, ":") { +@@ -1280,7 +1280,7 @@ func detectLang() string { + } + + func loadVocabulary(lang string) map[string]string { +- langsDir := "/usr/share/nwg-look/langs/" ++ langsDir := "@out@/share/nwg-look/langs/" + enUSFile := filepath.Join(langsDir, "en_US.json") + if pathExists(enUSFile) { + log.Infof(">>> Loading basic lang from '%s'", enUSFile) diff --git a/nixpkgs/pkgs/applications/misc/nwg-look/go.mod b/nixpkgs/pkgs/applications/misc/nwg-look/go.mod new file mode 100644 index 000000000000..0446058e56c2 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/nwg-look/go.mod @@ -0,0 +1,10 @@ +module github.com/nwg-piotr/nwg-look + +go 1.20 + +require ( + github.com/gotk3/gotk3 v0.6.2 + github.com/sirupsen/logrus v1.9.3 +) + +require golang.org/x/sys v0.6.0 // indirect diff --git a/nixpkgs/pkgs/applications/misc/organicmaps/default.nix b/nixpkgs/pkgs/applications/misc/organicmaps/default.nix index f0d4a10dd6d5..e5bd2f46aba5 100644 --- a/nixpkgs/pkgs/applications/misc/organicmaps/default.nix +++ b/nixpkgs/pkgs/applications/misc/organicmaps/default.nix @@ -87,7 +87,7 @@ in stdenv.mkDerivation rec { meta = with lib; { # darwin: "invalid application of 'sizeof' to a function type" - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = stdenv.isDarwin; homepage = "https://organicmaps.app/"; description = "Detailed Offline Maps for Travellers, Tourists, Hikers and Cyclists"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/applications/misc/pot/Cargo.lock b/nixpkgs/pkgs/applications/misc/pot/Cargo.lock index 4e67e8bbfe1b..9e2076047a94 100644 --- a/nixpkgs/pkgs/applications/misc/pot/Cargo.lock +++ b/nixpkgs/pkgs/applications/misc/pot/Cargo.lock @@ -66,6 +66,12 @@ dependencies = [ ] [[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] name = "android-tzdata" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -258,6 +264,15 @@ dependencies = [ ] [[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + +[[package]] name = "atomic-waker" version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -330,6 +345,9 @@ name = "bitflags" version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +dependencies = [ + "serde", +] [[package]] name = "block" @@ -680,6 +698,12 @@ dependencies = [ ] [[package]] +name = "const-oid" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" + +[[package]] name = "const-random" version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -776,6 +800,21 @@ dependencies = [ ] [[package]] +name = "crc" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" + +[[package]] name = "crc32fast" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -819,6 +858,16 @@ 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" @@ -927,6 +976,17 @@ dependencies = [ ] [[package]] +name = "der" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] name = "deranged" version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -977,6 +1037,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", + "const-oid", "crypto-common", "subtle", ] @@ -1077,6 +1138,12 @@ dependencies = [ ] [[package]] +name = "dotenvy" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" + +[[package]] name = "downcast-rs" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1108,6 +1175,9 @@ name = "either" version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +dependencies = [ + "serde", +] [[package]] name = "embed-resource" @@ -1139,14 +1209,15 @@ dependencies = [ [[package]] name = "enigo" -version = "0.1.2" -source = "git+https://github.com/enigo-rs/enigo?rev=c53be78#c53be78a4cdbd2d19ccda59f990050d8591bb969" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "802e4b2ae123615659085369b453cba87c5562e46ed8050a909fee18a9bc3157" dependencies = [ - "core-graphics 0.22.3", + "core-graphics 0.23.1", "libc", "objc", "pkg-config", - "windows 0.48.0", + "windows 0.51.1", ] [[package]] @@ -1208,6 +1279,17 @@ dependencies = [ ] [[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] + +[[package]] name = "event-listener" version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1285,6 +1367,12 @@ dependencies = [ ] [[package]] +name = "finl_unicode" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" + +[[package]] name = "fixedbitset" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1310,7 +1398,7 @@ dependencies = [ "futures-sink", "nanorand", "pin-project", - "spin", + "spin 0.9.8", ] [[package]] @@ -1406,6 +1494,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", + "futures-sink", ] [[package]] @@ -1426,6 +1515,17 @@ dependencies = [ ] [[package]] +name = "futures-intrusive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot", +] + +[[package]] name = "futures-io" version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1853,6 +1953,19 @@ name = "hashbrown" version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "hashlink" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +dependencies = [ + "hashbrown 0.14.0", +] [[package]] name = "heck" @@ -1868,6 +1981,9 @@ name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +dependencies = [ + "unicode-segmentation", +] [[package]] name = "hermit-abi" @@ -1882,6 +1998,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] +name = "hkdf" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +dependencies = [ + "hmac", +] + +[[package]] name = "hmac" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1891,6 +2016,15 @@ dependencies = [ ] [[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] name = "html5ever" version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2181,6 +2315,15 @@ dependencies = [ ] [[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] name = "itoa" version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2311,6 +2454,9 @@ name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +dependencies = [ + "spin 0.5.2", +] [[package]] name = "lebe" @@ -2388,6 +2534,23 @@ dependencies = [ ] [[package]] +name = "libm" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" + +[[package]] +name = "libsqlite3-sys" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] name = "line-wrap" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2407,7 +2570,7 @@ dependencies = [ "compact_str", "fraction", "include_dir", - "itertools", + "itertools 0.10.5", "lingua-arabic-language-model", "lingua-chinese-language-model", "lingua-english-language-model", @@ -2993,6 +3156,23 @@ dependencies = [ ] [[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand 0.8.5", + "smallvec", + "zeroize", +] + +[[package]] name = "num-complex" version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3041,6 +3221,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -3300,6 +3481,12 @@ dependencies = [ ] [[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] name = "pathdiff" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3318,6 +3505,15 @@ dependencies = [ ] [[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + +[[package]] name = "percent-encoding" version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3464,6 +3660,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + +[[package]] name = "pkg-config" version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3537,6 +3754,7 @@ dependencies = [ "tauri-plugin-fs-watch", "tauri-plugin-log", "tauri-plugin-single-instance", + "tauri-plugin-sql", "tauri-plugin-store", "thiserror", "tiny_http", @@ -3918,6 +4136,43 @@ dependencies = [ ] [[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin 0.5.2", + "untrusted", + "web-sys", + "winapi", +] + +[[package]] +name = "rsa" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8" +dependencies = [ + "byteorder", + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-iter", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core 0.6.4", + "signature", + "spki", + "subtle", + "zeroize", +] + +[[package]] name = "rustc-demangle" version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3960,6 +4215,36 @@ dependencies = [ ] [[package]] +name = "rustls" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +dependencies = [ + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +dependencies = [ + "base64 0.21.3", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] name = "rustversion" version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4026,6 +4311,16 @@ dependencies = [ ] [[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] name = "security-framework" version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4050,8 +4345,9 @@ dependencies = [ [[package]] name = "selection" -version = "0.1.0" -source = "git+https://github.com/pot-app/Selection#8b44b68fbfe614aff190610ec03d52b6f3b57f19" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09de39c8f10d37a7b9c2a9cb224dbe4535525cbe17ccf37c21419123ab54a197" dependencies = [ "arboard", "enigo", @@ -4297,6 +4593,16 @@ dependencies = [ ] [[package]] +name = "signature" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +dependencies = [ + "digest", + "rand_core 0.6.4", +] + +[[package]] name = "simd-adler32" version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4373,6 +4679,12 @@ dependencies = [ [[package]] name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" @@ -4381,6 +4693,229 @@ dependencies = [ ] [[package]] +name = "spki" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "sqlformat" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b7b278788e7be4d0d29c0f39497a0eef3fba6bbc8e70d8bf7fde46edeaa9e85" +dependencies = [ + "itertools 0.11.0", + "nom", + "unicode_categories", +] + +[[package]] +name = "sqlx" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e58421b6bc416714d5115a2ca953718f6c621a51b68e4f4922aea5a4391a721" +dependencies = [ + "sqlx-core", + "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", +] + +[[package]] +name = "sqlx-core" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd4cef4251aabbae751a3710927945901ee1d97ee96d757f6880ebb9a79bfd53" +dependencies = [ + "ahash", + "atoi", + "byteorder", + "bytes", + "crc", + "crossbeam-queue", + "dotenvy", + "either", + "event-listener", + "futures-channel", + "futures-core", + "futures-intrusive", + "futures-io", + "futures-util", + "hashlink", + "hex", + "indexmap 2.0.0", + "log", + "memchr", + "once_cell", + "paste", + "percent-encoding", + "rustls", + "rustls-pemfile", + "serde", + "serde_json", + "sha2", + "smallvec", + "sqlformat", + "thiserror", + "time 0.3.28", + "tokio", + "tokio-stream", + "tracing", + "url", + "webpki-roots", +] + +[[package]] +name = "sqlx-macros" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "208e3165167afd7f3881b16c1ef3f2af69fa75980897aac8874a0696516d12c2" +dependencies = [ + "proc-macro2", + "quote", + "sqlx-core", + "sqlx-macros-core", + "syn 1.0.109", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a4a8336d278c62231d87f24e8a7a74898156e34c1c18942857be2acb29c7dfc" +dependencies = [ + "dotenvy", + "either", + "heck 0.4.1", + "hex", + "once_cell", + "proc-macro2", + "quote", + "serde", + "serde_json", + "sha2", + "sqlx-core", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", + "syn 1.0.109", + "tempfile", + "tokio", + "url", +] + +[[package]] +name = "sqlx-mysql" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ca69bf415b93b60b80dc8fda3cb4ef52b2336614d8da2de5456cc942a110482" +dependencies = [ + "atoi", + "base64 0.21.3", + "bitflags 2.4.0", + "byteorder", + "bytes", + "crc", + "digest", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array", + "hex", + "hkdf", + "hmac", + "itoa 1.0.9", + "log", + "md-5", + "memchr", + "once_cell", + "percent-encoding", + "rand 0.8.5", + "rsa", + "serde", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "time 0.3.28", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-postgres" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0db2df1b8731c3651e204629dd55e52adbae0462fa1bdcbed56a2302c18181e" +dependencies = [ + "atoi", + "base64 0.21.3", + "bitflags 2.4.0", + "byteorder", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "hex", + "hkdf", + "hmac", + "home", + "itoa 1.0.9", + "log", + "md-5", + "memchr", + "once_cell", + "rand 0.8.5", + "serde", + "serde_json", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "time 0.3.28", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4c21bf34c7cae5b283efb3ac1bcc7670df7561124dc2f8bdc0b59be40f79a2" +dependencies = [ + "atoi", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "sqlx-core", + "time 0.3.28", + "tracing", + "url", +] + +[[package]] name = "stable_deref_trait" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4434,6 +4969,17 @@ dependencies = [ ] [[package]] +name = "stringprep" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" +dependencies = [ + "finl_unicode", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] name = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4775,6 +5321,22 @@ dependencies = [ ] [[package]] +name = "tauri-plugin-sql" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a" +dependencies = [ + "futures-core", + "log", + "serde", + "serde_json", + "sqlx", + "tauri", + "thiserror", + "time 0.3.28", + "tokio", +] + +[[package]] name = "tauri-plugin-store" version = "0.0.0" source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a" @@ -5051,6 +5613,17 @@ dependencies = [ ] [[package]] +name = "tokio-stream" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] name = "tokio-util" version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5120,6 +5693,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -5257,6 +5831,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] +name = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] name = "url" version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5584,6 +6170,15 @@ dependencies = [ ] [[package]] +name = "webpki-roots" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" +dependencies = [ + "rustls-webpki", +] + +[[package]] name = "webview2-com" version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5628,6 +6223,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" [[package]] +name = "whoami" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" + +[[package]] name = "widestring" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5743,6 +6344,16 @@ dependencies = [ ] [[package]] +name = "windows" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +dependencies = [ + "windows-core", + "windows-targets 0.48.5", +] + +[[package]] name = "windows-bindgen" version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5753,6 +6364,15 @@ dependencies = [ ] [[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] name = "windows-implement" version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6230,6 +6850,12 @@ dependencies = [ ] [[package]] +name = "zeroize" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" + +[[package]] name = "zip" version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/nixpkgs/pkgs/applications/misc/pot/default.nix b/nixpkgs/pkgs/applications/misc/pot/default.nix index 8866596cf7a9..a2b1971b369e 100644 --- a/nixpkgs/pkgs/applications/misc/pot/default.nix +++ b/nixpkgs/pkgs/applications/misc/pot/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "pot"; - version = "2.0.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "pot-app"; repo = "pot-desktop"; rev = version; - hash = "sha256-VgEDV7bD5EfT5ZG7wuj5Ch3mfZ6x8a8473AvX96C64Q="; + hash = "sha256-PvbqPGT8BTHEufYp+TUSd0tTSBnTBDIYHxaeI7FEVDE="; }; sourceRoot = "${src.name}/src-tauri"; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashMode = "recursive"; - outputHash = "sha256-+/GDP3IFCidIs2/ZqQX7pZmZNQrCHNT6uy+x1CKkCmI="; + outputHash = "sha256-iHFzv8dMC0TT6PtMJmL0EufZ8TnbyjmsoBH3Z8U48D0="; }; cargoDeps = rustPlatform.importCargoLock { @@ -74,8 +74,6 @@ stdenv.mkDerivation rec { outputHashes = { # All other crates in the same workspace reuse this hash. "tauri-plugin-autostart-0.0.0" = "sha256-7Qi07yRb+ww569+sEXFIwAtS8jbUNQx6LsrUnMl5YOo="; - "enigo-0.1.2" = "sha256-99VJ0WYD8jV6CYUZ1bpYJBwIE2iwOZ9SjOvyA2On12Q="; - "selection-0.1.0" = "sha256-V4vixiyKqhpZeTXiFw0HKz5xr0zHd4DkC/hovJ8Y2a8="; "reqwest_dav-0.1.3" = "sha256-nWOH1SOoNA2o2lmGAIEJj3OLOlP39FjlXqK8LPZ95hI="; }; }; diff --git a/nixpkgs/pkgs/applications/misc/translatelocally/default.nix b/nixpkgs/pkgs/applications/misc/translatelocally/default.nix new file mode 100644 index 000000000000..81aa9ec91bcf --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/translatelocally/default.nix @@ -0,0 +1,62 @@ +{ lib, stdenv, fetchFromGitHub +, cmake, qt6, libarchive, pcre2, protobuf, gperftools, blas +}: + +let + rev = "f8a2dba0a63989c6b3a7be36f736ed478cad1dd2"; + +in stdenv.mkDerivation (finalAttrs: { + pname = "translatelocally"; + version = "unstable-2023-08-25"; + + src = fetchFromGitHub { + owner = "XapaJIaMnu"; + repo = "translateLocally"; + inherit rev; + hash = "sha256-uUdDi0CwCR/FQjw5D2s088d/Tp7NQOI0ia30oOhlGoc="; + fetchSubmodules = true; + }; + + patches = [ + ./version_without_git.patch + ]; + + postPatch = '' + echo '#define GIT_REVISION "${rev} ${finalAttrs.version}"' > \ + 3rd_party/bergamot-translator/3rd_party/marian-dev/src/common/git_revision.h + ''; + + nativeBuildInputs = [ + cmake + protobuf + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + qt6.qttools + qt6.qtbase + qt6.qtsvg + libarchive + pcre2 + protobuf + gperftools # provides tcmalloc + blas + ]; + + cmakeFlags = [ + "-DBLAS_LIBRARIES=-lblas" + "-DCBLAS_LIBRARIES=-lcblas" + ]; + + meta = with lib; { + mainProgram = "translateLocally"; + homepage = "https://translatelocally.com/"; + description = "Fast and secure translation on your local machine, powered by marian and Bergamot."; + license = licenses.mit; + maintainers = with maintainers; [ pacien ]; + platforms = platforms.linux; + + # https://github.com/XapaJIaMnu/translateLocally/issues/150 + broken = stdenv.isAarch64; + }; +}) diff --git a/nixpkgs/pkgs/applications/misc/translatelocally/version_without_git.patch b/nixpkgs/pkgs/applications/misc/translatelocally/version_without_git.patch new file mode 100644 index 000000000000..9d7e618e3e67 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/translatelocally/version_without_git.patch @@ -0,0 +1,66 @@ +Submodule 3rd_party/bergamot-translator contains modified content +Submodule 3rd_party/marian-dev contains modified content +diff --git a/3rd_party/bergamot-translator/3rd_party/marian-dev/cmake/GetVersionFromFile.cmake b/3rd_party/bergamot-translator/3rd_party/marian-dev/cmake/GetVersionFromFile.cmake +index 31352565..d90a366d 100644 +--- a/3rd_party/bergamot-translator/3rd_party/marian-dev/cmake/GetVersionFromFile.cmake ++++ b/3rd_party/bergamot-translator/3rd_party/marian-dev/cmake/GetVersionFromFile.cmake +@@ -22,10 +22,8 @@ else() + endif() + + # Get current commit SHA from git +-execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- OUTPUT_VARIABLE PROJECT_VERSION_GIT_SHA +- OUTPUT_STRIP_TRAILING_WHITESPACE) ++# (dummy value for nix package without the .git) ++set(PROJECT_VERSION_GIT_SHA 000000000000) + + # Get partial versions into a list + string(REGEX MATCHALL "-.*$|[0-9]+" PROJECT_PARTIAL_VERSION_LIST +diff --git a/3rd_party/bergamot-translator/3rd_party/marian-dev/src/CMakeLists.txt b/3rd_party/bergamot-translator/3rd_party/marian-dev/src/CMakeLists.txt +index 76aa0e2b..ca982bd3 100644 +--- a/3rd_party/bergamot-translator/3rd_party/marian-dev/src/CMakeLists.txt ++++ b/3rd_party/bergamot-translator/3rd_party/marian-dev/src/CMakeLists.txt +@@ -149,23 +149,8 @@ target_compile_options(marian PRIVATE ${ALL_WARNINGS}) + # + # We set MARIAN_GIT_DIR to the appropriate path, depending on whether + # ${CMAKE_CURRENT_SOURCE_DIR}/../.git is a directory or file. +-set(MARIAN_GIT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../.git) +-if(NOT IS_DIRECTORY ${MARIAN_GIT_DIR}) # i.e., it's a submodule +- file(READ ${MARIAN_GIT_DIR} MARIAN_GIT_DIR) +- string(REGEX REPLACE "gitdir: (.*)\n" "\\1" MARIAN_GIT_DIR ${MARIAN_GIT_DIR}) +- if(NOT IS_ABSOLUTE ${MARIAN_GIT_DIR}) +- get_filename_component(MARIAN_GIT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../${MARIAN_GIT_DIR}" ABSOLUTE) +- endif() +-endif(NOT IS_DIRECTORY ${MARIAN_GIT_DIR}) +- +-add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/common/git_revision.h +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- COMMAND git log -1 --pretty=format:\#define\ GIT_REVISION\ \"\%h\ \%ai\" > ${CMAKE_CURRENT_SOURCE_DIR}/common/git_revision.h +- DEPENDS ${MARIAN_GIT_DIR}/logs/HEAD +- VERBATIM +-) +-add_custom_target(marian_version DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/common/git_revision.h) +-add_dependencies(marian marian_version) # marian must depend on it so that it gets created first ++# (generated by nix package instead) ++ + # make sure all local dependencies are installed first before this is built + add_dependencies(marian 3rd_party_installs) + +diff --git a/cmake/GetVersionFromFile.cmake b/cmake/GetVersionFromFile.cmake +index 83b7975..71cd861 100644 +--- a/cmake/GetVersionFromFile.cmake ++++ b/cmake/GetVersionFromFile.cmake +@@ -23,10 +23,8 @@ else() + endif() + + # Get current commit SHA from git +-execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD +- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} +- OUTPUT_VARIABLE PROJECT_VERSION_GIT_SHA +- OUTPUT_STRIP_TRAILING_WHITESPACE) ++# (dummy value for nix package without the .git) ++set(PROJECT_VERSION_GIT_SHA 000000000000) + + # Get partial versions into a list + string(REGEX MATCHALL "-.*$|[0-9]+" PROJECT_PARTIAL_VERSION_LIST diff --git a/nixpkgs/pkgs/applications/misc/waypaper/default.nix b/nixpkgs/pkgs/applications/misc/waypaper/default.nix index 86c23400f1ba..cfb7ec3abf69 100644 --- a/nixpkgs/pkgs/applications/misc/waypaper/default.nix +++ b/nixpkgs/pkgs/applications/misc/waypaper/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "waypaper"; - version = "1.5"; + version = "1.9"; src = fetchFromGitHub { owner = "anufrievroman"; repo = "waypaper"; rev = "refs/tags/${version}"; - hash = "sha256-lK4TygR9cwEHcnrC0E5vE7Jor6afEiM9TmEgGXj+hNA="; + hash = "sha256-6hv+f2fbrbLodJIRHl5MYTkiZ51iZOAK42Vg73zSw/E="; }; nativeBuildInputs = [ |