diff options
Diffstat (limited to 'pkgs/applications')
11 files changed, 88 insertions, 20 deletions
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/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 575f93efcb27..85b067d9fb29 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 @@ -48,12 +49,17 @@ 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 pillow scour + pyparsing pyserial requests pygobject3 @@ -61,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 @@ -143,6 +149,7 @@ stdenv.mkDerivation rec { potrace python3Env zlib + libepoxy ] ++ lib.optionals (!stdenv.isDarwin) [ gspell ] ++ lib.optionals stdenv.isDarwin [ @@ -152,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; { 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/applications/misc/birdtray/default.nix b/pkgs/applications/misc/birdtray/default.nix index 534107f615a6..4865f9f29eda 100644 --- a/pkgs/applications/misc/birdtray/default.nix +++ b/pkgs/applications/misc/birdtray/default.nix @@ -33,7 +33,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; }; } 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/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" ]; 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/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 = [ 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 ]; |