pyrox.dev / nixpkgs
lol
fork atom

Merge master into staging-next

authored by

github-actions[bot] and committed by
GitHub 6594913d 5c89ba8a

+18 -7
unified split
+3 -3
pkgs/applications/version-management/git-cliff/default.nix
··· 7 8 rustPlatform.buildRustPackage rec { 9 pname = "git-cliff"; 10 - version = "1.3.1"; 11 12 src = fetchFromGitHub { 13 owner = "orhun"; 14 repo = "git-cliff"; 15 rev = "v${version}"; 16 - hash = "sha256-DzlCy8Y3OW3FiXO45wuUh3t87Za2jWQ4rnztZGRySYA="; 17 }; 18 19 - cargoHash = "sha256-+XyZqxjiOAIyc+FmnexIdV1RMzc+iqmo8nPahzUo43E="; 20 21 # attempts to run the program on .git in src which is not deterministic 22 doCheck = false;
··· 7 8 rustPlatform.buildRustPackage rec { 9 pname = "git-cliff"; 10 + version = "1.4.0"; 11 12 src = fetchFromGitHub { 13 owner = "orhun"; 14 repo = "git-cliff"; 15 rev = "v${version}"; 16 + hash = "sha256-OK2eoWlqlpf/X8EGMnWTv9Gs5FkYvW5rmQDB/Mkbp60="; 17 }; 18 19 + cargoHash = "sha256-gtkpZKOaG5p79uJ9cbbGdiOX57bDFTf2/Bd8+WToJrw="; 20 21 # attempts to run the program on .git in src which is not deterministic 22 doCheck = false;
+9 -4
pkgs/by-name/my/mystmd/package.nix
··· 1 - { lib, buildNpmPackage, fetchFromGitHub }: 2 3 buildNpmPackage rec { 4 pname = "mystmd"; 5 - version = "1.1.22"; 6 7 src = fetchFromGitHub { 8 owner = "executablebooks"; 9 repo = "mystmd"; 10 rev = "mystmd@${version}"; 11 - hash = "sha256-jx/UCC/Cl5kqAbMzeikTmrx9xWS02OCp3rn0pvtIAPY="; 12 }; 13 14 - npmDepsHash = "sha256-1qQ19iB7N+KvO1uUdEMU1iN91FMQs4wzfTCdv6wfn30="; 15 16 dontNpmInstall = true; 17 ··· 22 23 runHook postInstall 24 ''; 25 26 meta = with lib; { 27 description = "Command line tools for working with MyST Markdown";
··· 1 + { lib, buildNpmPackage, fetchFromGitHub, mystmd, testers }: 2 3 buildNpmPackage rec { 4 pname = "mystmd"; 5 + version = "1.1.23"; 6 7 src = fetchFromGitHub { 8 owner = "executablebooks"; 9 repo = "mystmd"; 10 rev = "mystmd@${version}"; 11 + hash = "sha256-+zgAm3v7XcNhhVOFueRqJijteQqMCZmE33hDyR4d5bA="; 12 }; 13 14 + npmDepsHash = "sha256-8brgDSV0BBggYUnizV+24RQMXxPd6HUBDYrw9fJtL+M="; 15 16 dontNpmInstall = true; 17 ··· 22 23 runHook postInstall 24 ''; 25 + 26 + passthru.tests.version = testers.testVersion { 27 + package = mystmd; 28 + version = "v${version}"; 29 + }; 30 31 meta = with lib; { 32 description = "Command line tools for working with MyST Markdown";
+6
pkgs/development/tools/continuous-integration/buildbot/master.nix
··· 31 , parameterized 32 , git 33 , openssh 34 , glibcLocales 35 , nixosTests 36 , callPackage ··· 88 autobahn 89 pyjwt 90 pyyaml 91 ] 92 # tls 93 ++ twisted.optional-dependencies.tls; ··· 108 git 109 openssh 110 glibcLocales 111 ]; 112 113 patches = [ 114 # This patch disables the test that tries to read /etc/os-release which
··· 31 , parameterized 32 , git 33 , openssh 34 + , setuptools 35 + , pythonRelaxDepsHook 36 , glibcLocales 37 , nixosTests 38 , callPackage ··· 90 autobahn 91 pyjwt 92 pyyaml 93 + setuptools 94 ] 95 # tls 96 ++ twisted.optional-dependencies.tls; ··· 111 git 112 openssh 113 glibcLocales 114 + pythonRelaxDepsHook 115 ]; 116 + 117 + pythonRelaxDeps = [ "Twisted" ]; 118 119 patches = [ 120 # This patch disables the test that tries to read /etc/os-release which