From 9b3ff4831bef9c3c1d96d0faa1724c7614371041 Mon Sep 17 00:00:00 2001 From: oxalica Date: Wed, 19 Jul 2023 15:49:36 +0800 Subject: {birdtray,isgx,mycrypto,osu-lazer,stretchly,tree-sitter}: remove oxalica as maintainer --- pkgs/applications/blockchains/mycrypto/default.nix | 2 +- pkgs/applications/misc/birdtray/default.nix | 2 +- pkgs/applications/misc/stretchly/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/blockchains/mycrypto/default.nix b/pkgs/applications/blockchains/mycrypto/default.nix index 514e2e198e7a..d4793eb9276b 100644 --- a/pkgs/applications/blockchains/mycrypto/default.nix +++ b/pkgs/applications/blockchains/mycrypto/default.nix @@ -49,6 +49,6 @@ in appimageTools.wrapType2 rec { homepage = "https://mycrypto.com"; license = licenses.mit; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ oxalica ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/birdtray/default.nix b/pkgs/applications/misc/birdtray/default.nix index f007fb71377b..4b75072db69e 100644 --- a/pkgs/applications/misc/birdtray/default.nix +++ b/pkgs/applications/misc/birdtray/default.nix @@ -44,7 +44,7 @@ mkDerivation rec { description = "Mail system tray notification icon for Thunderbird"; homepage = "https://github.com/gyunaev/birdtray"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ Flakebi oxalica ]; + maintainers = with maintainers; [ Flakebi ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/stretchly/default.nix b/pkgs/applications/misc/stretchly/default.nix index 4316905e655c..8584dbbf1ee2 100644 --- a/pkgs/applications/misc/stretchly/default.nix +++ b/pkgs/applications/misc/stretchly/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { homepage = "https://hovancik.net/stretchly"; downloadPage = "https://hovancik.net/stretchly/downloads/"; license = licenses.bsd2; - maintainers = with maintainers; [ _1000101 oxalica ]; + maintainers = with maintainers; [ _1000101 ]; platforms = platforms.linux; }; } -- cgit 1.4.1 From 8913801669a9411a4427b4c1cb9126b9cedb9b36 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 26 Oct 2023 14:24:09 +0200 Subject: inkscape: inherit filelock dependency from cachecontrol MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The dependency is not imported anywhere in the Inkscape code so let’s make the requirement explicit. --- pkgs/applications/graphics/inkscape/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 575f93efcb27..143bab5d784b 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -48,7 +48,11 @@ let appdirs beautifulsoup4 cachecontrol - filelock + ] + # CacheControl requires extra runtime dependencies for FileCache + # https://gitlab.com/inkscape/extras/extension-manager/-/commit/9a4acde6c1c028725187ff5972e29e0dbfa99b06 + ++ cachecontrol.optional-dependencies.filecache + ++ [ numpy lxml packaging -- cgit 1.4.1 From 99ab0ebeabff4f694eb7179cce7cd1f9da772060 Mon Sep 17 00:00:00 2001 From: leiserfg Date: Tue, 25 Jul 2023 21:32:16 +0200 Subject: inkscape: 1.2.2 → 1.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://inkscape.org/doc/release_notes/1.3/Inkscape_1.3.html libepoxy for experimental GPU-accelerated rendering. pyparsing for HPGL support. Co-authored-by: Jan Tojnar --- pkgs/applications/graphics/inkscape/default.nix | 9 ++++++--- pkgs/development/python-modules/inkex/default.nix | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 143bab5d784b..059dd8bf7c65 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -40,6 +40,7 @@ , python3 , substituteAll , wrapGAppsHook +, libepoxy , zlib }: let @@ -58,6 +59,7 @@ let packaging pillow scour + pyparsing pyserial requests pygobject3 @@ -65,11 +67,11 @@ let in stdenv.mkDerivation rec { pname = "inkscape"; - version = "1.2.2"; + version = "1.3"; src = fetchurl { - url = "https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"; - sha256 = "oMf9DQPAohU15kjvMB3PgN18/B81ReUQZfvxuj7opcQ="; + url = "https://inkscape.org/release/inkscape-${version}/source/archive/xz/dl/inkscape-${version}.tar.xz"; + sha256 = "sha256-v08oawJeAWm4lIzBTVGZqbTCBNdhyJTEtISWVx7HYwc="; }; # Inkscape hits the ARGMAX when linking on macOS. It appears to be @@ -147,6 +149,7 @@ stdenv.mkDerivation rec { potrace python3Env zlib + libepoxy ] ++ lib.optionals (!stdenv.isDarwin) [ gspell ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/inkex/default.nix b/pkgs/development/python-modules/inkex/default.nix index a0393162dc8c..4d04618ec3e6 100644 --- a/pkgs/development/python-modules/inkex/default.nix +++ b/pkgs/development/python-modules/inkex/default.nix @@ -9,6 +9,7 @@ , packaging , pillow , pygobject3 +, pyparsing , pyserial , scour , gobject-introspection @@ -47,6 +48,7 @@ buildPythonPackage { gtk3 packaging pillow + pyparsing scour ]; -- cgit 1.4.1 From 4f2eaf6a5ffb1e3c712ab6f8de80e2e5eef54c62 Mon Sep 17 00:00:00 2001 From: amesgen Date: Sat, 9 Sep 2023 18:23:20 +0200 Subject: bazecor: init at 1.3.6 Co-authored-by: Gabriel Volpe --- pkgs/applications/misc/bazecor/10-dygma.rules | 4 ++ pkgs/applications/misc/bazecor/default.nix | 56 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 62 insertions(+) create mode 100644 pkgs/applications/misc/bazecor/10-dygma.rules create mode 100644 pkgs/applications/misc/bazecor/default.nix (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/bazecor/10-dygma.rules b/pkgs/applications/misc/bazecor/10-dygma.rules new file mode 100644 index 000000000000..6805e68c0644 --- /dev/null +++ b/pkgs/applications/misc/bazecor/10-dygma.rules @@ -0,0 +1,4 @@ +SUBSYSTEMS=="usb", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="2201", MODE="0666" +SUBSYSTEMS=="usb", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="2200", MODE="0666" +SUBSYSTEMS=="usb", ATTRS{idVendor}=="35ef", MODE="0666" +KERNEL=="hidraw*", ATTRS{idVendor}=="35ef", MODE="0666" diff --git a/pkgs/applications/misc/bazecor/default.nix b/pkgs/applications/misc/bazecor/default.nix new file mode 100644 index 000000000000..e84cf11b3389 --- /dev/null +++ b/pkgs/applications/misc/bazecor/default.nix @@ -0,0 +1,56 @@ +{ lib +, appimageTools +, fetchurl +}: + +appimageTools.wrapAppImage rec { + pname = "bazecor"; + version = "1.3.6"; + + src = appimageTools.extract { + inherit pname version; + src = fetchurl { + url = "https://github.com/Dygmalab/Bazecor/releases/download/v.${version}/Bazecor-${version}-x64.AppImage"; + hash = "sha256-Mz7T/AAlyfMzdfy/ZV4AEP3ClTolwr2pPzkSCPL66/w="; + }; + + # Workaround for https://github.com/Dygmalab/Bazecor/issues/370 + postExtract = '' + substituteInPlace \ + $out/usr/lib/bazecor/resources/app/.webpack/main/index.js \ + --replace \ + 'checkUdev=()=>{try{if(c.default.existsSync(f))return c.default.readFileSync(f,"utf-8").trim()===l.trim()}catch(e){console.error(e)}return!1}' \ + 'checkUdev=()=>{return 1}' + ''; + }; + + # also make sure to update the udev rules in ./10-dygma.rules; most recently + # taken from + # https://github.com/Dygmalab/Bazecor/blob/v1.3.6/src/main/utils/udev.ts#L6 + + extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ + p.glib + ]; + + # Also expose the udev rules here, so it can be used as: + # services.udev.packages = [ pkgs.bazecor ]; + # to allow non-root modifications to the keyboards. + + extraInstallCommands = '' + mv $out/bin/bazecor-* $out/bin/bazecor + + mkdir -p $out/lib/udev/rules.d + ln -s --target-directory=$out/lib/udev/rules.d ${./10-dygma.rules} + ''; + + meta = { + description = "Graphical configurator for Dygma Products"; + homepage = "https://github.com/Dygmalab/Bazecor"; + changelog = "https://github.com/Dygmalab/Bazecor/releases/tag/v${version}"; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ amesgen ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "bazecor"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc3932356bd9..44a6dd078de7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -342,6 +342,8 @@ with pkgs; bakelite = callPackage ../tools/backup/bakelite { }; + bazecor = callPackage ../applications/misc/bazecor { }; + bearer = callPackage ../development/tools/bearer { }; benthos = callPackage ../development/tools/benthos { }; -- cgit 1.4.1 From c5e4273f6064a702693015c403afeffb2adea685 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 18:33:23 +0000 Subject: kubectl-cnpg: 1.20.2 -> 1.21.0 --- pkgs/applications/networking/cluster/kubectl-cnpg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix b/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix index 8df27913dc10..131a653b0ed2 100644 --- a/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "kubectl-cnpg"; - version = "1.20.2"; + version = "1.21.0"; src = fetchFromGitHub { owner = "cloudnative-pg"; repo = "cloudnative-pg"; rev = "v${version}"; - hash = "sha256-JkvaFhzazvuqRJ6ertwMQhp+H2zsjRGA23XbvLCIYg0="; + hash = "sha256-FRSypaZex55ABE+e23kvNZFTTn6Z8AEy8ag3atwMdEk="; }; - vendorHash = "sha256-unOPTQeJW9rUOpZh7gTjD8IZDh4wi04oBAfDO5juJf8="; + vendorHash = "sha256-mirnieBrrVwRccJDgelZvSfQaAVlTsttOh3nJBN6ev0="; subPackages = [ "cmd/kubectl-cnpg" ]; -- cgit 1.4.1 From 9518abf6ce56fc3c1890e568e5c10b37cd0527af Mon Sep 17 00:00:00 2001 From: kilianar Date: Sun, 5 Nov 2023 00:16:01 +0100 Subject: portfolio: 0.65.4 -> 0.65.5 https://github.com/portfolio-performance/portfolio/releases/tag/0.65.5 --- pkgs/applications/office/portfolio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index cf7b59f6fa1a..c29db89f0d77 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.65.4"; + version = "0.65.5"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-2+1lwaO2+kq/EjJoA4EvGCMLH6iErR9KtWINLoO17+w="; + hash = "sha256-NdBs/WyN1WDOJ5tnIYPtQTAm4EdVJj1HXm2KIjOKC7E="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 31da059615a82e9a4e33bebd5d31d52d7f4efee9 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 5 Nov 2023 13:50:22 +0900 Subject: python311Packages.zxing-cpp: rename from zxing_cpp --- pkgs/applications/misc/yubioath-flutter/helper.nix | 4 +-- pkgs/applications/office/paperless-ngx/default.nix | 2 +- pkgs/development/libraries/zxing-cpp/default.nix | 2 +- .../python-modules/zxing-cpp/default.nix | 30 ++++++++++++++++++++++ .../python-modules/zxing_cpp/default.nix | 30 ---------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 ++- 7 files changed, 38 insertions(+), 35 deletions(-) create mode 100644 pkgs/development/python-modules/zxing-cpp/default.nix delete mode 100644 pkgs/development/python-modules/zxing_cpp/default.nix (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/yubioath-flutter/helper.nix b/pkgs/applications/misc/yubioath-flutter/helper.nix index ca0bf4472a4c..7f6bb6095dbe 100644 --- a/pkgs/applications/misc/yubioath-flutter/helper.nix +++ b/pkgs/applications/misc/yubioath-flutter/helper.nix @@ -4,7 +4,7 @@ , yubikey-manager , fido2 , mss -, zxing_cpp +, zxing-cpp , pillow , cryptography @@ -43,7 +43,7 @@ buildPythonApplication { yubikey-manager fido2 mss - zxing_cpp + zxing-cpp pillow cryptography ]; diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 7c5a3dc93276..d98958a8dfba 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -215,7 +215,7 @@ python.pkgs.buildPythonApplication rec { whoosh zipp zope_interface - zxing_cpp + zxing-cpp ] ++ redis.optional-dependencies.hiredis ++ twisted.optional-dependencies.tls diff --git a/pkgs/development/libraries/zxing-cpp/default.nix b/pkgs/development/libraries/zxing-cpp/default.nix index 9cd78b7b56a1..1c010638693e 100644 --- a/pkgs/development/libraries/zxing-cpp/default.nix +++ b/pkgs/development/libraries/zxing-cpp/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tests = { - inherit (python3.pkgs) zxing_cpp; + inherit (python3.pkgs) zxing-cpp; }; updateScript = gitUpdater { rev-prefix = "v"; diff --git a/pkgs/development/python-modules/zxing-cpp/default.nix b/pkgs/development/python-modules/zxing-cpp/default.nix new file mode 100644 index 000000000000..02ff95588d70 --- /dev/null +++ b/pkgs/development/python-modules/zxing-cpp/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, cmake +, numpy +, pillow +, pybind11 +, libzxing-cpp +}: + +buildPythonPackage rec { + pname = "zxing-cpp"; + inherit (libzxing-cpp) src version meta; + + sourceRoot = "${src.name}/wrappers/python"; + + dontUseCmakeConfigure = true; + + propagatedBuildInputs = [ + pybind11 + numpy + ]; + + nativeBuildInputs = [ + cmake + ]; + + nativeCheckInputs = [ + pillow + ]; +} diff --git a/pkgs/development/python-modules/zxing_cpp/default.nix b/pkgs/development/python-modules/zxing_cpp/default.nix deleted file mode 100644 index b876ab05af3f..000000000000 --- a/pkgs/development/python-modules/zxing_cpp/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, buildPythonPackage -, cmake -, numpy -, pillow -, pybind11 -, zxing-cpp -}: - -buildPythonPackage rec { - pname = "zxing_cpp"; - inherit (zxing-cpp) src version meta; - - sourceRoot = "${src.name}/wrappers/python"; - - dontUseCmakeConfigure = true; - - propagatedBuildInputs = [ - pybind11 - numpy - ]; - - nativeBuildInputs = [ - cmake - ]; - - nativeCheckInputs = [ - pillow - ]; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 39577ac30411..8d683207ebe8 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -448,4 +448,5 @@ mapAliases ({ zope_i18nmessageid = zope-i18nmessageid; # added 2023-07-29 zope_lifecycleevent = zope-lifecycleevent; # added 2023-10-11 zope_proxy = zope-proxy; # added 2023-10-07 + zxing_cpp = zxing-cpp; # added 2023-11-05 }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0bd217ad4ee1..9315299277ba 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16111,5 +16111,7 @@ self: super: with self; { zxcvbn = callPackage ../development/python-modules/zxcvbn { }; - zxing_cpp = callPackage ../development/python-modules/zxing_cpp { }; + zxing-cpp = callPackage ../development/python-modules/zxing-cpp { + libzxing-cpp = pkgs.zxing-cpp; + }; } -- cgit 1.4.1 From 5dc90ed9327bc2f1f3a668c24bf6a866561d3621 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Nov 2023 07:02:36 +0000 Subject: gitoxide: 0.30.0 -> 0.31.1 --- pkgs/applications/version-management/gitoxide/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index 64efc4731a17..bd39ff17762d 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.30.0"; + version = "0.31.1"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - hash = "sha256-VJZwNLFePUNIRHEyiEr1tiLaB2tuL6Ah81LNuM/1H14="; + hash = "sha256-ML0sVsegrG96rBfpnD7GgOf9TWe/ojRo9UJwMFpDsKs="; }; - cargoHash = "sha256-vEp0wLxmmmv33oRO7eOxOoOsV87/7DQ8db5RUfqUb88="; + cargoHash = "sha256-gz4VY4a4AK9laIQo2MVTabyKzMyc7jRHrYsrfOLx+Ao="; nativeBuildInputs = [ cmake pkg-config ]; -- cgit 1.4.1 From c5b219ec902db9fd069f7f0d6ac7dd864d5d9c47 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 6 Nov 2023 12:56:50 +0100 Subject: inkscape: fix runtime error on darwin --- pkgs/applications/graphics/inkscape/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 059dd8bf7c65..85b067d9fb29 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -159,8 +159,9 @@ stdenv.mkDerivation rec { # Make sure PyXML modules can be found at run-time. postInstall = lib.optionalString stdenv.isDarwin '' - install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkscape - install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkview + for f in $out/lib/inkscape/*.dylib; do + ln -s $f $out/lib/$(basename $f) + done ''; meta = with lib; { -- cgit 1.4.1