diff options
Diffstat (limited to 'pkgs/misc')
57 files changed, 175 insertions, 709 deletions
diff --git a/pkgs/misc/ananicy-cpp/default.nix b/pkgs/misc/ananicy-cpp/default.nix deleted file mode 100644 index 9a771a470339f..0000000000000 --- a/pkgs/misc/ananicy-cpp/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib -, clangStdenv -, fetchFromGitLab -, cmake -, pkg-config -, spdlog -, nlohmann_json -, systemd -, libbpf -, elfutils -, bpftools -, zlib -}: - -clangStdenv.mkDerivation rec { - pname = "ananicy-cpp"; - version = "1.1.1"; - - src = fetchFromGitLab { - owner = "ananicy-cpp"; - repo = "ananicy-cpp"; - rev = "v${version}"; - fetchSubmodules = true; - sha256 = "sha256-oPinSc00+Z6SxjfTh7DttcXSjsLv1X0NI+O37C8M8GY="; - }; - - strictDeps = true; - - nativeBuildInputs = [ - cmake - pkg-config - bpftools - ]; - - buildInputs = [ - spdlog - nlohmann_json - systemd - libbpf - elfutils - zlib - ]; - - # BPF A call to built-in function '__stack_chk_fail' is not supported. - hardeningDisable = [ "stackprotector" ]; - - cmakeFlags = [ - "-DUSE_EXTERNAL_JSON=ON" - "-DUSE_EXTERNAL_SPDLOG=ON" - "-DUSE_EXTERNAL_FMTLIB=ON" - "-DUSE_BPF_PROC_IMPL=ON" - "-DBPF_BUILD_LIBBPF=OFF" - "-DENABLE_SYSTEMD=ON" - "-DVERSION=${version}" - ]; - - postInstall = '' - rm -rf "$out"/include - rm -rf "$out"/lib/cmake - ''; - - meta = with lib; { - homepage = "https://gitlab.com/ananicy-cpp/ananicy-cpp"; - description = "Rewrite of ananicy in c++ for lower cpu and memory usage"; - license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [ artturin ]; - mainProgram = "ananicy-cpp"; - }; -} diff --git a/pkgs/misc/ananicy-rules-cachyos/default.nix b/pkgs/misc/ananicy-rules-cachyos/default.nix deleted file mode 100644 index fba65999b0f93..0000000000000 --- a/pkgs/misc/ananicy-rules-cachyos/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenvNoCC, fetchFromGitHub }: - -stdenvNoCC.mkDerivation { - pname = "ananicy-rules-cachyos"; - version = "unstable-2024-04-22"; - - src = fetchFromGitHub { - owner = "CachyOS"; - repo = "ananicy-rules"; - rev = "8646faa8c0c8fc16d78ca3a25d65ddbd86b9d468"; - hash = "sha256-b9M6Uqlb6Ysp8BRe1QV62sjVOU6tgFbrjTxDc3B4xlg="; - }; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - mkdir -p $out/etc/ananicy.d - rm README.md LICENSE - cp -r * $out/etc/ananicy.d - runHook postInstall - ''; - - meta = { - homepage = "https://github.com/CachyOS/ananicy-rules"; - description = "CachyOS' ananicy-rules meant to be used with ananicy-cpp"; - license = lib.licenses.gpl3Only; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ artturin johnrtitor diniamo ]; - }; -} diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index 6fb9aea3bfeb1..28fffb24bcf38 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -79,7 +79,7 @@ let meta = with lib; { homepage = "https://github.com/ARM-software/arm-trusted-firmware"; - description = "A reference implementation of secure world software for ARMv8-A"; + description = "Reference implementation of secure world software for ARMv8-A"; license = [ licenses.bsd3 ] ++ lib.optionals (!deleteHDCPBlobBeforeBuild) [ licenses.unfreeRedistributable ]; maintainers = with maintainers; [ lopsided98 ]; } // extraMeta; diff --git a/pkgs/misc/autotiling/default.nix b/pkgs/misc/autotiling/default.nix index 13b834dcbda41..41131cbb916bd 100644 --- a/pkgs/misc/autotiling/default.nix +++ b/pkgs/misc/autotiling/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "autotiling"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-u+Tvvge/rQvylbZDmCxvoMGjZm2gKsFZEAb9evR/Ckw="; + hash = "sha256-k+UiAGMB/fJiE+C737yGdyTpER1ciZrMkZezkcn/4yk="; }; propagatedBuildInputs = [ i3ipc importlib-metadata ]; diff --git a/pkgs/misc/barebox/default.nix b/pkgs/misc/barebox/default.nix index cb77a607e0160..4b1e373ca69d3 100644 --- a/pkgs/misc/barebox/default.nix +++ b/pkgs/misc/barebox/default.nix @@ -72,7 +72,7 @@ let meta = with lib; { homepage = "https://www.barebox.org"; - description = "The Swiss Army Knive for bare metal"; + description = "Swiss Army Knive for bare metal"; license = licenses.gpl2; maintainers = with maintainers; [ emantor ]; } // extraMeta; diff --git a/pkgs/misc/beep/default.nix b/pkgs/misc/beep/default.nix index 180b53e1e7686..a11b4ca38ad4d 100644 --- a/pkgs/misc/beep/default.nix +++ b/pkgs/misc/beep/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "fortify3" ]; meta = with lib; { - description = "The advanced PC speaker beeper"; + description = "Advanced PC speaker beeper"; homepage = "https://github.com/spkr-beep/beep"; license = licenses.gpl2Only; platforms = platforms.linux; diff --git a/pkgs/misc/cliscord/default.nix b/pkgs/misc/cliscord/default.nix index 1f8de323efe3b..bdfa620ef3f2f 100644 --- a/pkgs/misc/cliscord/default.nix +++ b/pkgs/misc/cliscord/default.nix @@ -4,7 +4,6 @@ , openssl , pkg-config , fetchFromGitHub -, fetchpatch , Security }: diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index c8df29776db95..3fc4ab361e3ea 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "cups"; - version = "2.4.7"; + version = "2.4.8"; src = fetchurl { url = "https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; - sha256 = "sha256-3VQijdkDUmQozn43lhr67SMK0xB4gUHadc66oINiz2w="; + sha256 = "sha256-dcMmtLpzl178yaJQeMSwTNtO4zPKqtDQgj29UixkeaA="; }; outputs = [ "out" "lib" "dev" "man" ]; @@ -145,7 +145,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://openprinting.github.io/cups/"; - description = "A standards-based printing system for UNIX"; + description = "Standards-based printing system for UNIX"; license = licenses.asl20; maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.unix; diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix index 1f95c8cdd0317..cce75b26d71e8 100644 --- a/pkgs/misc/cups/drivers/brlaser/default.nix +++ b/pkgs/misc/cups/drivers/brlaser/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCUPS_SERVER_BIN=lib/cups" "-DCUPS_DATA_DIR=share/cups" ]; meta = with lib; { - description = "A CUPS driver for Brother laser printers"; + description = "CUPS driver for Brother laser printers"; longDescription = '' Although most Brother printers support a standard printer language such as PCL or PostScript, not all do. If you have a monochrome Brother laser printer (or multi-function device) and the other open source drivers don't work, this one might help. diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix index 8520ba7aff2e3..f5ec8e29b634b 100644 --- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = "Canon InkJet printer drivers for many Pixma series printers."; + description = "Canon InkJet printer drivers for many Pixma series printers"; longDescription = '' Canon InjKet printer drivers for series E200, E300, E3100, E3300, E4200, E450, E470, E480, G3000, G3010, G4000, G4010, G5000, G5080, G6000, G6050, G6080, G7000, G7050, G7080, GM2000, diff --git a/pkgs/misc/cups/drivers/cups-pdf-to-pdf/default.nix b/pkgs/misc/cups/drivers/cups-pdf-to-pdf/default.nix index a26216cbc7273..7eb957af643fd 100644 --- a/pkgs/misc/cups/drivers/cups-pdf-to-pdf/default.nix +++ b/pkgs/misc/cups/drivers/cups-pdf-to-pdf/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { passthru.tests.vmtest = nixosTests.cups-pdf; meta = with lib; { - description = "A CUPS backend that turns print jobs into searchable PDF files"; + description = "CUPS backend that turns print jobs into searchable PDF files"; homepage = "https://github.com/alexivkin/CUPS-PDF-to-PDF"; license = licenses.gpl2Only; maintainers = [ maintainers.yarny ]; diff --git a/pkgs/misc/cups/drivers/foomatic-db-engine/default.nix b/pkgs/misc/cups/drivers/foomatic-db-engine/default.nix deleted file mode 100644 index 5408f7eff38e5..0000000000000 --- a/pkgs/misc/cups/drivers/foomatic-db-engine/default.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ lib -, perlPackages -, fetchFromGitHub -, withCupsAccess ? false # needed to access local cups server -, cups -, cups-filters -, curl -, withSocketAccess ? false # needed to access network printers -, netcat-gnu -, withSMBAccess ? false # needed to access SMB-connected printers -, samba -, autoconf -, automake -, file -, makeWrapper -}: - -perlPackages.buildPerlPackage rec { - pname = "foomatic-db-engine"; - version = "unstable-2024-02-10"; - - src = fetchFromGitHub { - # there is also a daily snapshot at the `downloadPage`, - # but it gets deleted quickly and would provoke 404 errors - owner = "OpenPrinting"; - repo = "foomatic-db-engine"; - rev = "a2b12271e145fe3fd34c3560d276a57e928296cb"; - hash = "sha256-qM12qtGotf9C0cjO9IkmzlW9GWCkT2Um+6dU3mZm3DU="; - }; - - outputs = [ "out" ]; - - propagatedBuildInputs = [ - perlPackages.Clone - perlPackages.DBI - perlPackages.XMLLibXML - ]; - - buildInputs = - [ curl ] - # provide some "cups-*" commands to `foomatic-{configure,printjob}` - # so that they can manage a local cups server (add queues, add jobs...) - ++ lib.optionals withCupsAccess [ cups cups-filters ] - # the commands `foomatic-{configure,getpjloptions}` need - # netcat if they are used to query or alter a network - # printer via AppSocket/HP JetDirect protocol - ++ lib.optional withSocketAccess netcat-gnu - # `foomatic-configure` can be used to access printers that are - # shared via the SMB protocol, but it needs the `smbclient` binary - ++ lib.optional withSMBAccess samba - ; - - nativeBuildInputs = [ autoconf automake file makeWrapper ]; - - # sed-substitute indirection is more robust against - # characters in paths that might need escaping - prePatch = '' - sed -Ei 's|^(S?BINSEARCHPATH=).+$|\1"@PATH@"|g' configure.ac - substituteInPlace configure.ac --subst-var PATH - touch Makefile.PL # `buildPerlPackage` fails unless this exists - ''; - - preConfigure = '' - ./make_configure - ''; - - configureFlags = [ - "--sysconfdir=${placeholder "out"}/etc" - "LIBDIR=${placeholder "out"}/share/foomatic" - "PERLPREFIX=${placeholder "out"}" - ]; - - postFixup = '' - for bin in "${placeholder "out"}/bin"/*; do - test '!' -L "$bin" || continue # skip symlink - wrapProgram "$bin" --set PERL5LIB "$PERL5LIB" - done - ''; - - doCheck = false; # no tests, would fail - - meta = { - changelog = "https://github.com/OpenPrinting/foomatic-db-engine/blob/${src.rev}/ChangeLog"; - description = "OpenPrinting printer support database engine"; - downloadPage = "https://www.openprinting.org/download/foomatic/"; - homepage = "https://openprinting.github.io/projects/02-foomatic/"; - license = lib.licenses.gpl2Only; - maintainers = [ lib.maintainers.yarny ]; - longDescription = '' - Foomatic's database engine generates PPD files - from the data in Foomatic's XML database. - It also contains scripts to directly - generate print queues and handle jobs. - ''; - }; -} diff --git a/pkgs/misc/cups/drivers/foomatic-db-nonfree/default.nix b/pkgs/misc/cups/drivers/foomatic-db-nonfree/default.nix deleted file mode 100644 index a9ce7228f45f1..0000000000000 --- a/pkgs/misc/cups/drivers/foomatic-db-nonfree/default.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoconf -, automake -, perl -}: - -stdenv.mkDerivation rec { - pname = "foomatic-db-nonfree"; - version = "unstable-2015-06-05"; - - src = fetchFromGitHub { - # there is also a daily snapshot at the `downloadPage`, - # but it gets deleted quickly and would provoke 404 errors - owner = "OpenPrinting"; - repo = "foomatic-db-nonfree"; - rev = "6ddae02ac89240c019f8b5026cfe70e30fd2b3db"; - hash = "sha256-cRZH0CXg03FEqUJdxaNnPVXjf8+ct86PjhL59WQbw60="; - }; - - nativeBuildInputs = [ autoconf automake perl ]; - - # sed-substitute indirection is more robust against - # characters in paths that might need escaping - postPatch = '' - sed -Ei -e 's|^(S?BINSEARCHPATH=).+$|\1"@PATH@"|g' \ - -e 's|^(DATASEARCHPATH=).+$|\1"@DATA@"|g' configure.ac - substituteInPlace configure.ac \ - --subst-var PATH \ - --subst-var-by DATA "${placeholder "out"}/share" - ''; - - preConfigure = '' - mkdir -p "${placeholder "out"}/share/foomatic/db/source" - ./make_configure - ''; - - # make ppd files available to cups, - # use a package-specific subdirectory to avoid - # conflicts with other ppd-containing packages - postInstall = '' - if ! [[ -d "${placeholder "out"}/share/foomatic/db/source/PPD" ]]; then - echo "failed to create share/foomatic/db/source/PPD" - exit 1 - fi - mkdir -p "${placeholder "out"}/share/cups/model" - ln -s "${placeholder "out"}/share/foomatic/db/source/PPD" \ - "${placeholder "out"}/share/cups/model/foomatic-db-nonfree" - ''; - - # we might patch ppd file commands with `patchPpdFilesHook`, - # but the only command "rastertophaser6100" isn't packaged yet - - # compress ppd files - postFixup = '' - echo 'compressing ppd files' - find -H "${placeholder "out"}/share/cups/model/foomatic-db-nonfree" -type f -iname '*.ppd' -print0 \ - | xargs -0r -n 64 -P "$NIX_BUILD_CORES" gzip -9n - ''; - - meta = { - changelog = "https://github.com/OpenPrinting/foomatic-db-nonfree/blob/${src.rev}/ChangeLog"; - description = "OpenPrinting printer support database (unfree content)"; - downloadPage = "https://www.openprinting.org/download/foomatic/"; - homepage = "https://openprinting.github.io/projects/02-foomatic/"; - license = lib.licenses.unfree; - maintainers = [ lib.maintainers.yarny ]; - # list printer manufacturers here so people - # searching for ppd files can find this package - longDescription = '' - The collected knowledge about printers, - drivers, and driver options in XML files, - used by `foomatic-db-engine` to generate PPD files. - This is a package of PPD and Foomatic XML files - that may have restrictions that keep them - from being used on a variety of machines - for licensing and other non-technical reasons. - The XML files in this package enable `foomatic-db-ppds` - to create about 120 additional PPD files, for printer from - Dell, Genicom, Lexmark, Oce, Tektronix and Xerox. - Besides the XML files, this package contains - about 130 PPD files, for printers from - Dell, Genicom, Lexmark, Oce and Xerox. - ''; - }; -} diff --git a/pkgs/misc/cups/drivers/foomatic-db-ppds/default.nix b/pkgs/misc/cups/drivers/foomatic-db-ppds/default.nix deleted file mode 100644 index bdc1e0a9b5feb..0000000000000 --- a/pkgs/misc/cups/drivers/foomatic-db-ppds/default.nix +++ /dev/null @@ -1,122 +0,0 @@ -{ lib -, foomatic-db -, foomatic-db-nonfree -, buildEnv -, foomatic-db-engine -, stdenv -, cups-filters -, ghostscript -, netpbm -, perl -, psutils -, patchPpdFilesHook -, withNonfreeDb ? false # include foomatic-db-nonfree ppd files -}: - -let - foomatic-db-packages = [ foomatic-db ] ++ - lib.lists.optional withNonfreeDb foomatic-db-nonfree; - - foomatic-db-combined = buildEnv { - name = "foomatic-db-combined"; - paths = foomatic-db-packages; - pathsToLink = [ "/share/foomatic" ]; - # `foomatic-db-combined` is a nativeBuildInput of `foomatic-db-ppds`. - # The setup hook defined here helps scripts in - # `foomatic-db-engine` to find the database. - postBuild = '' - mkdir -p "${placeholder "out"}"/{etc/cups,nix-support} - cat >> "${placeholder "out"}/nix-support/setup-hook" << eof - export FOOMATICDB="${placeholder "out"}/share/foomatic" - eof - ''; - }; - - # the effective license is `free` if all database - # packages have free licenses, `unfree` otherwise - isFree = lib.trivial.pipe foomatic-db-packages [ - (lib.lists.map (lib.attrsets.attrByPath [ "meta" "license" ] lib.licenses.unfree)) - (lib.lists.all (lib.attrsets.attrByPath [ "free" ] true)) - ]; -in - -stdenv.mkDerivation { - pname = "foomatic-db-ppds"; - # the effective version is simply the - # highest version of all database packages - version = lib.trivial.pipe foomatic-db-packages [ - (lib.lists.map (lib.attrsets.getAttr "version")) - (lib.lists.sort lib.strings.versionOlder) - lib.lists.reverseList - lib.lists.head - ]; - - buildInputs = [ - cups-filters - ghostscript - netpbm - perl - psutils - ]; - - nativeBuildInputs = [ - foomatic-db-combined - foomatic-db-engine - patchPpdFilesHook - ]; - - dontUnpack = true; - - installPhase = '' - runHook preInstall - mkdir -p "${placeholder "out"}/share/cups/model" - foomatic-compiledb -j "$NIX_BUILD_CORES" -d "${placeholder "out"}/share/cups/model/foomatic-db-ppds" - runHook postInstall - ''; - - # Comments indicate the respective - # package the command is contained in. - ppdFileCommands = [ - "cat" "echo" # coreutils - "foomatic-rip" # cups-filters or foomatic-filters - "gs" # ghostscript - "pnmflip" "pnmgamma" "pnmnoraw" # netpbm - "perl" # perl - "psresize" # psutils - # These commands aren't packaged yet. - # ppd files using these likely won't work. - #"c2050" "c2070" "cjet" "lm1100" - #"pbm2l2030" "pbm2lwxl" "rastertophaser6100" - ]; - - # compress ppd files - postFixup = '' - echo 'compressing ppd files' - find -H "${placeholder "out"}/share/cups/model/foomatic-db-ppds" -type f -iname '*.ppd' -print0 \ - | xargs -0r -n 64 -P "$NIX_BUILD_CORES" gzip -9n - ''; - - meta = { - description = "OpenPrinting ppd files"; - homepage = "https://openprinting.github.io/projects/02-foomatic/"; - license = if isFree then lib.licenses.free else lib.licenses.unfree; - maintainers = [ lib.maintainers.yarny ]; - # list printer manufacturers here so people - # searching for ppd files can find this package - longDescription = '' - All PPD files available in - OpenPrinting's Foomatic database. - This package contains about 8,800 PPD files, - for printers from - Alps, Anitech, Apollo, Apple, Avery, Brother, Canon, - Citizen, CItoh, Compaq, DEC, Dell, Dymo-CoStar, Epson, - Fujitsu, FujiXerox, Generic, Genicom, Gestetner, - Heidelberg, Hitachi, HP, IBM, Imagen, Imagistics, - InfoPrint, Infotec, Kodak, KONICAMINOLTA, Kyocera, Lanier, - Lexmark, Minolta, MinoltaQMS, Mitsubishi, NEC, NRG, Oce, - Oki, Olivetti, Panasonic, PCPI, Pentax, QMS, Raven, Ricoh, - Samsung, Savin, Seiko, Sharp, SiPix, Sony, Star, Tally, - Tektronix, TexasInstruments, Toshiba, Xante and Xerox. - ''; - }; -} diff --git a/pkgs/misc/cups/drivers/foomatic-db/default.nix b/pkgs/misc/cups/drivers/foomatic-db/default.nix deleted file mode 100644 index b4be3a1436047..0000000000000 --- a/pkgs/misc/cups/drivers/foomatic-db/default.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cups -, cups-filters -, ghostscript -, gnused -, perl -, autoconf -, automake -, patchPpdFilesHook -}: - -stdenv.mkDerivation rec { - pname = "foomatic-db"; - version = "unstable-2024-02-09"; - - src = fetchFromGitHub { - # there is also a daily snapshot at the `downloadPage`, - # but it gets deleted quickly and would provoke 404 errors - owner = "OpenPrinting"; - repo = "foomatic-db"; - rev = "f8b43644771612f854fecda969440511de784bf0"; - hash = "sha256-8Pui83Z7g5aHBJk46AYeKil/0++I6zcc5S/BWRuy1WM="; - }; - - buildInputs = [ cups cups-filters ghostscript gnused perl ]; - - nativeBuildInputs = [ autoconf automake patchPpdFilesHook perl ]; - - # sed-substitute indirection is more robust - # against characters in paths that might need escaping - postPatch = '' - sed -Ei -e 's|^(S?BINSEARCHPATH=).+$|\1"@PATH@"|g' \ - -e 's|^(DATASEARCHPATH=).+$|\1"@DATA@"|g' configure.ac - substituteInPlace configure.ac \ - --subst-var PATH \ - --subst-var-by DATA "${placeholder "out"}/share" - ''; - - preConfigure = '' - mkdir -p "${placeholder "out"}/share/foomatic/db/source" - ./make_configure - ''; - - # don't let the intaller gzip ppd files as we would - # have to unzip them later in order to patch them - configureFlags = [ "--disable-gzip-ppds" ]; - - # make ppd files available to cups, - # use a package-specific subdirectory to avoid - # conflicts with other ppd-containing packages - postInstall = '' - if ! [[ -d "${placeholder "out"}/share/foomatic/db/source/PPD" ]]; then - echo "failed to create share/foomatic/db/source/PPD" - exit 1 - fi - mkdir -p "${placeholder "out"}/share/cups/model" - ln -s "${placeholder "out"}/share/foomatic/db/source/PPD" \ - "${placeholder "out"}/share/cups/model/foomatic-db" - ''; - - # Comments indicate the respective - # package the command is contained in. - ppdFileCommands = [ - "cat" "date" "printf" # coreutils - "rastertohp" # cups - "foomatic-rip" # cups-filters or foomatic-filters - "gs" # ghostscript - "sed" # gnused - "perl" # perl - ]; - - # compress ppd files - postFixup = '' - echo 'compressing ppd files' - find -H "${placeholder "out"}/share/cups/model/foomatic-db" -type f -iname '*.ppd' -print0 \ - | xargs -0r -n 64 -P "$NIX_BUILD_CORES" gzip -9n - ''; - - meta = { - changelog = "https://github.com/OpenPrinting/foomatic-db/blob/${src.rev}/ChangeLog"; - description = "OpenPrinting printer support database (free content)"; - downloadPage = "https://www.openprinting.org/download/foomatic/"; - homepage = "https://openprinting.github.io/projects/02-foomatic/"; - license = lib.licenses.free; # mostly GPL and MIT, see README in source dir - maintainers = [ lib.maintainers.yarny ]; - # list printer manufacturers here so people - # searching for ppd files can find this package - longDescription = '' - The collected knowledge about printers, - drivers, and driver options in XML files, - used by `foomatic-db-engine` to generate PPD files. - PPD files generated from the XML files in this package - are contained in the package 'foomatic-db-ppds'. - Besides the XML files, this package contains - about 6,700 PPD files, for printers from - Brother, Canon, Epson, Gestetner, HP, InfoPrint, - Infotec, KONICA_MINOLTA, Kyocera, Lanier, Lexmark, NRG, - Oce, Oki, Ricoh, Samsung, Savin, Sharp, Toshiba and Utax. - ''; - }; -} diff --git a/pkgs/misc/cups/drivers/hl1210w/default.nix b/pkgs/misc/cups/drivers/hl1210w/default.nix index c8cd6e95651b6..b4bf573d68e57 100644 --- a/pkgs/misc/cups/drivers/hl1210w/default.nix +++ b/pkgs/misc/cups/drivers/hl1210w/default.nix @@ -43,9 +43,9 @@ stdenv.mkDerivation { substituteInPlace $out/opt/brother/Printers/HL1210W/cupswrapper/brother_lpdwrapper_HL1210W --replace /opt "$out/opt" - mkdir -p $out/lib/cups/filter + mkdir -p $out/lib/cups/filter $out/share/cups/model ln -s $out/opt/brother/Printers/HL1210W/cupswrapper/brother_lpdwrapper_HL1210W $out/lib/cups/filter/brother_lpdwrapper_HL1210W - ln -s $out/opt/brother/Printers/HL1210W/cupswrapper/brother-HL1210W-cups-en.ppd $out/lib/cups/filter/brother-HL1210W-cups-en.ppd + ln -s $out/opt/brother/Printers/HL1210W/cupswrapper/brother-HL1210W-cups-en.ppd $out/share/cups/model/ # cp brcupsconfig4 $out/opt/brother/Printers/HL1110/cupswrapper/ ln -s $out/opt/brother/Printers/HL1210W/cupswrapper/brcupsconfig4 $out/lib/cups/filter/brcupsconfig4 diff --git a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix deleted file mode 100644 index bd9974d5b6447..0000000000000 --- a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper -, cups -, dpkg -, a2ps, ghostscript, gnugrep, gnused, coreutils, file, perl, which -}: - -stdenv.mkDerivation rec { - pname = "hll2390dw-cups"; - version = "4.0.0-1"; - - src = fetchurl { - # The i386 part is a lie. There are x86, x86_64 and armv7l drivers. - # Though this builds only supports x86_64 for now. - url = "https://download.brother.com/welcome/dlf103579/hll2390dwpdrv-${version}.i386.deb"; - sha256 = "0w8rxh1sa5amxr87qmzs4m2p06b1b36wn2q127mg427sbkh1rwni"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ cups ghostscript dpkg a2ps ]; - - dontUnpack = true; - - installPhase = '' - dpkg-deb -x $src $out - - substituteInPlace $out/opt/brother/Printers/HLL2390DW/lpd/lpdfilter \ - --replace /opt "$out/opt" \ - --replace /usr/bin/perl ${perl}/bin/perl \ - --replace "BR_PRT_PATH =~" "BR_PRT_PATH = \"$out\"; #" \ - --replace "PRINTER =~" "PRINTER = \"HLL2390DW\"; #" - - # FIXME : Allow i686 and armv7l variations to be setup instead. - _PLAT=x86_64 - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - $out/opt/brother/Printers/HLL2390DW/lpd/$_PLAT/brprintconflsr3 - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - $out/opt/brother/Printers/HLL2390DW/lpd/$_PLAT/rawtobr3 - ln -s $out/opt/brother/Printers/HLL2390DW/lpd/$_PLAT/brprintconflsr3 $out/opt/brother/Printers/HLL2390DW/lpd/brprintconflsr3 - ln -s $out/opt/brother/Printers/HLL2390DW/lpd/$_PLAT/rawtobr3 $out/opt/brother/Printers/HLL2390DW/lpd/rawtobr3 - - for f in \ - $out/opt/brother/Printers/HLL2390DW/cupswrapper/lpdwrapper \ - $out/opt/brother/Printers/HLL2390DW/cupswrapper/paperconfigml2 \ - ; do - #substituteInPlace $f \ - wrapProgram $f \ - --prefix PATH : ${lib.makeBinPath [ - coreutils ghostscript gnugrep gnused - ]} - done - - mkdir -p $out/lib/cups/filter/ - ln -s $out/opt/brother/Printers/HLL2390DW/lpd/lpdfilter $out/lib/cups/filter/brother_lpdwrapper_HLL2390DW - - mkdir -p $out/share/cups/model - ln -s $out/opt/brother/Printers/HLL2390DW/cupswrapper/brother-HLL2390DW-cups-en.ppd $out/share/cups/model/ - - wrapProgram $out/opt/brother/Printers/HLL2390DW/lpd/lpdfilter \ - --prefix PATH ":" ${ lib.makeBinPath [ ghostscript a2ps file gnused gnugrep coreutils which ] } - ''; - - meta = with lib; { - homepage = "http://www.brother.com/"; - description = "Brother HL-L2390DW combined print driver"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us_ot&lang=en&prod=hll2390dw_us&os=128"; - maintainers = [ maintainers.samueldr ]; - }; -} - diff --git a/pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix b/pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix index 26e90cbf6bba4..8ebcccbaa2819 100644 --- a/pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Brother MFC-5890CN CUPS wrapper driver."; + description = "Brother MFC-5890CN CUPS wrapper driver"; longDescription = "Brother MFC-5890CN CUPS wrapper driver. Use the connection string 'lpd://\${IP_ADDRESS}/binary_p1' when connecting to this printer via the network."; homepage = "http://www.brother.com/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix b/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix index e98da9de2b60a..3cf7c62c4e723 100644 --- a/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix +++ b/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix @@ -22,7 +22,7 @@ let in { options = { services.samsung-unified-linux-driver_1_00_36 = { - enable = mkEnableOption "enable samsung-unified-linux-driver_1_00_36"; + enable = mkEnableOption "samsung-unified-linux-driver_1_00_36"; }; }; config = mkIf cfg.enable { diff --git a/pkgs/misc/drivers/argononed/default.nix b/pkgs/misc/drivers/argononed/default.nix index 5fa28c17c529a..48b5800abb028 100644 --- a/pkgs/misc/drivers/argononed/default.nix +++ b/pkgs/misc/drivers/argononed/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.com/DarkElvenAngel/argononed"; - description = "A replacement daemon for the Argon One Raspberry Pi case"; + description = "Replacement daemon for the Argon One Raspberry Pi case"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.misterio77 ]; diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index a2e3bd28f490c..b29572b436bd5 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -251,6 +251,38 @@ let plugins = { meta = common_meta // { description = "iscan esci s80 plugin for " + passthru.hw; }; }; + s600 = stdenv.mkDerivation rec { + name = "iscan-gt-s600-bundle"; + version = "2.30.4"; + + src = fetchurl { + urls = [ + "https://download2.ebz.epson.net/iscan/plugin/gt-s600/rpm/x64/iscan-gt-s600-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/20240614120113/https://download2.ebz.epson.net/iscan/plugin/gt-s600/rpm/x64/iscan-gt-s600-bundle-${version}.x64.rpm.tar.gz" + ]; + sha256 = "fe1356b1d5c40bc5ac985a5693166efb9e5049a78b412f49c385eb503eadf2c6"; + }; + + nativeBuildInputs = [ autoPatchelfHook rpm ]; + + installPhase = '' + cd plugins + ${rpm}/bin/rpm2cpio iscan-plugin-gt-s600-*.x86_64.rpm | ${cpio}/bin/cpio -idmv + mkdir $out + cp -r usr/share $out + cp -r usr/lib64 $out/lib + mv $out/share/iscan $out/share/esci + mv $out/lib/iscan $out/lib/esci + ''; + + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x012d "$plugin/lib/esci/libesint66 $plugin/share/esci/esfw66.bin" + ''; + hw = "GT-F650, GT-S600, Perfection V10, Perfection V100 Photo"; + }; + meta = common_meta // { description = "iscan gt-s600 plugin for " + passthru.hw; }; + }; s650 = stdenv.mkDerivation rec { name = "iscan-gt-s650-bundle"; version = "2.30.4"; diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index 4c3b969b425fa..e84cc3b0e3f88 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.2.9"; + version = "1.2.11"; src = fetchurl { # To find new versions, visit # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for # some printer like for instance "WF-7210" to get to the most recent # version. - url = "https://download3.ebz.epson.net/dsc/f/03/00/15/33/94/3bf10a30a1f8b5b91ddbafa4571c073878ec476b/epson-inkjet-printer-escpr2-1.2.9-1.src.rpm"; - sha256 = "sha256-2smNBTMSqoKYsGUoBtIHS3Fwk9ODbiXaP7Dtq69FG9U="; + url = "https://download3.ebz.epson.net/dsc/f/03/00/15/93/07/6926ce2857b2e0f563eecfd6a877b7b71898ad46/epson-inkjet-printer-escpr2-1.2.11-1.src.rpm"; + sha256 = "sha256-WMjtYYuMGMPf6222rvrP5Ep6fMRwebPTUXeQ6CbwEt4="; }; unpackPhase = '' diff --git a/pkgs/misc/drivers/epsonscan2/default.nix b/pkgs/misc/drivers/epsonscan2/default.nix index 01d8e5c8f83b8..6ee092b12e15b 100644 --- a/pkgs/misc/drivers/epsonscan2/default.nix +++ b/pkgs/misc/drivers/epsonscan2/default.nix @@ -24,25 +24,25 @@ let pname = "epsonscan2"; description = "Epson Scan 2 scanner driver for many modern Epson scanners and multifunction printers"; - version = "6.7.61.0"; + version = "6.7.63.0"; system = stdenv.hostPlatform.system; src = fetchzip { - url = "https://download3.ebz.epson.net/dsc/f/03/00/14/53/67/1a6447b4acc5568dfd970feba0518fabea35bca2/epsonscan2-${version}-1.src.tar.gz"; - hash = "sha256-xwvdgmV6Mrs1RC18U2mA+HlTYybeYb0V5lz5hCvC7+8="; + url = "https://download3.ebz.epson.net/dsc/f/03/00/15/17/69/0ef02802c476a6564f13cac929859c394f40326a/epsonscan2-6.7.63.0-1.src.tar.gz"; + hash = "sha256-ZLnbIk0I7g6ext5anPD+/lD4qNlk6f2fL0xdIWLcfbY="; }; bundle = { "i686-linux" = fetchzip { name = "${pname}-bundle"; - url = "https://download3.ebz.epson.net/dsc/f/03/00/14/53/69/3151031c0fb4deea3f48781fd051411b983ccee4/epsonscan2-bundle-${version}.i686.deb.tar.gz"; - hash = "sha256-nq3Nqunt8aMcCf7U7JBYrVscvrhhcwcn8RlhYXLmC2c="; + url = "https://download3.ebz.epson.net/dsc/f/03/00/15/17/67/ceae6a02aaa81cb61012899987fbb5ab891b6ab2/epsonscan2-bundle-6.7.63.0.i686.deb.tar.gz"; + hash = "sha256-h9beAzNdjOhTlZqW0rJbSQXGOpvFRGvTcWw0ZtOqiYY="; }; "x86_64-linux" = fetchzip { name = "${pname}-bundle"; - url = "https://download3.ebz.epson.net/dsc/f/03/00/14/53/68/a5e06101ba3f328dd747888e3dddebbb677bb8c8/epsonscan2-bundle-${version}.x86_64.deb.tar.gz"; - hash = "sha256-cFx54CKkZtvhZ5ABuBwB8+IzhT2lu8D3+GZFaMuWf3Y="; + url = "https://download3.ebz.epson.net/dsc/f/03/00/15/17/68/050e5a55ed90f4efb4ca3bdd34e5797b149443ca/epsonscan2-bundle-6.7.63.0.x86_64.deb.tar.gz"; + hash = "sha256-+S17FfS2h4zZCvE6W+yZvdJb6+OWYTt0ZWCA+pe1NZc="; }; }."${system}" or (throw "Unsupported system: ${system}"); diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index eb3b84d04529e..ad98f3fa768f7 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -127,7 +127,7 @@ python3Packages.buildPythonApplication { -e s,/usr/bin/perl,${perl}/bin/perl,g \ -e s,/usr/bin/file,${file}/bin/file,g \ -e s,/usr/bin/gs,${ghostscript}/bin/gs,g \ - -e s,/usr/share/cups/fonts,${ghostscript}/share/ghostscript/fonts,g \ + -e s,/usr/share/cups/fonts,${ghostscript.fonts}/share/fonts,g \ -e "s,ExecStart=/usr/bin/python /usr/bin/hp-config_usb_printer,ExecStart=$out/bin/hp-config_usb_printer,g" \ -e s,Exec=/usr/bin/hp-uiscan,Exec=hp-uiscan,g \ -e s,Icon=/usr/share/icons/Humanity/devices/48/printer.svg,Icon=printer,g \ diff --git a/pkgs/misc/drivers/m33-linux/default.nix b/pkgs/misc/drivers/m33-linux/default.nix index 7d9f8a406290d..e7bfbe34ee7f3 100644 --- a/pkgs/misc/drivers/m33-linux/default.nix +++ b/pkgs/misc/drivers/m33-linux/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/donovan6000/M3D-Linux"; - description = "A Linux program that can communicate with the Micro 3D printer"; + description = "Linux program that can communicate with the Micro 3D printer"; mainProgram = "m33-linux"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/misc/drivers/steamcontroller/default.nix b/pkgs/misc/drivers/steamcontroller/default.nix index 50d1133c38201..cd2563779d6fe 100644 --- a/pkgs/misc/drivers/steamcontroller/default.nix +++ b/pkgs/misc/drivers/steamcontroller/default.nix @@ -25,7 +25,7 @@ buildPythonApplication { pythonImportsCheck = [ "steamcontroller" ]; meta = with lib; { - description = "A standalone Steam controller driver"; + description = "Standalone Steam controller driver"; homepage = "https://github.com/ynsta/steamcontroller"; license = licenses.mit; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index 712a28782af78..4c8fdb2a64de1 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "fastly"; - version = "10.8.10"; + version = "10.12.3"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-AUseetBbr4phJJZe0qh9vXeNX7IwFGhgm+uGCbVWx5s="; + hash = "sha256-rvutRCfySapyHHzU6hVUdcQ/QdC/mqjrDhx1KTJnWlE="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -33,7 +33,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-L9U2MN7b2AU3fQSBKhF2Q6p7eN95bQGV0u9c0C6/yx0="; + vendorHash = "sha256-rQLnCY4tdNKYJcCpRs/J5SII0hSkxHxtVZkl4O4Ytyk="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/misc/flashfocus/default.nix b/pkgs/misc/flashfocus/default.nix index 753f82f6bd44c..20f6846274b73 100644 --- a/pkgs/misc/flashfocus/default.nix +++ b/pkgs/misc/flashfocus/default.nix @@ -17,7 +17,6 @@ python3Packages.buildPythonApplication rec { ''; nativeBuildInputs = with python3Packages; [ - pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix index e310879eb950d..7f90ceee29153 100644 --- a/pkgs/misc/frescobaldi/default.nix +++ b/pkgs/misc/frescobaldi/default.nix @@ -40,7 +40,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://frescobaldi.org/"; - description = "A LilyPond sheet music text editor"; + description = "LilyPond sheet music text editor"; longDescription = '' Powerful text editor with syntax highlighting and automatic completion, Music view with advanced Point & Click, Midi player to proof-listen diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 1420290055cb5..64bdf7b0d99e5 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -43,11 +43,11 @@ let srcs = [ (fetchurl { url = "mirror://sourceforge/gs-fonts/ghostscript-fonts-std-8.11.tar.gz"; - sha256 = "00f4l10xd826kak51wsmaz69szzm2wp8a41jasr4jblz25bg7dhf"; + hash = "sha256-DrbzVhGfLkmyVjIQhS4X9X+dzFdV81Cmmkag1kGgxAE="; }) (fetchurl { url = "mirror://gnu/ghostscript/gnu-gs-fonts-other-6.0.tar.gz"; - sha256 = "1cxaah3r52qq152bbkiyj2f7dx1rf38vsihlhjmrvzlr8v6cqil1"; + hash = "sha256-gUbMzEaZ/p2rhBRGvdFwOfR2nJA+zrVECRiLkgdUqrM="; }) # ... add other fonts here ]; @@ -61,11 +61,11 @@ let in stdenv.mkDerivation rec { pname = "ghostscript${lib.optionalString x11Support "-with-X"}"; - version = "10.02.1"; + version = "10.03.1"; src = fetchurl { url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${lib.replaceStrings ["."] [""] version}/ghostscript-${version}.tar.xz"; - hash = "sha512-7g91TBvYoYQorRTqo+rYD/i5YnWvUBLnqDhPHxBJDaBW7smuPMeRp6E6JOFuVN9bzN0QnH1ToUU0u9c2CjALEQ="; + hash = "sha256-FXIS7clrjMxAlHXc4uSYM/tEJ/FQxFUlje2WMsEGq+4="; }; patches = [ @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { ./doc-no-ref.diff ]; - outputs = [ "out" "man" "doc" ]; + outputs = [ "out" "man" "doc" "fonts" ]; enableParallelBuilding = true; @@ -133,7 +133,9 @@ stdenv.mkDerivation rec { cp -r Resource "$out/share/ghostscript/${version}" - ln -s "${fonts}" "$out/share/ghostscript/fonts" + mkdir -p $fonts/share/fonts + cp -rv ${fonts}/* "$fonts/share/fonts/" + ln -s "$fonts/share/fonts" "$out/share/ghostscript/fonts" '' + lib.optionalString stdenv.isDarwin '' for file in $out/lib/*.dylib* ; do install_name_tool -id "$file" $file diff --git a/pkgs/misc/gnuk/generic.nix b/pkgs/misc/gnuk/generic.nix index 2556ff42308f6..e9cc3aff2cf6f 100644 --- a/pkgs/misc/gnuk/generic.nix +++ b/pkgs/misc/gnuk/generic.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://www.fsij.org/doc-gnuk/"; - description = "An implementation of USB cryptographic token for gpg"; + description = "Implementation of USB cryptographic token for gpg"; license = licenses.gpl3; platforms = with platforms; linux; }; diff --git a/pkgs/misc/i3a/default.nix b/pkgs/misc/i3a/default.nix index 5c549bc7f16ae..853b758793c1b 100644 --- a/pkgs/misc/i3a/default.nix +++ b/pkgs/misc/i3a/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { changelog = "https://git.goral.net.pl/i3a.git/log/"; - description = "A set of scripts used for automation of i3 and sway window manager layouts"; + description = "Set of scripts used for automation of i3 and sway window manager layouts"; homepage = "https://git.goral.net.pl/i3a.git/about"; license = licenses.gpl3Plus; maintainers = with maintainers; [ moni ]; diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 64f386e0378d3..d13c9315b3c34 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, python3Packages, makeWrapper +{ lib, stdenv, fetchFromGitHub, fetchpatch2, pkg-config, python3Packages, makeWrapper , libsamplerate, libsndfile, readline, eigen, celt , wafHook # Darwin Dependencies @@ -46,12 +46,19 @@ stdenv.mkDerivation (finalAttrs: { aften AudioUnit CoreAudio Accelerate libobjc ]; + patches = [ + (fetchpatch2 { + # Python 3.12 support + name = "jack2-waf2.0.26.patch"; + url = "https://github.com/jackaudio/jack2/commit/250420381b1a6974798939ad7104ab1a4b9a9994.patch"; + hash = "sha256-M/H72lLTeddefqth4BSkEfySZRYMIzLErb7nIgVN0u8="; + }) + ]; + postPatch = '' patchShebangs --build svnversion_regenerate.sh ''; - dontAddWafCrossFlags = true; - wafConfigureFlags = [ "--classic" "--autostart=${if (optDbus != null) then "dbus" else "classic"}" diff --git a/pkgs/misc/libcardiacarrest/default.nix b/pkgs/misc/libcardiacarrest/default.nix index 4139c5b0f13eb..b5cfa1216eee2 100644 --- a/pkgs/misc/libcardiacarrest/default.nix +++ b/pkgs/misc/libcardiacarrest/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = src.meta // { - description = "A trivial implementation of libpulse PulseAudio library API"; + description = "Trivial implementation of libpulse PulseAudio library API"; longDescription = '' libcardiacarrest is a trivial implementation of libpulse PulseAudio library API that unconditionally (but gracefully) diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index acb3a543f68a8..e66c76614fb25 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-documentation" # FIXME: these URW fonts are not OTF, configure reports "URW++ OTF files... no". - "--with-urwotf-dir=${ghostscript}/share/ghostscript/fonts" + "--with-urwotf-dir=${ghostscript.fonts}/share/fonts" "--with-texgyre-dir=${gyre-fonts}/share/fonts/truetype/" ]; diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix index f500a7971315a..74f9932794939 100644 --- a/pkgs/misc/lilypond/unstable.nix +++ b/pkgs/misc/lilypond/unstable.nix @@ -1,10 +1,10 @@ { lib, fetchurl, lilypond }: lilypond.overrideAttrs (oldAttrs: rec { - version = "2.25.14"; + version = "2.25.17"; src = fetchurl { url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - hash = "sha256-b0qfNjr5jxEJbCYINX2/JhESMOIf9DefRHI47gn5Zio="; + hash = "sha256-AVGd/H2+lQxUYyXGB2dOBU4rpqR5LSkn3ishu5uqDYs="; }; passthru.updateScript = { diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index 5d0629d1fb69d..70c1e26a49d67 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, elk7Version, buildGoModule, libpcap, nixosTests, systemd, config }: -let beat = package: extraArgs: buildGoModule (rec { +let beat = package: extraArgs: buildGoModule (lib.attrsets.recursiveUpdate (rec { pname = package; version = elk7Version; @@ -21,7 +21,7 @@ let beat = package: extraArgs: buildGoModule (rec { maintainers = with maintainers; [ fadenb basvandijk dfithian ]; platforms = platforms.linux; }; -} // extraArgs); +}) extraArgs); in rec { auditbeat7 = beat "auditbeat" { meta.description = "Lightweight shipper for audit data"; }; diff --git a/pkgs/misc/logging/pacemaker/default.nix b/pkgs/misc/logging/pacemaker/default.nix index a3d365cd41709..2c3fd76b1dfd2 100644 --- a/pkgs/misc/logging/pacemaker/default.nix +++ b/pkgs/misc/logging/pacemaker/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://clusterlabs.org/pacemaker/"; - description = "Pacemaker is an open source, high availability resource manager suitable for both small and large clusters."; + description = "Pacemaker is an open source, high availability resource manager suitable for both small and large clusters"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ ryantm astro ]; diff --git a/pkgs/misc/long-shebang/default.nix b/pkgs/misc/long-shebang/default.nix index 34ad0350771f8..a1d0405186f43 100644 --- a/pkgs/misc/long-shebang/default.nix +++ b/pkgs/misc/long-shebang/default.nix @@ -10,7 +10,7 @@ in stdenv.mkDerivation { }; meta = { - description = "A tool for #! scripts with more than one argument"; + description = "Tool for #! scripts with more than one argument"; homepage = "https://github.com/shlevy/long-shebang"; diff --git a/pkgs/misc/lssecret/default.nix b/pkgs/misc/lssecret/default.nix index 2e5169974fc17..b1bf44096d888 100644 --- a/pkgs/misc/lssecret/default.nix +++ b/pkgs/misc/lssecret/default.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation rec { - name = "lssecret"; + pname = "lssecret"; version = "unstable-2022-12-02"; src = fetchFromGitLab { owner = "GrantMoyer"; - repo = name; + repo = "lssecret"; rev = "20fd771a"; hash = "sha256-yU70WZj4EC/sFJxyq2SQ0YQ6RCQHYiW/aQiYWo7+ujk="; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { makeFlags = ["DESTDIR=$(out)"]; meta = { - description = "A tool to list passwords and other secrets stored using the org.freedesktop.secrets dbus api"; + description = "Tool to list passwords and other secrets stored using the org.freedesktop.secrets dbus api"; homepage = "https://gitlab.com/GrantMoyer/lssecret"; license = lib.licenses.unlicense; maintainers = with lib.maintainers; [ genericnerdyusername ]; diff --git a/pkgs/misc/moonfire-nvr/default.nix b/pkgs/misc/moonfire-nvr/default.nix index 0946161ce52fd..d6a994ac3e684 100644 --- a/pkgs/misc/moonfire-nvr/default.nix +++ b/pkgs/misc/moonfire-nvr/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , rustPlatform , buildNpmPackage , fetchFromGitHub @@ -7,6 +8,7 @@ , sqlite , testers , moonfire-nvr +, darwin }: let @@ -52,7 +54,9 @@ in rustPlatform.buildRustPackage { buildInputs = [ ncurses sqlite - ]; + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + Security + ]); postInstall = '' mkdir -p $out/lib/ui diff --git a/pkgs/misc/present/default.nix b/pkgs/misc/present/default.nix index 6ed15f03e6e4f..a27b6abe4359b 100644 --- a/pkgs/misc/present/default.nix +++ b/pkgs/misc/present/default.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonPackage rec { doCheck = false; meta = with lib; { - description = "A terminal-based presentation tool with colors and effects."; + description = "Terminal-based presentation tool with colors and effects"; homepage = "https://github.com/vinayak-mehta/present"; license = licenses.asl20; maintainers = with maintainers; [ lom ]; diff --git a/pkgs/misc/rich-cli/default.nix b/pkgs/misc/rich-cli/default.nix index 9d03cfc66917c..a76f921dcf995 100644 --- a/pkgs/misc/rich-cli/default.nix +++ b/pkgs/misc/rich-cli/default.nix @@ -1,68 +1,52 @@ { lib , fetchFromGitHub +, fetchpatch , python3 }: -let - py = python3.override { - packageOverrides = final: prev: { - rich = prev.rich.overridePythonAttrs (old: rec { - version = "12.4.0"; - src = fetchFromGitHub { - owner = "Textualize"; - repo = "rich"; - rev = "refs/tags/v12.4.0"; - hash = "sha256-ryJTusUNpvNF2031ICJWK8ScxHIh+LrXYg7nd0ph4aQ="; - }; - propagatedBuildInputs = with py.pkgs; [ - commonmark - pygments - ]; - doCheck = false; - }); - - textual = prev.textual.overridePythonAttrs (old: rec { - version = "0.1.18"; - src = fetchFromGitHub { - owner = "Textualize"; - repo = "textual"; - rev = "refs/tags/v0.1.18"; - hash = "sha256-XVmbt8r5HL8r64ISdJozmM+9HuyvqbpdejWICzFnfiw="; - }; - doCheck = false; - }); - }; - }; -in - python3.pkgs.buildPythonApplication rec { pname = "rich-cli"; version = "1.8.0"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "Textualize"; - repo = pname; + repo = "rich-cli"; rev = "refs/tags/v${version}"; hash = "sha256-mV5b/J9wX9niiYtlmAUouaAm9mY2zTtDmex7FNWcezQ="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'rich = "^12.4.0"' 'rich = "*"' \ - --replace 'textual = "^0.1.18"' 'textual = "*"' - ''; + patches = [ + # Update dependencies, https://github.com/Textualize/rich-cli/pull/94 + (fetchpatch { + name = "update-dependencies.patch"; + url = "https://github.com/Textualize/rich-cli/pull/94/commits/1e9a11af7c1c78a5a44a207b1e0dce4c4b3c39f0.patch"; + hash = "sha256-cU+s/LK2GDVWXLZob0n5J6sLjflCr8w10hRLgeWN5Vg="; + }) + (fetchpatch { + name = "markdown.patch"; + url = "https://github.com/Textualize/rich-cli/pull/94/commits/0a8e77d724ace88ce88ee9d68a46b1dc8464fe0b.patch"; + hash = "sha256-KXvRG36Qj5kCj1RiAJsNkoJY7t41zUfJFgHeCtc0O4w="; + }) + ]; + + pythonRelaxDeps = [ + "textual" + ]; - nativeBuildInputs = with py.pkgs; [ + build-system = with python3.pkgs; [ poetry-core ]; - propagatedBuildInputs = with py.pkgs; [ - rich + nativeBuildInputs = with python3.pkgs; [ + ]; + + dependencies = with python3.pkgs; [ click requests - textual + rich rich-rst + textual ]; pythonImportsCheck = [ diff --git a/pkgs/misc/rkdeveloptool-pine64/default.nix b/pkgs/misc/rkdeveloptool-pine64/default.nix index b70298ded96a3..fbb1a2b725a57 100644 --- a/pkgs/misc/rkdeveloptool-pine64/default.nix +++ b/pkgs/misc/rkdeveloptool-pine64/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { in { homepage = "https://gitlab.com/pine64-org/quartz-bsp/rkdeveloptool/"; - description = "A tool from Rockchip to communicate with Rockusb devices (pine64 fork)"; + description = "Tool from Rockchip to communicate with Rockusb devices (pine64 fork)"; license = lib.licenses.gpl2; maintainers = [ maintainers.adisbladis ]; mainProgram = "rkdeveloptool"; diff --git a/pkgs/misc/rkdeveloptool/default.nix b/pkgs/misc/rkdeveloptool/default.nix index 341232e8cf191..3b6a85764bfa3 100644 --- a/pkgs/misc/rkdeveloptool/default.nix +++ b/pkgs/misc/rkdeveloptool/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/rockchip-linux/rkdeveloptool"; - description = "A tool from Rockchip to communicate with Rockusb devices"; + description = "Tool from Rockchip to communicate with Rockusb devices"; license = licenses.gpl2; maintainers = [ maintainers.lopsided98 ]; mainProgram = "rkdeveloptool"; diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index a231d22d90f5c..6691feeec6bb0 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -13,7 +13,7 @@ , libgtop , boost179 , tinyxml -, freeglut +, libglut , libGLU , libGL , glee @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { libgtop boost179 tinyxml - freeglut + libglut libGLU libGL glee diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index 734f3f515d03d..f1ba5eb0f1e27 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/the-cavalry/light-locker"; - description = "A simple session-locker for LightDM"; + description = "Simple session-locker for LightDM"; longDescription = '' A simple locker (forked from gnome-screensaver) that aims to have simple, sane, secure defaults and be well integrated with diff --git a/pkgs/misc/screensavers/physlock/default.nix b/pkgs/misc/screensavers/physlock/default.nix index dbe5e724835c7..caae1a4ba2c01 100644 --- a/pkgs/misc/screensavers/physlock/default.nix +++ b/pkgs/misc/screensavers/physlock/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" "SESSION=systemd" ]; meta = with lib; { - description = "A secure suspend/hibernate-friendly alternative to `vlock -an`"; + description = "Secure suspend/hibernate-friendly alternative to `vlock -an`"; mainProgram = "physlock"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/misc/screensavers/pipes-rs/default.nix b/pkgs/misc/screensavers/pipes-rs/default.nix index 858b634739458..d1ca26da47587 100644 --- a/pkgs/misc/screensavers/pipes-rs/default.nix +++ b/pkgs/misc/screensavers/pipes-rs/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "An over-engineered rewrite of pipes.sh in Rust"; + description = "Over-engineered rewrite of pipes.sh in Rust"; mainProgram = "pipes-rs"; homepage = "https://github.com/lhvy/pipes-rs"; license = licenses.blueOak100; diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index 3ecf07d29a3f5..eba0b568b92a2 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "xlockmore"; - version = "5.77"; + version = "5.78"; src = fetchurl { url = "http://sillycycle.com/xlock/xlockmore-${version}.tar.xz"; - sha256 = "sha256-UrfEE+c3hPxYFcc78SOPWiBd7rt4F6jBnnq/Pvb8LDY="; + sha256 = "sha256-wMlnQiF4ejMFWJSOWe9EN91IPMgbAoXNReHgaovr+pE="; curlOpts = "--user-agent 'Mozilla/5.0'"; }; diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 48e764b5f3e24..0f9457c9aaef4 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "seafile-shared"; - version = "9.0.5"; + version = "9.0.6"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; rev = "v${version}"; - sha256 = "sha256-ENxmRnnQVwRm/3OXouM5Oj0fLVRSj0aOHJeVT627UdY="; + sha256 = "sha256-ig22Rw9VWPqOsJS1Wxy69OjdMRcxh2fOyqMHBEky/Uo="; }; nativeBuildInputs = [ diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index dbdf6a24951b8..b29c717e591dd 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -92,12 +92,12 @@ in rec { catppuccin = mkTmuxPlugin { pluginName = "catppuccin"; - version = "unstable-2023-08-21"; + version = "unstable-2024-05-15"; src = fetchFromGitHub { owner = "catppuccin"; repo = "tmux"; - rev = "7a284c98e5df4cc84a1a45ad633916f0b2b916b2"; - hash = "sha256-jxcxW0gEfXaSt8VM3UIs0dKNKaHb8JSEQBBV3SVjW/A="; + rev = "697087f593dae0163e01becf483b192894e69e33"; + hash = "sha256-EHinWa6Zbpumu+ciwcMo6JIIvYFfWWEKH1lwfyZUNTo="; }; postInstall = '' sed -i -e 's|''${PLUGIN_DIR}/catppuccin-selected-theme.tmuxtheme|''${TMUX_TMPDIR}/catppuccin-selected-theme.tmuxtheme|g' $target/catppuccin.tmux @@ -207,7 +207,7 @@ in rec { }; meta = with lib; { homepage = "https://draculatheme.com/tmux"; - description = "A feature packed Dracula theme for tmux!"; + description = "Feature packed Dracula theme for tmux!"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ ethancedwards8 ]; @@ -587,12 +587,12 @@ in rec { session-wizard = mkTmuxPlugin rec { pluginName = "session-wizard"; rtpFilePath = "session-wizard.tmux"; - version = "1.2.0"; + version = "1.3.1"; src = pkgs.fetchFromGitHub { owner = "27medkamal"; repo = "tmux-session-wizard"; rev = "V${version}"; - sha256 = "sha256-IfSgX02vXdpzyu1GRF1EvzVCqqOEiTjeXtl1EvNr7EI="; + sha256 = "sha256-nJaC5aX+cR/+ks3I/lW/tUnVG0CrEYfsIjPDisgMrTE="; }; meta = with lib; { homepage = "https://github.com/27medkamal/tmux-session-wizard"; @@ -610,9 +610,11 @@ in rec { }; nativeBuildInputs = [ pkgs.makeWrapper ]; postInstall = '' - substituteInPlace $target/session-wizard.tmux \ - --replace \$CURRENT_DIR/session-wizard.sh $target/session-wizard.sh - wrapProgram $target/session-wizard.sh \ + for f in .gitignore Dockerfile flake.* scripts tests; do + rm -rf $target/$f + done + substituteInPlace $target/session-wizard.tmux --replace \$CURRENT_DIR $target + wrapProgram $target/bin/t \ --prefix PATH : ${with pkgs; lib.makeBinPath ([ fzf zoxide coreutils gnugrep gnused ])} ''; }; @@ -816,4 +818,23 @@ in rec { sha256 = "hRvkBf+YrWycecnDixAsD4CAHg3KsioomfJ/nLl5Zgs="; }; }; + + tmux-nova = mkTmuxPlugin rec { + pluginName = "tmux-nova"; + rtpFilePath = "nova.tmux"; + version = "1.2.0"; + src = fetchFromGitHub { + owner = "o0th"; + repo = "tmux-nova"; + rev = "v${version}"; + sha256 = "16llz3nlyw88lyd8mmj27i0ncyhpfjj5c1yikngf7nxcqsbjmcnh"; + }; + meta = with lib; { + homepage = "https://github.com/o0th/tmux-nova"; + description = "tmux-nova theme"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ o0th ]; + }; + }; } diff --git a/pkgs/misc/tpm2-pkcs11/default.nix b/pkgs/misc/tpm2-pkcs11/default.nix index 48ec7839d3e1a..797f515c1a7c9 100644 --- a/pkgs/misc/tpm2-pkcs11/default.nix +++ b/pkgs/misc/tpm2-pkcs11/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A PKCS#11 interface for TPM2 hardware"; + description = "PKCS#11 interface for TPM2 hardware"; homepage = "https://github.com/tpm2-software/tpm2-pkcs11"; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 837070e656147..95fadc40da5fd 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -133,7 +133,7 @@ let homepage = "https://www.denx.de/wiki/U-Boot/"; description = "Boot loader for embedded systems"; license = licenses.gpl2; - maintainers = with maintainers; [ bartsch dezgeg samueldr lopsided98 ]; + maintainers = with maintainers; [ bartsch dezgeg lopsided98 ]; } // extraMeta; } // removeAttrs args [ "extraMeta" "pythonScriptsToInstall" ])); in { diff --git a/pkgs/misc/uq/default.nix b/pkgs/misc/uq/default.nix index a4c9a7d92fb49..99ebe5a8be0f6 100644 --- a/pkgs/misc/uq/default.nix +++ b/pkgs/misc/uq/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1p6008vxm2pi9v31qhsq7zysanal6rcvcl8553373bkqlfd7w5c4"; meta = with lib; { - description = "A simple, user-friendly alternative to sort | uniq"; + description = "Simple, user-friendly alternative to sort | uniq"; homepage = "https://github.com/lostutils/uq"; license = licenses.mit; maintainers = with maintainers; [ doronbehar matthiasbeyer ]; diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index d601d41347039..611d9ec622d16 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://urbit.org"; - description = "An operating function"; + description = "Operating function"; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"]; maintainers = [ maintainers.matthew-levan ]; license = licenses.mit; diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix index e3c6a4f2bb10a..55c2638dba5c1 100644 --- a/pkgs/misc/wiki-tui/default.nix +++ b/pkgs/misc/wiki-tui/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-rKTR7vKt8woWAn7XgNYFiWu4KSiZYhaH+PLEIOfbNIY="; meta = with lib; { - description = "A simple and easy to use Wikipedia Text User Interface"; + description = "Simple and easy to use Wikipedia Text User Interface"; homepage = "https://github.com/builditluc/wiki-tui"; changelog = "https://github.com/Builditluc/wiki-tui/releases/tag/v${version}"; license = licenses.mit; |