diff options
Diffstat (limited to 'pkgs/by-name')
-rw-r--r-- | pkgs/by-name/ay/ayatana-indicator-session/package.nix | 4 | ||||
-rw-r--r-- | pkgs/by-name/di/dissent/package.nix | 29 | ||||
-rw-r--r-- | pkgs/by-name/dt/dtools/package.nix | 4 | ||||
-rw-r--r-- | pkgs/by-name/me/meletrix-udev-rules/meletrix.rules | 26 | ||||
-rw-r--r-- | pkgs/by-name/me/meletrix-udev-rules/package.nix | 24 | ||||
-rw-r--r-- | pkgs/by-name/tr/tracy/0001-remove-unifiedtypeidentifiers-framework | 13 | ||||
-rw-r--r-- | pkgs/by-name/tr/tracy/package.nix | 119 | ||||
-rw-r--r-- | pkgs/by-name/wx/wxc/package.nix | 43 |
8 files changed, 239 insertions, 23 deletions
diff --git a/pkgs/by-name/ay/ayatana-indicator-session/package.nix b/pkgs/by-name/ay/ayatana-indicator-session/package.nix index d2a5860098b4c..7a625b94eb499 100644 --- a/pkgs/by-name/ay/ayatana-indicator-session/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-session/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ayatana-indicator-session"; - version = "24.2.0"; + version = "24.5.0"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-indicator-session"; rev = finalAttrs.version; - hash = "sha256-XHJhzL7B+4FnUHbsJVywELoY7xxG19RRryaPYZVao1I="; + hash = "sha256-p4nu7ZgnEjnnxNqyZIg//YcssnQcCY7GFDbpGIu1dz0="; }; postPatch = '' diff --git a/pkgs/by-name/di/dissent/package.nix b/pkgs/by-name/di/dissent/package.nix index fdcc4ad37ce41..f3c0f81133888 100644 --- a/pkgs/by-name/di/dissent/package.nix +++ b/pkgs/by-name/di/dissent/package.nix @@ -1,16 +1,10 @@ { buildGoModule -, cairo , fetchFromGitHub -, gdk-pixbuf -, glib , gobject-introspection -, graphene , gst_all_1 -, gtk4 , lib , libadwaita , libcanberra-gtk3 -, pango , pkg-config , sound-theme-freedesktop , wrapGAppsHook4 @@ -18,13 +12,13 @@ buildGoModule rec { pname = "dissent"; - version = "0.0.24"; + version = "0.0.25"; src = fetchFromGitHub { owner = "diamondburned"; repo = "dissent"; rev = "v${version}"; - hash = "sha256-XoppHkKQhWZbqVIViGIV0e0W/NhZW0v6ufmXlVtmzvI="; + hash = "sha256-ysI7zgducK52XbSzsaCnffSC9BRd/aaybMif/GkkhcI="; }; nativeBuildInputs = [ @@ -34,34 +28,31 @@ buildGoModule rec { ]; buildInputs = [ - cairo - gdk-pixbuf - glib - graphene - gtk4 - pango # Optional according to upstream but required for sound and video gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-ugly gst_all_1.gstreamer + libadwaita libcanberra-gtk3 sound-theme-freedesktop - libadwaita ]; postInstall = '' install -D -m 444 -t $out/share/applications nix/so.libdb.dissent.desktop - install -D -m 444 internal/icons/hicolor/scalable/apps/so.libdb.dissent.svg $out/share/icons/hicolor/scalable/apps/so.libdb.dissent.svg + install -D -m 444 -t $out/share/icons/hicolor/scalable/apps internal/icons/hicolor/scalable/apps/so.libdb.dissent.svg + install -D -m 444 -t $out/share/icons/hicolor/symbolic/apps internal/icons/symbolic/apps/so.libdb.dissent-symbolic.svg + install -D -m 444 -t $out/share/metainfo so.libdb.dissent.metainfo.xml + install -D -m 444 -t $out/share/dbus-1/services nix/so.libdb.dissent.service ''; - vendorHash = "sha256-8/k9auM7+rceV26f3pNjEK1trzzAM530CX008pLZ1OA="; + vendorHash = "sha256-qBgj3h+WKWxVahRXyO/w2zGY4UCVkjP7XKFk/9GOFqs="; meta = with lib; { - description = "GTK4 Discord client in Go, attempt #4 (formerly gtkcord4)"; + description = "A third-party Discord client designed for a smooth, native experience (formerly gtkcord4)"; homepage = "https://github.com/diamondburned/dissent"; - license = licenses.gpl3Only; + license = with licenses; [ gpl3Plus cc0 ]; mainProgram = "dissent"; maintainers = with maintainers; [ hmenke urandom aleksana ]; }; diff --git a/pkgs/by-name/dt/dtools/package.nix b/pkgs/by-name/dt/dtools/package.nix index feb4dc740b80a..8db3a14cf6173 100644 --- a/pkgs/by-name/dt/dtools/package.nix +++ b/pkgs/by-name/dt/dtools/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtools"; - version = "2.108.0"; + version = "2.109.0"; src = fetchFromGitHub { owner = "dlang"; repo = "tools"; rev = "v${finalAttrs.version}"; - hash = "sha256-YEBUgJPG/+WN4MnQUNAVftZM0ULxZZzpHoOozXua46U="; + hash = "sha256-C4hSs4zsFC8hWkhmDmNzVfK7Ctfnd1IQUphibUPiVzE="; name = "dtools"; }; diff --git a/pkgs/by-name/me/meletrix-udev-rules/meletrix.rules b/pkgs/by-name/me/meletrix-udev-rules/meletrix.rules new file mode 100644 index 0000000000000..fc7cafd1e563f --- /dev/null +++ b/pkgs/by-name/me/meletrix-udev-rules/meletrix.rules @@ -0,0 +1,26 @@ +# Download VIA jsons from https://drive.google.com/drive/folders/1ky4kmGxZo1i0WyRZiY9V6FQlGzjegcPk for USB vendor and product ids + +# Zoom 65 Olivia Wired +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="806c", ATTRS{idProduct}=="0005", MODE:="0660", GROUP="input" + +# Zoom 65 EE +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1ea7", ATTRS{idProduct}=="7777", MODE:="0660", GROUP="input" +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1ea7", ATTRS{idProduct}=="cc65", MODE:="0660", GROUP="input" + +# Zoom 65 V2 +# also 1ea7:7777 +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1ea7", ATTRS{idProduct}=="ccbb", MODE:="0660", GROUP="input" + +# Zoom 65 V2.5 +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1ea7", ATTRS{idProduct}=="ccc3", MODE:="0660", GROUP="input" + +# Zoom 75 (production unit) +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1ea7", ATTRS{idProduct}=="ced3", MODE:="0660", GROUP="input" + +# Zoom 75 (prototype) +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1ea7", ATTRS{idProduct}=="ce81", MODE:="0660", GROUP="input" + +# ZoomTKL +# also 1ea7:7777 +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1ea7", ATTRS{idProduct}=="cd87", MODE:="0660", GROUP="input" + diff --git a/pkgs/by-name/me/meletrix-udev-rules/package.nix b/pkgs/by-name/me/meletrix-udev-rules/package.nix new file mode 100644 index 0000000000000..43fd2b94cdd5b --- /dev/null +++ b/pkgs/by-name/me/meletrix-udev-rules/package.nix @@ -0,0 +1,24 @@ +{ + lib, + stdenvNoCC, +}: +stdenvNoCC.mkDerivation { + pname = "meletrix-udev-rules"; + version = "0-unstable-2023-10-20"; + + src = [./meletrix.rules]; + + dontUnpack = true; + dontBuild = true; + + installPhase = '' + install -Dpm644 $src $out/lib/udev/rules.d/70-meletrix.rules + ''; + + meta = with lib; { + description = "udev rules to configure Meletrix keyboards"; + license = licenses.cc0; + maintainers = with maintainers; [Scrumplex]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/tr/tracy/0001-remove-unifiedtypeidentifiers-framework b/pkgs/by-name/tr/tracy/0001-remove-unifiedtypeidentifiers-framework new file mode 100644 index 0000000000000..0dc5a7eb68f16 --- /dev/null +++ b/pkgs/by-name/tr/tracy/0001-remove-unifiedtypeidentifiers-framework @@ -0,0 +1,13 @@ +diff --git a/profiler/build/unix/legacy.mk b/profiler/build/unix/legacy.mk +index 24765f1a..8baffb68 100644 +--- a/profiler/build/unix/legacy.mk ++++ b/profiler/build/unix/legacy.mk +@@ -16,7 +16,7 @@ else + UNAME := $(shell uname -s) + ifeq ($(UNAME),Darwin) + SRC3 += ../../../nfd/nfd_cocoa.m +- LIBS += -framework CoreFoundation -framework AppKit -framework UniformTypeIdentifiers ++ LIBS += -framework CoreFoundation -framework AppKit + else + ifdef TRACY_GTK_FILESELECTOR + SRC += ../../../nfd/nfd_gtk.cpp diff --git a/pkgs/by-name/tr/tracy/package.nix b/pkgs/by-name/tr/tracy/package.nix new file mode 100644 index 0000000000000..82d4b9c285b82 --- /dev/null +++ b/pkgs/by-name/tr/tracy/package.nix @@ -0,0 +1,119 @@ +{ lib +, stdenv +, fetchFromGitHub + +, capstone +, darwin +, dbus +, freetype +, glfw +, hicolor-icon-theme +, pkg-config +, tbb + +, withWayland ? stdenv.isLinux +, libxkbcommon +, wayland +}: + +stdenv.mkDerivation rec { + pname = "tracy"; + version = "0.10"; + + src = fetchFromGitHub { + owner = "wolfpld"; + repo = "tracy"; + rev = "v${version}"; + sha256 = "sha256-DN1ExvQ5wcIUyhMAfiakFbZkDsx+5l8VMtYGvSdboPA="; + }; + + patches = lib.optionals (stdenv.isDarwin && !(lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11")) [ + ./0001-remove-unifiedtypeidentifiers-framework + ]; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + capstone + freetype + glfw + ] ++ lib.optionals (stdenv.isLinux && withWayland) [ + libxkbcommon + wayland + ] ++ lib.optionals stdenv.isLinux [ + dbus + hicolor-icon-theme + tbb + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.Carbon + ] ++ lib.optionals (stdenv.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") [ + darwin.apple_sdk.frameworks.UniformTypeIdentifiers + ]; + + env.NIX_CFLAGS_COMPILE = toString ([ ] + # Apple's compiler finds a format string security error on + # ../../../server/TracyView.cpp:649:34, preventing building. + ++ lib.optional stdenv.isDarwin "-Wno-format-security" + ++ lib.optional stdenv.isLinux "-ltbb" + ++ lib.optional stdenv.cc.isClang "-faligned-allocation" + # workaround issue #19098 + ++ lib.optional (stdenv.cc.isClang && stdenv.isDarwin) "-fno-lto"); + + buildPhase = '' + runHook preBuild + + make -j $NIX_BUILD_CORES -C capture/build/unix release + make -j $NIX_BUILD_CORES -C csvexport/build/unix release + make -j $NIX_BUILD_CORES -C import-chrome/build/unix release + make -j $NIX_BUILD_CORES -C library/unix release + make -j $NIX_BUILD_CORES -C profiler/build/unix release \ + ${lib.optionalString (stdenv.isLinux && !withWayland) "LEGACY=1"} + make -j $NIX_BUILD_CORES -C update/build/unix release + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -D -m 0755 capture/build/unix/capture-release $out/bin/capture + install -D -m 0755 csvexport/build/unix/csvexport-release $out/bin/tracy-csvexport + install -D -m 0755 import-chrome/build/unix/import-chrome-release $out/bin/import-chrome + install -D -m 0755 library/unix/libtracy-release.so $out/lib/libtracy.so + install -D -m 0755 profiler/build/unix/Tracy-release $out/bin/tracy + install -D -m 0755 update/build/unix/update-release $out/bin/update + + mkdir -p $out/include/Tracy/client + mkdir -p $out/include/Tracy/common + mkdir -p $out/include/Tracy/tracy + + cp -p public/client/*.{h,hpp} $out/include/Tracy/client + cp -p public/common/*.{h,hpp} $out/include/Tracy/common + cp -p public/tracy/*.{h,hpp} $out/include/Tracy/tracy + '' + lib.optionalString stdenv.isLinux '' + substituteInPlace extra/desktop/tracy.desktop \ + --replace Exec=/usr/bin/tracy Exec=tracy + + install -D -m 0644 extra/desktop/application-tracy.xml $out/share/mime/packages/application-tracy.xml + install -D -m 0644 extra/desktop/tracy.desktop $out/share/applications/tracy.desktop + install -D -m 0644 icon/application-tracy.svg $out/share/icons/hicolor/scalable/apps/application-tracy.svg + install -D -m 0644 icon/icon.png $out/share/icons/hicolor/256x256/apps/tracy.png + install -D -m 0644 icon/icon.svg $out/share/icons/hicolor/scalable/apps/tracy.svg + '' + '' + runHook postInstall + ''; + + postFixup = lib.optionalString stdenv.isDarwin '' + install_name_tool -change libcapstone.4.dylib ${capstone}/lib/libcapstone.4.dylib $out/bin/tracy + ''; + + meta = with lib; { + description = "Real time, nanosecond resolution, remote telemetry frame profiler for games and other applications"; + homepage = "https://github.com/wolfpld/tracy"; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.bsd3; + mainProgram = "tracy"; + maintainers = with maintainers; [ mpickering nagisa paveloom ]; + }; +} diff --git a/pkgs/by-name/wx/wxc/package.nix b/pkgs/by-name/wx/wxc/package.nix new file mode 100644 index 0000000000000..42de45ecfcf17 --- /dev/null +++ b/pkgs/by-name/wx/wxc/package.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitea +, cmake +, libGL +, wxGTK32 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "wxc"; + version = "1.0.0.2"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "wxHaskell"; + repo = "wxHaskell"; + rev = "wxc-${finalAttrs.version}"; + hash = "sha256-wjby7F+Xi+H4avLGZxKJ7/LY2CJAGMIwBM7mfVzI1Bg="; + }; + + sourceRoot = finalAttrs.src.name + "/wxc"; + + nativeBuildInputs = [ + cmake + wxGTK32 # in nativeBuildInputs because of wx-config + ]; + + buildInputs = [ + libGL + ]; + + preConfigure = '' + bash generate-version-header.sh + ''; + + meta = { + description = "C language binding for wxWidgets"; + homepage = "https://wiki.haskell.org/WxHaskell"; + license = lib.licenses.wxWindows; + maintainers = with lib.maintainers; [ fgaz ]; + platforms = wxGTK32.meta.platforms; + }; +}) |