diff --git a/pkgs/applications/audio/surge-XT/default.nix b/pkgs/applications/audio/surge-XT/default.nix index b10b52e7d1c4..7c36c190128d 100644 --- a/pkgs/applications/audio/surge-XT/default.nix +++ b/pkgs/applications/audio/surge-XT/default.nix @@ -17,7 +17,7 @@ let juce-lv2 = stdenv.mkDerivation { pname = "juce-lv2"; - version = "unstable-2022-03-30"; + version = "unstable-2023-03-04"; # lv2 branch src = fetchFromGitHub { @@ -37,14 +37,14 @@ let in stdenv.mkDerivation rec { pname = "surge-XT"; - version = "1.2.0"; + version = "1.2.3"; src = fetchFromGitHub { owner = "surge-synthesizer"; repo = "surge"; rev = "release_xt_${version}"; fetchSubmodules = true; - sha256 = "sha256-LRYKkzeEuuRbMmvU3E0pHAnotOd4DyIJ7rTb+fpW0H4="; + sha256 = "sha256-DGzdzoCjMGEDltEwlPvLk2tyMVRH1Ql2Iq1ypogw/m0="; }; nativeBuildInputs = [ @@ -64,6 +64,8 @@ stdenv.mkDerivation rec { libXrandr ]; + enableParallelBuilding = true; + cmakeFlags = [ "-DJUCE_SUPPORTS_LV2=ON" "-DSURGE_JUCE_PATH=${juce-lv2}" diff --git a/pkgs/applications/networking/pyload-ng/default.nix b/pkgs/applications/networking/pyload-ng/default.nix index ebe4db46aba0..f0bb06802070 100644 --- a/pkgs/applications/networking/pyload-ng/default.nix +++ b/pkgs/applications/networking/pyload-ng/default.nix @@ -1,13 +1,13 @@ { lib, fetchPypi, python3 }: python3.pkgs.buildPythonApplication rec { - version = "0.5.0b3.dev72"; + version = "0.5.0b3.dev75"; pname = "pyload-ng"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-pcbJc23Fylh/JoWRmbZmC8xUzUqh2ej6gT+B2w8DHFQ="; + hash = "sha256-1lPIKkZESonDaVCnac0iUu/gCqXVDBhNZrk5S0eC6F0="; }; postPatch = '' diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 9be7b663d4f3..2050591ed1d4 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "bruno"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "https://github.com/usebruno/bruno/releases/download/v${version}/bruno_${version}_amd64_linux.deb"; - hash = "sha256-E9aVyZWqY8XTwoUbHaj8VM32Eex7GNQcEpg8Hkk2O0U="; + hash = "sha256-vZNl5qdK8hztfGaQCL6RnWlL8hPJaL/GBh7AOT5D3Js="; }; nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook ]; diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix index 6989e86a3729..79ccffffc992 100644 --- a/pkgs/by-name/su/supersonic/package.nix +++ b/pkgs/by-name/su/supersonic/package.nix @@ -20,16 +20,16 @@ assert waylandSupport -> stdenv.isLinux; buildGoModule rec { pname = "supersonic" + lib.optionalString waylandSupport "-wayland"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "dweymouth"; repo = "supersonic"; rev = "v${version}"; - hash = "sha256-rNM3kQrEkqLAW6Dia+VsEi9etUG218AL8tO0amWXb34="; + hash = "sha256-tx0IlPqFb5ZPxd6GLlJIWVN4axqnzcuyxUMNI8WSJYk="; }; - vendorHash = "sha256-I4ZZmQfYTMtNT+3WCs6/g42uF4EKGSjGHCqG8Du5rCo="; + vendorHash = "sha256-HBvLs/OOp6AAd6mP2QsonP7HBvdbo3JHszBsVvoB0Dk="; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/development/embedded/svdtools/default.nix b/pkgs/development/embedded/svdtools/default.nix index 4ff90b4f85a6..4a57b0ace290 100644 --- a/pkgs/development/embedded/svdtools/default.nix +++ b/pkgs/development/embedded/svdtools/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "svdtools"; - version = "0.3.4"; + version = "0.3.6"; src = fetchCrate { inherit version pname; - hash = "sha256-rdBUEOyE4bHqPXZs3MxT/oivagKmJIVE/hI9mp0RY0k="; + hash = "sha256-bk6kv13HMDSRBjShWnRZJzb0YX0zKljPoEC6tebkVKI="; }; - cargoHash = "sha256-mPz8m/9VGKSqXan/R1k1JTZ9a44CwCL6JefVyeeREeE="; + cargoHash = "sha256-MdYzYmbI7ZNLeLZdnLIVo9y2rvmGevEGy7t+2FFu5yo="; meta = with lib; { description = "Tools to handle vendor-supplied, often buggy SVD files"; diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index 4cab671e64dd..801b16753613 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.162.0"; + version = "0.172.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-F+iBO4R+JSOaNHw/+T8X2P+8Q/l0hKN2tu/rRshY/5A="; + sha256 = "sha256-zOynyNFKLWQ8Z6r0iFFLj1ZzGq7m22Nb5wdvS5rlQmw="; }; - vendorHash = "sha256-WNbHnYCC8G0kxsLWOZWDFugBQ7E5YT2pTQy+wczZ1qU="; + vendorHash = "sha256-H3LpREwpQCFL99rB/7fmsxPAP/je5EFhrOEJHvCYYe8="; ldflags = [ "-s" "-w" diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix index 6b0f4edd5a77..ce555facf410 100644 --- a/pkgs/tools/misc/infracost/default.nix +++ b/pkgs/tools/misc/infracost/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "infracost"; - version = "0.10.30"; + version = "0.10.31"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-YHhaOf2MNrFHv29pEnhkOjFH30Mi5Oi6gYkSH6PZhU4="; + sha256 = "sha256-slZFZu+NEOLy4oxdcZwW2OhabGxE/RPsfEhO0W6+gT0="; }; - vendorHash = "sha256-yjPtNTfkL8+fkmXW98SnpboMqdsjQYCif65sn0jjLgc="; + vendorHash = "sha256-o8CMISBU5C/SDexeEiwnxTC9hvbCWUrm6a/2TOE9Bmw="; ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ]; diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index 5006007035ee..c13ec56c4b6a 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -1,12 +1,22 @@ -{ lib, stdenv, fetchurl, pcsclite, pkg-config, libusb1, perl }: +{ lib +, stdenv +, fetchurl +, flex +, pcsclite +, pkg-config +, libusb1 +, perl +, zlib +, gitUpdater +}: stdenv.mkDerivation rec { pname = "ccid"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.bz2"; - sha256 = "sha256-E5NEh+b4tI9pmhbTZ8x6GvejyodN5yGsbpYzvrhuchk="; + hash = "sha256-boMq3Bcuzc/e4rVvMxRGhIgsvpctr/GTjnqcc6ZPiL8="; }; postPatch = '' @@ -14,21 +24,50 @@ stdenv.mkDerivation rec { substituteInPlace src/Makefile.in --replace /bin/echo echo ''; - preConfigure = '' - configureFlagsArray+=("--enable-usbdropdir=$out/pcsc/drivers") - ''; + configureFlags = [ + "--enable-twinserial" + "--enable-serialconfdir=${placeholder "out"}/etc/reader.conf.d" + "--enable-ccidtwindir=${placeholder "out"}/pcsc/drivers/serial" + "--enable-usbdropdir=${placeholder "out"}/pcsc/drivers" + ]; - nativeBuildInputs = [ pkg-config perl ]; - buildInputs = [ pcsclite libusb1 ]; + # error: call to undeclared function 'InterruptRead'; + # ISO C99 and later do not support implicit function declarations + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + + nativeBuildInputs = [ + flex + pkg-config + perl + ]; + + buildInputs = [ + pcsclite + libusb1 + zlib + ]; + + postInstall = '' + install -Dm 0444 -t $out/lib/udev/rules.d src/92_pcscd_ccid.rules + substituteInPlace $out/lib/udev/rules.d/92_pcscd_ccid.rules \ + --replace "/usr/sbin/pcscd" "${pcsclite}/bin/pcscd" + ''; # The resulting shared object ends up outside of the default paths which are # usually getting stripped. stripDebugList = ["pcsc"]; + passthru.updateScript = gitUpdater { + url = "https://salsa.debian.org/rousseau/CCID.git"; + }; + meta = with lib; { - description = "ccid drivers for pcsclite"; + description = "PC/SC driver for USB CCID smart card readers"; homepage = "https://ccid.apdu.fr/"; - license = licenses.gpl2Plus; + license = licenses.lgpl21Plus; + maintainers = [ maintainers.anthonyroussel ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix index ec2a5f3fb305..7aadeb5c02b8 100644 --- a/pkgs/tools/security/pcsctools/default.nix +++ b/pkgs/tools/security/pcsctools/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/scriptor \ - --set PERL5LIB "${with perlPackages; makePerlPath [ pcscperl ]}" + --set PERL5LIB "${with perlPackages; makePerlPath [ ChipcardPCSC ]}" wrapProgram $out/bin/gscriptor \ - --set PERL5LIB "${with perlPackages; makePerlPath [ pcscperl GlibObjectIntrospection Glib Gtk3 Pango Cairo CairoGObject ]}" + --set PERL5LIB "${with perlPackages; makePerlPath [ ChipcardPCSC GlibObjectIntrospection Glib Gtk3 Pango Cairo CairoGObject ]}" wrapProgram $out/bin/ATR_analysis \ - --set PERL5LIB "${with perlPackages; makePerlPath [ pcscperl ]}" + --set PERL5LIB "${with perlPackages; makePerlPath [ ChipcardPCSC ]}" wrapProgram $out/bin/pcsc_scan \ --prefix PATH : "$out/bin:${lib.makeBinPath [ coreutils wget ]}" diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 91135d86429a..770709d3edd5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3296,6 +3296,32 @@ with self; { }; }; + ChipcardPCSC = buildPerlPackage { + pname = "Chipcard-PCSC"; + version = "1.4.16"; + src = fetchurl { + url = "mirror://cpan/authors/id/W/WH/WHOM/Chipcard-PCSC-v1.4.16.tar.gz"; + hash = "sha256-O14p1jRDXxQm7Nzfebo1G04mWPNsPCK+N7HTHjbKj6k="; + }; + buildInputs = [ pkgs.pcsclite ]; + nativeBuildInputs = [ pkgs.pkg-config ]; + env.NIX_CFLAGS_COMPILE = toString ([ + "-I${pkgs.pcsclite.dev}/include/PCSC" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=implicit-int" + "-Wno-error=int-conversion" + ]); + NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.pcsclite}/lib -lpcsclite"; + # tests fail; look unfinished + doCheck = false; + meta = { + description = "Communicate with a smart card using PC/SC"; + homepage = "https://pcsc-perl.apdu.fr/"; + license = with lib.licenses; [ gpl2Plus ]; + maintainers = with maintainers; [ abbradar anthonyroussel ]; + }; + }; + CiscoIPPhone = buildPerlPackage { pname = "Cisco-IPPhone"; version = "0.05"; @@ -20198,27 +20224,6 @@ with self; { }; }; - pcscperl = buildPerlPackage { - pname = "pcsc-perl"; - version = "1.4.14"; - src = fetchurl { - url = "mirror://cpan/authors/id/W/WH/WHOM/pcsc-perl-1.4.14.tar.bz2"; - hash = "sha256-JyK35VQ+T687oexrKaff7G2Svh7ewJ0KMZGZLU2Ixp0="; - }; - buildInputs = [ pkgs.pcsclite ]; - nativeBuildInputs = [ pkgs.pkg-config ]; - NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.pcsclite}/lib -lpcsclite"; - # tests fail; look unfinished - doCheck = false; - meta = { - description = "Communicate with a smart card using PC/SC"; - homepage = "http://ludovic.rousseau.free.fr/softwares/pcsc-perl/"; - license = with lib.licenses; [ gpl2Plus ]; - maintainers = with maintainers; [ abbradar ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.pcscperl.x86_64-darwin - }; - }; - PDFAPI2 = buildPerlPackage { pname = "PDF-API2"; version = "2.045"; @@ -29327,4 +29332,5 @@ with self; { version = self.Version; Gtk2GladeXML = throw "Gtk2GladeXML has been removed"; # 2022-01-15 + pcscperl = throw "'pcscperl' has been renamed to 'ChipcardPCSC'"; # Added 2023-12-07 }