diff options
Diffstat (limited to 'pkgs/misc')
118 files changed, 916 insertions, 2054 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..f9d107f12ffa5 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; @@ -156,7 +156,6 @@ in { platform = "rk3588"; extraMeta.platforms = ["aarch64-linux"]; filesToInstall = [ "build/${platform}/release/bl31/bl31.elf"]; - platformCanUseHDCPBlob = true; # TODO: remove this once the following get merged: # 1: https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/21840 diff --git a/pkgs/misc/autoadb/default.nix b/pkgs/misc/autoadb/default.nix index 8832d314df857..6b3ef212772a6 100644 --- a/pkgs/misc/autoadb/default.nix +++ b/pkgs/misc/autoadb/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-9Sv38dCtvbqvxSnRpq+HsIwF/rfLUVZbi0J+mltLres="; }; - cargoSha256 = "1gzg1lhq8gp790mrc8fw8dg146k8lg20pnk45m2ssnmdka0826f7"; + cargoHash = "sha256-xxmBgJqtWq1FLWTaC8SjaBoSXkPcIZYrSOc+hCEN778="; meta = with lib; { description = "Execute a command whenever a device is adb-connected"; 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..ab981d1f38c0e 100644 --- a/pkgs/misc/barebox/default.nix +++ b/pkgs/misc/barebox/default.nix @@ -72,8 +72,8 @@ let meta = with lib; { homepage = "https://www.barebox.org"; - description = "The Swiss Army Knive for bare metal"; - license = licenses.gpl2; + description = "Swiss Army Knive for bare metal"; + license = licenses.gpl2Only; maintainers = with maintainers; [ emantor ]; } // extraMeta; } // removeAttrs args [ "extraMeta" ]; diff --git a/pkgs/misc/base16-builder/generate.sh b/pkgs/misc/base16-builder/generate.sh index ebcdc72ed1bc3..af6e7ee4e1f7c 100755 --- a/pkgs/misc/base16-builder/generate.sh +++ b/pkgs/misc/base16-builder/generate.sh @@ -3,6 +3,5 @@ exec node2nix --nodejs-18 \ --input node-packages.json \ --output node-packages-generated.nix \ - --supplement-input supplement.json \ --composition node-packages.nix \ --node-env ./../../development/node-packages/node-env.nix \ diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix index 2bf491c2e6652..f4120816cba97 100644 --- a/pkgs/misc/base16-builder/node-packages.nix +++ b/pkgs/misc/base16-builder/node-packages.nix @@ -5,17 +5,13 @@ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}: let - globalBuildInputs = pkgs.lib.attrValues (import ./supplement.nix { - inherit nodeEnv; - inherit (pkgs) stdenv lib nix-gitignore fetchurl fetchgit; - }); nodeEnv = import ../../development/node-packages/node-env.nix { inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; }; in import ./node-packages-generated.nix { inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv globalBuildInputs; + inherit nodeEnv; } diff --git a/pkgs/misc/base16-builder/supplement.json b/pkgs/misc/base16-builder/supplement.json deleted file mode 100644 index 2838e627165fb..0000000000000 --- a/pkgs/misc/base16-builder/supplement.json +++ /dev/null @@ -1,3 +0,0 @@ -[ - "node-pre-gyp" -] diff --git a/pkgs/misc/base16-builder/supplement.nix b/pkgs/misc/base16-builder/supplement.nix deleted file mode 100644 index e6abbfeb42eeb..0000000000000 --- a/pkgs/misc/base16-builder/supplement.nix +++ /dev/null @@ -1,693 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: - -let - sources = { - "abbrev-1.1.1" = { - name = "abbrev"; - packageName = "abbrev"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; - sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; - }; - }; - "ansi-regex-2.1.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; - sha512 = "TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA=="; - }; - }; - "aproba-1.2.0" = { - name = "aproba"; - packageName = "aproba"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; - sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; - }; - }; - "are-we-there-yet-1.1.7" = { - name = "are-we-there-yet"; - packageName = "are-we-there-yet"; - version = "1.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz"; - sha512 = "nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g=="; - }; - }; - "balanced-match-1.0.2" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"; - sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; - }; - }; - "brace-expansion-1.1.11" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "1.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; - }; - }; - "chownr-1.1.4" = { - name = "chownr"; - packageName = "chownr"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"; - sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; - }; - }; - "code-point-at-1.1.0" = { - name = "code-point-at"; - packageName = "code-point-at"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; - sha512 = "RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA=="; - }; - }; - "concat-map-0.0.1" = { - name = "concat-map"; - packageName = "concat-map"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; - }; - }; - "console-control-strings-1.1.0" = { - name = "console-control-strings"; - packageName = "console-control-strings"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"; - sha512 = "ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="; - }; - }; - "core-util-is-1.0.3" = { - name = "core-util-is"; - packageName = "core-util-is"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"; - sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; - }; - }; - "debug-3.2.7" = { - name = "debug"; - packageName = "debug"; - version = "3.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"; - sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; - }; - }; - "deep-extend-0.6.0" = { - name = "deep-extend"; - packageName = "deep-extend"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; - sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; - }; - }; - "delegates-1.0.0" = { - name = "delegates"; - packageName = "delegates"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; - sha512 = "bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="; - }; - }; - "detect-libc-1.0.3" = { - name = "detect-libc"; - packageName = "detect-libc"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz"; - sha512 = "pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg=="; - }; - }; - "fs-minipass-1.2.7" = { - name = "fs-minipass"; - packageName = "fs-minipass"; - version = "1.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz"; - sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA=="; - }; - }; - "fs.realpath-1.0.0" = { - name = "fs.realpath"; - packageName = "fs.realpath"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; - }; - }; - "gauge-2.7.4" = { - name = "gauge"; - packageName = "gauge"; - version = "2.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"; - sha512 = "14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg=="; - }; - }; - "glob-7.2.3" = { - name = "glob"; - packageName = "glob"; - version = "7.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"; - sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; - }; - }; - "has-unicode-2.0.1" = { - name = "has-unicode"; - packageName = "has-unicode"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; - sha512 = "8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="; - }; - }; - "iconv-lite-0.4.24" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.24"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; - sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; - }; - }; - "ignore-walk-3.0.4" = { - name = "ignore-walk"; - packageName = "ignore-walk"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz"; - sha512 = "PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ=="; - }; - }; - "inflight-1.0.6" = { - name = "inflight"; - packageName = "inflight"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; - }; - }; - "inherits-2.0.4" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; - sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; - }; - }; - "ini-1.3.8" = { - name = "ini"; - packageName = "ini"; - version = "1.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"; - sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; - }; - }; - "is-fullwidth-code-point-1.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha512 = "1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw=="; - }; - }; - "isarray-1.0.0" = { - name = "isarray"; - packageName = "isarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; - sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; - }; - }; - "minimatch-3.1.2" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"; - sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; - }; - }; - "minimist-1.2.8" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz"; - sha512 = "2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="; - }; - }; - "minipass-2.9.0" = { - name = "minipass"; - packageName = "minipass"; - version = "2.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz"; - sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg=="; - }; - }; - "minizlib-1.3.3" = { - name = "minizlib"; - packageName = "minizlib"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz"; - sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q=="; - }; - }; - "mkdirp-0.5.6" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.6"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz"; - sha512 = "FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="; - }; - }; - "ms-2.1.3" = { - name = "ms"; - packageName = "ms"; - version = "2.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"; - sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; - }; - }; - "needle-2.9.1" = { - name = "needle"; - packageName = "needle"; - version = "2.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz"; - sha512 = "6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ=="; - }; - }; - "nopt-4.0.3" = { - name = "nopt"; - packageName = "nopt"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz"; - sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg=="; - }; - }; - "npm-bundled-1.1.2" = { - name = "npm-bundled"; - packageName = "npm-bundled"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz"; - sha512 = "x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ=="; - }; - }; - "npm-normalize-package-bin-1.0.1" = { - name = "npm-normalize-package-bin"; - packageName = "npm-normalize-package-bin"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz"; - sha512 = "EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="; - }; - }; - "npm-packlist-1.4.8" = { - name = "npm-packlist"; - packageName = "npm-packlist"; - version = "1.4.8"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz"; - sha512 = "5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A=="; - }; - }; - "npmlog-4.1.2" = { - name = "npmlog"; - packageName = "npmlog"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; - sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; - }; - }; - "number-is-nan-1.0.1" = { - name = "number-is-nan"; - packageName = "number-is-nan"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha512 = "4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ=="; - }; - }; - "object-assign-4.1.1" = { - name = "object-assign"; - packageName = "object-assign"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; - sha512 = "rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="; - }; - }; - "once-1.4.0" = { - name = "once"; - packageName = "once"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; - }; - }; - "os-homedir-1.0.2" = { - name = "os-homedir"; - packageName = "os-homedir"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; - sha512 = "B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ=="; - }; - }; - "os-tmpdir-1.0.2" = { - name = "os-tmpdir"; - packageName = "os-tmpdir"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha512 = "D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g=="; - }; - }; - "osenv-0.1.5" = { - name = "osenv"; - packageName = "osenv"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"; - sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; - }; - }; - "path-is-absolute-1.0.1" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; - }; - }; - "process-nextick-args-2.0.1" = { - name = "process-nextick-args"; - packageName = "process-nextick-args"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; - }; - }; - "rc-1.2.8" = { - name = "rc"; - packageName = "rc"; - version = "1.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"; - sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; - }; - }; - "readable-stream-2.3.8" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz"; - sha512 = "8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="; - }; - }; - "rimraf-2.7.1" = { - name = "rimraf"; - packageName = "rimraf"; - version = "2.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"; - sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; - }; - }; - "safe-buffer-5.1.2" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; - }; - }; - "safe-buffer-5.2.1" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"; - sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; - }; - }; - "safer-buffer-2.1.2" = { - name = "safer-buffer"; - packageName = "safer-buffer"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; - }; - }; - "sax-1.2.4" = { - name = "sax"; - packageName = "sax"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; - sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; - }; - }; - "semver-5.7.1" = { - name = "semver"; - packageName = "semver"; - version = "5.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; - sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; - }; - }; - "set-blocking-2.0.0" = { - name = "set-blocking"; - packageName = "set-blocking"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; - sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; - }; - }; - "signal-exit-3.0.7" = { - name = "signal-exit"; - packageName = "signal-exit"; - version = "3.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"; - sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; - }; - }; - "string-width-1.0.2" = { - name = "string-width"; - packageName = "string-width"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; - sha512 = "0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw=="; - }; - }; - "string_decoder-1.1.1" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; - sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; - }; - }; - "strip-ansi-3.0.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha512 = "VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg=="; - }; - }; - "strip-json-comments-2.0.1" = { - name = "strip-json-comments"; - packageName = "strip-json-comments"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha512 = "4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ=="; - }; - }; - "tar-4.4.19" = { - name = "tar"; - packageName = "tar"; - version = "4.4.19"; - src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz"; - sha512 = "a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA=="; - }; - }; - "util-deprecate-1.0.2" = { - name = "util-deprecate"; - packageName = "util-deprecate"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="; - }; - }; - "wide-align-1.1.5" = { - name = "wide-align"; - packageName = "wide-align"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz"; - sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="; - }; - }; - "wrappy-1.0.2" = { - name = "wrappy"; - packageName = "wrappy"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; - }; - }; - "yallist-3.1.1" = { - name = "yallist"; - packageName = "yallist"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; - sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; - }; - }; - }; -in -{ - node-pre-gyp = nodeEnv.buildNodePackage { - name = "node-pre-gyp"; - packageName = "node-pre-gyp"; - version = "0.17.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.17.0.tgz"; - sha512 = "abzZt1hmOjkZez29ppg+5gGqdPLUuJeAEwVPtHYEJgx0qzttCbcKFpxrCQn2HYbwCv2c+7JwH4BgEzFkUGpn4A=="; - }; - dependencies = [ - sources."abbrev-1.1.1" - sources."ansi-regex-2.1.1" - sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.7" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."chownr-1.1.4" - sources."code-point-at-1.1.0" - sources."concat-map-0.0.1" - sources."console-control-strings-1.1.0" - sources."core-util-is-1.0.3" - sources."debug-3.2.7" - sources."deep-extend-0.6.0" - sources."delegates-1.0.0" - sources."detect-libc-1.0.3" - sources."fs-minipass-1.2.7" - sources."fs.realpath-1.0.0" - sources."gauge-2.7.4" - sources."glob-7.2.3" - sources."has-unicode-2.0.1" - sources."iconv-lite-0.4.24" - sources."ignore-walk-3.0.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."is-fullwidth-code-point-1.0.0" - sources."isarray-1.0.0" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."minipass-2.9.0" - sources."minizlib-1.3.3" - sources."mkdirp-0.5.6" - sources."ms-2.1.3" - sources."needle-2.9.1" - sources."nopt-4.0.3" - sources."npm-bundled-1.1.2" - sources."npm-normalize-package-bin-1.0.1" - sources."npm-packlist-1.4.8" - sources."npmlog-4.1.2" - sources."number-is-nan-1.0.1" - sources."object-assign-4.1.1" - sources."once-1.4.0" - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" - sources."path-is-absolute-1.0.1" - sources."process-nextick-args-2.0.1" - sources."rc-1.2.8" - sources."readable-stream-2.3.8" - sources."rimraf-2.7.1" - sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - sources."sax-1.2.4" - sources."semver-5.7.1" - sources."set-blocking-2.0.0" - sources."signal-exit-3.0.7" - sources."string-width-1.0.2" - sources."string_decoder-1.1.1" - sources."strip-ansi-3.0.1" - sources."strip-json-comments-2.0.1" - (sources."tar-4.4.19" // { - dependencies = [ - sources."safe-buffer-5.2.1" - ]; - }) - sources."util-deprecate-1.0.2" - sources."wide-align-1.1.5" - sources."wrappy-1.0.2" - sources."yallist-3.1.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Node.js native addon binary install tool"; - homepage = "https://github.com/mapbox/node-pre-gyp#readme"; - license = "BSD-3-Clause"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} 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/cbeams/default.nix b/pkgs/misc/cbeams/default.nix deleted file mode 100644 index 928b03df09f7d..0000000000000 --- a/pkgs/misc/cbeams/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, buildPythonApplication, fetchPypi, isPy3k, blessings, docopt }: - -buildPythonApplication rec { - pname = "cbeams"; - version = "1.0.3"; - disabled = !isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "1agcjg6kmcyvk834xd2j60mi349qi9iw3dc2vwpd7pqwq1daq3gi"; - }; - - propagatedBuildInputs = [ blessings docopt ]; - - meta = with lib; { - homepage = "https://github.com/tartley/cbeams"; - description = "Command-line program to draw animated colored circles in the terminal"; - license = licenses.bsd3; - maintainers = with maintainers; [ oxzi ]; - }; -} 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/cups-pk-helper.nix b/pkgs/misc/cups/cups-pk-helper.nix index 1a3b4ebfbef69..75f5122cfd03a 100644 --- a/pkgs/misc/cups/cups-pk-helper.nix +++ b/pkgs/misc/cups/cups-pk-helper.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "PolicyKit helper to configure cups with fine-grained privileges"; homepage = "https://www.freedesktop.org/wiki/Software/cups-pk-helper/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index c8df29776db95..194074ce9cb66 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.10"; src = fetchurl { url = "https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; - sha256 = "sha256-3VQijdkDUmQozn43lhr67SMK0xB4gUHadc66oINiz2w="; + sha256 = "sha256-11dXwrwPeiiwLuTVLKnksaoboq/+FrmFhU9TNpQOWtc="; }; 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/brgenml1lpr/default.nix b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix index 1e838db932634..d683e80b28937 100644 --- a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix +++ b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix @@ -28,9 +28,9 @@ */ let - myPatchElf = file: with lib; '' + myPatchElf = file: '' patchelf --set-interpreter \ - ${stdenv.cc.libc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \ + ${stdenv.cc.libc}/lib/ld-linux${lib.optionalString stdenv.is64bit "-x86-64"}.so.2 \ ${file} ''; in diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix index 1f95c8cdd0317..c0f4e1854379d 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. @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { Lenovo M7605D ''; homepage = "https://github.com/pdewacht/brlaser"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ StijnDW ]; }; diff --git a/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix b/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix index 828b4bb831b62..de1d397f7b581 100644 --- a/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix +++ b/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix @@ -82,7 +82,7 @@ in rec { description = "Brother ${lib.strings.toUpper model} CUPS wrapper driver"; homepage = "http://www.brother.com/"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ lib.maintainers.steveej ]; }; diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix index 8614bdda2ab22..afee420903291 100644 --- a/pkgs/misc/cups/drivers/canon/default.nix +++ b/pkgs/misc/cups/drivers/canon/default.nix @@ -13,11 +13,9 @@ , gdk-pixbuf , pango , cairo -, coreutils , atk , pkg-config , libxml2 -, runtimeShell , libredirect , ghostscript , pkgs @@ -32,13 +30,15 @@ let ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; libs = pkgs: lib.makeLibraryPath buildInputs; - version = "5.70"; - dl = "8/0100007658/33"; + version = "5.90"; + dl = "8/0100007658/40"; + suffix1 = "m17n"; + suffix2 = "03"; versionNoDots = builtins.replaceStrings [ "." ] [ "" ] version; src_canon = fetchurl { - url = "http://gdlp01.c-wss.com/gds/${dl}/linux-UFRII-drv-v${versionNoDots}-m17n-11.tar.gz"; - hash = "sha256-d5VHlPpUPAr3RWVdQRdn42YLuVekOw1IaMFLVt1Iu7o="; + url = "http://gdlp01.c-wss.com/gds/${dl}/linux-UFRII-drv-v${versionNoDots}-${suffix1}-${suffix2}.tar.gz"; + hash = "sha256-HvuRQYqkHRCwfajSJPridDcADq7VkYwBEo4qr9W5mqA="; }; buildInputs = [ cups zlib jbigkit glib gtk3 libxml2 gdk-pixbuf pango cairo atk ]; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { postUnpack = '' ( cd $sourceRoot - tar -xf Sources/cnrdrvcups-lb-${version}-1.11.tar.xz + tar -xf Sources/cnrdrvcups-lb-${version}-1.${suffix2}.tar.xz sed -ie "s@_prefix=/usr@_prefix=$out@" cnrdrvcups-common-${version}/allgen.sh sed -ie "s@_libdir=/usr/lib@_libdir=$out/lib@" cnrdrvcups-common-${version}/allgen.sh sed -ie "s@_bindir=/usr/bin@_bindir=$out/bin@" cnrdrvcups-common-${version}/allgen.sh diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix index 8520ba7aff2e3..5be4e17581b6e 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, @@ -145,6 +145,6 @@ stdenv.mkDerivation { homepage = "https://hk.canon/en/support/0101048401/1"; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } 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/dymo/default.nix b/pkgs/misc/cups/drivers/dymo/default.nix index 97dcbde2b8b52..c3186cafa264d 100644 --- a/pkgs/misc/cups/drivers/dymo/default.nix +++ b/pkgs/misc/cups/drivers/dymo/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "CUPS Linux drivers and SDK for DYMO printers"; homepage = "https://www.dymo.com/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ makefu ]; }; } 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/fxlinuxprint/default.nix b/pkgs/misc/cups/drivers/fxlinuxprint/default.nix index e0936b73b08a7..4c64152e6c929 100644 --- a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix +++ b/pkgs/misc/cups/drivers/fxlinuxprint/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { homepage = "https://onlinesupport.fujixerox.com"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ delan ]; + maintainers = [ ]; platforms = platforms.linux; }; } 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..2b265498ac6d0 100644 --- a/pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix @@ -1,5 +1,4 @@ { lib -, findutils , stdenv , fetchurl , dpkg @@ -65,7 +64,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/mfcj470dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix index 767597548991a..c629a4918901d 100644 --- a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.brother.com/"; description = "Brother MFC-J470DW CUPS wrapper driver"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj470dw_us_eu_as&os=128"; maintainers = [ lib.maintainers.yochai ]; diff --git a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix index 4e6f37112087b..aead095635b39 100644 --- a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.brother.com/"; description = "Brother MFC-J6510DW CUPS wrapper driver"; - license = with licenses; gpl2; + license = with licenses; gpl2Plus; platforms = with platforms; linux; downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj6510dw_all&os=128"; maintainers = with maintainers; [ ramkromberg ]; diff --git a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix index f30f9abae3347..abf25ae69850e 100644 --- a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2720DW CUPS wrapper driver"; homepage = "http://www.brother.com/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ lib.maintainers.xeji ]; }; diff --git a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix index 2cad0ceba55be..9b2fe4ce1736a 100644 --- a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2740DW CUPS wrapper driver"; homepage = "http://www.brother.com/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ lib.maintainers.Enzime ]; + maintainers = [ ]; }; } diff --git a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix index 9c4dfa2f9978f..162b019ac9b13 100644 --- a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ lib.maintainers.Enzime ]; + maintainers = [ ]; }; } diff --git a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix index 47700265231f2..a76ecd6dcbf65 100644 --- a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix +++ b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix @@ -115,6 +115,6 @@ in stdenv.mkDerivation rec { # Tested on linux-x86_64. Might work on linux-i386. # Probably won't work on anything else. platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } 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..1b9ea38a3006c 100644 --- a/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix +++ b/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix @@ -15,17 +15,16 @@ # again after turning the device off and on. atm i have no idea how # to fix this and no time to do more about it. {config, pkgs, lib ? pkgs.lib, ...}: -with lib; let cfg = config.services.samsung-unified-linux-driver_1_00_36; pkg = pkgs.samsung-unified-linux-driver_1_00_36; in { options = { services.samsung-unified-linux-driver_1_00_36 = { - enable = mkEnableOption "enable samsung-unified-linux-driver_1_00_36"; + enable = lib.mkEnableOption "samsung-unified-linux-driver_1_00_36"; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.printing.drivers = [pkg]; hardware.sane.extraBackends = [pkg]; environment.etc = { diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix index d3ae34a80ae58..142f32dd2593c 100644 --- a/pkgs/misc/cups/drivers/splix/default.nix +++ b/pkgs/misc/cups/drivers/splix/default.nix @@ -47,8 +47,8 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "CUPS drivers for SPL (Samsung Printer Language) printers"; homepage = "http://splix.ap2c.org"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index c1654782db265..127910f97aac6 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters"; description = "Backends, filters, and other software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; } diff --git a/pkgs/misc/drivers/argononed/default.nix b/pkgs/misc/drivers/argononed/default.nix index 5fa28c17c529a..320aaf3440504 100644 --- a/pkgs/misc/drivers/argononed/default.nix +++ b/pkgs/misc/drivers/argononed/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "DarkElvenAngel"; repo = pname; rev = "97c4fa07fc2c09ffc3bd86e0f6319d50fa639578"; - sha256 = "sha256-5/xUYbprRiwD+FN8V2cUpHxnTbBkEsFG2wfsEXrCrgQ="; + hash = "sha256-5/xUYbprRiwD+FN8V2cUpHxnTbBkEsFG2wfsEXrCrgQ="; }; patches = [ ./fix-hardcoded-reboot-poweroff-paths.patch ]; @@ -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/cups-filter-ppd-dirs.patch b/pkgs/misc/drivers/epson-escpr2/cups-filter-ppd-dirs.patch deleted file mode 100644 index 02897f4f44d9b..0000000000000 --- a/pkgs/misc/drivers/epson-escpr2/cups-filter-ppd-dirs.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/configure.orig b/configure -index e9d400f..dac1943 100755 ---- a/configure.orig -+++ b/configure -@@ -12184,48 +12184,8 @@ esac - # *) ESCPR_LIB_NAME="escpr2_32" ;; - #esac - -- -- --# Check whether --with-cupsfilterdir was given. --if test "${with_cupsfilterdir+set}" = set; then : -- withval=$with_cupsfilterdir; --else -- with_cupsfilterdir=no --fi -- --if test "xno" = "x${with_cupsfilterdir}"; then -- if test "xyes" = "x$have_cups_config" ; then -- CUPS_FILTER_DIR="${cups_default_prefix}`cups-config --serverbin | sed -e 's,^/[^/][^/]*,,'`/filter" -- else -- CUPS_FILTER_DIR="${cups_default_prefix}/lib/cups/filter" -- fi --else -- CUPS_FILTER_DIR="${with_cupsfilterdir}" --fi -- -- --# Check whether --with-cupsppddir was given. --if test "${with_cupsppddir+set}" = set; then : -- withval=$with_cupsppddir; --else -- with_cupsppddir=no --fi -- --if test "xno" = "x${with_cupsppddir}"; then -- if test -d "${cups_default_prefix}/share/ppd" ; then -- CUPS_PPD_DIR="${cups_default_prefix}/share/ppd" -- elif test "xyes" = "x$have_cups_config" ; then -- CUPS_PPD_DIR="${cups_default_prefix}`cups-config --datadir | sed -e 's,^/[^/][^/]*,,'`/model" -- else -- CUPS_PPD_DIR="${cups_default_prefix}/share/cups/model" -- fi --else -- CUPS_PPD_DIR="${with_cupsppddir}" --fi -- -- -- -- -+CUPS_FILTER_DIR="${prefix}/lib/cups/filter" -+CUPS_PPD_DIR="${prefix}/share/cups/model" - - # Check whether --enable-lsb was given. - if test "${enable_lsb+set}" = set; then : diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index 4c3b969b425fa..d15c5d7cfc371 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -1,16 +1,23 @@ -{ lib, stdenv, fetchurl, cups, rpm, cpio }: +{ + lib, + stdenv, + fetchurl, + autoreconfHook, + cups, + rpm, + cpio, +}: stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.2.9"; + version = "1.2.13"; 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="; + # To find the most recent version go to + # https://support.epson.net/linux/Printer/LSB_distribution_pages/en/escpr2.php + # and retreive the download link for source package for x86 CPU + url = "https://download3.ebz.epson.net/dsc/f/03/00/16/00/23/60c57d2774eea9b27d2c636f0c3615b8619291b3/epson-inkjet-printer-escpr2-1.2.13-1.src.rpm"; + sha256 = "sha256-yOZqeNrtC28OucY5HOT6OY6qqvLSGh1LTIXbIB7VNrY="; }; unpackPhase = '' @@ -23,10 +30,17 @@ stdenv.mkDerivation rec { runHook postUnpack ''; - patches = [ ./cups-filter-ppd-dirs.patch ]; - buildInputs = [ cups ]; - nativeBuildInputs = [ rpm cpio ]; + nativeBuildInputs = [ + autoreconfHook + rpm + cpio + ]; + + configureFlags = [ + "--with-cupsfilterdir=${builtins.placeholder "out"}/lib/cups/filter" + "--with-cupsppddir=${builtins.placeholder "out"}/share/cups/model" + ]; meta = with lib; { homepage = "http://download.ebz.epson.net/dsc/search/01/search/"; @@ -37,8 +51,12 @@ stdenv.mkDerivation rec { Refer to the description of epson-escpr for usage. ''; - license = licenses.gpl2; - maintainers = with maintainers; [ ma9e ma27 shawn8901 ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ + ma9e + ma27 + shawn8901 + ]; platforms = platforms.linux; }; } 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/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index 8004af7686e18..e2d5b8ec6a82b 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Ghostscript and cups printer drivers"; homepage = "https://sourceforge.net/projects/gimp-print/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; isGutenprint = true; }; diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index eb3b84d04529e..fa3c2aad09fde 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, substituteAll -, pkg-config, autoreconfHook -, cups, zlib, libjpeg, libusb1, python3Packages, sane-backends +, pkg-config, autoreconfHook, gobject-introspection, wrapGAppsHook3 +, cups, zlib, libjpeg, libusb1, python311Packages, sane-backends , dbus, file, ghostscript, usbutils , net-snmp, openssl, perl, nettools, avahi , bash, util-linux @@ -14,16 +14,16 @@ let pname = "hplip"; - version = "3.23.8"; + version = "3.24.4"; src = fetchurl { url = "mirror://sourceforge/hplip/${pname}-${version}.tar.gz"; - hash = "sha256-98wF9ijAz9dQ5UrkFDHB390p6XaC8YtcW6XLLFtLG0Y="; + hash = "sha256-XXZDgxiTpeKt351C1YGl2/5arwI2Johrh2LFZF2g8fs="; }; plugin = fetchurl { url = "https://developers.hp.com/sites/default/files/${pname}-${version}-plugin.run"; - hash = "sha256-frsgye3f0M3HE2trKRlfFvMnDEwe+z74IumCdVPrcSY="; + hash = "sha256-Hzxr3SVmGoouGBU2VdbwbwKMHZwwjWnI7P13Z6LQxao="; }; hplipState = substituteAll { @@ -49,7 +49,7 @@ in assert withPlugin -> builtins.elem hplipArch pluginArches || throw "HPLIP plugin not supported on ${stdenv.hostPlatform.system}"; -python3Packages.buildPythonApplication { +python311Packages.buildPythonApplication { inherit pname version src; format = "other"; @@ -74,15 +74,16 @@ python3Packages.buildPythonApplication { pkg-config removeReferencesTo autoreconfHook + gobject-introspection + wrapGAppsHook3 ] ++ lib.optional withQt5 qt5.wrapQtAppsHook; - pythonPath = with python3Packages; [ + pythonPath = with python311Packages; [ dbus pillow pygobject3 reportlab usbutils - sip4 dbus-python distro ] ++ lib.optionals withQt5 [ @@ -105,9 +106,6 @@ python3Packages.buildPythonApplication { url = "https://web.archive.org/web/20230226174550/https://sources.debian.org/data/main/h/hplip/3.22.10+dfsg0-1/debian/patches/0028-Remove-ImageProcessor-binary-installs.patch"; sha256 = "sha256:18njrq5wrf3fi4lnpd1jqmaqr7ph5d7jxm7f15b1wwrbxir1rmml"; }) - - # Revert changes that break compilation under -Werror=format-security - ./revert-snprintf-change.patch ]; postPatch = '' @@ -127,7 +125,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 \ @@ -239,7 +237,8 @@ python3Packages.buildPythonApplication { # 1. Calling patchPythonProgram on the original script in $out/share/hplip # 2. Making our own wrapper pointing directly to the original script. dontWrapPythonPrograms = true; - # We also avoid double wrapping in case we add qt5 support + # We also avoid double (or triple in case qt5 support is added) wrapping + dontWrapGApps = true; dontWrapQtApps = true; preFixup = '' buildPythonPath "$out $pythonPath" @@ -253,7 +252,7 @@ python3Packages.buildPythonApplication { ${if withQt5 then "makeQtWrapper" else "makeWrapper"} "$py" "$bin" \ --prefix PATH ':' "$program_PATH" \ --set PYTHONNOUSERSITE "true" \ - $makeWrapperArgs + $makeWrapperArgs "''${gappsWrapperArgs[@]}" done ''; @@ -272,7 +271,7 @@ python3Packages.buildPythonApplication { # There are some binaries there, which reference gcc-unwrapped otherwise. stripDebugList = [ - "share/hplip" "lib/cups/backend" "lib/cups/filter" python3Packages.python.sitePackages "lib/sane" + "share/hplip" "lib/cups/backend" "lib/cups/filter" python311Packages.python.sitePackages "lib/sane" ]; meta = with lib; { @@ -283,6 +282,6 @@ python3Packages.buildPythonApplication { then licenses.unfree else with licenses; [ mit bsd2 gpl2Plus ]; platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ ttuegel arthsmn ]; + maintainers = with maintainers; [ ttuegel ]; }; } diff --git a/pkgs/misc/drivers/hplip/revert-snprintf-change.patch b/pkgs/misc/drivers/hplip/revert-snprintf-change.patch deleted file mode 100644 index 2caa98dc2cffa..0000000000000 --- a/pkgs/misc/drivers/hplip/revert-snprintf-change.patch +++ /dev/null @@ -1,61 +0,0 @@ -commit f103a260215016fc035bc1399c8accabf83b0264 -Author: Claudio Bley <claudio.bley@gmail.com> -Date: Fri Jul 1 22:29:05 2022 +0200 - - Revert change to hp_ipp.c from 3.22.{4 -> 6} - - This fails compilation: - ``` - protocol/hp_ipp.c: In function ‘addCupsPrinter’: - protocol/hp_ipp.c:113:9: error: format not a string literal and no format arguments [-Werror=format-security] - 113 | snprintf( info,sizeof(info), name ); - | ^~~~~~~~ - ``` - -diff --git a/protocol/hp_ipp.c b/protocol/hp_ipp.c -index 97d827d..af7013b 100644 ---- a/protocol/hp_ipp.c -+++ b/protocol/hp_ipp.c -@@ -110,7 +110,7 @@ int addCupsPrinter(char *name, char *device_uri, char *location, char *ppd_file, - } - - if ( info == NULL ) -- snprintf( info,sizeof(info), name ); -+ strcpy( info, name ); - - sprintf( printer_uri, "ipp://localhost/printers/%s", name ); - -@@ -511,27 +511,27 @@ int __parsePrinterAttributes(ipp_t *response, printer_t **printer_list) - - if ( strcmp(attr_name, "printer-name") == 0 && - val_tag == IPP_TAG_NAME ) { -- snprintf(t_printer->name, sizeof(t_printer->name),ippGetString(attr, 0, NULL) ); -+ strcpy(t_printer->name, ippGetString(attr, 0, NULL) ); - } - else if ( strcmp(attr_name, "device-uri") == 0 && - val_tag == IPP_TAG_URI ) { -- snprintf(t_printer->device_uri,sizeof(t_printer->device_uri), ippGetString(attr, 0, NULL) ); -+ strcpy(t_printer->device_uri, ippGetString(attr, 0, NULL) ); - } - else if ( strcmp(attr_name, "printer-uri-supported") == 0 && - val_tag == IPP_TAG_URI ) { -- snprintf(t_printer->printer_uri,sizeof(t_printer->printer_uri), ippGetString(attr, 0, NULL) ); -+ strcpy(t_printer->printer_uri, ippGetString(attr, 0, NULL) ); - } - else if ( strcmp(attr_name, "printer-info") == 0 && - val_tag == IPP_TAG_TEXT ) { -- snprintf(t_printer->info,sizeof(t_printer->info), ippGetString(attr, 0, NULL) ); -+ strcpy(t_printer->info, ippGetString(attr, 0, NULL) ); - } - else if ( strcmp(attr_name, "printer-location") == 0 && - val_tag == IPP_TAG_TEXT ) { -- snprintf(t_printer->location,sizeof(t_printer->location),ippGetString(attr, 0, NULL) ); -+ strcpy(t_printer->location, ippGetString(attr, 0, NULL) ); - } - else if ( strcmp(attr_name, "printer-make-and-model") == 0 && - val_tag == IPP_TAG_TEXT ) { -- snprintf(t_printer->make_model,sizeof(t_printer->make_model),ippGetString(attr, 0, NULL) ); -+ strcpy(t_printer->make_model, ippGetString(attr, 0, NULL) ); - } - else if ( strcmp(attr_name, "printer-state") == 0 && - val_tag == IPP_TAG_ENUM ) { diff --git a/pkgs/misc/drivers/m33-linux/default.nix b/pkgs/misc/drivers/m33-linux/default.nix index 7d9f8a406290d..9331760ef66bf 100644 --- a/pkgs/misc/drivers/m33-linux/default.nix +++ b/pkgs/misc/drivers/m33-linux/default.nix @@ -28,9 +28,9 @@ 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; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/misc/drivers/pantum-driver/default.nix b/pkgs/misc/drivers/pantum-driver/default.nix index 78a09f969325a..69e973fd95841 100644 --- a/pkgs/misc/drivers/pantum-driver/default.nix +++ b/pkgs/misc/drivers/pantum-driver/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "pantum-driver"; - version = "1.1.106"; + version = "1.1.123"; src = fetchzip { - url = "https://drivers.pantum.com/userfiles/files/download/drive/Pantum%20Ubuntu%20Driver%20V1_1_106.zip"; - hash = "sha256-FzR/wC73dJ4+rqFT+JvTduxzcozJIAs6jADNbmJby+M="; + url = "https://github.com/ArticExploit/pantum-driver/releases/download/${version}/Pantum.Ubuntu.Driver.V${builtins.replaceStrings ["."] ["_"] version}.zip"; + hash = "sha256-TUk6CTnWlSvyG8MOpDRhg/eblAo6X/MDUFOiWuOuro0="; }; buildInputs = [ libusb1 libjpeg8 cups ]; diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix index 48783b492387d..41614b27711c4 100644 --- a/pkgs/misc/drivers/sc-controller/default.nix +++ b/pkgs/misc/drivers/sc-controller/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchFromGitHub, wrapGAppsHook +{ lib, buildPythonApplication, fetchFromGitHub, wrapGAppsHook3 , pytestCheckHook , gtk3, gobject-introspection, libappindicator-gtk3, librsvg , evdev, pygobject3, pylibacl, bluez, vdf @@ -8,16 +8,16 @@ buildPythonApplication rec { pname = "sc-controller"; - version = "0.4.8.13"; + version = "0.4.8.21"; src = fetchFromGitHub { - owner = "Ryochan7"; - repo = pname; + owner = "C0rn3j"; + repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-vK/5S+GyqVfKTqn5PaPmOV/tXE9PIW57gqYxvhGaJSg="; + hash = "sha256-XakbCuwjIAXYFZxvJsAlDIJEl09pwFPT12h04onXd34="; }; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; buildInputs = [ gtk3 libappindicator-gtk3 librsvg ]; @@ -47,10 +47,10 @@ buildPythonApplication rec { ''; meta = with lib; { - homepage = "https://github.com/Ryochan7/sc-controller"; + homepage = "https://github.com/C0rn3j/sc-controller"; # donations: https://www.patreon.com/kozec description = "User-mode driver and GUI for Steam Controller and other controllers"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ orivej rnhmjoj ]; }; 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/drivers/sundtek/default.nix b/pkgs/misc/drivers/sundtek/default.nix index da2852e70d56a..3cba4a5f15c82 100644 --- a/pkgs/misc/drivers/sundtek/default.nix +++ b/pkgs/misc/drivers/sundtek/default.nix @@ -1,10 +1,7 @@ { fetchurl, lib, stdenv }: - -with lib; - let version = "2016-01-26"; - rpath = makeLibraryPath [ "$out/lib" "$out/bin" ]; + rpath = lib.makeLibraryPath [ "$out/lib" "$out/bin" ]; platform = with stdenv; if isx86_64 then "64bit" else @@ -13,7 +10,6 @@ let sha256 = with stdenv; if isx86_64 then "1jfsng5n3phw5rqpkid9m5j7m7zgj5bifh7swvba7f97y6imdaax" else "15y6r5w306pcq4g1rn9f7vf70f3a7qhq237ngaf0wxh2nr0aamxp"; - in stdenv.mkDerivation { src = fetchurl { @@ -42,7 +38,7 @@ in preferLocalBuild = true; - meta = { + meta = with lib; { description = "Sundtek MediaTV driver"; maintainers = [ maintainers.simonvandel ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/misc/drivers/utsushi/default.nix index d4e6c6ed4a96b..1642e91bb109c 100644 --- a/pkgs/misc/drivers/utsushi/default.nix +++ b/pkgs/misc/drivers/utsushi/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { owner = "utsushi"; repo = pname; rev = version; - sha256 = "sha256-CrN9F/WJKmlDN7eozEHtKgGUQBWVwTqwjnrfiATk7lI="; + hash = "sha256-CrN9F/WJKmlDN7eozEHtKgGUQBWVwTqwjnrfiATk7lI="; }; patches = [ diff --git a/pkgs/misc/drivers/xwiimote/default.nix b/pkgs/misc/drivers/xwiimote/default.nix deleted file mode 100644 index 14f22c9463ed9..0000000000000 --- a/pkgs/misc/drivers/xwiimote/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, udev, ncurses, pkg-config, fetchurl, bluez }: - -stdenv.mkDerivation rec { - pname = "xwiimote"; - version = "2"; - - src = fetchurl { - url = "https://github.com/dvdhrm/xwiimote/releases/download/xwiimote-${version}/xwiimote-${version}.tar.xz"; - sha256 = "1g9cbhblll47l300zr999xr51x2g98y49l222f77fhswd12kjzhd"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ udev ncurses bluez ]; - - configureFlags = [ "--with-doxygen=no" ]; - - meta = { - homepage = "https://dvdhrm.github.io/xwiimote"; - description = "Userspace utilities to control connected Nintendo Wii Remotes"; - mainProgram = "xwiishow"; - platforms = lib.platforms.linux; - license = lib.licenses.mit; - }; - - postInstallPhase = '' - mkdir -p "$out/etc/X11/xorg.conf.d/" - cp "res/50-xorg-fix-xwiimote.conf" "$out/etc/X11/xorg.conf.d/50-fix-xwiimote.conf" - ''; -} diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index 712a28782af78..abeda56f51650 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.14.1"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-AUseetBbr4phJJZe0qh9vXeNX7IwFGhgm+uGCbVWx5s="; + hash = "sha256-7awNvXlumeY6GXB91rUs8/rWIon0ig3C6S11fBdRj6Y="; # 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-innmJ40h80SFx8dRVsY4vR5QehFuavkl357zShXiyIE="; nativeBuildInputs = [ installShellFiles @@ -52,8 +52,8 @@ buildGoModule rec { ]; preBuild = let cliConfigToml = fetchurl { - url = "https://web.archive.org/web/20231130153524/https://developer.fastly.com/api/internal/cli-config"; - hash = "sha256-ZKr6D4DI+lr8FDjfLMgpn4Zq4i5kiwcLEDEScuuCBBw="; + url = "https://web.archive.org/web/20240910172801/https://developer.fastly.com/api/internal/cli-config"; + hash = "sha256-r4ahroyU4hyTN88UK02FvXU8OTQ6OoNInt9WrzZk7Bk="; }; in '' cp ${cliConfigToml} ./pkg/config/config.toml diff --git a/pkgs/misc/flashfocus/default.nix b/pkgs/misc/flashfocus/default.nix index 753f82f6bd44c..8c7fb067f1ab0 100644 --- a/pkgs/misc/flashfocus/default.nix +++ b/pkgs/misc/flashfocus/default.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-O6jRQ6e96b8CuumTD6TGELaz26No7WFZgGSnNSlqzuE="; + hash = "sha256-O6jRQ6e96b8CuumTD6TGELaz26No7WFZgGSnNSlqzuE="; }; postPatch = '' @@ -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..f37826501d729 100644 --- a/pkgs/misc/frescobaldi/default.nix +++ b/pkgs/misc/frescobaldi/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub, python3Packages, pyqtwebengine, lilypond }: +{ lib, stdenv, fetchFromGitHub, python311Packages, lilypond }: -buildPythonApplication rec { +python311Packages.buildPythonApplication rec { pname = "frescobaldi"; version = "3.3.0"; @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "sha256-Q6ruthNcpjLlYydUetkuTECiCIzu055bw40O8BPGq/A="; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python311Packages; [ qpageview lilypond pygame @@ -22,7 +22,7 @@ buildPythonApplication rec { pyqtwebengine ]; - nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; + nativeBuildInputs = [ python311Packages.pyqtwebengine.wrapQtAppsHook ]; # Needed because source is fetched from git preBuild = '' @@ -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..466bd1c909387 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 @@ -190,7 +192,7 @@ stdenv.mkDerivation rec { ''; license = lib.licenses.agpl3Plus; platforms = lib.platforms.all; - maintainers = [ lib.maintainers.viric ]; + maintainers = [ lib.maintainers.tobim ]; mainProgram = "gs"; }; } 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/ite-backlight/default.nix b/pkgs/misc/ite-backlight/default.nix index 376c4c409ca08..9660ad613be1d 100644 --- a/pkgs/misc/ite-backlight/default.nix +++ b/pkgs/misc/ite-backlight/default.nix @@ -1,5 +1,4 @@ { lib -, pkgs , stdenv , fetchpatch , ninja diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 64f386e0378d3..09e158da3ac32 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"}" @@ -79,6 +86,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2Plus; pkgConfigModules = [ "jack" ]; platforms = platforms.unix; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; }; }) diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index 4e7375a269168..428bb9685f47f 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { broken = stdenv.isDarwin; description = "JACK audio connection kit"; homepage = "https://jackaudio.org"; - license = with licenses; [ gpl2 lgpl21 ]; + license = with licenses; [ gpl2Plus lgpl21 ]; pkgConfigModules = [ "jack" ]; platforms = platforms.unix; }; diff --git a/pkgs/misc/jackaudio/tools.nix b/pkgs/misc/jackaudio/tools.nix index ac14d1528ce4c..e0e51a0ba4d98 100644 --- a/pkgs/misc/jackaudio/tools.nix +++ b/pkgs/misc/jackaudio/tools.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation (final: { homepage = "https://jackaudio.org"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ pennae ]; + maintainers = [ ]; }; }) diff --git a/pkgs/misc/jitsi-meet-prosody/default.nix b/pkgs/misc/jitsi-meet-prosody/default.nix index d9bcafca3eac1..00bd87d9b2988 100644 --- a/pkgs/misc/jitsi-meet-prosody/default.nix +++ b/pkgs/misc/jitsi-meet-prosody/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jitsi-meet-prosody"; - version = "1.0.7952"; + version = "1.0.8091"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "YSRii+oj2dHRJdfUvRmKYwJc+2OiJAumcSjWZ7STZwE="; + sha256 = "LsZItRkFvpYaj5DwEv4C6tRpmypHadzSVv8/Wto2/68="; }; dontBuild = true; diff --git a/pkgs/misc/libcardiacarrest/default.nix b/pkgs/misc/libcardiacarrest/default.nix index 4139c5b0f13eb..4c0d0fa97ad11 100644 --- a/pkgs/misc/libcardiacarrest/default.nix +++ b/pkgs/misc/libcardiacarrest/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, glib, libpulseaudio }: -with lib; - stdenv.mkDerivation rec { pname = "libcardiacarrest"; version = "12.2.8"; # <PA API version>.<version> @@ -27,8 +25,8 @@ stdenv.mkDerivation rec { moveToOutput $out/lib/cmake $dev ''; - meta = src.meta // { - description = "A trivial implementation of libpulse PulseAudio library API"; + meta = with lib; src.meta // { + 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..327882951d298 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "lilypond"; - version = "2.24.3"; + version = "2.24.4"; src = fetchurl { url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - sha256 = "sha256-3wBfdu969aTNdKEPjnEVJ4t/p58UAYk3tlwQlJjsRL4="; + sha256 = "sha256-6W+gNXHHnyDhl5ZTr6vb5O5Cdlo9n9FJU/DNnupReBw="; }; postInstall = '' @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # its Scheme libraries. wrapProgram "$f" \ --set GUILE_AUTO_COMPILE 0 \ - --set PATH "${lib.makeBinPath [ ghostscript coreutils (placeholder "out") ]}" \ + --prefix PATH : "${lib.makeBinPath [ ghostscript coreutils (placeholder "out") ]}" \ --argv0 "$f" done ''; @@ -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..738c5f76da203 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.19"; src = fetchurl { url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - hash = "sha256-b0qfNjr5jxEJbCYINX2/JhESMOIf9DefRHI47gn5Zio="; + hash = "sha256-gGG4ObmY9PcO0JIKxAagquHS74Elc49SZ/8FDwFfZDU="; }; 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..e0d20dfcb46cf 100644 --- a/pkgs/misc/logging/pacemaker/default.nix +++ b/pkgs/misc/logging/pacemaker/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "pacemaker"; - version = "2.1.7"; + version = "2.1.8"; src = fetchFromGitHub { owner = "ClusterLabs"; repo = pname; rev = "Pacemaker-${version}"; - sha256 = "sha256-cvCMIzeyP9oEzHpafOvCORYwWg6cH5qj3qXOUMW4nHA="; + sha256 = "sha256-J57+NSs4cL3BlEjSaXAoUTEhbMMxhWy8sUZ/K3x2nRM="; }; nativeBuildInputs = [ @@ -78,6 +78,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ "-Wno-error=strict-prototypes" + "-Wno-error=deprecated-declarations" ]); enableParallelBuilding = true; @@ -94,7 +95,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/meson-tools/default.nix b/pkgs/misc/meson-tools/default.nix index 02b162c88098d..78e8549807917 100644 --- a/pkgs/misc/meson-tools/default.nix +++ b/pkgs/misc/meson-tools/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/afaerber/meson-tools"; description = "Tools for Amlogic Meson ARM platforms"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ lopsided98 ]; }; } diff --git a/pkgs/misc/mlxbf-bootimages/default.nix b/pkgs/misc/mlxbf-bootimages/default.nix index a7552c0bb5cb2..7c4291fe778e8 100644 --- a/pkgs/misc/mlxbf-bootimages/default.nix +++ b/pkgs/misc/mlxbf-bootimages/default.nix @@ -6,12 +6,11 @@ stdenv.mkDerivation rec { pname = "mlxbf-bootimages"; - version = "4.0.3-12704"; + version = "4.8.0-13249"; src = fetchurl { - url = let mainVersion = builtins.elemAt (lib.splitString "-" version) 0; in - "https://linux.mellanox.com/public/repo/bluefield/${mainVersion}/bootimages/prod/${pname}-signed_${version}_arm64.deb"; - hash = "sha256-e13XZhxf41240Qu+hh2a9+KIvZCL+8k5JyZrpJCHmI8="; + url = "https://linux.mellanox.com/public/repo/bluefield/${version}/bootimages/prod/${pname}-signed_${version}_arm64.deb"; + hash = "sha256-VwbngA2UpHtvhCmL21qrebVSNG6/4PbkhnVAmERpek0="; }; nativeBuildInputs = [ @@ -35,7 +34,7 @@ stdenv.mkDerivation rec { # they are unfree. See https://github.com/Mellanox/bootimages/issues/3 license = licenses.unfree; platforms = [ "aarch64-linux" ]; - maintainers = with maintainers; [ nikstur ]; + maintainers = with maintainers; [ nikstur thillux ]; }; } 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/mxt-app/default.nix b/pkgs/misc/mxt-app/default.nix index 0f231bfd2f54c..6ddf91523cd36 100644 --- a/pkgs/misc/mxt-app/default.nix +++ b/pkgs/misc/mxt-app/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, libtool }: stdenv.mkDerivation rec { - version="1.36"; + version="1.40"; pname = "mxt-app"; src = fetchFromGitHub { owner = "atmel-maxtouch"; repo = "mxt-app"; rev = "v${version}"; - sha256 = "sha256-hS/4d7HUCoulY73Sn1+IAb/IWD4VDht78Tn2jdluzhU="; + sha256 = "sha256-ZquD1aZu/TJQdr7QwKHTbCwSCFxt4drVBm4D1FLlzF0="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/misc/opcua-client-gui/default.nix b/pkgs/misc/opcua-client-gui/default.nix index 962d48be8f8e6..c37568cfc9cbd 100644 --- a/pkgs/misc/opcua-client-gui/default.nix +++ b/pkgs/misc/opcua-client-gui/default.nix @@ -55,7 +55,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/FreeOpcUa/opcua-client-gui"; platforms = platforms.unix; license = licenses.gpl3Only; - maintainers = with maintainers; [ janik ]; + maintainers = [ ]; mainProgram = "opcua-client"; }; } diff --git a/pkgs/misc/opensbi/default.nix b/pkgs/misc/opensbi/default.nix index 347e7deb0d317..dae75b546caec 100644 --- a/pkgs/misc/opensbi/default.nix +++ b/pkgs/misc/opensbi/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "opensbi"; - version = "1.4"; + version = "1.5.1"; src = fetchFromGitHub { owner = "riscv-software-src"; repo = "opensbi"; rev = "v${version}"; - hash = "sha256-T8ZeAzjM9aeTXitjE7s+m+jjGGtDo2jK1qO5EuKiVLU="; + hash = "sha256-qb3orbmZJtesIBj9F2OX+BhrlctymZA1ZIbV/GVa0lU="; }; postPatch = '' diff --git a/pkgs/misc/plasma-hud/default.nix b/pkgs/misc/plasma-hud/default.nix index b0adf0e1efc69..e70162b79af74 100644 --- a/pkgs/misc/plasma-hud/default.nix +++ b/pkgs/misc/plasma-hud/default.nix @@ -1,4 +1,4 @@ -{ wrapGAppsHook +{ wrapGAppsHook3 , lib , python3Packages , fetchFromGitHub @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; propagatedBuildInputs = (with python3Packages; [ diff --git a/pkgs/misc/present/default.nix b/pkgs/misc/present/default.nix index 6ed15f03e6e4f..77ca05b0faae9 100644 --- a/pkgs/misc/present/default.nix +++ b/pkgs/misc/present/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-l9W5L4LD9qRo3rLBkgd2I/aDaj+ucib5UYg+X4RYg6c="; + hash = "sha256-l9W5L4LD9qRo3rLBkgd2I/aDaj+ucib5UYg+X4RYg6c="; }; propagatedBuildInputs = with python3Packages; [ @@ -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..8399cbb8d32b2 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 = [ @@ -74,7 +58,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/Textualize/rich-cli"; changelog = "https://github.com/Textualize/rich-cli/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ joelkoen ]; + maintainers = [ ]; mainProgram = "rich"; }; } diff --git a/pkgs/misc/rkdeveloptool-pine64/default.nix b/pkgs/misc/rkdeveloptool-pine64/default.nix index b70298ded96a3..1c53f6d664f26 100644 --- a/pkgs/misc/rkdeveloptool-pine64/default.nix +++ b/pkgs/misc/rkdeveloptool-pine64/default.nix @@ -37,8 +37,8 @@ stdenv.mkDerivation { in { homepage = "https://gitlab.com/pine64-org/quartz-bsp/rkdeveloptool/"; - description = "A tool from Rockchip to communicate with Rockusb devices (pine64 fork)"; - license = lib.licenses.gpl2; + description = "Tool from Rockchip to communicate with Rockusb devices (pine64 fork)"; + license = lib.licenses.gpl2Only; maintainers = [ maintainers.adisbladis ]; mainProgram = "rkdeveloptool"; }; diff --git a/pkgs/misc/rkdeveloptool/default.nix b/pkgs/misc/rkdeveloptool/default.nix index 341232e8cf191..dcbcfcf432c87 100644 --- a/pkgs/misc/rkdeveloptool/default.nix +++ b/pkgs/misc/rkdeveloptool/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/rockchip-linux/rkdeveloptool"; - description = "A tool from Rockchip to communicate with Rockusb devices"; - license = licenses.gpl2; + description = "Tool from Rockchip to communicate with Rockusb devices"; + license = licenses.gpl2Only; maintainers = [ maintainers.lopsided98 ]; mainProgram = "rkdeveloptool"; }; diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix deleted file mode 100644 index 30adbf2c62b53..0000000000000 --- a/pkgs/misc/scrcpy/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchFromGitHub -, makeWrapper -, meson -, ninja -, pkg-config -, runtimeShell -, installShellFiles - -, android-tools -, ffmpeg -, libusb1 -, SDL2 -}: - -let - version = "2.4"; - prebuilt_server = fetchurl { - name = "scrcpy-server"; - inherit version; - url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - hash = "sha256-k8Jyt0OGBcBV4Sf3REBk7Xj6nKSfgRVnd/0gHnnOe6M="; - }; -in -stdenv.mkDerivation rec { - pname = "scrcpy"; - inherit version; - - src = fetchFromGitHub { - owner = "Genymobile"; - repo = "scrcpy"; - rev = "refs/tags/v${version}"; - hash = "sha256-x1feZgCR3ZUi40/YZSjDULYk4W9Pjo17cn8RqcOoeoE="; - }; - - # display.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly. - # This can happen when running on non-NixOS because then scrcpy seems to have a hard time using the host OpenGL-supporting hardware. - # It would be better to fix the OpenGL problem, but that seems much more intrusive. - postPatch = '' - substituteInPlace app/src/display.c \ - --replace "SDL_RENDERER_ACCELERATED" "SDL_RENDERER_ACCELERATED || SDL_RENDERER_SOFTWARE" - ''; - - nativeBuildInputs = [ makeWrapper meson ninja pkg-config installShellFiles ]; - - buildInputs = [ ffmpeg SDL2 libusb1 ]; - - # Manually install the server jar to prevent Meson from "fixing" it - preConfigure = '' - echo -n > server/meson.build - ''; - - postInstall = '' - mkdir -p "$out/share/scrcpy" - ln -s "${prebuilt_server}" "$out/share/scrcpy/scrcpy-server" - - # runtime dep on `adb` to push the server - wrapProgram "$out/bin/scrcpy" --prefix PATH : "${android-tools}/bin" - '' + lib.optionalString stdenv.isLinux '' - substituteInPlace $out/share/applications/scrcpy-console.desktop \ - --replace "/bin/bash" "${runtimeShell}" - ''; - - meta = with lib; { - description = "Display and control Android devices over USB or TCP/IP"; - homepage = "https://github.com/Genymobile/scrcpy"; - changelog = "https://github.com/Genymobile/scrcpy/releases/tag/v${version}"; - sourceProvenance = with sourceTypes; [ - fromSource - binaryBytecode # server - ]; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ deltaevo ]; - mainProgram = "scrcpy"; - }; -} diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix index 4fcee6fa9b10c..a8bf0eabbe442 100644 --- a/pkgs/misc/screensavers/alock/default.nix +++ b/pkgs/misc/screensavers/alock/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { rev-prefix = "v"; - ignoredVersions = "^[^.]+$"; # ignore versions without a dot + allowedVersions = "\\."; }; meta = with lib; { diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix index 1c9ee8c1af0a5..d9dde026f98c6 100644 --- a/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -26,13 +26,13 @@ in stdenv.mkDerivation rec { pname = "betterlockscreen"; - version = "4.2.0"; + version = "4.4.0"; src = fetchFromGitHub { - owner = "pavanjadhaw"; + owner = "betterlockscreen"; repo = "betterlockscreen"; rev = "v${version}"; - sha256 = "sha256-e/NyUxrN18+x2zt+JzqVA00P8VdHo8oj9Bx09XKI+Eg="; + sha256 = "sha256-59Ct7XIfZqU3yaW9FO7UV8SSMLdcZMPRc7WJangxFPo="; }; nativeBuildInputs = [ makeWrapper ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast and sweet looking lockscreen for linux systems with effects!"; - homepage = "https://github.com/pavanjadhaw/betterlockscreen"; + homepage = "https://github.com/betterlockscreen/betterlockscreen"; mainProgram = "betterlockscreen"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index a231d22d90f5c..a75c725c0dbcf 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , wxGTK32 -, ffmpeg_4 +, ffmpeg_7 , lua5_1 , curl , libpng @@ -13,28 +13,28 @@ , libgtop , boost179 , tinyxml -, freeglut +, libglut , libGLU , libGL , glee }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "electricsheep"; - version = "3.0.2-2019-10-05"; + version = "3.0.2-unstable-2024-02-13"; src = fetchFromGitHub { owner = "scottdraves"; - repo = pname; - rev = "37ba0fd692d6581f8fe009ed11c9650cd8174123"; - sha256 = "sha256-v/+2dxOY/p6wNAywcFHUAfsZEJw31Syu2MacN/KeyWg="; + repo = "electricsheep"; + rev = "5fbbb684752be06ccbea41639968aa7f1cc678dd"; + hash = "sha256-X3EZ1/VcLEU1GkZbskWSsqQWYTnsH3pbFDvDLpdLmcU="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ wxGTK32 - ffmpeg_4 + ffmpeg_7 lua5_1 curl libpng @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { libgtop boost179 tinyxml - freeglut + libglut libGLU libGL glee @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Electric Sheep, a distributed screen saver for evolving artificial organisms"; homepage = "https://electricsheep.org/"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; license = licenses.gpl2Only; }; diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index 33db5825bc020..ef141c784d8d3 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -14,7 +14,7 @@ , libXext , systemd , pantheon -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -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 @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { It relies on LightDM for locking and unlocking your session via ConsoleKit/UPower or logind/systemd. ''; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ obadz ] ++ teams.pantheon.members; platforms = platforms.linux; }; diff --git a/pkgs/misc/screensavers/physlock/default.nix b/pkgs/misc/screensavers/physlock/default.nix index dbe5e724835c7..993ec8447c3a4 100644 --- a/pkgs/misc/screensavers/physlock/default.nix +++ b/pkgs/misc/screensavers/physlock/default.nix @@ -20,9 +20,9 @@ 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; + license = licenses.gpl2Plus; 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/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index 3ec89194df872..f8e0479b36c2a 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { This package currently contains all of the screensavers from the original collection, plus a few others. ''; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; }; } diff --git a/pkgs/misc/screensavers/vlock/default.nix b/pkgs/misc/screensavers/vlock/default.nix index c156373f14813..4596f707f344e 100644 --- a/pkgs/misc/screensavers/vlock/default.nix +++ b/pkgs/misc/screensavers/vlock/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Virtual console locking program"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ ]; platforms = platforms.linux; mainProgram = "vlock"; diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix index 90265afc4284e..e0fd83897e80d 100644 --- a/pkgs/misc/screensavers/xautolock/default.nix +++ b/pkgs/misc/screensavers/xautolock/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromGitHub , imake, gccmakedep, libX11, libXext, libXScrnSaver, xorgproto +, nixosTests }: stdenv.mkDerivation (finalAttrs: { @@ -25,12 +26,14 @@ stdenv.mkDerivation (finalAttrs: { installTargets = [ "install" "install.man" ]; + passthru.tests = { inherit (nixosTests) xautolock; }; + meta = with lib; { description = "Launch a given program when your X session has been idle for a given time"; homepage = "http://www.ibiblio.org/pub/linux/X11/screensavers"; maintainers = with maintainers; [ peti ]; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Only; mainProgram = "xautolock"; }; }) diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index 79b4adae6eb2b..d99c9fd7fcff5 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.76"; + version = "5.78"; src = fetchurl { url = "http://sillycycle.com/xlock/xlockmore-${version}.tar.xz"; - sha256 = "sha256-gnn7crvjflmW05+J8EIg0pbK11IGlXz/EbCqc7gFvfM="; + sha256 = "sha256-wMlnQiF4ejMFWJSOWe9EN91IPMgbAoXNReHgaovr+pE="; curlOpts = "--user-agent 'Mozilla/5.0'"; }; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Screen locker for the X Window System"; homepage = "http://sillycycle.com/xlockmore.html"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; }; diff --git a/pkgs/misc/screensavers/xss-lock/default.nix b/pkgs/misc/screensavers/xss-lock/default.nix index 88b4b6b795f3d..dfadfedaee9a0 100644 --- a/pkgs/misc/screensavers/xss-lock/default.nix +++ b/pkgs/misc/screensavers/xss-lock/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, docutils, pkg-config, glib, libpthreadstubs -, libXau, libXdmcp, xcbutil }: +, libXau, libXdmcp, xcbutil, nixosTests }: stdenv.mkDerivation { pname = "xss-lock"; @@ -15,6 +15,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config docutils ]; buildInputs = [ glib libpthreadstubs libXau libXdmcp xcbutil ]; + passthru.tests = { inherit (nixosTests) xss-lock; }; + meta = with lib; { description = "Use external locker (such as i3lock) as X screen saver"; license = licenses.mit; diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/pkgs/misc/screensavers/xtrlock-pam/default.nix index b87374df14dfe..25ac901759140 100644 --- a/pkgs/misc/screensavers/xtrlock-pam/default.nix +++ b/pkgs/misc/screensavers/xtrlock-pam/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { homepage = "https://github.com/aanatoly/xtrlock-pam"; description = "PAM based X11 screen locker"; license = "unknown"; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 48e764b5f3e24..e4852faeb409f 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.7"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; rev = "v${version}"; - sha256 = "sha256-ENxmRnnQVwRm/3OXouM5Oj0fLVRSj0aOHJeVT627UdY="; + sha256 = "sha256-Q2jqwuGhZpASfpLfgfuZKnOrALmctURj845QhxO3o5s="; }; nativeBuildInputs = [ diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix index 2da49d1f45bca..40f308280e629 100644 --- a/pkgs/misc/sndio/default.nix +++ b/pkgs/misc/sndio/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, alsa-lib, fixDarwinDylibNames }: +{ lib, stdenv, fetchurl, alsa-lib, fixDarwinDylibNames, gitUpdater }: stdenv.mkDerivation (finalAttrs: { pname = "sndio"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { url = "https://www.sndio.org/sndio-${finalAttrs.version}.tar.gz"; - hash = "sha256-8wgm/JwH42nTkk1fzt9qClPA30rh9atQ/pzygFQPaZo="; + hash = "sha256-vr07/QHFDJN2zz54FLk3m+2eF9A5O1ETt+t6PQ0DjFQ="; }; nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; @@ -18,6 +18,13 @@ stdenv.mkDerivation (finalAttrs: { ''; enableParallelBuilding = true; + # does not provide --disable-static + dontDisableStatic = true; + + passthru.updateScript = gitUpdater { + url = "https://sndio.org/git/sndio"; + rev-prefix = "v"; + }; meta = { homepage = "https://www.sndio.org"; diff --git a/pkgs/misc/solfege/css.patch b/pkgs/misc/solfege/css.patch deleted file mode 100644 index 40273df0132b4..0000000000000 --- a/pkgs/misc/solfege/css.patch +++ /dev/null @@ -1,33 +0,0 @@ -Fix theme parsing errors: https://savannah.gnu.org/bugs/index.php?53107 - ---- a/solfege.css -+++ b/solfege.css -@@ -7,19 +7,19 @@ --#ProgressionNameLabel, #Feedback { font: "Sans 18" } --#ProgressionLabelNumber { font: "Sans 12" } --#BoldText { font: Bold } -+#ProgressionNameLabel, #Feedback { font: 18px Sans } -+#ProgressionLabelNumber { font: 12px Sans } -+#BoldText { font: 12px Sans Bold } - --#StatisticsH1, #Heading1 { font: Sans 18 } --#StatisticsH2, #Heading2 { font: Sans 14 } -+#StatisticsH1, #Heading1 { font: 18px Sans } -+#StatisticsH2, #Heading2 { font: 14px Sans } - --#BpmInactiveLabel { font: Sans 12 } --#BpmActiveLabel { font: Sans Bold 12 } -+#BpmInactiveLabel { font: 12px Sans } -+#BpmActiveLabel { font: 12px Sans Bold } - - #DIALOGWARNING2 { background: red; } - #DIALOGWARNING { background: yellow; } - - #DEBUGWARNING { - background: red; -- font: Sans Bold 24; -+ font: 24px Sans Bold; - } - --#FlashBarLabel { font: Sans 16 } -+#FlashBarLabel { font: 16px Sans } diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix deleted file mode 100644 index 63606078abada..0000000000000 --- a/pkgs/misc/solfege/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ lib, fetchurl, gettext, pkg-config, texinfo, wrapGAppsHook -, buildPythonApplication, pycairo, pygobject3 -, gdk-pixbuf, gobject-introspection, gtk3, librsvg -, alsa-utils, timidity, mpg123, vorbis-tools, csound, lilypond -, automake, autoconf, txt2man -}: - -buildPythonApplication rec { - pname = "solfege"; - version = "3.23.4"; - - src = fetchurl { - url = "https://alpha.gnu.org/gnu/solfege/solfege-${version}.tar.gz"; - sha256 = "0sc17vf4xz6gy0s0z9ghi68yskikdmyb4gdaxx6imrm40734k8mp"; - }; - - patches = [ - ./css.patch - ./menubar.patch - ./texinfo.patch - ./webbrowser.patch - ]; - - preConfigure = '' - aclocal - autoconf - ''; - - nativeBuildInputs = [ - automake - autoconf - gdk-pixbuf - gettext - pkg-config - texinfo - txt2man - - gobject-introspection - wrapGAppsHook - ]; - - buildInputs = [ - gtk3 - librsvg - ]; - - propagatedBuildInputs = [ - pycairo - pygobject3 - ]; - - preBuild = '' - sed -i -e 's|wav_player=.*|wav_player=${alsa-utils}/bin/aplay|' \ - -e 's|midi_player=.*|midi_player=${timidity}/bin/timidity|' \ - -e 's|mp3_player=.*|mp3_player=${mpg123}/bin/mpg123|' \ - -e 's|ogg_player=.*|ogg_player=${vorbis-tools}/bin/ogg123|' \ - -e 's|csound=.*|csound=${csound}/bin/csound|' \ - -e 's|lilypond-book=.*|lilypond-book=${lilypond}/bin/lilypond-book|' \ - default.config - ''; - - format = "other"; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Ear training program"; - homepage = "https://www.gnu.org/software/solfege/"; - license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor orivej anthonyroussel ]; - mainProgram = "solfege"; - }; -} diff --git a/pkgs/misc/solfege/menubar.patch b/pkgs/misc/solfege/menubar.patch deleted file mode 100644 index 36d3944af61d2..0000000000000 --- a/pkgs/misc/solfege/menubar.patch +++ /dev/null @@ -1,7 +0,0 @@ -Fix https://savannah.gnu.org/bugs/index.php?53109 - ---- a/solfege/mainwin.py -+++ b/solfege/mainwin.py -@@ -270,1 +270,1 @@ -- hdlbox = Gtk.HandleBox() -+ hdlbox = Gtk.HBox() diff --git a/pkgs/misc/solfege/texinfo.patch b/pkgs/misc/solfege/texinfo.patch deleted file mode 100644 index d681b3e901bd8..0000000000000 --- a/pkgs/misc/solfege/texinfo.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fix build with texinfo 6.7. Otherwise - - makeinfo -I topdocs --no-split --no-headers --output AUTHORS topdocs/AUTHORS.texi - -fails with - - utf8 "\xC1" does not map to Unicode at /nix/store/...-texinfo-6.7/share/texinfo/Texinfo/ParserNonXS.pm line 1796, <FH> line 38. - ---- a/topdocs/AUTHORS.texi -+++ b/topdocs/AUTHORS.texi -@@ -1,2 +1,3 @@ - \input texinfo -+@documentencoding ISO-8859-1 - @setfilename AUTHORS.info ---- a/topdocs/README.texi -+++ b/topdocs/README.texi -@@ -1,2 +1,3 @@ - \input texinfo -+@documentencoding ISO-8859-1 - @setfilename README.info diff --git a/pkgs/misc/solfege/webbrowser.patch b/pkgs/misc/solfege/webbrowser.patch deleted file mode 100644 index 2c9b77d0b8eb7..0000000000000 --- a/pkgs/misc/solfege/webbrowser.patch +++ /dev/null @@ -1,8 +0,0 @@ -Fix startup. - ---- a/solfege/mainwin.py -+++ b/solfege/mainwin.py -@@ -27,2 +27,3 @@ import textwrap - try: -+ webbrowser.register_standard_browsers() - i = webbrowser._tryorder.index("x-www-browser") diff --git a/pkgs/misc/stabber/default.nix b/pkgs/misc/stabber/default.nix index c0b34982303dc..fd64b3942b5a1 100644 --- a/pkgs/misc/stabber/default.nix +++ b/pkgs/misc/stabber/default.nix @@ -1,9 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, expat , libmicrohttpd, darwin }: - -with lib; - stdenv.mkDerivation { pname = "stabber-unstable"; version = "2020-06-08"; @@ -28,7 +25,7 @@ stdenv.mkDerivation { buildInputs = [ glib expat libmicrohttpd ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - meta = { + meta = with lib; { description = "Stubbed XMPP Server"; mainProgram = "stabber"; homepage = "https://github.com/profanity-im/stabber"; diff --git a/pkgs/misc/talkfilters/default.nix b/pkgs/misc/talkfilters/default.nix index 3b785dfc56647..1560af6d9967f 100644 --- a/pkgs/misc/talkfilters/default.nix +++ b/pkgs/misc/talkfilters/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "Converts English text into text that mimics a stereotyped or humorous dialect"; homepage = "https://www.hyperrealm.com/talkfilters/talkfilters.html"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ ikervagyok ]; platforms = with lib.platforms; unix; }; diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index dbdf6a24951b8..dacf6ba1ef6fb 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 @@ -140,26 +140,26 @@ in rec { }; }; - copy-toolkit = mkTmuxPlugin rec { + copy-toolkit = mkTmuxPlugin { pluginName = "copy-toolkit"; rtpFilePath = "copytk.tmux"; - version = "1.1"; + version = "2021-12-20"; src = fetchFromGitHub { owner = "CrispyConductor"; repo = "tmux-copy-toolkit"; - rev = "v${version}"; - sha256 = "MEMC9klm+PH66UHwrB2SqdCaZX0LAujL+Woo/hV84m4="; + rev = "c80c2c068059fe04f840ea9f125c21b83cb6f81f"; + hash = "sha256-cLeOoJ+4MF8lSpwy5lkcPakvB3cpgey0RfLbVTwERNk="; }; postInstall = '' sed -i -e 's|python3 |${pkgs.python3}/bin/python3 |g' $target/copytk.tmux - sed -i -e 's|/bin/bash|${pkgs.bash}/bin/bash|g;s|/bin/cat|${pkgs.coreutils}/bin/cat|g' $target/copytk.py + sed -i -e 's|python3|${pkgs.python3}/bin/python3|g;s|/bin/bash|${pkgs.bash}/bin/bash|g;s|/bin/cat|${pkgs.coreutils}/bin/cat|g' $target/copytk.py ''; meta = { homepage = "https://github.com/CrispyConductor/tmux-copy-toolkit"; description = "Various copy-mode tools"; license = lib.licenses.mit; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ deejayem ]; + maintainers = with lib.maintainers; [ deejayem sedlund ]; }; }; @@ -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 ]; @@ -242,29 +242,8 @@ in rec { }; }; - fingers = mkTmuxPlugin rec { - pluginName = "tmux-fingers"; - rtpFilePath = "load-config.tmux"; - version = "2.1.1"; - src = fetchFromGitHub { - owner = "Morantron"; - repo = "tmux-fingers"; - rev = "${version}"; - sha256 = "sha256-1YMh6m8M6FKf8RPXsOfWCVC5CXSr/MynguwkG7O+oEY="; - }; - nativeBuildInputs = [ pkgs.makeWrapper pkgs.crystal pkgs.shards ]; - postInstall = '' - shards build --production - rm -rf $target/* $target/.* - cp -r bin $target/bin - echo "$target/bin/${pluginName} load-config" > $target/${rtpFilePath} - chmod +x $target/${rtpFilePath} - - wrapProgram $target/${rtpFilePath} \ - --prefix PATH : ${with pkgs; lib.makeBinPath ( - [ gawk ] ++ lib.optionals stdenv.isDarwin [ reattach-to-user-namespace ] - )} - ''; + fingers = pkgs.callPackage ./tmux-fingers { + inherit mkTmuxPlugin; }; fpp = mkTmuxPlugin { @@ -479,6 +458,35 @@ in rec { }; }; + pass = mkTmuxPlugin { + pluginName = "pass"; + version = "0-unstable-2020-02-28"; + rtpFilePath = "plugin.tmux"; + src = pkgs.fetchFromGitHub { + owner = "rafi"; + repo = "tmux-pass"; + rev = "76b1c98911d56928063a41bc93a2d9e81818ef4c"; + sha256 = "sha256-bamz4IZrozo5R7jt+z7YKyrogawPqsZ9cTJi9osjVoA="; + }; + + nativeBuildInputs = [ pkgs.makeWrapper ]; + postInstall = '' + rm $target/README.md + rm -r $target/test + + wrapProgram $target/scripts/main.sh \ + --prefix PATH : ${with pkgs; lib.makeBinPath ( [ + findutils fzf gnugrep gnused ncurses pkgs.pass tmux + ] )} + ''; + + meta = with lib; { + description = "Password-store browser using fzf in tmux"; + homepage = "https://github.com/rafi/tmux-pass"; + license = licenses.unlicense; + }; + }; + plumb = mkTmuxPlugin rec { pluginName = "plumb"; version = "0.1.1"; @@ -496,12 +504,18 @@ in rec { power-theme = mkTmuxPlugin { pluginName = "power"; rtpFilePath = "tmux-power.tmux"; - version = "unstable-2020-11-18"; + version = "unstable-2024-05-12"; src = pkgs.fetchFromGitHub { owner = "wfxr"; repo = "tmux-power"; - rev = "aec44aa5e00cc39eb71c668b1d73823270058e7d"; - sha256 = "11nm8cylx10d565g17acy0bj12n6dcbxp71zca2bmg0j1dq859cm"; + rev = "16bbde801378a70512059541d104c5ae35be32b9"; + hash = "sha256-IyYQyIONMnVBwhhcI3anOPxKpv2TfI2KZgJ5o5JtZ8I="; + }; + meta = with lib; { + description = "Tmux powerline theme"; + homepage = "https://github.com/wfxr/tmux-power"; + license = licenses.mit; + platforms = platforms.unix; }; }; @@ -587,12 +601,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 +624,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 ])} ''; }; @@ -669,6 +685,25 @@ in rec { }; }; + tokyo-night-tmux = mkTmuxPlugin { + pluginName = "tokyo-night-tmux"; + rtpFilePath = "tokyo-night.tmux"; + version = "1.5.3"; + src = pkgs.fetchFromGitHub { + owner = "janoamaral"; + repo = "tokyo-night-tmux"; + rev = "d34f1487b4a644b13d8b2e9a2ee854ae62cc8d0e"; + hash = "sha256-3rMYYzzSS2jaAMLjcQoKreE0oo4VWF9dZgDtABCUOtY="; + }; + meta = with lib; { + homepage = "https://github.com/janoamaral/tokyo-night-tmux"; + description = "A clean, dark Tmux theme that celebrates the lights of Downtown Tokyo at night."; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ redyf ]; + }; + }; + tmux-colors-solarized = mkTmuxPlugin { pluginName = "tmuxcolors"; version = "unstable-2019-07-14"; @@ -680,6 +715,26 @@ in rec { }; }; + tmux-floax = mkTmuxPlugin { + pluginName = "tmux-floax"; + rtpFilePath = "floax.tmux"; + version = "0-unstable-2024-07-24"; + src = fetchFromGitHub { + owner = "omerxx"; + repo = "tmux-floax"; + rev = "46c0a6a8c3cf79b83d1b338f547acbbd1d306301"; + hash = "sha256-bALZfVWcoAzcTeWwkBHhi7TzUQJicOBTNdeJh3O/Bj8="; + }; + meta = { + description = "Floating pane for Tmux"; + homepage = "https://github.com/omerxx/tmux-floax"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ redyf ]; + mainProgram = "tmux-floax"; + platforms = lib.platforms.all; + }; + }; + tmux-fzf = mkTmuxPlugin { pluginName = "tmux-fzf"; rtpFilePath = "main.tmux"; @@ -816,4 +871,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/tmux-plugins/tmux-fingers/default.nix b/pkgs/misc/tmux-plugins/tmux-fingers/default.nix new file mode 100644 index 0000000000000..bb415d76935b7 --- /dev/null +++ b/pkgs/misc/tmux-plugins/tmux-fingers/default.nix @@ -0,0 +1,46 @@ +{ + mkTmuxPlugin, + substituteAll, + fetchFromGitHub, + crystal, +}: +let + fingers = crystal.buildCrystalPackage rec { + format = "shards"; + version = "2.2.2"; + pname = "fingers"; + src = fetchFromGitHub { + owner = "Morantron"; + repo = "tmux-fingers"; + rev = "${version}"; + sha256 = "sha256-m9QON7diHVEDnnv/alXCJOG+BnfrAKygScrubZZ605I="; + }; + + shardsFile = ./shards.nix; + crystalBinaries.tmux-fingers.src = "src/fingers.cr"; + + postInstall = '' + shopt -s dotglob extglob + rm -rv !("tmux-fingers.tmux"|"bin") + shopt -u dotglob extglob + ''; + + # TODO: Needs starting a TMUX session to run tests + # Unhandled exception: Missing ENV key: "TMUX" (KeyError) + doCheck = false; + doInstallCheck = false; + }; +in +mkTmuxPlugin { + inherit (fingers) version src meta; + + pluginName = fingers.src.repo; + rtpFilePath = "tmux-fingers.tmux"; + + patches = [ + (substituteAll { + src = ./fix.patch; + tmuxFingersDir = "${fingers}/bin"; + }) + ]; +} diff --git a/pkgs/misc/tmux-plugins/tmux-fingers/fix.patch b/pkgs/misc/tmux-plugins/tmux-fingers/fix.patch new file mode 100644 index 0000000000000..34014441ebf95 --- /dev/null +++ b/pkgs/misc/tmux-plugins/tmux-fingers/fix.patch @@ -0,0 +1,41 @@ +diff --git a/tmux-fingers.tmux b/tmux-fingers.tmux +index f15b509..a14e312 100755 +--- a/tmux-fingers.tmux ++++ b/tmux-fingers.tmux +@@ -1,35 +1,4 @@ + #!/usr/bin/env bash + +-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +- +-if command -v "tmux-fingers" &>/dev/null; then +- FINGERS_BINARY="tmux-fingers" +-elif [[ -f "$CURRENT_DIR/bin/tmux-fingers" ]]; then +- FINGERS_BINARY="$CURRENT_DIR/bin/tmux-fingers" +-fi +- +-if [[ -z "$FINGERS_BINARY" ]]; then +- tmux run-shell -b "bash $CURRENT_DIR/install-wizard.sh" +- exit 0 +-fi +- +-CURRENT_FINGERS_VERSION="$($FINGERS_BINARY version)" +- +-pushd $CURRENT_DIR &> /dev/null +-CURRENT_GIT_VERSION=$(cat shard.yml | grep "^version" | cut -f2 -d':' | sed "s/ //g") +-popd &> /dev/null +- +-SKIP_WIZARD=$(tmux show-option -gqv @fingers-skip-wizard) +-SKIP_WIZARD=${SKIP_WIZARD:-0} +- +-if [ "$SKIP_WIZARD" = "0" ] && [ "$CURRENT_FINGERS_VERSION" != "$CURRENT_GIT_VERSION" ]; then +- tmux run-shell -b "FINGERS_UPDATE=1 bash $CURRENT_DIR/install-wizard.sh" +- +- if [[ "$?" != "0" ]]; then +- echo "Something went wrong while updating tmux-fingers. Please try again." +- exit 1 +- fi +-fi +- +-tmux run "$FINGERS_BINARY load-config" ++tmux run "@tmuxFingersDir@/tmux-fingers load-config" + exit $? diff --git a/pkgs/misc/tmux-plugins/tmux-fingers/shards.nix b/pkgs/misc/tmux-plugins/tmux-fingers/shards.nix new file mode 100644 index 0000000000000..9367ddf7b1a76 --- /dev/null +++ b/pkgs/misc/tmux-plugins/tmux-fingers/shards.nix @@ -0,0 +1,12 @@ +{ + cling = { + url = "https://github.com/devnote-dev/cling.git"; + rev = "v3.0.0"; + sha256 = "0mj5xvpiif1vhg4qds938p9zb5a47qzl397ybz1l1jks0gg361wq"; + }; + xdg_base_directory = { + url = "https://github.com/tijn/xdg_base_directory.git"; + rev = "60bf28dc060c221d5af52727927e92b840022eb0"; + sha256 = "1sa8bw8mzsz0pbj3m8v0w1pnk1q86zjivr0jndfg77wa33ki34y0"; + }; +} diff --git a/pkgs/misc/tpm2-pkcs11/default.nix b/pkgs/misc/tpm2-pkcs11/default.nix index 48ec7839d3e1a..80d9a1c452001 100644 --- a/pkgs/misc/tpm2-pkcs11/default.nix +++ b/pkgs/misc/tpm2-pkcs11/default.nix @@ -76,11 +76,11 @@ 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; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "tpm2_ptool"; }; } diff --git a/pkgs/misc/translatelocally-models/default.nix b/pkgs/misc/translatelocally-models/default.nix index 3c71247d1d9a9..9fb4754ed50d1 100644 --- a/pkgs/misc/translatelocally-models/default.nix +++ b/pkgs/misc/translatelocally-models/default.nix @@ -1,7 +1,10 @@ +let + modelSpecs = (builtins.fromJSON (builtins.readFile ./models.json)); +in + { lib, stdenvNoCC, fetchurl }: let - modelSpecs = (builtins.fromJSON (builtins.readFile ./models.json)); withCodeAsKey = f: { code, ... }@attrs: lib.nameValuePair code (f attrs); mkModelPackage = { name, code, version, url, checksum }: stdenvNoCC.mkDerivation { @@ -34,10 +37,5 @@ let lib.listToAttrs (map (withCodeAsKey mkModelPackage) modelSpecs); in allModelPkgs // { - is-en-tiny = allModelPkgs.is-en-tiny.overrideAttrs (super: { - # missing model https://github.com/XapaJIaMnu/translateLocally/issues/147 - meta = super.meta // { broken = true; }; - }); -} // { passthru.updateScript = ./update.sh; } diff --git a/pkgs/misc/translatelocally-models/models.json b/pkgs/misc/translatelocally-models/models.json index 98529a1a95491..5dcc26f6c12da 100644 --- a/pkgs/misc/translatelocally-models/models.json +++ b/pkgs/misc/translatelocally-models/models.json @@ -1,149 +1,233 @@ [ { "version": 1, - "checksum": "3714539160d5b4dce3ce0d829939315e3daffeaff53647249cc6336d745c09f2", - "url": "https://data.statmt.org/bergamot/models/csen/csen.student.base.tar.gz", + "checksum": "cd5418ba6a412fc7e06288e3b879e5ac9155508f6ddab75c175039e0277486fa", + "url": "https://data.statmt.org/bergamot/models/csen/csen.student.base.v1.cd5418ba6a412fc7.tar.gz", "name": "Czech-English base", "code": "cs-en-base" }, { "version": 1, - "checksum": "693aa14ecb86275169ad4b01cbca294f3bd38d8d9bc1fad8dd89fa7e937e7d2c", - "url": "https://data.statmt.org/bergamot/models/csen/csen.student.tiny11.tar.gz", + "checksum": "8f603aded58f0a3c97d4498550dd070a356465109229f3c98cc61f2571bb1089", + "url": "https://data.statmt.org/bergamot/models/csen/csen.student.tiny11.v1.8f603aded58f0a3c.tar.gz", "name": "Czech-English tiny", "code": "cs-en-tiny" }, { "version": 1, - "checksum": "7a57b4e3a11a2c5e03fc6855ffc2b8f61ce3f1a68aeefa4592577a9eebe25031", - "url": "https://data.statmt.org/bergamot/models/csen/encs.student.base.tar.gz", + "checksum": "db770d87e491b0dc26d34e96a63188232f39198db157048fed5d111391a63cd0", + "url": "https://data.statmt.org/bergamot/models/csen/encs.student.base.v1.db770d87e491b0dc.tar.gz", "name": "English-Czech base", "code": "en-cs-base" }, { "version": 1, - "checksum": "f999d6511bdb4f1ff246b0563fdf9b71d836e1c3037fe5306a61836d3b5b8d19", - "url": "https://data.statmt.org/bergamot/models/csen/encs.student.tiny11.tar.gz", + "checksum": "b5c1ff605296b0e5a55ae6876db434fded62ae0c947e153f758d7b8a58c2c3dd", + "url": "https://data.statmt.org/bergamot/models/csen/encs.student.tiny11.v1.b5c1ff605296b0e5.tar.gz", "name": "English-Czech tiny", "code": "en-cs-tiny" }, { "version": 2, - "checksum": "e7362faa83c4f61e552adf8fbd4bc528fe706746eb9fc1c286ec9af7566e3daf", - "url": "https://data.statmt.org/bergamot/models/deen/deen.student.base.tar.gz", + "checksum": "caa7c0ce3c8eaf05d333dc9458683f4b0375e5eeb604f6fb2c8585f7b70d398b", + "url": "https://data.statmt.org/bergamot/models/deen/deen.student.base.v2.caa7c0ce3c8eaf05.tar.gz", "name": "German-English base", "code": "de-en-base" }, { "version": 2, - "checksum": "5c11b6ccfa0533fd5632b3cbccbb054972076266e2d1d989d3babb0ec0b10e28", - "url": "https://data.statmt.org/bergamot/models/deen/deen.student.tiny11.tar.gz", + "checksum": "9f70fcb17bf9572d969aee69ed34c5d8b54c896c60dfe057da37f2e51d46895f", + "url": "https://data.statmt.org/bergamot/models/deen/deen.student.tiny11.v2.9f70fcb17bf9572d.tar.gz", "name": "German-English tiny", "code": "de-en-tiny" }, { "version": 2, - "checksum": "cf9ab5a41ce359672ab47579686f9af50fc1fe040552c375ca86912f0fce7827", - "url": "https://data.statmt.org/bergamot/models/deen/ende.student.base.tar.gz", + "checksum": "37b172bc9b594f9b60460f6d5c4ac1eb6af723ecccbdfa2c213308223a8a420f", + "url": "https://data.statmt.org/bergamot/models/deen/ende.student.base.v2.37b172bc9b594f9b.tar.gz", "name": "English-German base", "code": "en-de-base" }, { "version": 2, - "checksum": "0e85d1d7ee4f8a3ec12680696ffc11fa97d67a54d068ceafcf390a87df94877f", - "url": "https://data.statmt.org/bergamot/models/deen/ende.student.tiny11.tar.gz", + "checksum": "93821e13b3c511b5390f9fb79f476f738d66e3656889bf076e906897e614fed2", + "url": "https://data.statmt.org/bergamot/models/deen/ende.student.tiny11.v2.93821e13b3c511b5.tar.gz", "name": "English-German tiny", "code": "en-de-tiny" }, { "version": 1, - "checksum": "adf49d0e2f21b82414bc353ae1f0904d93360caa92203ae9f2fc209a83882d81", - "url": "https://data.statmt.org/bergamot/models/esen/esen.student.tiny11.tar.gz", + "checksum": "09576f06d0ad805e6851defdd63434840729c3bcc5cf19db732f00298dcdb5d9", + "url": "https://data.statmt.org/bergamot/models/esen/esen.student.tiny11.v1.09576f06d0ad805e.tar.gz", "name": "Spanish-English tiny", "code": "es-en-tiny" }, { "version": 1, - "checksum": "6594dda2a4f5d333969c30f8356f4a9f3fe15a9f8a5fd018b0d85b9d9ad2abb0", - "url": "https://data.statmt.org/bergamot/models/esen/enes.student.tiny11.tar.gz", + "checksum": "a7203a8f8e9daea85698d5912f25cca6fecae3e4097b188a0c31ed2d58e13c61", + "url": "https://data.statmt.org/bergamot/models/esen/enes.student.tiny11.v1.a7203a8f8e9daea8.tar.gz", "name": "English-Spanish tiny", "code": "en-es-tiny" }, { "version": 1, - "checksum": "05c6525549c9c621e348f8de74533764ad7696aba8245fc9a504116f8ef4053c", - "url": "https://data.statmt.org/bergamot/models/eten/eten.student.tiny11.tar.gz", + "checksum": "38de61c668e42f36a6b8acd564f3044b283d0cd61ebdb3947c490a99e297a2d5", + "url": "https://data.statmt.org/bergamot/models/eten/eten.student.tiny11.v1.38de61c668e42f36.tar.gz", "name": "Estonian-English tiny", "code": "et-en-tiny" }, { "version": 1, - "checksum": "afce6c566270abdd4db332e8dcf4fe22057ada3b2a1171aab04d0d4817396fb5", - "url": "https://data.statmt.org/bergamot/models/eten/enet.student.tiny11.tar.gz", + "checksum": "0b8f835b0c154aaa01f612bfcf1bdcd41f86f1088f1226f2d3d6fa8155cb80a0", + "url": "https://data.statmt.org/bergamot/models/eten/enet.student.tiny11.v1.0b8f835b0c154aaa.tar.gz", "name": "English-Estonian tiny", "code": "en-et-tiny" }, { - "version": 1, - "checksum": "5c1696747590d1a75bef67348dce96bcd3889eb5a06a0f670c3d7232ed79f60e", - "url": "https://data.statmt.org/bergamot/models/isen/isen.student.tiny11.tar.gz", + "version": 2.0, + "checksum": "536d6b8808a5c0765e058a8dc98f0ed667d6e14747708ca885aacbd21a99e795", + "url": "https://data.statmt.org/bergamot/models/isen/isen.student.base.v2.536d6b8808a5c076.tar.gz", + "name": "Icelandic-English base", + "code": "is-en-base" + }, + { + "version": 2.0, + "checksum": "829203cf37b7bdc4ac0cbee206d40eb48bb8d8f6d73fba0c0e6dec8cd25a3448", + "url": "https://data.statmt.org/bergamot/models/isen/isen.student.tiny11.v2.829203cf37b7bdc4.tar.gz", "name": "Icelandic-English tiny", "code": "is-en-tiny" }, { "version": 1, - "checksum": "9f5dde2f4f87438c24c9561990636e624c53b527ddc8505f822b22b073069de8", - "url": "https://data.statmt.org/bergamot/models/nben/nben.student.tiny11.tar.gz", + "checksum": "e410ce34f8337aabe2e105af14f44669f29cfae40f92f90b107323cf8f4188a9", + "url": "https://data.statmt.org/bergamot/models/nben/nben.student.tiny11.v1.e410ce34f8337aab.tar.gz", "name": "Norwegian (Bokmål)-English tiny", "code": "nb-en-tiny" }, { "version": 1, - "checksum": "0bb4b83560caaffae95940574d939999092800a7803fae4c79a97e6481887a4f", - "url": "https://data.statmt.org/bergamot/models/nnen/nnen.student.tiny11.tar.gz", + "checksum": "0efa37c16887eea4ccd579e5de52bf09708893d93c7b0d4656d5a13e0bc9a07f", + "url": "https://data.statmt.org/bergamot/models/nnen/nnen.student.tiny11.v1.0efa37c16887eea4.tar.gz", "name": "Norwegian (Nynorsk)-English tiny", "code": "nn-en-tiny" }, { "version": 1, - "checksum": "ecfe9c2b0be3406c0205ad2da58f4005893a4ae969e81dd9c523093cf5c7abc3", - "url": "https://data.statmt.org/bergamot/models/bgen/bgen.student.tiny11.tar.gz", + "checksum": "f9c89a3a25ff8dca84413b28c1afe722ebc969f4aa84e7ecd14ea03ba77c8ae5", + "url": "https://data.statmt.org/bergamot/models/bgen/bgen.student.tiny11.v1.f9c89a3a25ff8dca.tar.gz", "name": "Bulgarian-English tiny", "code": "bg-en-tiny" }, { "version": 1, - "checksum": "eb9a7511ae9c89fb91ab6da1e9d5061946ad752e5801351f39c8eddca9705c74", - "url": "https://data.statmt.org/bergamot/models/bgen/enbg.student.tiny11.tar.gz", + "checksum": "3ea060c1b76470a7769dc1f32010a99fcc9a2e868a58c429cd8e8251fa1330c8", + "url": "https://data.statmt.org/bergamot/models/bgen/enbg.student.tiny11.v1.3ea060c1b76470a7.tar.gz", "name": "English-Bulgarian tiny", "code": "en-bg-tiny" }, { "version": 1, "checksum": "87148203cbda28421d76fffbd7d3cd6c1fc0d6dae2843c248870274d6512a388", - "url": "https://data.statmt.org/bergamot/models/plen/plen.student.tiny11.tar.gz", + "url": "https://data.statmt.org/bergamot/models/plen/plen.student.tiny11.v1.87148203cbda2842.tar.gz", "name": "Polish-English tiny", "code": "pl-en-tiny" }, { "version": 1, "checksum": "c33219daa12e7872cf7ac8a1b86a2f3e0592ebadd7e756bf11d16d9a7725cf9b", - "url": "https://data.statmt.org/bergamot/models/plen/enpl.student.tiny11.tar.gz", + "url": "https://data.statmt.org/bergamot/models/plen/enpl.student.tiny11.v1.c33219daa12e7872.tar.gz", "name": "English-Polish tiny", "code": "en-pl-tiny" }, { "version": 1, - "checksum": "817a45ed9ec3228bfb797e5e14781ab7fe9f388fe1e834e280031f05089809f8", - "url": "https://data.statmt.org/bergamot/models/fren/fren.student.tiny11.tar.gz", + "checksum": "dccea16d03c0a3897b4ce085db676ae4bb2777f7e2b1755c04c0f92efa894b01", + "url": "https://data.statmt.org/bergamot/models/fren/fren.student.tiny11.v1.dccea16d03c0a389.tar.gz", "name": "French-English tiny", "code": "fr-en-tiny" }, { "version": 1, - "checksum": "28deea86d2a02102a7fedf19391a7628386f01f1f532d430306a9728dc5ec2d6", - "url": "https://data.statmt.org/bergamot/models/fren/enfr.student.tiny11.tar.gz", + "checksum": "805d112122af03d0fe2769eacaaaf5a9eac2c4b97e862a5b2cf0eb95862a7efb", + "url": "https://data.statmt.org/bergamot/models/fren/enfr.student.tiny11.v1.805d112122af03d0.tar.gz", "name": "English-French tiny", "code": "en-fr-tiny" + }, + { + "version": 2.0, + "checksum": "536d6b8808a5c0765e058a8dc98f0ed667d6e14747708ca885aacbd21a99e795", + "url": "https://data.statmt.org/bergamot/models/isen/isen.student.base.v2.536d6b8808a5c076.tar.gz", + "name": "Icelandic-English base", + "code": "is-en-base" + }, + { + "version": 2.0, + "checksum": "829203cf37b7bdc4ac0cbee206d40eb48bb8d8f6d73fba0c0e6dec8cd25a3448", + "url": "https://data.statmt.org/bergamot/models/isen/isen.student.tiny11.v2.829203cf37b7bdc4.tar.gz", + "name": "Icelandic-English tiny", + "code": "is-en-tiny" + }, + { + "version": 1.0, + "checksum": "fa8a29e01a5332ba78801ae269b0d1e33b2777e19cc1c23aa0c487b884236858", + "url": "https://data.statmt.org/bergamot/models/hbseng/hbseng.student.tiny11.v1.fa8a29e01a5332ba.tar.gz", + "name": "SerboCroatian-English tiny", + "code": "hbs-eng-tiny" + }, + { + "version": 1.0, + "checksum": "d029034e49c3bb0843cb540d60a3f2d8e5c2fda70e6856427a3d41f383e8bda9", + "url": "https://data.statmt.org/bergamot/models/slen/slen.student.tiny11.v1.d029034e49c3bb08.tar.gz", + "name": "Slovene-English tiny", + "code": "sl-en-tiny" + }, + { + "version": 1.0, + "checksum": "dd03ef56f4695c7bf967072df97cdfa3884c9a816b2da8515779da2b2879145b", + "url": "https://data.statmt.org/bergamot/models/mken/mken.student.tiny11.v1.dd03ef56f4695c7b.tar.gz", + "name": "Macedonian-English tiny", + "code": "mk-en-tiny" + }, + { + "version": 1.0, + "checksum": "4089a5a036eff1c3e646415b30ee3d1455b942a122fe427d4f087cd417963c5e", + "url": "https://data.statmt.org/bergamot/models/mten/mten.student.tiny11.v1.4089a5a036eff1c3.tar.gz", + "name": "Maltese-English tiny", + "code": "mt-en-tiny" + }, + { + "version": 1.0, + "checksum": "d7728d17a313230a7a12b99106c5d588c3ac7a65950211b2aac455b258ca0b30", + "url": "https://data.statmt.org/bergamot/models/tren/tren.student.tiny11.v1.d7728d17a313230a.tar.gz", + "name": "Turkish-English tiny", + "code": "tr-en-tiny" + }, + { + "version": 1.0, + "checksum": "6ead0c9b236f942bd2b059996730f349861b9e99ed462618fef1c0aefccb289c", + "url": "https://data.statmt.org/bergamot/models/sqen/sqen.student.tiny11.v1.6ead0c9b236f942b.tar.gz", + "name": "Albanian-English tiny", + "code": "sq-en-tiny" + }, + { + "version": 1.0, + "checksum": "edaf67d1938e80d3ad082056c08be8c19d8cd178375de1211b17c8d0cd06aec7", + "url": "https://data.statmt.org/bergamot/models/caen/caen.student.tiny11.v1.edaf67d1938e80d3.tar.gz", + "name": "Catalan-English tiny", + "code": "ca-en-tiny" + }, + { + "version": 1.0, + "checksum": "000644283159637882bf8901a57bb39dce29319717e86274720c44676a158d71", + "url": "https://data.statmt.org/bergamot/models/elen/elen.student.tiny11.v1.0006442831596378.tar.gz", + "name": "Greek-English tiny", + "code": "el-en-tiny" + }, + { + "version": 1.0, + "checksum": "108d04d1e160153a9dc92e676010b79cc8a5de1ec0112a997db0a834a8457420", + "url": "https://data.statmt.org/bergamot/models/uken/uken.student.tiny11.v1.108d04d1e160153a.tar.gz", + "name": "Ukrainian-English tiny", + "code": "uk-en-tiny" } ] diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 837070e656147..351c5788584a2 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -28,10 +28,10 @@ }: let - defaultVersion = "2024.04"; + defaultVersion = "2024.07"; defaultSrc = fetchurl { url = "https://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; - hash = "sha256-GKhT/jn6160DqQzC1Cda6u1tppc13vrDSSuAUIhD3Uo="; + hash = "sha256-9ZHamrkO89az0XN2bQ3f+QxO1zMGgIl0hhF985DYPI8="; }; # Dependencies for the tools need to be included as either native or cross, @@ -132,8 +132,8 @@ let meta = with lib; { homepage = "https://www.denx.de/wiki/U-Boot/"; description = "Boot loader for embedded systems"; - license = licenses.gpl2; - maintainers = with maintainers; [ bartsch dezgeg samueldr lopsided98 ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ bartsch dezgeg lopsided98 ]; } // extraMeta; } // removeAttrs args [ "extraMeta" "pythonScriptsToInstall" ])); in { @@ -303,7 +303,7 @@ in { extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareRK3588}/bl31.elf"; ROCKCHIP_TPL = rkbin.TPL_RK3588; - filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" ]; + filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" "u-boot-rockchip-spi.bin" ]; }; ubootNovena = buildUBoot { @@ -389,6 +389,14 @@ in { filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" "u-boot-rockchip-spi.bin" ]; }; + ubootOrangePi5Plus = buildUBoot { + defconfig = "orangepi-5-plus-rk3588_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + BL31 = "${armTrustedFirmwareRK3588}/bl31.elf"; + ROCKCHIP_TPL = rkbin.TPL_RK3588; + filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" "u-boot-rockchip-spi.bin" ]; + }; + ubootOrangePiPc = buildUBoot { defconfig = "orangepi_pc_defconfig"; extraMeta.platforms = ["armv7l-linux"]; @@ -416,6 +424,16 @@ in { filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; + ubootOrangePiZero3 = buildUBoot { + defconfig = "orangepi_zero3_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + # According to https://linux-sunxi.org/H616 the H618 "is a minor update with a larger (1MB) L2 cache" (compared to the H616) + # but "does require extra support in U-Boot, TF-A and sunxi-fel. Support for that has been merged in mainline releases." + # But no extra support seems to be in TF-A. + BL31 = "${armTrustedFirmwareAllwinnerH616}/bl31.bin"; + filesToInstall = ["u-boot-sunxi-with-spl.bin"]; + }; + ubootOrangePi3 = buildUBoot { defconfig = "orangepi_3_defconfig"; extraMeta.platforms = ["aarch64-linux"]; diff --git a/pkgs/misc/uq/default.nix b/pkgs/misc/uq/default.nix index a4c9a7d92fb49..414403d81ef9d 100644 --- a/pkgs/misc/uq/default.nix +++ b/pkgs/misc/uq/default.nix @@ -14,10 +14,10 @@ rustPlatform.buildRustPackage rec { sha256 = "1qqqmdk0v1d3ckasmmw5lbrkvhkv0nws4bzi9cfi1ndhrbvbkbxb"; }; - cargoSha256 = "1p6008vxm2pi9v31qhsq7zysanal6rcvcl8553373bkqlfd7w5c4"; + cargoHash = "sha256-hBV+mqN4rnHGKAVRtlk2VFml/T9YQxzGTvGK2jcCwNw="; 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..aa78c949e5c0c 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -10,15 +10,15 @@ let in stdenv.mkDerivation rec { pname = "urbit"; - version = "3.0"; + version = "3.1"; src = fetchzip { url = "https://github.com/urbit/vere/releases/download/vere-v${version}/${platform}.tgz"; sha256 = { - x86_64-linux = "sha256-ip35d9YgwFEkNb+1h+8WYBgUm+QlckvHhlAT69TpeYg="; - aarch64-linux = "sha256-3TkK9YyFtEMpRjG/iKvxctD8pYRh0bWgH+3QWh++r5U="; - x86_64-darwin = "sha256-bvDZBSQmsXmJA2ZekWPr6krB0KzCFFly8KUqT5mVK1A="; - aarch64-darwin = "sha256-UybuCXpE/xwg4YmR3rpZiFTs1KQYAttpEjF/Fz+UD00="; + x86_64-linux = "sha256-51Zgv9QANQVMk/dc7/heYmCNfeu4k7mrYNke1/oz/94="; + aarch64-linux = "sha256-Tdn/ve9iCjsY/b39TZ7ErHV14mIAHdtmycgUPIzRihQ="; + x86_64-darwin = "sha256-y/FQIVcEn6dLWXPztC34+7+5eDMO7Xcx25D2+0p7Mxk="; + aarch64-darwin = "sha256-YJGRZlpTdm1x4P+GnZiKC1411tcEX+Jdnm+iyxUlsU0="; }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; @@ -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..1724fe435faac 100644 --- a/pkgs/misc/wiki-tui/default.nix +++ b/pkgs/misc/wiki-tui/default.nix @@ -1,11 +1,12 @@ -{ lib -, stdenv -, rustPlatform -, fetchFromGitHub -, ncurses -, openssl -, pkg-config -, Security +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + ncurses, + openssl, + pkg-config, + Security, }: rustPlatform.buildRustPackage rec { @@ -14,30 +15,34 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "Builditluc"; - repo = pname; + repo = "wiki-tui"; rev = "v${version}"; hash = "sha256-euyg4wYWYerYT3hKdOCjokx8lJldGN7E3PHimDgQy3U="; }; - nativeBuildInputs = [ - pkg-config - ]; + # Note: bump `time` dependency to be able to build with rust 1.80, should be removed on the next + # release (see: https://github.com/NixOS/nixpkgs/issues/332957) + cargoPatches = [ ./time.patch ]; + + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses openssl - ] ++ lib.optionals stdenv.isDarwin [ - Security - ]; + ] ++ lib.optionals stdenv.isDarwin [ Security ]; - cargoHash = "sha256-rKTR7vKt8woWAn7XgNYFiWu4KSiZYhaH+PLEIOfbNIY="; + cargoHash = "sha256-XovbT+KC0va7yC5j7kf6t1SnXe1uyy1KI8FRV1AwkS0="; 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; - maintainers = with maintainers; [ lom builditluc matthiasbeyer ]; + maintainers = with maintainers; [ + lom + builditluc + matthiasbeyer + ]; mainProgram = "wiki-tui"; }; } diff --git a/pkgs/misc/wiki-tui/time.patch b/pkgs/misc/wiki-tui/time.patch new file mode 100644 index 0000000000000..09cd2a41d36e5 --- /dev/null +++ b/pkgs/misc/wiki-tui/time.patch @@ -0,0 +1,211 @@ +diff --git a/Cargo.lock b/Cargo.lock +index e66f0ac..918c3b2 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -318,7 +318,7 @@ dependencies = [ + "log", + "num", + "owning_ref", +- "time 0.3.22", ++ "time 0.3.36", + "unicode-segmentation", + "unicode-width", + "xi-unicode", +@@ -344,7 +344,7 @@ dependencies = [ + "ident_case", + "proc-macro2", + "quote", +- "syn 2.0.23", ++ "syn 2.0.32", + ] + + [[package]] +@@ -355,7 +355,16 @@ checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" + dependencies = [ + "darling_core", + "quote", +- "syn 2.0.23", ++ "syn 2.0.32", ++] ++ ++[[package]] ++name = "deranged" ++version = "0.3.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" ++dependencies = [ ++ "powerfmt", + ] + + [[package]] +@@ -427,7 +436,7 @@ checksum = "8560b409800a72d2d7860f8e5f4e0b0bd22bea6a352ea2a9ce30ccdef7f16d2f" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.23", ++ "syn 2.0.32", + ] + + [[package]] +@@ -448,7 +457,7 @@ dependencies = [ + "darling", + "proc-macro2", + "quote", +- "syn 2.0.23", ++ "syn 2.0.32", + ] + + [[package]] +@@ -1025,6 +1034,12 @@ dependencies = [ + "num-traits", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-integer" + version = "0.1.45" +@@ -1129,7 +1144,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.23", ++ "syn 2.0.32", + ] + + [[package]] +@@ -1282,6 +1297,12 @@ version = "0.3.27" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + ++[[package]] ++name = "powerfmt" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" ++ + [[package]] + name = "ppv-lite86" + version = "0.2.17" +@@ -1518,9 +1539,9 @@ dependencies = [ + + [[package]] + name = "serde" +-version = "1.0.167" ++version = "1.0.193" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7daf513456463b42aa1d94cff7e0c24d682b429f020b9afa4f5ba5c40a22b237" ++checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" + dependencies = [ + "serde_derive", + ] +@@ -1537,13 +1558,13 @@ dependencies = [ + + [[package]] + name = "serde_derive" +-version = "1.0.167" ++version = "1.0.193" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b69b106b68bc8054f0e974e70d19984040f8a5cf9215ca82626ea4853f82c4b9" ++checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.23", ++ "syn 2.0.32", + ] + + [[package]] +@@ -1565,7 +1586,7 @@ checksum = "1d89a8107374290037607734c0b73a85db7ed80cae314b3c5791f192a496e731" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.23", ++ "syn 2.0.32", + ] + + [[package]] +@@ -1750,9 +1771,9 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "2.0.23" ++version = "2.0.32" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" ++checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" + dependencies = [ + "proc-macro2", + "quote", +@@ -1832,7 +1853,7 @@ checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.23", ++ "syn 2.0.32", + ] + + [[package]] +@@ -1859,13 +1880,16 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.22" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ ++ "deranged", + "itoa", + "libc", ++ "num-conv", + "num_threads", ++ "powerfmt", + "serde", + "time-core", + "time-macros", +@@ -1873,16 +1897,17 @@ dependencies = [ + + [[package]] + name = "time-core" +-version = "0.1.1" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" ++checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.9" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + +@@ -2133,7 +2158,7 @@ dependencies = [ + "once_cell", + "proc-macro2", + "quote", +- "syn 2.0.23", ++ "syn 2.0.32", + "wasm-bindgen-shared", + ] + +@@ -2167,7 +2192,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.23", ++ "syn 2.0.32", + "wasm-bindgen-backend", + "wasm-bindgen-shared", + ] diff --git a/pkgs/misc/xosd/default.nix b/pkgs/misc/xosd/default.nix index 3190cfb380d8e..9ff961454bf17 100644 --- a/pkgs/misc/xosd/default.nix +++ b/pkgs/misc/xosd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Displays text on your screen"; homepage = "https://sourceforge.net/projects/libxosd"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pSub ]; }; |