diff options
Diffstat (limited to 'pkgs/by-name/in')
| -rw-r--r-- | pkgs/by-name/in/incus/package.nix | 6 | ||||
| -rw-r--r-- | pkgs/by-name/in/ingress2gateway/package.nix | 28 | ||||
| -rw-r--r-- | pkgs/by-name/in/inotify-info/package.nix | 2 | ||||
| -rw-r--r-- | pkgs/by-name/in/insync-emblem-icons/package.nix | 47 | ||||
| -rw-r--r-- | pkgs/by-name/in/insync-nautilus/package.nix | 18 | ||||
| -rw-r--r-- | pkgs/by-name/in/insync/package.nix | 120 | ||||
| -rw-r--r-- | pkgs/by-name/in/intiface-central/package.nix | 6 | ||||
| -rw-r--r-- | pkgs/by-name/in/intiface-central/pubspec.lock.json | 40 | ||||
| -rw-r--r-- | pkgs/by-name/in/invidious-router/package.nix | 2 | ||||
| -rw-r--r-- | pkgs/by-name/in/invidtui/package.nix | 2 |
10 files changed, 191 insertions, 80 deletions
diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix index be289a05e0772..e5249ac1d48f5 100644 --- a/pkgs/by-name/in/incus/package.nix +++ b/pkgs/by-name/in/incus/package.nix @@ -1,6 +1,6 @@ import ./generic.nix { - hash = "sha256-BFB4bdfh3hI7D1m7a20ckPPyP9CYXW7mjqeTZ/21Gqs="; - version = "6.1.0"; - vendorHash = "sha256-a8ZPhzs7sNIJLjQ9Y87Zf9SXAsmbdVn250Q0OQwy69A="; + hash = "sha256-33qUmET1BYAv6e8ZaFNSa7jrn8WGf3BqY8Nud/ZywSY="; + version = "6.2.0"; + vendorHash = "sha256-dFg3LSG/ao73ODWcPDq5s9xUjuHabCMOB2AtngNCrlA="; patches = [ ]; } diff --git a/pkgs/by-name/in/ingress2gateway/package.nix b/pkgs/by-name/in/ingress2gateway/package.nix new file mode 100644 index 0000000000000..90e5a465921c4 --- /dev/null +++ b/pkgs/by-name/in/ingress2gateway/package.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "ingress2gateway"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "kubernetes-sigs"; + repo = pname; + rev = "v${version}"; + hash = "sha256-+ImMpO1qRkXYLy+MDloKSoDCmMmJSBorgDjzaeSCBdY="; + }; + + vendorHash = "sha256-IEU9cfYCkrQagxzJT6jPz2nRCz1BAaiGvkEPhNRQr4E="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Convert Ingress resources to Gateway API resources "; + homepage = "https://github.com/kubernetes-sigs/ingress2gateway"; + license = licenses.asl20; + maintainers = with maintainers; [ arikgrahl ]; + mainProgram = "ingress2gateway"; + }; +} diff --git a/pkgs/by-name/in/inotify-info/package.nix b/pkgs/by-name/in/inotify-info/package.nix index 0405400b7f6da..6edae9b3f5402 100644 --- a/pkgs/by-name/in/inotify-info/package.nix +++ b/pkgs/by-name/in/inotify-info/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { - description = "Easily track down the number of inotify watches, instances, and which files are being watched."; + description = "Easily track down the number of inotify watches, instances, and which files are being watched"; homepage = "https://github.com/mikesart/inotify-info"; license = licenses.mit; mainProgram = "inotify-info"; diff --git a/pkgs/by-name/in/insync-emblem-icons/package.nix b/pkgs/by-name/in/insync-emblem-icons/package.nix new file mode 100644 index 0000000000000..b31f05170a635 --- /dev/null +++ b/pkgs/by-name/in/insync-emblem-icons/package.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenv, + fetchurl, + dpkg, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "insync-emblem-icons"; + version = "3.8.7.50516"; + + src = fetchurl rec { + urls = [ + "https://cdn.insynchq.com/builds/linux/insync-emblem-icons_${finalAttrs.version}_all.deb" + "https://web.archive.org/web/20240409081214/${builtins.elemAt urls 0}" + ]; + hash = "sha256-uALaIxETEEkjDTx331uIsb4VswWk2K0dGuDMYH8v5U8="; + }; + + nativeBuildInputs = [ dpkg ]; + + unpackPhase = '' + runHook preUnpack + + dpkg-deb --fsys-tarfile "$src" | tar -x --no-same-permissions --no-same-owner + + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -R usr/* $out/ + + runHook postInstall + ''; + + meta = with lib; { + platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + maintainers = with maintainers; [ hellwolf ]; + homepage = "https://www.insynchq.com"; + description = "This package contains the file manager emblem icons for Insync file manager extensions"; + }; +}) diff --git a/pkgs/by-name/in/insync-nautilus/package.nix b/pkgs/by-name/in/insync-nautilus/package.nix index 98079f1a2e88b..8cf010c893264 100644 --- a/pkgs/by-name/in/insync-nautilus/package.nix +++ b/pkgs/by-name/in/insync-nautilus/package.nix @@ -1,39 +1,39 @@ -{ stdenv, +{ + stdenv, fetchurl, lib, dpkg, gnome, - insync + insync-emblem-icons, }: stdenv.mkDerivation (finalAttrs: { pname = "insync-nautilus"; - version = lib.getVersion insync; + version = lib.getVersion insync-emblem-icons; pyproject = true; # Download latest from: https://www.insynchq.com/downloads/linux#nautilus - src = fetchurl { + src = fetchurl rec { urls = [ "https://cdn.insynchq.com/builds/linux/insync-nautilus_${finalAttrs.version}_all.deb" - "https://web.archive.org/web/20240409080611/https://cdn.insynchq.com/builds/linux/insync-nautilus_${finalAttrs.version}_all.deb" + "https://web.archive.org/web/20240409080611/${builtins.elemAt urls 0}" ]; hash = "sha256-aB1/ZzcQH3T1lviMZO8jXbtdbe4TW20f0TAcv4HDOGI="; }; - nativeBuildInputs = [ - dpkg - ]; + nativeBuildInputs = [ dpkg ]; buildInputs = [ gnome.nautilus-python - insync + insync-emblem-icons ]; installPhase = '' runHook preInstall mkdir -p $out cp -R usr/share $out/ + cp -rs "${insync-emblem-icons}"/share/icons $out/share/icons runHook postInstall ''; diff --git a/pkgs/by-name/in/insync/package.nix b/pkgs/by-name/in/insync/package.nix index 7ec64182f9477..048ead9d7d996 100644 --- a/pkgs/by-name/in/insync/package.nix +++ b/pkgs/by-name/in/insync/package.nix @@ -1,44 +1,34 @@ -{ lib -, writeShellScript -, buildFHSEnv -, stdenvNoCC -, fetchurl -, autoPatchelfHook -, dpkg -, nss -, alsa-lib -, libvorbis -, libdrm -, libGL -, wayland -, xkeyboard_config -, libthai -, libsForQt5 +{ + lib, + writeShellScript, + buildFHSEnv, + stdenvNoCC, + fetchurl, + autoPatchelfHook, + dpkg, + nss, + alsa-lib, + xkeyboard_config, + libthai, + libsForQt5, }: let pname = "insync"; - # Find a binary from https://www.insynchq.com/downloads/linux#ubuntu. - version = "3.8.7.50516"; - ubuntu-dist = "mantic_amd64"; - insyncDeb = (fetchurl { - urls = [ - "https://cdn.insynchq.com/builds/linux/insync_${version}-${ubuntu-dist}.deb" - "https://web.archive.org/web/20240409080945/https://cdn.insynchq.com/builds/linux/insync_${version}-${ubuntu-dist}.deb" - ]; - hash = "sha256-U7BcgghbdR7r9WiZpEOka+BzXwnxrzL6p4imGESuB/k="; - }); - insyncEmblemIconsDeb = (fetchurl { - urls = [ - "https://cdn.insynchq.com/builds/linux/insync-emblem-icons_${version}_all.deb" - "https://web.archive.org/web/20240409081214/https://cdn.insynchq.com/builds/linux/insync-emblem-icons_${version}_all.deb" - ]; - hash = "sha256-uALaIxETEEkjDTx331uIsb4VswWk2K0dGuDMYH8v5U8="; - }); + # Find a binary from https://www.insynchq.com/downloads/linux + version = "3.9.1.60010"; + ubuntu-dist = "trixie_amd64"; insync-pkg = stdenvNoCC.mkDerivation { - name = "${pname}-pkg-${version}"; + pname = "${pname}-pkg"; + inherit version; - srcs = [ insyncDeb insyncEmblemIconsDeb ]; + src = fetchurl rec { + urls = [ + "https://cdn.insynchq.com/builds/linux/${version}/insync_${version}-${ubuntu-dist}.deb" + "https://web.archive.org/web/20240622110117/${builtins.elemAt urls 0}" + ]; + hash = "sha256-8gT2xLZa/zrM3X3AXTOvHelO0tF2w/3/qOyw2wB98uY="; + }; nativeBuildInputs = [ dpkg @@ -47,24 +37,25 @@ let ]; buildInputs = [ - nss alsa-lib - libvorbis - libdrm - libGL - wayland + nss libthai - libsForQt5.qt5.qtvirtualkeyboard - ]; + ] ++ (with libsForQt5; [ qt5.qtvirtualkeyboard ]); unpackPhase = '' - dpkg-deb --fsys-tarfile ${insyncDeb} | tar -x --no-same-permissions --no-same-owner - dpkg-deb --fsys-tarfile ${insyncEmblemIconsDeb} | tar -x --no-same-permissions --no-same-owner + runHook preUnpack + + dpkg-deb --fsys-tarfile "$src" | tar -x --no-same-permissions --no-same-owner + + runHook postUnpack ''; installPhase = '' runHook preInstall + # Remove unused plugins. This is based on missing libraries from the upstream package. + rm -rf usr/lib/insync/PySide2/Qt/qml/ + mkdir -p $out cp -R usr/* $out/ @@ -75,13 +66,15 @@ let dontStrip = true; }; -in buildFHSEnv { +in +buildFHSEnv { inherit pname version; - targetPkgs = pkgs: with pkgs; [ - libudev0-shim - insync-pkg - ]; + targetPkgs = + pkgs: with pkgs; [ + libudev0-shim + insync-pkg + ]; extraInstallCommands = '' cp -rsHf "${insync-pkg}"/share $out/ @@ -91,18 +84,21 @@ in buildFHSEnv { # xkb configuration needed: https://github.com/NixOS/nixpkgs/issues/236365 export XKB_CONFIG_ROOT=${xkeyboard_config}/share/X11/xkb/ + # When using Ubuntu deb package, this might be needed for showing system tray icon. + # export XDG_CURRENT_DESKTOP=Unity + # For debugging: # export QT_DEBUG_PLUGINS=1 exec /usr/lib/insync/insync "$@" - ''; + ''; # As intended by this bubble wrap, share as much namespaces as possible with user. - unshareUser = false; - unshareIpc = false; - unsharePid = false; - unshareNet = false; - unshareUts = false; + unshareUser = false; + unshareIpc = false; + unsharePid = false; + unshareNet = false; + unshareUts = false; unshareCgroup = false; dieWithParent = true; @@ -115,16 +111,16 @@ in buildFHSEnv { homepage = "https://www.insynchq.com"; description = "Google Drive sync and backup with multiple account support"; longDescription = '' - Insync is a commercial application that syncs your Drive files to your - computer. It has more advanced features than Google's official client - such as multiple account support, Google Doc conversion, symlink support, - and built in sharing. + Insync is a commercial application that syncs your Drive files to your + computer. It has more advanced features than Google's official client + such as multiple account support, Google Doc conversion, symlink support, + and built in sharing. - There is a 15-day free trial, and it is a paid application after that. + There is a 15-day free trial, and it is a paid application after that. - Known bug(s): + Known bug(s): - 1) Currently the system try icon does not render correctly. + 1) Currently the system try icon does not render correctly. ''; mainProgram = "insync"; }; diff --git a/pkgs/by-name/in/intiface-central/package.nix b/pkgs/by-name/in/intiface-central/package.nix index 6424f523b3b96..186c4918b9940 100644 --- a/pkgs/by-name/in/intiface-central/package.nix +++ b/pkgs/by-name/in/intiface-central/package.nix @@ -11,12 +11,12 @@ }: flutterPackages.v3_19.buildFlutterApplication rec { pname = "intiface-central"; - version = "2.5.6"; + version = "2.6.0"; src = fetchFromGitHub { owner = "intiface"; repo = pname; rev = "v${version}"; - hash = "sha256-EcOFiaWqljNZIvsCkhuCEChEC51ERxM74EYE6u7Q4U8="; + hash = "sha256-7+rw0cD8MJPFOkgmfHD6y+EojTGQhb15o1mn2p14eoE="; }; patches = [ ./corrosion.patch @@ -28,7 +28,7 @@ flutterPackages.v3_19.buildFlutterApplication rec { name = "${pname}-${version}-cargo-deps"; inherit src; sourceRoot = "${src.name}/intiface-engine-flutter-bridge"; - hash = "sha256-tkJcwT2lt8+FT9GZ0ROrm1jkOxoq875O3wZkgZl22r4="; + hash = "sha256-tPkLZmHReY1TU2qcY4aGWsQPhLFowrqxTPwmTHZ5fDE="; }; cargoRoot = "intiface-engine-flutter-bridge"; diff --git a/pkgs/by-name/in/intiface-central/pubspec.lock.json b/pkgs/by-name/in/intiface-central/pubspec.lock.json index e27fd28e9fe08..d3f088c6623de 100644 --- a/pkgs/by-name/in/intiface-central/pubspec.lock.json +++ b/pkgs/by-name/in/intiface-central/pubspec.lock.json @@ -230,6 +230,16 @@ "source": "hosted", "version": "1.18.0" }, + "console": { + "dependency": "transitive", + "description": { + "name": "console", + "sha256": "e04e7824384c5b39389acdd6dc7d33f3efe6b232f6f16d7626f194f6a01ad69a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, "convert": { "dependency": "transitive", "description": { @@ -466,6 +476,16 @@ "source": "hosted", "version": "0.6.18+2" }, + "flutter_multi_slider": { + "dependency": "direct main", + "description": { + "name": "flutter_multi_slider", + "sha256": "3c4603999f5c399b57b5a85086cf92c8870e726fe07fd63bc3968bd3e564518b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, "flutter_rust_bridge": { "dependency": "direct main", "description": { @@ -508,6 +528,16 @@ "source": "hosted", "version": "3.2.0" }, + "get_it": { + "dependency": "transitive", + "description": { + "name": "get_it", + "sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.7.0" + }, "github": { "dependency": "direct main", "description": { @@ -738,6 +768,16 @@ "source": "hosted", "version": "1.0.4" }, + "msix": { + "dependency": "direct dev", + "description": { + "name": "msix", + "sha256": "519b183d15dc9f9c594f247e2d2339d855cf0eaacc30e19b128e14f3ecc62047", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.16.7" + }, "multicast_dns": { "dependency": "direct main", "description": { diff --git a/pkgs/by-name/in/invidious-router/package.nix b/pkgs/by-name/in/invidious-router/package.nix index 112ca05a97c03..68c642af3dcee 100644 --- a/pkgs/by-name/in/invidious-router/package.nix +++ b/pkgs/by-name/in/invidious-router/package.nix @@ -22,7 +22,7 @@ in meta = { homepage = "https://gitlab.com/gaincoder/invidious-router"; - description = "A Go application that routes requests to different Invidious instances based on their health status and (optional) response time"; + description = "Go application that routes requests to different Invidious instances based on their health status and (optional) response time"; license = with lib.licenses; [mit]; maintainers = with lib.maintainers; [sils]; mainProgram = "invidious-router"; diff --git a/pkgs/by-name/in/invidtui/package.nix b/pkgs/by-name/in/invidtui/package.nix index 68f31ed6f10bd..11b17b76aa721 100644 --- a/pkgs/by-name/in/invidtui/package.nix +++ b/pkgs/by-name/in/invidtui/package.nix @@ -24,7 +24,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://darkhz.github.io/invidtui/"; - description = "An invidious TUI client"; + description = "Invidious TUI client"; license = licenses.mit; maintainers = with maintainers; [ rettetdemdativ ]; mainProgram = "invidtui"; |