commit 97b2abc6785670d7c728bc902de595efae9ea90a · pyrox.dev/nixpkgs

+10 -15

maintainers/maintainer-list.nix

··· 2094 githubId = 68566724; 2095 name = "bootstrap-prime"; 2096 }; 2097 - boppyt = { 2098 - email = "boppy@nwcpz.com"; 2099 - github = "boppyt"; 2100 - githubId = 71049646; 2101 - name = "Zack A"; 2102 - keys = [{ 2103 - fingerprint = "E8D7 5C19 9F65 269B 439D F77B 6310 C97D E31D 1545"; 2104 - }]; 2105 - }; 2106 borisbabic = { 2107 email = "boris.ivan.babic@gmail.com"; 2108 github = "borisbabic"; ··· 13611 githubId = 17243347; 13612 name = "Sebastian Sellmeier"; 13613 }; 13614 sei40kr = { 13615 name = "Seong Yong-ju"; 13616 email = "sei40kr@gmail.com"; ··· 16175 email = "contact@weijia.wang"; 16176 github = "wegank"; 16177 githubId = 9713184; 16178 - }; 16179 - weihua = { 16180 - email = "luwh364@gmail.com"; 16181 - github = "weihua-lu"; 16182 - githubId = 9002575; 16183 - name = "Weihua Lu"; 16184 }; 16185 welteki = { 16186 email = "welteki@pm.me";

··· 2094 githubId = 68566724; 2095 name = "bootstrap-prime"; 2096 }; 2097 borisbabic = { 2098 email = "boris.ivan.babic@gmail.com"; 2099 github = "borisbabic"; ··· 13602 githubId = 17243347; 13603 name = "Sebastian Sellmeier"; 13604 }; 13605 + sefidel = { 13606 + name = "sefidel"; 13607 + email = "contact@sefidel.net"; 13608 + matrix = "@sef:exotic.sh"; 13609 + github = "sefidel"; 13610 + githubId = 71049646; 13611 + keys = [{ 13612 + fingerprint = "8BDF DFB5 6842 2393 82A0 441B 9238 BC70 9E05 516A"; 13613 + }]; 13614 + }; 13615 sei40kr = { 13616 name = "Seong Yong-ju"; 13617 email = "sei40kr@gmail.com"; ··· 16176 email = "contact@weijia.wang"; 16177 github = "wegank"; 16178 githubId = 9713184; 16179 }; 16180 welteki = { 16181 email = "welteki@pm.me";

+5 -2

maintainers/team-list.nix

··· 424 425 llvm = { 426 members = [ 427 ericson2314 428 - sternenseemann 429 lovek323 430 - dtzWill 431 primeos 432 ]; 433 scope = "Maintain LLVM package sets and related packages"; 434 shortName = "LLVM";

··· 424 425 llvm = { 426 members = [ 427 + dtzWill 428 ericson2314 429 lovek323 430 primeos 431 + qyliss 432 + raitobezarius 433 + rrbutani 434 + sternenseemann 435 ]; 436 scope = "Maintain LLVM package sets and related packages"; 437 shortName = "LLVM";

+33 -8

nixos/modules/hardware/opengl.nix

··· 69 package = mkOption { 70 type = types.package; 71 internal = true; 72 description = lib.mdDoc '' 73 The package that provides the OpenGL implementation. 74 ''; 75 }; 76 - 77 package32 = mkOption { 78 type = types.package; 79 internal = true; 80 description = lib.mdDoc '' 81 - The package that provides the 32-bit OpenGL implementation on 82 - 64-bit systems. Used when {option}`driSupport32Bit` is 83 - set. 84 ''; 85 }; 86 87 extraPackages = mkOption { ··· 97 ::: 98 ''; 99 }; 100 - 101 extraPackages32 = mkOption { 102 type = types.listOf types.package; 103 default = []; ··· 152 153 environment.sessionVariables.LD_LIBRARY_PATH = mkIf cfg.setLdLibraryPath 154 ([ "/run/opengl-driver/lib" ] ++ optional cfg.driSupport32Bit "/run/opengl-driver-32/lib"); 155 - 156 - hardware.opengl.package = mkDefault pkgs.mesa.drivers; 157 - hardware.opengl.package32 = mkDefault pkgs.pkgsi686Linux.mesa.drivers; 158 159 boot.extraModulePackages = optional (elem "virtualbox" videoDrivers) kernelPackages.virtualboxGuestAdditions; 160 };

··· 69 package = mkOption { 70 type = types.package; 71 internal = true; 72 + default = cfg.mesaPackage; 73 description = lib.mdDoc '' 74 The package that provides the OpenGL implementation. 75 + 76 + The default is Mesa's drivers which should cover all OpenGL-capable 77 + hardware. If you want to use another Mesa version, adjust 78 + {option}`mesaPackage`. 79 ''; 80 }; 81 package32 = mkOption { 82 type = types.package; 83 internal = true; 84 + default = cfg.mesaPackage32; 85 description = lib.mdDoc '' 86 + Same as {option}`package` but for the 32-bit OpenGL implementation on 87 + 64-bit systems. Used when {option}`driSupport32Bit` is set. 88 + ''; 89 + }; 90 + 91 + mesaPackage = mkOption { 92 + type = types.package; 93 + default = pkgs.mesa_23; 94 + defaultText = literalExpression "pkgs.mesa_23"; 95 + example = literalExpression "pkgs.mesa_22"; 96 + description = lib.mdDoc '' 97 + The Mesa driver package used for rendering support on the system. 98 + 99 + You should only need to adjust this if you require a newer Mesa 100 + version for your hardware or because you need to patch a bug. 101 ''; 102 + apply = mesa: mesa.drivers or throw "`mesa` package must have a `drivers` output."; 103 + }; 104 + mesaPackage32 = mkOption { 105 + type = types.package; 106 + default = pkgs.pkgsi686Linux.mesa_23; 107 + defaultText = literalExpression "pkgs.pkgsi686Linux.mesa_23"; 108 + example = literalExpression "pkgs.pkgsi686Linux.mesa_22"; 109 + description = lib.mdDoc '' 110 + Same as {option}`mesaPackage` but for the 32-bit Mesa on 64-bit 111 + systems. Used when {option}`driSupport32Bit` is set. 112 + ''; 113 + apply = mesa: mesa.drivers or throw "`mesa` package must have a `drivers` output."; 114 }; 115 116 extraPackages = mkOption { ··· 126 ::: 127 ''; 128 }; 129 extraPackages32 = mkOption { 130 type = types.listOf types.package; 131 default = []; ··· 180 181 environment.sessionVariables.LD_LIBRARY_PATH = mkIf cfg.setLdLibraryPath 182 ([ "/run/opengl-driver/lib" ] ++ optional cfg.driSupport32Bit "/run/opengl-driver-32/lib"); 183 184 boot.extraModulePackages = optional (elem "virtualbox" videoDrivers) kernelPackages.virtualboxGuestAdditions; 185 };

+3 -3

pkgs/applications/audio/ebumeter/default.nix

··· 4 5 stdenv.mkDerivation rec { 6 pname = "ebumeter"; 7 - version = "0.4.2"; 8 9 src = fetchurl { 10 - url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; 11 - sha256 = "1wm9j1phmpicrp7jdsvdbc3mghdd92l61yl9qbps0brq2ljjyd5s"; 12 }; 13 14 buildInputs = [

··· 4 5 stdenv.mkDerivation rec { 6 pname = "ebumeter"; 7 + version = "0.5.1"; 8 9 src = fetchurl { 10 + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.xz"; 11 + hash = "sha256-U2ZpNfvy+X1RdA9Q4gvFYzAxlgc6kYjJpQ/0sEX0A4I="; 12 }; 13 14 buildInputs = [

+2

pkgs/applications/audio/lingot/default.nix

··· 8 , alsa-lib 9 , libpulseaudio 10 , fftw 11 , json_c 12 , libjack2 13 , jackSupport ? true ··· 33 alsa-lib 34 libpulseaudio 35 fftw 36 json_c 37 ] ++ lib.optional jackSupport libjack2; 38

··· 8 , alsa-lib 9 , libpulseaudio 10 , fftw 11 + , fftwFloat 12 , json_c 13 , libjack2 14 , jackSupport ? true ··· 34 alsa-lib 35 libpulseaudio 36 fftw 37 + fftwFloat 38 json_c 39 ] ++ lib.optional jackSupport libjack2; 40

+1 -1

pkgs/applications/editors/lite-xl/default.nix

··· 41 description = "A lightweight text editor written in Lua"; 42 homepage = "https://github.com/lite-xl/lite-xl"; 43 license = licenses.mit; 44 - maintainers = with maintainers; [ boppyt ]; 45 platforms = platforms.unix; 46 }; 47 }

··· 41 description = "A lightweight text editor written in Lua"; 42 homepage = "https://github.com/lite-xl/lite-xl"; 43 license = licenses.mit; 44 + maintainers = with maintainers; [ sefidel ]; 45 platforms = platforms.unix; 46 }; 47 }

+2 -12

pkgs/applications/emulators/snes9x/default.nix

··· 3 , alsa-lib 4 , cmake 5 , fetchFromGitHub 6 - , fetchpatch 7 , gtkmm3 8 , libepoxy 9 , libpng ··· 34 "snes9x-gtk" 35 else 36 "snes9x"; 37 - version = "1.62"; 38 39 src = fetchFromGitHub { 40 owner = "snes9xgit"; 41 repo = "snes9x"; 42 rev = version; 43 fetchSubmodules = true; 44 - hash = "sha256-RcxFNmUbJp0rUugWOqQa3Sy/Hh18ZPOeDTxC0JY5GJQ="; 45 }; 46 - 47 - patches = [ 48 - # Fix cross-compilation, otherwise it fails to detect host compiler features 49 - # Doesn't affect non CC builds 50 - (fetchpatch { 51 - url = "https://github.com/snes9xgit/snes9x/commit/f39ab408f4151c16d44e45470cc0736ffb2803f8.patch"; 52 - hash = "sha256-GMlHBsADEF+rycmEVgpWy220hZwld5D2e8fsYA7HblM="; 53 - }) 54 - ]; 55 56 nativeBuildInputs = [ 57 pkg-config

··· 3 , alsa-lib 4 , cmake 5 , fetchFromGitHub 6 , gtkmm3 7 , libepoxy 8 , libpng ··· 33 "snes9x-gtk" 34 else 35 "snes9x"; 36 + version = "1.62.1"; 37 38 src = fetchFromGitHub { 39 owner = "snes9xgit"; 40 repo = "snes9x"; 41 rev = version; 42 fetchSubmodules = true; 43 + hash = "sha256-y/tNJmmgigMEqjBWLyqxM/GQ2jcu4YXZjP0AbIjoPLg="; 44 }; 45 46 nativeBuildInputs = [ 47 pkg-config

+36 -59

pkgs/applications/finance/odoo/default.nix

··· 1 { stdenv 2 , lib 3 , fetchurl 4 - , python39 5 , nodePackages 6 , wkhtmltopdf 7 , nixosTests 8 }: 9 10 let 11 - python = python39.override { 12 packageOverrides = self: super: { 13 - click = super.click.overridePythonAttrs (old: rec { 14 - version = "7.1.2"; 15 - src = old.src.override { 16 - inherit version; 17 - sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"; 18 }; 19 }); 20 flask = super.flask.overridePythonAttrs (old: rec { 21 - version = "1.1.4"; 22 - src = old.src.override { 23 - inherit version; 24 - sha256 = "0fbeb6180d383a9186d0d6ed954e0042ad9f18e0e8de088b2b419d526927d196"; 25 - }; 26 - }); 27 - itsdangerous = super.itsdangerous.overridePythonAttrs (old: rec { 28 - version = "1.1.0"; 29 - src = old.src.override { 30 - inherit version; 31 - sha256 = "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19"; 32 - }; 33 - }); 34 - jinja2 = super.jinja2.overridePythonAttrs (old: rec { 35 - version = "2.11.3"; 36 src = old.src.override { 37 inherit version; 38 - sha256 = "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6"; 39 - }; 40 - }); 41 - markupsafe = super.markupsafe.overridePythonAttrs (old: rec { 42 - version = "2.0.1"; 43 - src = old.src.override { 44 - inherit version; 45 - sha256 = "594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a"; 46 }; 47 }); 48 werkzeug = super.werkzeug.overridePythonAttrs (old: rec { 49 - version = "1.0.1"; 50 src = old.src.override { 51 inherit version; 52 - sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c"; 53 }; 54 - nativeCheckInputs = old.nativeCheckInputs ++ (with self; [ 55 - requests 56 - ]); 57 - disabledTests = old.disabledTests ++ [ 58 - # ResourceWarning: unclosed file 59 - "test_basic" 60 - "test_date_to_unix" 61 - "test_easteregg" 62 - "test_file_rfc2231_filename_continuations" 63 - "test_find_terminator" 64 - "test_save_to_pathlib_dst" 65 - ]; 66 - disabledTestPaths = old.disabledTestPaths ++ [ 67 - # ResourceWarning: unclosed file 68 - "tests/test_http.py" 69 - ]; 70 }); 71 }; 72 }; 73 in python.pkgs.buildPythonApplication rec { 74 pname = "odoo"; 75 - 76 - odoo_version = "15.0"; 77 - odoo_release = "20220506"; 78 - 79 version = "${odoo_version}.${odoo_release}"; 80 81 format = "setuptools"; ··· 84 src = fetchurl { 85 url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.tar.gz"; 86 name = "${pname}-${version}"; 87 - sha256 = "0mwlmfz5nhvg483ldrmlrjhwaf284c0c0pxf0fb0sfx2dnjjj3ib"; # odoo 88 }; 89 90 # needs some investigation 91 doCheck = false; 92 93 - makeWrapperArgs = [ "--prefix" "PATH" ":" "${lib.makeBinPath [ wkhtmltopdf nodePackages.rtlcss ]}" ]; 94 95 propagatedBuildInputs = with python.pkgs; [ 96 babel ··· 101 freezegun 102 gevent 103 greenlet 104 - html2text 105 idna 106 jinja2 107 libsass ··· 127 qrcode 128 reportlab 129 requests 130 vobject 131 werkzeug 132 xlrd ··· 135 zeep 136 ]; 137 138 - unpackPhase = '' 139 - tar xfz $src 140 - cd odoo* 141 - ''; 142 143 passthru = { 144 updateScript = ./update.sh;

··· 1 { stdenv 2 , lib 3 + , fetchFromGitHub 4 , fetchurl 5 + , python310 6 , nodePackages 7 , wkhtmltopdf 8 , nixosTests 9 }: 10 11 let 12 + python = python310.override { 13 packageOverrides = self: super: { 14 + pypdf2 = super.pypdf2.overridePythonAttrs (old: rec { 15 + version = "1.28.6"; 16 + format = "setuptools"; 17 + 18 + src = fetchFromGitHub { 19 + owner = "py-pdf"; 20 + repo = "pypdf"; 21 + rev = version; 22 + fetchSubmodules = true; 23 + hash = "sha256-WnRbsy/PJcotZqY9mJPLadrYqkXykOVifLIbDyNf4s4="; 24 }; 25 + 26 + nativeBuildInputs = []; 27 + 28 + nativeCheckInputs = with self; [ pytestCheckHook pillow ]; 29 }); 30 flask = super.flask.overridePythonAttrs (old: rec { 31 + version = "2.1.3"; 32 src = old.src.override { 33 inherit version; 34 + hash = "sha256-FZcuUBffBXXD1sCQuhaLbbkCWeYgrI1+qBOjlrrVtss="; 35 }; 36 }); 37 werkzeug = super.werkzeug.overridePythonAttrs (old: rec { 38 + version = "2.1.2"; 39 src = old.src.override { 40 inherit version; 41 + hash = "sha256-HOCOgJPtZ9Y41jh5/Rujc1gX96gN42dNKT9ZhPJftuY="; 42 }; 43 }); 44 }; 45 }; 46 + 47 + odoo_version = "15.0"; 48 + odoo_release = "20230317"; 49 in python.pkgs.buildPythonApplication rec { 50 pname = "odoo"; 51 version = "${odoo_version}.${odoo_release}"; 52 53 format = "setuptools"; ··· 56 src = fetchurl { 57 url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.tar.gz"; 58 name = "${pname}-${version}"; 59 + hash = "sha256-nJEFPtZhq7DLLDCL9xt0RV75d/a45o6hBKsUlQAWh1U="; # odoo 60 }; 61 62 + unpackPhase = '' 63 + tar xfz $src 64 + cd odoo* 65 + ''; 66 + 67 # needs some investigation 68 doCheck = false; 69 70 + makeWrapperArgs = [ 71 + "--prefix" "PATH" ":" "${lib.makeBinPath [ wkhtmltopdf nodePackages.rtlcss ]}" 72 + ]; 73 74 propagatedBuildInputs = with python.pkgs; [ 75 babel ··· 80 freezegun 81 gevent 82 greenlet 83 idna 84 jinja2 85 libsass ··· 105 qrcode 106 reportlab 107 requests 108 + setuptools 109 vobject 110 werkzeug 111 xlrd ··· 114 zeep 115 ]; 116 117 + # takes 5+ minutes and there are not files to strip 118 + dontStrip = true; 119 120 passthru = { 121 updateScript = ./update.sh;

+1 -1

pkgs/applications/finance/odoo/update.sh

··· 22 23 cd "$(dirname "${BASH_SOURCE[0]}")" 24 25 - sed -ri "s| sha256.+ # odoo| sha256 = \"$(nix-prefetch-url --type sha256 "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.tar.gz")\"; # odoo|g" default.nix 26 sed -ri "s| odoo_version.+| odoo_version = \"$VERSION\";|" default.nix 27 sed -ri "s| odoo_release.+| odoo_release = \"$RELEASE\";|" default.nix

··· 22 23 cd "$(dirname "${BASH_SOURCE[0]}")" 24 25 + sed -ri "s| hash.+ # odoo| hash = \"$(nix-prefetch-url --type sha256 "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.tar.gz")\"; # odoo|g" default.nix 26 sed -ri "s| odoo_version.+| odoo_version = \"$VERSION\";|" default.nix 27 sed -ri "s| odoo_release.+| odoo_release = \"$RELEASE\";|" default.nix

+2 -2

pkgs/applications/misc/gallery-dl/default.nix

··· 2 3 buildPythonApplication rec { 4 pname = "gallery-dl"; 5 - version = "1.25.0"; 6 format = "setuptools"; 7 8 src = fetchPypi { 9 inherit version; 10 pname = "gallery_dl"; 11 - sha256 = "sha256-WxmH6uAMnbmXZWOkLh4B6rR6RV2xfSVBZ7v47AwlwRY="; 12 }; 13 14 propagatedBuildInputs = [

··· 2 3 buildPythonApplication rec { 4 pname = "gallery-dl"; 5 + version = "1.25.1"; 6 format = "setuptools"; 7 8 src = fetchPypi { 9 inherit version; 10 pname = "gallery_dl"; 11 + sha256 = "sha256-us9lzchdsCD4sY4XQ1f4j3wKuFtEZnEuBrlSa3FpDP4="; 12 }; 13 14 propagatedBuildInputs = [

+1 -1

pkgs/applications/misc/logseq/default.nix

··· 61 homepage = "https://github.com/logseq/logseq"; 62 changelog = "https://github.com/logseq/logseq/releases/tag/${version}"; 63 license = licenses.agpl3Plus; 64 - maintainers = with maintainers; [ weihua ]; 65 platforms = [ "x86_64-linux" ]; 66 }; 67 }

··· 61 homepage = "https://github.com/logseq/logseq"; 62 changelog = "https://github.com/logseq/logseq/releases/tag/${version}"; 63 license = licenses.agpl3Plus; 64 + maintainers = with maintainers; [ ]; 65 platforms = [ "x86_64-linux" ]; 66 }; 67 }

+3 -3

pkgs/applications/misc/terminal-stocks/default.nix

··· 2 3 buildNpmPackage rec { 4 pname = "terminal-stocks"; 5 - version = "1.0.14"; 6 7 src = fetchFromGitHub { 8 owner = "shweshi"; 9 repo = pname; 10 rev = "v${version}"; 11 - hash = "sha256-AzLMqp5t9u1ne+xCKp0dq/3V3DKJ1Ou9riAN+KqkStg="; 12 }; 13 14 - npmDepsHash = "sha256-GOg6B8BWkWegxeYmlHSJjFNrb/frb6jdzjjNSGF38Zo="; 15 dontNpmBuild = true; 16 17 passthru.updateScript = nix-update-script {};

··· 2 3 buildNpmPackage rec { 4 pname = "terminal-stocks"; 5 + version = "1.0.15"; 6 7 src = fetchFromGitHub { 8 owner = "shweshi"; 9 repo = pname; 10 rev = "v${version}"; 11 + hash = "sha256-8n+Wpkiy+XTaIBO7nuxO2m3EkkaHsmYNqtUqMin6leg="; 12 }; 13 14 + npmDepsHash = "sha256-M9a33v1R/cAgUJJLHwPs8hpPtjzzKkMps/ACnWLqUZE="; 15 dontNpmBuild = true; 16 17 passthru.updateScript = nix-update-script {};

+3 -3

pkgs/applications/networking/cluster/pgo-client/default.nix

··· 2 3 buildGoModule rec { 4 pname = "pgo-client"; 5 - version = "4.7.7"; 6 7 src = fetchFromGitHub { 8 owner = "CrunchyData"; 9 repo = "postgres-operator"; 10 rev = "v${version}"; 11 - sha256 = "sha256-rHWCj25NEKbwV1kmuH6k3oWSXKelknb2GRDgLaZSb3U="; 12 }; 13 14 - vendorSha256 = "sha256-5/mLlgNdlX/ABrpofPqowCskxFwJAEKVpbsMOvMvTWc="; 15 16 subPackages = [ "cmd/pgo" ]; 17

··· 2 3 buildGoModule rec { 4 pname = "pgo-client"; 5 + version = "4.7.10"; 6 7 src = fetchFromGitHub { 8 owner = "CrunchyData"; 9 repo = "postgres-operator"; 10 rev = "v${version}"; 11 + sha256 = "sha256-ZwKfbmKPvhxLpCGH+IlfoQjnw8go4N6mfseY2LWCktA="; 12 }; 13 14 + vendorHash = "sha256-qpS1TLShJwXgmtuhWIPOlcHMofUgOWZ8vbri36i+hpM="; 15 16 subPackages = [ "cmd/pgo" ]; 17

+6 -6

pkgs/applications/networking/instant-messengers/zoom-us/default.nix

··· 48 # and often with different versions. We write them on three lines 49 # like this (rather than using {}) so that the updater script can 50 # find where to edit them. 51 - versions.aarch64-darwin = "5.13.11.16405"; 52 - versions.x86_64-darwin = "5.13.11.16405"; 53 - versions.x86_64-linux = "5.13.11.1288"; 54 55 srcs = { 56 aarch64-darwin = fetchurl { 57 url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; 58 name = "zoomusInstallerFull.pkg"; 59 - hash = "sha256-YjERJ6B06/uloHRQVyZDLyf/2Gae0P7xdk4Db9aqROs="; 60 }; 61 x86_64-darwin = fetchurl { 62 url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; 63 - hash = "sha256-g6n4SKdord7gRwBaYUle3+yi1eB0T36ilScTaCcU8us="; 64 }; 65 x86_64-linux = fetchurl { 66 url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; 67 - hash = "sha256-BdI3HEQVe9A3D6KJ45wHWsrfb+dhTZAp/xlcr9X92EU="; 68 }; 69 }; 70

··· 48 # and often with different versions. We write them on three lines 49 # like this (rather than using {}) so that the updater script can 50 # find where to edit them. 51 + versions.aarch64-darwin = "5.14.0.16775"; 52 + versions.x86_64-darwin = "5.14.0.16775"; 53 + versions.x86_64-linux = "5.14.0.1720"; 54 55 srcs = { 56 aarch64-darwin = fetchurl { 57 url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; 58 name = "zoomusInstallerFull.pkg"; 59 + hash = "sha256-79Jb5cv9OWYM55fB8wtP+qYJc67+gNdiw9VrqnQPJ5U="; 60 }; 61 x86_64-darwin = fetchurl { 62 url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; 63 + hash = "sha256-HetPvZ7Bv8bC4DdoNM+92bFFQnwDY26WiEniwrBNSfk="; 64 }; 65 x86_64-linux = fetchurl { 66 url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; 67 + hash = "sha256-d8R2jfol5zAaI4qcpUIVdph899d7t/LRxQImXFzXXWo="; 68 }; 69 }; 70

+6

pkgs/applications/video/bombono/default.nix

··· 53 {name="fix_ffmpeg30.patch"; sha256="sha256-vKEbvbjYVRzEaVYC8XOJBPmk6FDXI/WA0X/dldRRO8c=";} 54 ]); 55 56 nativeBuildInputs = [ wrapGAppsHook scons pkg-config gettext ]; 57 58 buildInputs = [ ··· 84 homepage = "https://www.bombono.org/"; 85 license = licenses.gpl2Only; 86 maintainers = with maintainers; [ symphorien ]; 87 }; 88 }

··· 53 {name="fix_ffmpeg30.patch"; sha256="sha256-vKEbvbjYVRzEaVYC8XOJBPmk6FDXI/WA0X/dldRRO8c=";} 54 ]); 55 56 + postPatch = '' 57 + substituteInPlace src/mbase/SConscript \ 58 + --replace "lib_mbase_env['CPPDEFINES']" "list(lib_mbase_env['CPPDEFINES'])" 59 + ''; 60 + 61 nativeBuildInputs = [ wrapGAppsHook scons pkg-config gettext ]; 62 63 buildInputs = [ ··· 89 homepage = "https://www.bombono.org/"; 90 license = licenses.gpl2Only; 91 maintainers = with maintainers; [ symphorien ]; 92 + platforms = platforms.linux; 93 }; 94 }

+2 -2

pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix

··· 1 - { lib, stdenv, fetchFromGitHub, substituteAll, glib, gnome, gettext, jq }: 2 3 stdenv.mkDerivation rec { 4 pname = "gnome-shell-extension-EasyScreenCast"; ··· 19 ]; 20 21 nativeBuildInputs = [ 22 - glib gettext jq 23 ]; 24 25 makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ];

··· 1 + { lib, stdenv, fetchFromGitHub, substituteAll, glib, gnome, gettext, jq, intltool }: 2 3 stdenv.mkDerivation rec { 4 pname = "gnome-shell-extension-EasyScreenCast"; ··· 19 ]; 20 21 nativeBuildInputs = [ 22 + glib gettext jq intltool 23 ]; 24 25 makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ];

+4 -9

pkgs/development/libraries/drumstick/default.nix

··· 1 { lib, stdenv, fetchurl 2 , cmake, docbook_xml_dtd_45, docbook_xsl, doxygen, graphviz-nox, pkg-config, qttools, wrapQtAppsHook 3 - , alsa-lib, fluidsynth, qtbase, qtsvg, libpulseaudio 4 }: 5 6 stdenv.mkDerivation rec { 7 pname = "drumstick"; 8 - version = "2.7.0"; 9 10 src = fetchurl { 11 url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2"; 12 - hash = "sha256-Yb5SrXJ5ZK0IJ8XbnxAGLlfqKGOrfv2VET9Ba8dKItU="; 13 }; 14 15 patches = [ ··· 18 19 postPatch = '' 20 substituteInPlace library/rt/backendmanager.cpp --subst-var out 21 - 22 - # https://sourceforge.net/p/drumstick/bugs/39/ 23 - substituteInPlace drumstick-alsa.pc.in drumstick-file.pc.in drumstick-rt.pc.in drumstick-widgets.pc.in \ 24 - --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ 25 - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ 26 ''; 27 28 outputs = [ "out" "dev" "man" ]; ··· 32 ]; 33 34 buildInputs = [ 35 - alsa-lib fluidsynth libpulseaudio qtbase qtsvg 36 ]; 37 38 cmakeFlags = [

··· 1 { lib, stdenv, fetchurl 2 , cmake, docbook_xml_dtd_45, docbook_xsl, doxygen, graphviz-nox, pkg-config, qttools, wrapQtAppsHook 3 + , alsa-lib, fluidsynth, libpulseaudio, qtbase, qtsvg, sonivox 4 }: 5 6 stdenv.mkDerivation rec { 7 pname = "drumstick"; 8 + version = "2.7.2"; 9 10 src = fetchurl { 11 url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2"; 12 + hash = "sha256-5XxG5ur584fgW4oCONgMiWzV48Q02HEdmpb9+YhBFe0="; 13 }; 14 15 patches = [ ··· 18 19 postPatch = '' 20 substituteInPlace library/rt/backendmanager.cpp --subst-var out 21 ''; 22 23 outputs = [ "out" "dev" "man" ]; ··· 27 ]; 28 29 buildInputs = [ 30 + alsa-lib fluidsynth libpulseaudio qtbase qtsvg sonivox 31 ]; 32 33 cmakeFlags = [

+5 -5

pkgs/development/libraries/libcef/default.nix

··· 66 projectArch = "x86_64"; 67 }; 68 }; 69 - platforms."aarch64-linux".sha256 = "1aacq9baw0hxf3h354fmws4v6008d3axxmri23vlvhzg7hza05n1"; 70 - platforms."x86_64-linux".sha256 = "17wpmvrbkdhnsk63f36yk6kq0mqhx63ih0mbhf8hl0qj6yndabgc"; 71 72 platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; 73 in 74 stdenv.mkDerivation rec { 75 pname = "cef-binary"; 76 - version = "110.0.27"; 77 - gitRevision = "1296c82"; 78 - chromiumVersion = "110.0.5481.100"; 79 80 src = fetchurl { 81 url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2";

··· 66 projectArch = "x86_64"; 67 }; 68 }; 69 + platforms."aarch64-linux".sha256 = "1mrrsj213jc3s926wc1ccz63n7052mbmb70411lsi0192xfmrpjb"; 70 + platforms."x86_64-linux".sha256 = "1jf4yv83xjbj75j1mqzib9f3kb9pwsnqryhv1dwqm5qi6if6g5y3"; 71 72 platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; 73 in 74 stdenv.mkDerivation rec { 75 pname = "cef-binary"; 76 + version = "111.2.6"; 77 + gitRevision = "491d238"; 78 + chromiumVersion = "111.0.5563.65"; 79 80 src = fetchurl { 81 url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2";

+4

pkgs/development/libraries/mesa/22.3.7.nix

···

··· 1 + import ./generic.nix { 2 + version = "22.3.7"; 3 + hash = "sha256-iUzi9KHC52F3zdIoRiAZLQ2jBmskPuwvux18838TBCw="; 4 + }

+4

pkgs/development/libraries/mesa/23.0.1.nix

···

··· 1 + import ./generic.nix { 2 + version = "23.0.1"; 3 + hash = "sha256-6OWGhWtViTq66b3NuYtBwIHZCbsfrzcubnJiMHvzSt8="; 4 + }

+6 -4

pkgs/development/libraries/mesa/default.nix pkgs/development/libraries/mesa/generic.nix

··· 1 { stdenv, lib, fetchurl 2 , meson, pkg-config, ninja 3 , intltool, bison, flex, file, python3Packages, wayland-scanner 4 , expat, libdrm, xorg, wayland, wayland-protocols, openssl 5 - , llvmPackages, libffi, libomxil-bellagio, libva-minimal 6 , libelf, libvdpau 7 , libglvnd, libunwind 8 , vulkan-loader, glslang ··· 87 let 88 # Release calendar: https://www.mesa3d.org/release-calendar.html 89 # Release frequency: https://www.mesa3d.org/releasing.html#schedule 90 - version = "22.3.7"; 91 - branch = lib.versions.major version; 92 93 withLibdrm = lib.meta.availableOn stdenv.hostPlatform libdrm; 94 95 # Align all the Mesa versions used. Required to prevent explosions when 96 # two different LLVMs are loaded in the same process. 97 # FIXME: these should really go into some sort of versioned LLVM package set ··· 119 "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" 120 "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" 121 ]; 122 - hash = "sha256-iUzi9KHC52F3zdIoRiAZLQ2jBmskPuwvux18838TBCw="; 123 }; 124 125 # TODO:

··· 1 + { version, hash }: 2 + 3 { stdenv, lib, fetchurl 4 , meson, pkg-config, ninja 5 , intltool, bison, flex, file, python3Packages, wayland-scanner 6 , expat, libdrm, xorg, wayland, wayland-protocols, openssl 7 + , llvmPackages_15, libffi, libomxil-bellagio, libva-minimal 8 , libelf, libvdpau 9 , libglvnd, libunwind 10 , vulkan-loader, glslang ··· 89 let 90 # Release calendar: https://www.mesa3d.org/release-calendar.html 91 # Release frequency: https://www.mesa3d.org/releasing.html#schedule 92 + branch = lib.versions.major version; 93 94 withLibdrm = lib.meta.availableOn stdenv.hostPlatform libdrm; 95 96 + llvmPackages = llvmPackages_15; 97 # Align all the Mesa versions used. Required to prevent explosions when 98 # two different LLVMs are loaded in the same process. 99 # FIXME: these should really go into some sort of versioned LLVM package set ··· 121 "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" 122 "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" 123 ]; 124 + inherit hash; 125 }; 126 127 # TODO:

+12

pkgs/development/perl-modules/CatalystAuthenticationStoreHtpasswd-test-replace-DES-hash-with-bcrypt.patch

···

··· 1 + Replaces the legacy DES crypt hash used in tests with a stronger 2 + bcrypt function, as crypt() in pkgs.perl no longer supports DES 3 + 4 + # htpasswd -nbB mufasa "Circle of Life" 5 + 6 + diff --git a/t/lib/TestApp/htpasswd b/t/lib/TestApp/htpasswd 7 + index 6cec784..91e5375 100644 8 + --- a/t/lib/TestApp/htpasswd 9 + +++ b/t/lib/TestApp/htpasswd 10 + @@ -1 +1 @@ 11 + -mufasa:Y7hn4ncIVPOuI 12 + +mufasa:$2y$05$.KPC4Gja9L5AxJATDQBzs.lCHkm49l/9dcoyPcJg0JhyIvsD6Gqza

+2 -2

pkgs/development/python-modules/asana/default.nix

··· 10 11 buildPythonPackage rec { 12 pname = "asana"; 13 - version = "3.1.1"; 14 format = "setuptools"; 15 16 disabled = pythonOlder "3.7"; ··· 19 owner = "asana"; 20 repo = "python-asana"; 21 rev = "refs/tags/v${version}"; 22 - hash = "sha256-7POA3r3PqJ/PcyG7GFugg5p8o0h3OIA8zEIfsTwPxFI="; 23 }; 24 25 propagatedBuildInputs = [

··· 10 11 buildPythonPackage rec { 12 pname = "asana"; 13 + version = "3.2.0"; 14 format = "setuptools"; 15 16 disabled = pythonOlder "3.7"; ··· 19 owner = "asana"; 20 repo = "python-asana"; 21 rev = "refs/tags/v${version}"; 22 + hash = "sha256-qxoGi7UByHEuDKsELEjwzf01/JNEiUgUs88536TGFKo="; 23 }; 24 25 propagatedBuildInputs = [

+8 -3

pkgs/development/python-modules/denonavr/default.nix

··· 12 , pytest-httpx 13 , pytest-timeout 14 , pythonOlder 15 }: 16 17 buildPythonPackage rec { 18 pname = "denonavr"; 19 - version = "0.11.1"; 20 - format = "setuptools"; 21 22 disabled = pythonOlder "3.7"; 23 ··· 25 owner = "ol-iver"; 26 repo = pname; 27 rev = "refs/tags/${version}"; 28 - hash = "sha256-iYekqqhrcN1rbclFVSbJSF5ky19WsBLKlTxAa2HULqY="; 29 }; 30 31 propagatedBuildInputs = [ 32 asyncstdlib

··· 12 , pytest-httpx 13 , pytest-timeout 14 , pythonOlder 15 + , setuptools 16 }: 17 18 buildPythonPackage rec { 19 pname = "denonavr"; 20 + version = "0.11.2"; 21 + format = "pyproject"; 22 23 disabled = pythonOlder "3.7"; 24 ··· 26 owner = "ol-iver"; 27 repo = pname; 28 rev = "refs/tags/${version}"; 29 + hash = "sha256-Sa5pfvSzshgwHh9LGWPBVIC7pXouZbTmSMYncT46phU="; 30 }; 31 + 32 + nativeBuildInputs = [ 33 + setuptools 34 + ]; 35 36 propagatedBuildInputs = [ 37 asyncstdlib

+3 -3

pkgs/development/python-modules/eternalegypt/default.nix

··· 8 9 buildPythonPackage rec { 10 pname = "eternalegypt"; 11 - version = "0.0.13"; 12 format = "setuptools"; 13 14 disabled = pythonOlder "3.8"; ··· 16 src = fetchFromGitHub { 17 owner = "amelchio"; 18 repo = pname; 19 - rev = "v${version}"; 20 - sha256 = "0wi2cqd81irqm873npkqg3mvdrb57idqdsp8qw8h0s7lk0kil1wi"; 21 }; 22 23 propagatedBuildInputs = [

··· 8 9 buildPythonPackage rec { 10 pname = "eternalegypt"; 11 + version = "0.0.15"; 12 format = "setuptools"; 13 14 disabled = pythonOlder "3.8"; ··· 16 src = fetchFromGitHub { 17 owner = "amelchio"; 18 repo = pname; 19 + rev = "refs/tags/v${version}"; 20 + sha256 = "sha256-CKiv5gVHaEyO9P5x2FKgpSIm2pUiFptaEQVPZHALASk="; 21 }; 22 23 propagatedBuildInputs = [

+5 -2

pkgs/development/python-modules/fake-useragent/default.nix

··· 10 11 buildPythonPackage rec { 12 pname = "fake-useragent"; 13 - version = "1.1.2"; 14 format = "pyproject"; 15 16 src = fetchFromGitHub { 17 owner = "fake-useragent"; 18 repo = "fake-useragent"; 19 rev = "refs/tags/${version}"; 20 - hash = "sha256-Rz+oEpgfvSRdly+H1bYxYjNCfo1STkLcogPgZs+b8DY="; 21 }; 22 23 postPatch = '' ··· 42 meta = with lib; { 43 description = "Up to date simple useragent faker with real world database"; 44 homepage = "https://github.com/hellysmile/fake-useragent"; 45 license = licenses.asl20; 46 maintainers = with maintainers; [ evanjs ]; 47 };

··· 10 11 buildPythonPackage rec { 12 pname = "fake-useragent"; 13 + version = "1.1.3"; 14 format = "pyproject"; 15 + 16 + disabled = pythonOlder "3.7"; 17 18 src = fetchFromGitHub { 19 owner = "fake-useragent"; 20 repo = "fake-useragent"; 21 rev = "refs/tags/${version}"; 22 + hash = "sha256-8fVNko65nP/u9vLGBPfSseKW07b4JC6kCPFCPK2f6wU="; 23 }; 24 25 postPatch = '' ··· 44 meta = with lib; { 45 description = "Up to date simple useragent faker with real world database"; 46 homepage = "https://github.com/hellysmile/fake-useragent"; 47 + changelog = "https://github.com/fake-useragent/fake-useragent/releases/tag/${version}"; 48 license = licenses.asl20; 49 maintainers = with maintainers; [ evanjs ]; 50 };

+12 -4

pkgs/development/python-modules/jupyter-cache/default.nix

··· 10 , sqlalchemy 11 , tabulate 12 , pythonOlder 13 }: 14 15 buildPythonPackage rec { 16 pname = "jupyter-cache"; 17 version = "0.5.0"; 18 19 disabled = pythonOlder "3.7"; 20 ··· 23 sha256 = "87408030a4c8c14fe3f8fe62e6ceeb24c84e544c7ced20bfee45968053d07801"; 24 }; 25 26 - postPatch = '' 27 - substituteInPlace setup.cfg \ 28 - --replace "nbclient>=0.2,<0.6" "nbclient" 29 - ''; 30 31 propagatedBuildInputs = [ 32 attrs ··· 37 pyyaml 38 sqlalchemy 39 tabulate 40 ]; 41 42 pythonImportsCheck = [ "jupyter_cache" ];

··· 10 , sqlalchemy 11 , tabulate 12 , pythonOlder 13 + , setuptools 14 + , pythonRelaxDepsHook 15 }: 16 17 buildPythonPackage rec { 18 pname = "jupyter-cache"; 19 version = "0.5.0"; 20 + format = "pyproject"; 21 22 disabled = pythonOlder "3.7"; 23 ··· 26 sha256 = "87408030a4c8c14fe3f8fe62e6ceeb24c84e544c7ced20bfee45968053d07801"; 27 }; 28 29 + nativeBuildInputs = [ 30 + setuptools 31 + pythonRelaxDepsHook 32 + ]; 33 34 propagatedBuildInputs = [ 35 attrs ··· 40 pyyaml 41 sqlalchemy 42 tabulate 43 + ]; 44 + 45 + pythonRelaxDeps = [ 46 + "nbclient" 47 + "sqlalchemy" # See https://github.com/executablebooks/jupyter-cache/pull/93 48 ]; 49 50 pythonImportsCheck = [ "jupyter_cache" ];

+2 -2

pkgs/development/python-modules/onvif-zeep-async/default.nix

··· 8 9 buildPythonPackage rec { 10 pname = "onvif-zeep-async"; 11 - version = "1.2.1"; 12 format = "setuptools"; 13 14 disabled = pythonOlder "3.7"; 15 16 src = fetchPypi { 17 inherit pname version; 18 - hash = "sha256-bRPqbuBrC4Q0gdQGb2KAy1pTHce42WvM7gjvAspH4WE="; 19 }; 20 21 propagatedBuildInputs = [

··· 8 9 buildPythonPackage rec { 10 pname = "onvif-zeep-async"; 11 + version = "1.2.2"; 12 format = "setuptools"; 13 14 disabled = pythonOlder "3.7"; 15 16 src = fetchPypi { 17 inherit pname version; 18 + hash = "sha256-Mq+mARZQD48M6+9XwzX7V541Jqn/vJMSeiEm5k8/YII="; 19 }; 20 21 propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/python-benedict/default.nix

··· 24 25 buildPythonPackage rec { 26 pname = "python-benedict"; 27 - version = "0.29.1"; 28 format = "setuptools"; 29 30 disabled = pythonOlder "3.7"; ··· 33 owner = "fabiocaccamo"; 34 repo = pname; 35 rev = "refs/tags/${version}"; 36 - hash = "sha256-tsTd9EJkwI98ynXu/vz5hX+X55vxOkhIfeawQNn2f6Q="; 37 }; 38 39 nativeBuildInputs = [

··· 24 25 buildPythonPackage rec { 26 pname = "python-benedict"; 27 + version = "0.30.0"; 28 format = "setuptools"; 29 30 disabled = pythonOlder "3.7"; ··· 33 owner = "fabiocaccamo"; 34 repo = pname; 35 rev = "refs/tags/${version}"; 36 + hash = "sha256-/LERLQw0Jb/Yuf2CfEKIZ658LtSkHjMvMxGcB00IgKs="; 37 }; 38 39 nativeBuildInputs = [

+2 -2

pkgs/development/python-modules/readchar/default.nix

··· 9 10 buildPythonPackage rec { 11 pname = "readchar"; 12 - version = "4.0.3"; 13 format = "setuptools"; 14 15 # Don't use wheels on PyPI ··· 17 owner = "magmax"; 18 repo = "python-${pname}"; 19 rev = "refs/tags/v${version}"; 20 - hash = "sha256-QMaTZRS9iOSuax706Es9WhkwU3vdcNb14dbiSt48aN0="; 21 }; 22 23 postPatch = ''

··· 9 10 buildPythonPackage rec { 11 pname = "readchar"; 12 + version = "4.0.5"; 13 format = "setuptools"; 14 15 # Don't use wheels on PyPI ··· 17 owner = "magmax"; 18 repo = "python-${pname}"; 19 rev = "refs/tags/v${version}"; 20 + hash = "sha256-Ru18lh+9tXtvttypnob0HNPKBiGF7E9HDL21l1AAGa8="; 21 }; 22 23 postPatch = ''

+2 -2

pkgs/development/python-modules/types-requests/default.nix

··· 6 7 buildPythonPackage rec { 8 pname = "types-requests"; 9 - version = "2.28.11.15"; 10 format = "setuptools"; 11 12 src = fetchPypi { 13 inherit pname version; 14 - hash = "sha256-/I6qCcwBRpnGtjxgwuOt0MiwmkEMgYtaxuZfkqJt3gk="; 15 }; 16 17 propagatedBuildInputs = [

··· 6 7 buildPythonPackage rec { 8 pname = "types-requests"; 9 + version = "2.28.11.16"; 10 format = "setuptools"; 11 12 src = fetchPypi { 13 inherit pname version; 14 + hash = "sha256-nUACBW3368TsHyj9cB+6gsXCJUnER3EWyyZWqjCs5ts="; 15 }; 16 17 propagatedBuildInputs = [

+2 -2

pkgs/development/tools/goa/default.nix

··· 5 6 buildGoModule rec { 7 pname = "goa"; 8 - version = "3.11.2"; 9 10 src = fetchFromGitHub { 11 owner = "goadesign"; 12 repo = "goa"; 13 rev = "v${version}"; 14 - sha256 = "sha256-zKiGPXkVAeWj9RXuFWvlSz1SYO+uGNBM65+ypIPZpmc="; 15 }; 16 vendorHash = "sha256-vND29xb5bG+MnBiOCP9PWC+VGqIwdUO0uVOcP5Wc4zA="; 17

··· 5 6 buildGoModule rec { 7 pname = "goa"; 8 + version = "3.11.3"; 9 10 src = fetchFromGitHub { 11 owner = "goadesign"; 12 repo = "goa"; 13 rev = "v${version}"; 14 + sha256 = "sha256-Po5i6pb7Qu6kYLO7rdW9SJFDf42rPx8mvSfNxtW3Qcg="; 15 }; 16 vendorHash = "sha256-vND29xb5bG+MnBiOCP9PWC+VGqIwdUO0uVOcP5Wc4zA="; 17

+18 -38

pkgs/development/tools/gotools/default.nix

··· 1 - { lib, buildGoModule, fetchgit }: 2 3 buildGoModule rec { 4 pname = "gotools"; 5 - version = "0.1.10"; 6 7 - src = fetchgit { 8 rev = "v${version}"; 9 - url = "https://go.googlesource.com/tools"; 10 - sha256 = "sha256-r71+//VhayW18uvMl/ls/8KYNbZ7uDZw3SWoqPL3Xqk="; 11 }; 12 13 - # The gopls folder contains a Go submodule which causes a build failure. 14 - # Given that, we can't have the gopls binary be part of the gotools 15 - # derivation. 16 - # 17 - # The attribute "gopls" provides the gopls binary. 18 - # 19 - # Related 20 - # 21 - # * https://github.com/NixOS/nixpkgs/pull/85868 22 - # * https://github.com/NixOS/nixpkgs/issues/88716 23 - postPatch = '' 24 - rm -rf gopls 25 - ''; 26 - 27 - vendorSha256 = "sha256-UJIXG8WKzazNTXoqEFlT/umC40F6z2Q5I8RfxnMbsPM="; 28 29 doCheck = false; 30 31 - postConfigure = '' 32 - # Make the builtin tools available here 33 - mkdir -p $out/bin 34 - eval $(go env | grep GOTOOLDIR) 35 - find $GOTOOLDIR -type f | while read x; do 36 - ln -sv "$x" "$out/bin" 37 - done 38 - export GOTOOLDIR=$out/bin 39 - ''; 40 - 41 - excludedPackages = [ "vet" "cover" ]; 42 - 43 # Set GOTOOLDIR for derivations adding this to buildInputs 44 postInstall = '' 45 mkdir -p $out/nix-support 46 substitute ${./setup-hook.sh} $out/nix-support/setup-hook \ 47 --subst-var-by bin $out 48 ''; 49 - 50 - # Do not copy this without a good reason for enabling 51 - # In this case tools is heavily coupled with go itself and embeds paths. 52 - allowGoReference = true; 53 54 meta = with lib; { 55 description = "Additional tools for Go development"; 56 - homepage = "http://go.googlesource.com/tools"; 57 license = licenses.bsd3; 58 - maintainers = with maintainers; [ danderson ]; 59 }; 60 }

··· 1 + { lib, buildGoModule, fetchFromGitHub }: 2 3 buildGoModule rec { 4 pname = "gotools"; 5 + version = "0.7.0"; 6 7 + # using GitHub instead of https://go.googlesource.com/tools because Gitiles UI is to basic to browse 8 + src = fetchFromGitHub { 9 + owner = "golang"; 10 + repo = "tools"; 11 rev = "v${version}"; 12 + # The gopls folder contains a Go submodule which causes a build failure 13 + # and lives in its own package named gopls. 14 + postFetch = '' 15 + rm -r $out/gopls 16 + ''; 17 + sha256 = "sha256-6Sdo6oKJHYXWkvJmbte7Wc7tov5AHzn70Bi1QdQ5HR4="; 18 }; 19 20 + vendorSha256 = "sha256-fp0pb3EcGRDWlSpgel4pYRdsPJGk8/d57EjWJ+fzq7g="; 21 22 doCheck = false; 23 24 # Set GOTOOLDIR for derivations adding this to buildInputs 25 postInstall = '' 26 mkdir -p $out/nix-support 27 substitute ${./setup-hook.sh} $out/nix-support/setup-hook \ 28 --subst-var-by bin $out 29 ''; 30 31 meta = with lib; { 32 description = "Additional tools for Go development"; 33 + longDescription = '' 34 + This package contains tools like: godoc, goimports, callgraph, digraph, stringer or toolstash. 35 + ''; 36 + homepage = "https://go.googlesource.com/tools"; 37 license = licenses.bsd3; 38 + maintainers = with maintainers; [ danderson SuperSandro2000 ]; 39 }; 40 }

+2 -2

pkgs/development/tools/misc/opengrok/default.nix

··· 2 3 stdenv.mkDerivation rec { 4 pname = "opengrok"; 5 - version = "1.8.4"; 6 7 # binary distribution 8 src = fetchurl { 9 url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz"; 10 - hash = "sha256-Xy8mTpdHorGGvUGHCDKOA2HaAJY3PBWjf6Pnll4Melk="; 11 }; 12 13 nativeBuildInputs = [ makeWrapper ];

··· 2 3 stdenv.mkDerivation rec { 4 pname = "opengrok"; 5 + version = "1.9.2"; 6 7 # binary distribution 8 src = fetchurl { 9 url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz"; 10 + hash = "sha256-z5jqKRnxPOwj1sOFGt0m54m9t0l3xBfulvmQCYeJj40="; 11 }; 12 13 nativeBuildInputs = [ makeWrapper ];

+3 -3

pkgs/development/tools/rust/cargo-vet/default.nix

··· 2 3 rustPlatform.buildRustPackage rec { 4 pname = "cargo-vet"; 5 - version = "0.5.1"; 6 7 src = fetchFromGitHub { 8 owner = "mozilla"; 9 repo = pname; 10 rev = version; 11 - sha256 = "sha256-nBhm6EDs99oKdUxT+N+IC7fY/U0yyeJyr6vbaZaiGSI="; 12 }; 13 14 - cargoSha256 = "sha256-M6CdYL8CDfFH0RaYGel6dC3LxQZzq9YbU8ecH9CWEr8="; 15 16 buildInputs = lib.optional stdenv.isDarwin Security; 17

··· 2 3 rustPlatform.buildRustPackage rec { 4 pname = "cargo-vet"; 5 + version = "0.5.2"; 6 7 src = fetchFromGitHub { 8 owner = "mozilla"; 9 repo = pname; 10 rev = version; 11 + sha256 = "sha256-+Qbq3EARedsaPtSTfR/UCC/1p0b/QmvriG2AIyx8coo="; 12 }; 13 14 + cargoSha256 = "sha256-Vij4vq+04fLpbcDpYVMBVl3QNVZprUYcVLB28mrjUOg="; 15 16 buildInputs = lib.optional stdenv.isDarwin Security; 17

+3 -3

pkgs/development/tools/sentry-cli/default.nix

··· 9 }: 10 rustPlatform.buildRustPackage rec { 11 pname = "sentry-cli"; 12 - version = "2.15.2"; 13 14 src = fetchFromGitHub { 15 owner = "getsentry"; 16 repo = "sentry-cli"; 17 rev = version; 18 - sha256 = "sha256-niPQC9h/7D6nHgC+eKjY4gQwrhN0OxB5QlhKInI4LpA="; 19 }; 20 doCheck = false; 21 ··· 25 buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; 26 nativeBuildInputs = [ pkg-config ]; 27 28 - cargoHash = "sha256-hsVYbIfhKYAxW9hqxWJ2GrutDZGLDLR3vGhanl1PND4="; 29 30 meta = with lib; { 31 homepage = "https://docs.sentry.io/cli/";

··· 9 }: 10 rustPlatform.buildRustPackage rec { 11 pname = "sentry-cli"; 12 + version = "2.16.0"; 13 14 src = fetchFromGitHub { 15 owner = "getsentry"; 16 repo = "sentry-cli"; 17 rev = version; 18 + sha256 = "sha256-8Dd0gz0j8kdB7/18gfrOSinALx1KAlY79tpt0jqPmdQ="; 19 }; 20 doCheck = false; 21 ··· 25 buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; 26 nativeBuildInputs = [ pkg-config ]; 27 28 + cargoHash = "sha256-CIjtEgekid/ZIpVNO2R56gz7B7HLtlFHErnSNhVacWM="; 29 30 meta = with lib; { 31 homepage = "https://docs.sentry.io/cli/";

+5 -5

pkgs/development/web/bun/default.nix

··· 12 }: 13 14 stdenvNoCC.mkDerivation rec { 15 - version = "0.5.7"; 16 pname = "bun"; 17 18 src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); ··· 33 sources = { 34 "aarch64-darwin" = fetchurl { 35 url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; 36 - sha256 = "m0lFokGfJY3qXLYO4vnFFqKb3/IPRXWN3L6PV5DqtX0="; 37 }; 38 "aarch64-linux" = fetchurl { 39 url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; 40 - sha256 = "XSUbfRkjo7yiPrPa/Mp30WolFex+Evziphut1sKflDE="; 41 }; 42 "x86_64-darwin" = fetchurl { 43 url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; 44 - sha256 = "RuZ0T5Y7Vi9mtyFL8ul715MRO4XozDf0WS+qjayx1kg="; 45 }; 46 "x86_64-linux" = fetchurl { 47 url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; 48 - sha256 = "uOVHQIjvZW0Gqv/GLlvbXl5bDcnwR80AP1lUJ2v2ZoM="; 49 }; 50 }; 51 updateScript = writeShellScript "update-bun" ''

··· 12 }: 13 14 stdenvNoCC.mkDerivation rec { 15 + version = "0.5.8"; 16 pname = "bun"; 17 18 src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); ··· 33 sources = { 34 "aarch64-darwin" = fetchurl { 35 url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; 36 + sha256 = "phTBV0vQT7Qgf1wY9Qqc7xXrs3Cms9jKpjp1KxlTbz8="; 37 }; 38 "aarch64-linux" = fetchurl { 39 url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; 40 + sha256 = "weH+Aygh8Ud9cfMOVpZe8EjL7BWsXBlm9GDnkZa/x0c="; 41 }; 42 "x86_64-darwin" = fetchurl { 43 url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; 44 + sha256 = "pYvBjlTPLuwOlarlZKXuvn7y6wTRdyHM/leb3hOJHrY="; 45 }; 46 "x86_64-linux" = fetchurl { 47 url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; 48 + sha256 = "+NiZtMUQBGPtI4VbtfIb+oZX+RMjIJiTnEbvoeeCC84="; 49 }; 50 }; 51 updateScript = writeShellScript "update-bun" ''

+3 -3

pkgs/games/dxx-rebirth/default.nix

··· 22 in 23 stdenv.mkDerivation rec { 24 pname = "dxx-rebirth"; 25 - version = "unstable-2022-09-17"; 26 27 src = fetchFromGitHub { 28 owner = "dxx-rebirth"; 29 repo = "dxx-rebirth"; 30 - rev = "ad46235b67a24a38dec4734f94a59eba149ad94a"; 31 - hash = "sha256-vIAY1O4VnOsV617J5yjg09JIL/vK4Fb/lopnX17g+uY="; 32 }; 33 34 nativeBuildInputs = [ pkg-config scons ];

··· 22 in 23 stdenv.mkDerivation rec { 24 pname = "dxx-rebirth"; 25 + version = "unstable-2023-03-23"; 26 27 src = fetchFromGitHub { 28 owner = "dxx-rebirth"; 29 repo = "dxx-rebirth"; 30 + rev = "841ebcc11d249febe48911bc239606ade3bd78b3"; 31 + hash = "sha256-cr5QdkKO/HNvtc2w4ynJixuLauhPCwtsSC3UEV7+C1A="; 32 }; 33 34 nativeBuildInputs = [ pkg-config scons ];

+2 -2

pkgs/games/opentyrian/default.nix

··· 9 10 stdenv.mkDerivation rec { 11 pname = "opentyrian"; 12 - version = "2.1.20220318"; 13 14 src = fetchFromGitHub { 15 owner = "opentyrian"; 16 repo = "opentyrian"; 17 rev = "v${version}"; 18 - sha256 = "01z1zxpps4ils0bnwazl9lmqdbfhfd8fkacahnh6kqyczavg40xg"; 19 }; 20 21 data = fetchzip {

··· 9 10 stdenv.mkDerivation rec { 11 pname = "opentyrian"; 12 + version = "2.1.20221123"; 13 14 src = fetchFromGitHub { 15 owner = "opentyrian"; 16 repo = "opentyrian"; 17 rev = "v${version}"; 18 + sha256 = "sha256-fVcc8v1c9uU72X6afEo4VoMo6YuDECQSwDQ/TQjgwUY="; 19 }; 20 21 data = fetchzip {

+9 -1

pkgs/games/xonotic/default.nix

··· 1 { lib, stdenv, fetchurl, fetchzip, makeWrapper, runCommand, makeDesktopItem 2 , xonotic-data, copyDesktopItems 3 , # required for both 4 - unzip, libjpeg, zlib, libvorbis, curl 5 , # glx 6 libX11, libGLU, libGL, libXpm, libXext, libXxf86vm, alsa-lib 7 , # sdl ··· 121 patchelf \ 122 --add-needed ${curl.out}/lib/libcurl.so \ 123 --add-needed ${libvorbis}/lib/libvorbisfile.so \ 124 --add-needed ${libvorbis}/lib/libvorbis.so \ 125 --add-needed ${libGL.out}/lib/libGL.so \ 126 $out/bin/xonotic-glx 127 '' + lib.optionalString withSDL '' 128 patchelf \ 129 --add-needed ${curl.out}/lib/libcurl.so \ 130 --add-needed ${libvorbis}/lib/libvorbisfile.so \ 131 --add-needed ${libvorbis}/lib/libvorbis.so \ 132 $out/bin/xonotic-sdl 133 ''; 134 };

··· 1 { lib, stdenv, fetchurl, fetchzip, makeWrapper, runCommand, makeDesktopItem 2 , xonotic-data, copyDesktopItems 3 , # required for both 4 + unzip, libjpeg, zlib, libvorbis, curl, freetype, libpng, libtheora 5 , # glx 6 libX11, libGLU, libGL, libXpm, libXext, libXxf86vm, alsa-lib 7 , # sdl ··· 121 patchelf \ 122 --add-needed ${curl.out}/lib/libcurl.so \ 123 --add-needed ${libvorbis}/lib/libvorbisfile.so \ 124 + --add-needed ${libvorbis}/lib/libvorbisenc.so \ 125 --add-needed ${libvorbis}/lib/libvorbis.so \ 126 --add-needed ${libGL.out}/lib/libGL.so \ 127 + --add-needed ${freetype}/lib/libfreetype.so \ 128 + --add-needed ${libpng}/lib/libpng.so \ 129 + --add-needed ${libtheora}/lib/libtheora.so \ 130 $out/bin/xonotic-glx 131 '' + lib.optionalString withSDL '' 132 patchelf \ 133 --add-needed ${curl.out}/lib/libcurl.so \ 134 --add-needed ${libvorbis}/lib/libvorbisfile.so \ 135 + --add-needed ${libvorbis}/lib/libvorbisenc.so \ 136 --add-needed ${libvorbis}/lib/libvorbis.so \ 137 + --add-needed ${freetype}/lib/libfreetype.so \ 138 + --add-needed ${libpng}/lib/libpng.so \ 139 + --add-needed ${libtheora}/lib/libtheora.so \ 140 $out/bin/xonotic-sdl 141 ''; 142 };

+1

pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix

··· 18 ''; 19 20 installFlags = [ "DSTROOT=$(out)" ]; 21 22 meta = with lib; { 23 description = "Apple's common startup stubs for darwin";

··· 18 ''; 19 20 installFlags = [ "DSTROOT=$(out)" ]; 21 + enableParallelInstalling = false; # cp: cannot create regular file '$out/lib/crt1.10.6.o' 22 23 meta = with lib; { 24 description = "Apple's common startup stubs for darwin";

+3 -3

pkgs/servers/monitoring/karma/default.nix

··· 19 20 buildGoModule rec { 21 pname = "karma"; 22 - version = "0.113"; 23 24 src = fetchFromGitHub { 25 owner = "prymitive"; 26 repo = "karma"; 27 rev = "v${version}"; 28 - hash = "sha256-q0RGdwZQv8ypBcjrf0UjBSp2PlaKzM0wX5q4GzUNX9o="; 29 }; 30 31 - vendorHash = "sha256-8YyTHPIr5Kk7M0LH662KQw4t2CuHZ/3jD0Rzhl8ps0M="; 32 33 nativeBuildInputs = [ 34 nodejs-18_x

··· 19 20 buildGoModule rec { 21 pname = "karma"; 22 + version = "0.114"; 23 24 src = fetchFromGitHub { 25 owner = "prymitive"; 26 repo = "karma"; 27 rev = "v${version}"; 28 + hash = "sha256-ZstBumK2ywwdr1ksMN7P8mHdYUiMOpfpYnvt0v0Io4w="; 29 }; 30 31 + vendorHash = "sha256-ZsXPA4KyKbc/bwkidyHNDg62mE8KlE+yIssOBZLmHVg="; 32 33 nativeBuildInputs = [ 34 nodejs-18_x

+2 -2

pkgs/servers/monitoring/plugins/wmic-bin.nix

··· 1 - { stdenv, lib, fetchFromGitHub, autoPatchelfHook, popt, libxcrypt }: 2 3 stdenv.mkDerivation rec { 4 pname = "wmic-bin"; ··· 11 sha256 = "1w1mdbiwz37wzry1q38h8dyjaa6iggmsb9wcyhhlawwm1vj50w48"; 12 }; 13 14 - buildInputs = [ popt libxcrypt ]; 15 16 nativeBuildInputs = [ autoPatchelfHook ]; 17

··· 1 + { stdenv, lib, fetchFromGitHub, autoPatchelfHook, popt, libxcrypt-legacy }: 2 3 stdenv.mkDerivation rec { 4 pname = "wmic-bin"; ··· 11 sha256 = "1w1mdbiwz37wzry1q38h8dyjaa6iggmsb9wcyhhlawwm1vj50w48"; 12 }; 13 14 + buildInputs = [ popt libxcrypt-legacy ]; 15 16 nativeBuildInputs = [ autoPatchelfHook ]; 17

+2 -2

pkgs/servers/web-apps/moodle/default.nix

··· 1 { lib, stdenv, fetchurl, writeText, plugins ? [ ], nixosTests }: 2 3 let 4 - version = "4.1.1"; 5 6 versionParts = lib.take 2 (lib.splitVersion version); 7 # 4.2 -> 402, 3.11 -> 311 ··· 15 16 src = fetchurl { 17 url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; 18 - sha256 = "sha256-w6N/jFYieL+yJXlDr1/9AATChSqiatx+aJl0XSOSL0s="; 19 }; 20 21 phpConfig = writeText "config.php" ''

··· 1 { lib, stdenv, fetchurl, writeText, plugins ? [ ], nixosTests }: 2 3 let 4 + version = "4.1.2"; 5 6 versionParts = lib.take 2 (lib.splitVersion version); 7 # 4.2 -> 402, 3.11 -> 311 ··· 15 16 src = fetchurl { 17 url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; 18 + sha256 = "sha256-ddXldOQLefV6Kjla+IeFwD50Vye4kholJD5R6X6A2Og="; 19 }; 20 21 phpConfig = writeText "config.php" ''

+3 -3

pkgs/tools/admin/scaleway-cli/default.nix

··· 2 3 buildGoModule rec { 4 pname = "scaleway-cli"; 5 - version = "2.12.0"; 6 7 src = fetchFromGitHub { 8 owner = "scaleway"; 9 repo = "scaleway-cli"; 10 rev = "v${version}"; 11 - sha256 = "sha256-4BIw+vk0LJL6/AWtZDtOP88UqUg1EiDASMaEP3/7Bx0="; 12 }; 13 14 - vendorHash = "sha256-Wdbh7rFKvWdDULMwYxvTrWim6iO6kQaYseSkq2PBfUM="; 15 16 ldflags = [ 17 "-w"

··· 2 3 buildGoModule rec { 4 pname = "scaleway-cli"; 5 + version = "2.13.0"; 6 7 src = fetchFromGitHub { 8 owner = "scaleway"; 9 repo = "scaleway-cli"; 10 rev = "v${version}"; 11 + sha256 = "sha256-C8Yeq2Mwyc3oPQSby8NiNrSNHle7Mc7uexg+G17Cl3M="; 12 }; 13 14 + vendorHash = "sha256-1OwzvGngSv8N5IFlB+vOKyPAaPnY4h2i0vKQAcQHt5o="; 15 16 ldflags = [ 17 "-w"

+2 -2

pkgs/tools/misc/bdf2psf/default.nix

··· 2 3 stdenv.mkDerivation rec { 4 pname = "bdf2psf"; 5 - version = "1.217"; 6 7 src = fetchurl { 8 url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; 9 - sha256 = "sha256-Rsud1DEsI946F8VzaF+S8nqTMih7ILWPhfx4zqa4Y9E="; 10 }; 11 12 nativeBuildInputs = [ dpkg ];

··· 2 3 stdenv.mkDerivation rec { 4 pname = "bdf2psf"; 5 + version = "1.218"; 6 7 src = fetchurl { 8 url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; 9 + sha256 = "sha256-pHL3Q/qOLq8AAmMuNoGRzz+c1xQxJk/6+t6u3EdWqMY="; 10 }; 11 12 nativeBuildInputs = [ dpkg ];

+5 -4

pkgs/tools/misc/mapcidr/default.nix

··· 5 6 buildGoModule rec { 7 pname = "mapcidr"; 8 - version = "1.1.0"; 9 10 src = fetchFromGitHub { 11 owner = "projectdiscovery"; 12 repo = pname; 13 - rev = "v${version}"; 14 - sha256 = "sha256-cpNNStPgGnEtiiHgpiLUvEFu78NtyJIVgjrkh6N+dLU="; 15 }; 16 17 - vendorHash = "sha256-t6bTbgOTWNz3nz/Tgwkd+TCBhN++0UaV0LqaEsO9YCI="; 18 19 modRoot = "."; 20 subPackages = [ ··· 28 operations, it can be used both as a library and as independent CLI tool. 29 ''; 30 homepage = "https://github.com/projectdiscovery/mapcidr"; 31 license = licenses.mit; 32 maintainers = with maintainers; [ hanemile ]; 33 };

··· 5 6 buildGoModule rec { 7 pname = "mapcidr"; 8 + version = "1.1.1"; 9 10 src = fetchFromGitHub { 11 owner = "projectdiscovery"; 12 repo = pname; 13 + rev = "refs/tags/v${version}"; 14 + hash = "sha256-HmX4C1DXPS/14TGxKFnw/sxxp2suU6c4GC5W7ZtzjZ8="; 15 }; 16 17 + vendorHash = "sha256-7cB+fDYWy1Qe3apEPaUMA2+6KmMpC7ANjEgIde00Pas="; 18 19 modRoot = "."; 20 subPackages = [ ··· 28 operations, it can be used both as a library and as independent CLI tool. 29 ''; 30 homepage = "https://github.com/projectdiscovery/mapcidr"; 31 + changelog = "https://github.com/projectdiscovery/mapcidr/releases/tag/v${version}"; 32 license = licenses.mit; 33 maintainers = with maintainers; [ hanemile ]; 34 };

+3 -3

pkgs/tools/misc/trdl-client/default.nix

··· 7 8 buildGoModule rec { 9 pname = "trdl-client"; 10 - version = "0.6.3"; 11 12 src = fetchFromGitHub { 13 owner = "werf"; 14 repo = "trdl"; 15 rev = "v${version}"; 16 - hash = "sha256-mmhbcBNHvx14Ihzq8UemPU8oYi/Gn3NK0FDZRVJvvfQ="; 17 }; 18 19 sourceRoot = "source/client"; 20 21 - vendorHash = "sha256-3B4MYj1jlovjWGIVK233t+e/mP8eEdHHv2M3xXSHaaM="; 22 23 subPackages = [ "cmd/trdl" ]; 24

··· 7 8 buildGoModule rec { 9 pname = "trdl-client"; 10 + version = "0.6.5"; 11 12 src = fetchFromGitHub { 13 owner = "werf"; 14 repo = "trdl"; 15 rev = "v${version}"; 16 + hash = "sha256-jJwRIfxmjlhfS/0+IN2IdQPlO9FkTb64PWUiLwkarfM="; 17 }; 18 19 sourceRoot = "source/client"; 20 21 + vendorHash = "sha256-f7FPeR+us3WvwqzcSQLbkKv905CCIAAm+HNV2FFF8OY="; 22 23 subPackages = [ "cmd/trdl" ]; 24

+3

pkgs/tools/security/gopass/default.nix

··· 53 --prefix PATH : "${wrapperPath}" \ 54 --set GOPASS_NO_REMINDER true 55 ''; 56 57 meta = with lib; { 58 description = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go";

··· 53 --prefix PATH : "${wrapperPath}" \ 54 --set GOPASS_NO_REMINDER true 55 ''; 56 + passthru = { 57 + inherit wrapperPath; 58 + }; 59 60 meta = with lib; { 61 description = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go";

+1 -1

pkgs/tools/security/gopass/jsonapi.nix

··· 29 30 postFixup = '' 31 wrapProgram $out/bin/gopass-jsonapi \ 32 - --prefix PATH : "${lib.makeBinPath [ gopass ]}" 33 ''; 34 35 meta = with lib; {

··· 29 30 postFixup = '' 31 wrapProgram $out/bin/gopass-jsonapi \ 32 + --prefix PATH : "${gopass.wrapperPath}" 33 ''; 34 35 meta = with lib; {

+17 -10

pkgs/top-level/all-packages.nix

··· 22484 # Default libGLU 22485 libGLU = mesa_glu; 22486 22487 - mesa = callPackage ../development/libraries/mesa { 22488 - llvmPackages = llvmPackages_15; 22489 - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; 22490 inherit (darwin.apple_sdk_11_0.frameworks) OpenGL; 22491 inherit (darwin.apple_sdk_11_0.libs) Xplugin; 22492 }; 22493 22494 mesa_glu = callPackage ../development/libraries/mesa-glu { 22495 inherit (darwin.apple_sdk.frameworks) ApplicationServices; ··· 23072 protobuf3_20 = callPackage ../development/libraries/protobuf/3.20.nix { }; 23073 protobuf3_19 = callPackage ../development/libraries/protobuf/3.19.nix { }; 23074 protobuf3_17 = callPackage ../development/libraries/protobuf/3.17.nix { }; 23075 - protobuf3_8 = callPackage ../development/libraries/protobuf/3.8.nix { }; 23076 23077 protobufc = callPackage ../development/libraries/protobufc { }; 23078 ··· 28904 28905 bombadillo = callPackage ../applications/networking/browsers/bombadillo { }; 28906 28907 - bombono = callPackage ../applications/video/bombono { 28908 - scons = sconsPackages.scons_4_1_0; 28909 - }; 28910 28911 bonzomatic = callPackage ../applications/editors/bonzomatic { }; 28912 ··· 35541 35542 dwarf-therapist = dwarf-fortress-packages.dwarf-therapist; 35543 35544 - dxx-rebirth = callPackage ../games/dxx-rebirth { 35545 - scons = sconsPackages.scons_4_1_0; 35546 - }; 35547 35548 inherit (callPackages ../games/dxx-rebirth/assets.nix { }) 35549 descent1-assets

··· 22484 # Default libGLU 22485 libGLU = mesa_glu; 22486 22487 + # When a new patch is out, add a new mesa attribute with the exact patch version 22488 + # Remove old mesa attributes when they're unused. 22489 + # Try to keep the previous version around for a bit in case there are new bugs. 22490 + mesa_22_3_7 = darwin.apple_sdk_11_0.callPackage ../development/libraries/mesa/22.3.7.nix { 22491 inherit (darwin.apple_sdk_11_0.frameworks) OpenGL; 22492 inherit (darwin.apple_sdk_11_0.libs) Xplugin; 22493 }; 22494 + mesa_23_0_1 = darwin.apple_sdk_11_0.callPackage ../development/libraries/mesa/23.0.1.nix { 22495 + inherit (darwin.apple_sdk_11_0.frameworks) OpenGL; 22496 + inherit (darwin.apple_sdk_11_0.libs) Xplugin; 22497 + }; 22498 + # Bump this immediately on patches; wait a bit for minor versions 22499 + mesa_22 = mesa_22_3_7; 22500 + mesa_23 = mesa_23_0_1; 22501 + # Bump on staging only, tonnes of packages depend on it. 22502 + # See https://github.com/NixOS/nixpkgs/issues/218232 22503 + # Major versions should be bumped when they have proven to be reasonably stable 22504 + mesa = mesa_22_3_7; 22505 22506 mesa_glu = callPackage ../development/libraries/mesa-glu { 22507 inherit (darwin.apple_sdk.frameworks) ApplicationServices; ··· 23084 protobuf3_20 = callPackage ../development/libraries/protobuf/3.20.nix { }; 23085 protobuf3_19 = callPackage ../development/libraries/protobuf/3.19.nix { }; 23086 protobuf3_17 = callPackage ../development/libraries/protobuf/3.17.nix { }; 23087 23088 protobufc = callPackage ../development/libraries/protobufc { }; 23089 ··· 28915 28916 bombadillo = callPackage ../applications/networking/browsers/bombadillo { }; 28917 28918 + bombono = callPackage ../applications/video/bombono { }; 28919 28920 bonzomatic = callPackage ../applications/editors/bonzomatic { }; 28921 ··· 35550 35551 dwarf-therapist = dwarf-fortress-packages.dwarf-therapist; 35552 35553 + dxx-rebirth = callPackage ../games/dxx-rebirth { }; 35554 35555 inherit (callPackages ../games/dxx-rebirth/assets.nix { }) 35556 descent1-assets

+7

pkgs/top-level/perl-packages.nix

··· 1180 hash = "sha256-tfr0fj+UikUoEGzLiMxxBIz+WY5bAmpEQ2i8fjk0gGc="; 1181 }; 1182 propagatedBuildInputs = [ ClassAccessor CryptPasswdMD5 DigestSHA1 IOLockedFile ]; 1183 meta = { 1184 description = "Interface to read and modify Apache .htpasswd files"; 1185 license = with lib.licenses; [ artistic1 gpl1Plus ]; ··· 2252 }; 2253 buildInputs = [ ModuleBuildTiny TestLongString TestSimple13 TestWWWMechanize TestWWWMechanizeCatalyst ]; 2254 propagatedBuildInputs = [ AuthenHtpasswd CatalystPluginAuthentication ]; 2255 meta = { 2256 description = "Authen::Htpasswd based user storage/authentication"; 2257 license = with lib.licenses; [ artistic1 gpl1Plus ];

··· 1180 hash = "sha256-tfr0fj+UikUoEGzLiMxxBIz+WY5bAmpEQ2i8fjk0gGc="; 1181 }; 1182 propagatedBuildInputs = [ ClassAccessor CryptPasswdMD5 DigestSHA1 IOLockedFile ]; 1183 + # Remove test files that fail after DES support was removed from crypt() 1184 + postPatch = '' 1185 + rm t/04core.t t/05edit.t 1186 + ''; 1187 meta = { 1188 description = "Interface to read and modify Apache .htpasswd files"; 1189 license = with lib.licenses; [ artistic1 gpl1Plus ]; ··· 2256 }; 2257 buildInputs = [ ModuleBuildTiny TestLongString TestSimple13 TestWWWMechanize TestWWWMechanizeCatalyst ]; 2258 propagatedBuildInputs = [ AuthenHtpasswd CatalystPluginAuthentication ]; 2259 + patches = [ 2260 + ../development/perl-modules/CatalystAuthenticationStoreHtpasswd-test-replace-DES-hash-with-bcrypt.patch 2261 + ]; 2262 meta = { 2263 description = "Authen::Htpasswd based user storage/authentication"; 2264 license = with lib.licenses; [ artistic1 gpl1Plus ];