Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
44715fd080
@ -2,6 +2,8 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, makeWrapper
|
||||
, alsa-utils
|
||||
, alsa-lib
|
||||
, gtk4
|
||||
, wrapGAppsHook4
|
||||
@ -22,9 +24,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
makeFlags = [ "DESTDIR=\${out}" "PREFIX=''" ];
|
||||
sourceRoot = "${src.name}/src";
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook4 ];
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook4 makeWrapper ];
|
||||
buildInputs = [ gtk4 alsa-lib ];
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/alsa-scarlett-gui --prefix PATH : ${lib.makeBinPath [ alsa-utils ]}
|
||||
|
||||
substituteInPlace $out/share/applications/vu.b4.alsa-scarlett-gui.desktop \
|
||||
--replace "Exec=/bin/alsa-scarlett-gui" "Exec=$out/bin/alsa-scarlett-gui"
|
||||
'';
|
||||
|
||||
26
pkgs/applications/version-management/degit/default.nix
Normal file
26
pkgs/applications/version-management/degit/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "degit";
|
||||
version = "2.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Rich-Harris";
|
||||
repo = "degit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Vw/gtmKywi5faSCs7Wek80nmnqcPHXlQarD5qMwlsQE=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-42cM31C2c1Gr7HWOowMUTEUEyL0mGnyl5fyQECcz1Sw=";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/Rich-Harris/degit/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "Make copies of git repositories";
|
||||
homepage = "https://github.com/Rich-Harris/degit";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ kidonng ];
|
||||
};
|
||||
}
|
||||
@ -12,16 +12,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "eww";
|
||||
version = "unstable-2023-06-10";
|
||||
version = "unstable-2023-08-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elkowar";
|
||||
repo = "eww";
|
||||
rev = "25e50eda46379bccd8a7887c18ee35833e0460e8";
|
||||
hash = "sha256-8e6gHSg6FDp6nU5v89D44Tqb1lR5aQpS0lXOVqzoUS4=";
|
||||
rev = "a9a35c1804d72ef92e04ee71555bd9e5a08fa17e";
|
||||
hash = "sha256-GEysmNDm+olt1WXHzRwb4ZLifkXmeP5+APAN3b81/Og=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-dC7yVJdR7mO0n+sxWwigM1Q4tbDv5ZuOINHHlUIPdA0=";
|
||||
cargoHash = "sha256-4yeu5AgleZMOLKNynGMd0XuyZxyyZ+RmzNtuJiNPN8g=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
|
||||
|
||||
|
||||
@ -15,16 +15,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "i3status-rust";
|
||||
version = "0.32.0";
|
||||
version = "0.32.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greshake";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-cBcmNeGfVPCdVvXkMe2Vx3zUaWGE1vMSfwmNPapTwBo=";
|
||||
hash = "sha256-F09gIDByRIJENwbzUb2IlWkyXjva0b7ivORgXotL/20=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-cD4QFrDgwwJIrpSYmoale+2p0xD2JMHcIcuc4sRH4wI=";
|
||||
cargoHash = "sha256-D0XGH6b6dJrgLnFUViRAl9+AhnR2Bt4J2hDXUyJhOyg=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, writeShellScript
|
||||
, pkg-config
|
||||
@ -17,19 +18,28 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libredwg";
|
||||
version = "0.12.5";
|
||||
version = "0.12.5.6248";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LibreDWG";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-s9aiOKSM7+3LJNE+jRrEMcL1QKRWrlTKbwO7oL9VhuE=";
|
||||
hash = "sha256-EHfqj+FeZZpQzF9/LFWg+onTMz2/9tvXNcdpZrdjry0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "dwg2svg-strcasestr-musl-fix.patch";
|
||||
# https://github.com/LibreDWG/libredwg/pull/822
|
||||
url = "https://github.com/LibreDWG/libredwg/commit/eec0b7aac6d2f695b7b258f47c3bde3f71f963ee.patch";
|
||||
hash = "sha256-TjpJuhRl9t0b9NOJ1FEOO0/y586WwaJcNzTM0cTwmYI=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = let
|
||||
printVersion = writeShellScript "print-version" ''
|
||||
echo ${lib.escapeShellArg version}
|
||||
echo -n ${lib.escapeShellArg version}
|
||||
'';
|
||||
in ''
|
||||
# avoid git dependency
|
||||
|
||||
@ -60,6 +60,8 @@ mapAliases {
|
||||
inherit (pkgs) configurable-http-proxy; # added 2023-08-19
|
||||
inherit (pkgs) cordova; # added 2023-08-18
|
||||
dat = throw "dat was removed because it was broken"; # added 2023-08-21
|
||||
inherit (pkgs) degit; # added 2023-08-18
|
||||
inherit (pkgs) dockerfile-language-server-nodejs; # added 2023-08-18
|
||||
eask = pkgs.eask; # added 2023-08-17
|
||||
inherit (pkgs.elmPackages) elm-test;
|
||||
eslint_d = pkgs.eslint_d; # Added 2023-05-26
|
||||
@ -67,8 +69,11 @@ mapAliases {
|
||||
flood = pkgs.flood; # Added 2023-07-25
|
||||
git-ssb = throw "git-ssb was removed because it was broken"; # added 2023-08-21
|
||||
glob = pkgs.node-glob; # added 2023-08-18
|
||||
inherit (pkgs) gqlint; # added 2023-08-19
|
||||
inherit (pkgs) graphqurl; # added 2023-08-19
|
||||
gtop = pkgs.gtop; # added 2023-07-31
|
||||
hs-client = pkgs.hsd; # added 2023-08-20
|
||||
inherit (pkgs) hsd; # added 2023-08-19
|
||||
inherit (pkgs) html-minifier; # added 2023-08-19
|
||||
inherit (pkgs) htmlhint; # added 2023-08-19
|
||||
hueadm = pkgs.hueadm; # added 2023-07-31
|
||||
@ -76,19 +81,24 @@ mapAliases {
|
||||
immich = pkgs.immich-cli; # added 2023-08-19
|
||||
indium = throw "indium was removed because it was broken"; # added 2023-08-19
|
||||
ionic = throw "ionic was replaced by @ionic/cli"; # added 2023-08-19
|
||||
inherit (pkgs) jake; # added 2023-08-19
|
||||
inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19
|
||||
karma = pkgs.karma-runner; # added 2023-07-29
|
||||
leetcode-cli = vsc-leetcode-cli; # added 2023-08-31
|
||||
manta = pkgs.node-manta; # Added 2023-05-06
|
||||
markdownlint-cli = pkgs.markdownlint-cli; # added 2023-07-29
|
||||
inherit (pkgs) markdownlint-cli2; # added 2023-08-22
|
||||
mdctl-cli = self."@medable/mdctl-cli"; # added 2023-08-21
|
||||
musescore-downloader = pkgs.dl-librescore; # added 2023-08-19
|
||||
node-inspector = throw "node-inspector was removed because it was broken"; # added 2023-08-21
|
||||
inherit (pkgs) npm-check-updates; # added 2023-08-22
|
||||
inherit (pkgs) react-static; # added 2023-08-21
|
||||
readability-cli = pkgs.readability-cli; # Added 2023-06-12
|
||||
reveal-md = pkgs.reveal-md; # added 2023-07-31
|
||||
inherit (pkgs) rtlcss; # added 2023-08-29
|
||||
s3http = throw "s3http was removed because it was abandoned upstream"; # added 2023-08-18
|
||||
inherit (pkgs) snyk; # Added 2023-08-30
|
||||
"@squoosh/cli" = throw "@squoosh/cli was removed because it was abandoned upstream"; # added 2023-09-02
|
||||
ssb-server = throw "ssb-server was removed because it was broken"; # added 2023-08-21
|
||||
stf = throw "stf was removed because it was broken"; # added 2023-08-21
|
||||
thelounge = pkgs.thelounge; # Added 2023-05-22
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
"@antfu/ni" = "ni";
|
||||
"@electron-forge/cli" = "electron-forge";
|
||||
"@microsoft/rush" = "rush";
|
||||
"@squoosh/cli" = "squoosh-cli";
|
||||
"@webassemblyjs/cli-1.11.1" = "wasm2wast";
|
||||
coffee-script = "coffee";
|
||||
"@withgraphite/graphite-cli" = "gt";
|
||||
@ -35,7 +34,6 @@
|
||||
conventional-changelog-cli = "conventional-changelog";
|
||||
cpy-cli = "cpy";
|
||||
diff2html-cli = "diff2html";
|
||||
dockerfile-language-server-nodejs = "docker-langserver";
|
||||
fast-cli = "fast";
|
||||
fauna-shell = "fauna";
|
||||
fkill-cli = "fkill";
|
||||
@ -47,7 +45,6 @@
|
||||
grunt-cli = "grunt";
|
||||
gulp-cli = "gulp";
|
||||
kaput-cli = "kaput";
|
||||
leetcode-cli = "leetcode";
|
||||
less = "lessc";
|
||||
localtunnel = "lt";
|
||||
lua-fmt = "luafmt";
|
||||
|
||||
@ -10,7 +10,6 @@
|
||||
, "@microsoft/rush"
|
||||
, "@nerdwallet/shepherd"
|
||||
, "@shopify/cli"
|
||||
, "@squoosh/cli"
|
||||
, "@tailwindcss/aspect-ratio"
|
||||
, "@tailwindcss/forms"
|
||||
, "@tailwindcss/language-server"
|
||||
@ -101,11 +100,9 @@
|
||||
, "create-react-native-app"
|
||||
, "cspell"
|
||||
, "csslint"
|
||||
, "degit"
|
||||
, "dhcp"
|
||||
, "diagnostic-languageserver"
|
||||
, "diff2html-cli"
|
||||
, "dockerfile-language-server-nodejs"
|
||||
, "dotenv-cli"
|
||||
, "dotenv-vault"
|
||||
, "elasticdump"
|
||||
@ -141,20 +138,16 @@
|
||||
, "grunt-cli"
|
||||
, "makam"
|
||||
, "meshcommander"
|
||||
, "gqlint"
|
||||
, "gulp"
|
||||
, "gulp-cli"
|
||||
, "he"
|
||||
, "http-server"
|
||||
, "hsd"
|
||||
, "hs-airdrop"
|
||||
, "hs-client"
|
||||
, "ijavascript"
|
||||
, "inliner"
|
||||
, "imapnotify"
|
||||
, "insect"
|
||||
, "intelephense"
|
||||
, "jake"
|
||||
, "joplin"
|
||||
, "js-beautify"
|
||||
, "js-yaml"
|
||||
@ -170,7 +163,6 @@
|
||||
, "katex"
|
||||
, "keyoxide"
|
||||
, "lcov-result-merger"
|
||||
, "leetcode-cli"
|
||||
, "vsc-leetcode-cli"
|
||||
, "lerna"
|
||||
, "less"
|
||||
@ -189,7 +181,6 @@
|
||||
, "meat"
|
||||
, "mocha"
|
||||
, "multi-file-swagger"
|
||||
, "musescore-downloader"
|
||||
, "near-cli"
|
||||
, "neovim"
|
||||
, "nijs"
|
||||
@ -233,7 +224,6 @@
|
||||
, "pyright"
|
||||
, "quicktype"
|
||||
, "react-native-cli"
|
||||
, "react-static"
|
||||
, "react-tools"
|
||||
, "redoc-cli"
|
||||
, "remod-cli"
|
||||
|
||||
2450
pkgs/development/node-packages/node-packages.nix
generated
2450
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -118,9 +118,6 @@ final: prev: {
|
||||
'';
|
||||
};
|
||||
|
||||
hsd = prev.hsd.override {
|
||||
buildInputs = [ final.node-gyp-build pkgs.unbound ];
|
||||
};
|
||||
|
||||
ijavascript = prev.ijavascript.override (oldAttrs: {
|
||||
preRebuild = ''
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bleak-retry-connector";
|
||||
version = "3.1.1";
|
||||
version = "3.1.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-fw1Eo4f9MdCjICkZiCUX3wa947s1kv9qqYmYjd0zqF4=";
|
||||
hash = "sha256-q+J4PUBm42jBcLbiywWwDZxUI0Gsl8GjnLPwniWp+Kw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bleak";
|
||||
version = "0.20.2";
|
||||
version = "0.21.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "hbldh";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-hiQSsQHq1hoCQhoWU50i2NXYR/LaTHAize9cfr1uZsY=";
|
||||
hash = "sha256-hnXBXm0BFNNzw563Ybr76KHiqt2sFqo0dtiRHGWsu3A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "2023.8.14";
|
||||
version = "2023.9.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-msN3S7rBYZnCAh2IGBVzHjqiTapzH2kMV5CBFHmtcNE=";
|
||||
hash = "sha256-FM07+ORPFne+9gtruuKqp2EwPLF9py7zi9a6vehN2Yk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "peaqevcore";
|
||||
version = "19.2.1";
|
||||
version = "19.3.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-4HLRZSxeRqpe8xutu5sGO63LAStx+3OgkQ1qPH1CUDY=";
|
||||
hash = "sha256-hVI3syst8F5BNrHcu21OxszPMWuv0wY65yFdfoXLMWM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tflint-ruleset-aws";
|
||||
version = "0.23.1";
|
||||
version = "0.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terraform-linters";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lvqWCTzb/07pEnNcrKkWumO17WXCFrDnNlw4LySl3Rs=";
|
||||
hash = "sha256-SKPmD34a11ynNmnD2cDTSXgRpUZ7tukaGRO8PQY6T5s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-RFgLAOQhSqpuXT5Jypk4EVk4hgyHlUfhbZUM4rA9pLU=";
|
||||
vendorHash = "sha256-JhAAyfDVRZS2QyvXNa61srlZKgsBFeKloeKbcXXpytk=";
|
||||
|
||||
# upstream Makefile also does a go test $(go list ./... | grep -v integration)
|
||||
preCheck = ''
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tflint";
|
||||
version = "0.47.0";
|
||||
version = "0.48.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terraform-linters";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-YKsX+dAnVRiD48CRHaXzUzfqsqpi/bWHNH9lqzC/TZQ=";
|
||||
hash = "sha256-QU3nSq13klBoa3+czvdlrNwtG0iQqoC/hcbTHr5KN14=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-dgK7o2DJUwAynfekrn6mN8IVxCpJa9b+kiYMQSo0RIg=";
|
||||
vendorHash = "sha256-yWxBiOPB0z3+bd6f+LalfVYYoV04scnl3YXJkaTo/dk=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "atlas";
|
||||
version = "0.13.3";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ariga";
|
||||
repo = "atlas";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mnLrmsKFDpjTHyOgOeL/YsWcTfbKgv/M+phJSMFQReU=";
|
||||
hash = "sha256-6Y6b8BBfCErbKJqhR7zhltbysibUlY7KAyZe7g5mRxQ=";
|
||||
};
|
||||
|
||||
modRoot = "cmd/atlas";
|
||||
|
||||
vendorHash = "sha256-Xi0N3lU/gqmkqJcJeQqkKr0rcbad6cIclhq4t6DCTZI=";
|
||||
vendorHash = "sha256-1Hhl2TzJWWXk4du9nbJTPXdYuss4TWfUIOw2DaAJQis=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
28
pkgs/development/tools/gqlint/default.nix
Normal file
28
pkgs/development/tools/gqlint/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "gqlint";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "happylinks";
|
||||
repo = "gqlint";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-m/Y7i3+93UdPnKQlZUHgtRbfSmJ1xYjao+bU+zxMgHw=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-Fc5RbBqrJB7KSqLgTmIsPf3MK2n7vef/UVeFqH0o7mE=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
meta = {
|
||||
description = "GraphQL linter";
|
||||
homepage = "https://github.com/happylinks/gqlint";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "gqlint";
|
||||
maintainers = with lib.maintainers; [ hardselius ];
|
||||
};
|
||||
}
|
||||
28
pkgs/development/tools/jake/default.nix
Normal file
28
pkgs/development/tools/jake/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "jake";
|
||||
version = "10.8.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jakejs";
|
||||
repo = "jake";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Qado9huQx9MVTFp8t7szB+IUVNWQqT/ni62JnURQqeM=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-3pOFrH/em/HMTswrZLAeqPAb9U0/odcZPt4AkQkMhZM=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
meta = {
|
||||
description = "JavaScript build tool, similar to Make or Rake";
|
||||
homepage = "https://github.com/jakejs/jake";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "jake";
|
||||
maintainers = with lib.maintainers; [ jasoncarr ];
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "dockerfile-language-server-nodejs";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rcjsuen";
|
||||
repo = "dockerfile-language-server-nodejs";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uwwwF1eMoSA2C5h56BBllTZW8zRHueNeVwhwtycrNfA=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-lI+tkUBR0rmWcU57jU0y7XaMK3JADNU7fcbCxMmz/7s=";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/rcjsuen/dockerfile-language-server-nodejs/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "A language server for Dockerfiles powered by Node.js, TypeScript, and VSCode technologies";
|
||||
homepage = "https://github.com/rcjsuen/dockerfile-language-server-nodejs";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "docker-langserver";
|
||||
maintainers = with lib.maintainers; [ rvolosatovs ];
|
||||
};
|
||||
}
|
||||
@ -5,16 +5,21 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "complgen";
|
||||
version = "0.1.2";
|
||||
version = "0.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adaszko";
|
||||
repo = "complgen";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-x6r6sLdPIpf1mLRu8gT94fGoaCtnjpUIlEbMt6uSBR8=";
|
||||
hash = "sha256-YKJleWnUZodPuJcWX8w06PH6q1SzeUXL8AjYr9i7+sY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-jljrT8OymXx8OKxWU3rE52Nw5Fw9XFmgXaOMxdzMTe4=";
|
||||
cargoHash = "sha256-ytwhIcm4NeHDRzKNHaxo4ke+gridXKmiKHkPnACXV8o=";
|
||||
|
||||
# Cargo.lock is outdated
|
||||
postConfigure = ''
|
||||
cargo metadata --offline
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Generate {bash,fish,zsh} completions from a single EBNF-like grammar";
|
||||
|
||||
55
pkgs/development/tools/react-static/default.nix
Normal file
55
pkgs/development/tools/react-static/default.nix
Normal file
@ -0,0 +1,55 @@
|
||||
{ lib
|
||||
, mkYarnPackage
|
||||
, fetchFromGitHub
|
||||
, fetchYarnDeps
|
||||
}:
|
||||
|
||||
mkYarnPackage rec {
|
||||
pname = "react-static";
|
||||
version = "7.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "react-static";
|
||||
repo = "react-static";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dlYmD0vgEqWxYf7E0VYstZMAuNDGvQP7xDgHo/wmlUs=";
|
||||
};
|
||||
|
||||
packageJSON = ./package.json;
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/yarn.lock";
|
||||
hash = "sha256-SNnJPUzv+l2HXfA6NKYpJvn/DCX3a42JQ3N0+XYKbd8=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
yarn --cwd deps/react-static/packages/react-static --offline build
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
doDist = false;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out/lib/node_modules"
|
||||
mv deps/react-static/packages/react-static "$out/lib/node_modules"
|
||||
mv node_modules "$out/lib/node_modules/react-static"
|
||||
|
||||
ln -s "$out/lib/node_modules/react-static/bin" "$out"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/react-static/react-static/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "A progressive static site generator for React";
|
||||
homepage = "https://github.com/react-static/react-static";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "react-static";
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
154
pkgs/development/tools/react-static/package.json
Normal file
154
pkgs/development/tools/react-static/package.json
Normal file
@ -0,0 +1,154 @@
|
||||
{
|
||||
"name": "react-static",
|
||||
"description": "A progressive static site generator for React",
|
||||
"version": "7.6.2",
|
||||
"license": "MIT",
|
||||
"repository": "https://github.com/react-static/react-static",
|
||||
"main": "lib/index.js",
|
||||
"types": "src/index.d.ts",
|
||||
"engines": {
|
||||
"node": ">=8.9.0"
|
||||
},
|
||||
"bin": {
|
||||
"react-static": "./bin/react-static"
|
||||
},
|
||||
"scripts": {
|
||||
"prebuild": "rimraf lib",
|
||||
"build": "cross-env REACT_STATIC_INTERNAL=true babel src --out-dir lib --ignore \"**/__tests__/*\" --ignore \"**/__mocks__/*\" --source-maps inline",
|
||||
"watch": "yarn build --watch",
|
||||
"watch:link": "onchange './lib/**/*' -- yalc push --changed",
|
||||
"start": "yarn watch",
|
||||
"test": "yarn format && yarn lint && yarn unitTest",
|
||||
"lint": "eslint src",
|
||||
"format": "prettier README.md {src,templates/*/src}/**/*.js --write",
|
||||
"unitTest": "cross-env NODE_ENV=test yarn jest ./src",
|
||||
"unitTestWatch": "cross-env NODE_ENV=test yarn jest src --watch",
|
||||
"preversion": "yarn build && yarn test",
|
||||
"publishLink": "echo '{{event}} to {{changed}}' && yalc publish"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"react": "^16.9.0",
|
||||
"react-dom": "^16.9.0",
|
||||
"react-hot-loader": "^4.12.11"
|
||||
},
|
||||
"dependencies": {
|
||||
"@babel/cli": "^7.5.5",
|
||||
"@babel/core": "^7.5.5",
|
||||
"@babel/plugin-proposal-class-properties": "^7.5.5",
|
||||
"@babel/plugin-proposal-export-default-from": "^7.5.2",
|
||||
"@babel/plugin-proposal-optional-chaining": "^7.2.0",
|
||||
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
|
||||
"@babel/plugin-transform-destructuring": "^7.5.0",
|
||||
"@babel/plugin-transform-modules-commonjs": "^7.5.0",
|
||||
"@babel/plugin-transform-runtime": "^7.5.5",
|
||||
"@babel/preset-env": "^7.5.5",
|
||||
"@babel/preset-react": "^7.0.0",
|
||||
"@babel/preset-stage-0": "^7.0.0",
|
||||
"@babel/register": "^7.5.5",
|
||||
"@babel/runtime": "^7.5.5",
|
||||
"@reach/router": "^1.3.1",
|
||||
"autoprefixer": "^9.7.4",
|
||||
"axios": "^0.21.1",
|
||||
"babel-core": "7.0.0-bridge.0",
|
||||
"babel-loader": "^8.0.6",
|
||||
"babel-plugin-macros": "^2.6.1",
|
||||
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
|
||||
"babel-plugin-universal-import": "^4.0.0",
|
||||
"case-sensitive-paths-webpack-plugin": "^2.2.0",
|
||||
"chalk": "^2.4.2",
|
||||
"chokidar": "^3.0.2",
|
||||
"circular-dependency-plugin": "^5.2.0",
|
||||
"cors": "^2.8.5",
|
||||
"css-loader": "^2.1.1",
|
||||
"download-git-repo": "^2.0.0",
|
||||
"extract-css-chunks-webpack-plugin": "^4.6.0",
|
||||
"file-loader": "3.0.1",
|
||||
"fs-extra": "^7.0.1",
|
||||
"git-promise": "^1.0.0",
|
||||
"glob": "^7.1.4",
|
||||
"gunzip-maybe": "^1.4.1",
|
||||
"html-webpack-plugin": "^3.2.0",
|
||||
"inquirer": "^6.5.1",
|
||||
"inquirer-autocomplete-prompt": "^1.0.1",
|
||||
"intersection-observer": "^0.7.0",
|
||||
"jsesc": "^2.5.2",
|
||||
"match-sorter": "^3.1.1",
|
||||
"minimist": "^1.2.0",
|
||||
"mutation-observer": "^1.0.3",
|
||||
"optimize-css-assets-webpack-plugin": "^5.0.3",
|
||||
"portfinder": "^1.0.21",
|
||||
"postcss-flexbugs-fixes": "^4.1.0",
|
||||
"postcss-loader": "^3.0.0",
|
||||
"pretty-error": "^2.1.1",
|
||||
"progress": "^2.0.3",
|
||||
"prop-types": "^15.7.2",
|
||||
"raf": "^3.4.1",
|
||||
"raw-loader": "^3.1.0",
|
||||
"react-helmet": "^6.1.0",
|
||||
"react-universal-component": "^4.0.0",
|
||||
"resolve-from": "^5.0.0",
|
||||
"serve": "^11.1.0",
|
||||
"shorthash": "^0.0.2",
|
||||
"slash": "^2.0.0",
|
||||
"socket.io": "^2.2.0",
|
||||
"socket.io-client": "^2.2.0",
|
||||
"style-loader": "0.23.1",
|
||||
"swimmer": "^1.4.0",
|
||||
"tar-fs": "^2.0.0",
|
||||
"terser-webpack-plugin": "^1.4.1",
|
||||
"upath": "^1.1.2",
|
||||
"url-loader": "^2.1.0",
|
||||
"webpack": "^4.39.2",
|
||||
"webpack-bundle-analyzer": "^3.4.1",
|
||||
"webpack-dev-server": "^3.8.0",
|
||||
"webpack-flush-chunks": "^2.0.3",
|
||||
"webpack-node-externals": "^1.7.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/react": "^16.9.1",
|
||||
"@types/react-helmet": "^6.1.0",
|
||||
"babel-jest": "^24.8.0",
|
||||
"cors": "^2.8.5",
|
||||
"cross-env": "^5.2.0",
|
||||
"enzyme": "^3.10.0",
|
||||
"enzyme-adapter-react-16": "^1.14.0",
|
||||
"enzyme-to-json": "^3.4.0",
|
||||
"eslint": "^6.1.0",
|
||||
"eslint-config-prettier": "^6.0.0",
|
||||
"eslint-config-react-tools": "^1.1.7",
|
||||
"eslint-plugin-babel": "^5.3.0",
|
||||
"eslint-plugin-import": "^2.18.2",
|
||||
"eslint-plugin-jsx-a11y": "^6.2.3",
|
||||
"eslint-plugin-react": "^7.14.3",
|
||||
"express": "^4.17.1",
|
||||
"husky": "^3.0.3",
|
||||
"jest": "^24.8.0",
|
||||
"lerna": "^3.16.4",
|
||||
"onchange": "^6.0.0",
|
||||
"prettier": "1.18.2",
|
||||
"react": "^16.9.0",
|
||||
"react-dev-utils": "^9.0.3",
|
||||
"react-dom": "^16.9.0",
|
||||
"react-hot-loader": "^4.12.11",
|
||||
"rimraf": "^2.7.0",
|
||||
"webpack-hot-middleware": "^2.25.0"
|
||||
},
|
||||
"jest": {
|
||||
"verbose": true,
|
||||
"moduleDirectories": [
|
||||
"node_modules",
|
||||
"src"
|
||||
],
|
||||
"testRegex": "(/__tests__/.*\\.(test))\\.jsx?$",
|
||||
"moduleNameMapper": {
|
||||
"static.config.js$": "<rootDir>/src/static/__mocks__/static.config.js.mock.js"
|
||||
},
|
||||
"setupFiles": [
|
||||
"<rootDir>/setupTests.js"
|
||||
],
|
||||
"snapshotSerializers": [
|
||||
"enzyme-to-json/serializer"
|
||||
]
|
||||
},
|
||||
"gitHead": "875004e6e75d36043382b8ec8bba27a766c1a83a"
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
From d9df7aaaaf9c758499f569376a041045d99e4015 Mon Sep 17 00:00:00 2001
|
||||
From: Bob van der Linden <bobvanderlinden@gmail.com>
|
||||
Date: Thu, 9 Feb 2023 16:17:46 +0100
|
||||
Subject: [PATCH 1/2] cargo: lock: update version
|
||||
|
||||
---
|
||||
Cargo.lock | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 79a81d1..374c10a 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -642,7 +642,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rubyfmt-main"
|
||||
-version = "0.8.0-pre"
|
||||
+version = "0.8.1"
|
||||
dependencies = [
|
||||
"atty",
|
||||
"clap",
|
||||
--
|
||||
2.39.1
|
||||
|
||||
@ -12,19 +12,20 @@
|
||||
, libobjc
|
||||
, libunwind
|
||||
, libxcrypt
|
||||
, libyaml
|
||||
, Foundation
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rubyfmt";
|
||||
version = "0.8.1";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fables-tales";
|
||||
repo = "rubyfmt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lHq9lcLMp6HUHMonEe3T2YGwMYW1W131H1jo1cy6kyc=";
|
||||
hash = "sha256-IIHPU6iwFwQ5cOAtOULpMSjexFtTelSd/LGLuazdmUo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -38,6 +39,7 @@ rustPlatform.buildRustPackage rec {
|
||||
buildInputs = [
|
||||
zlib
|
||||
libxcrypt
|
||||
libyaml
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
readline
|
||||
libiconv
|
||||
@ -55,15 +57,13 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
|
||||
cargoPatches = [
|
||||
# The 0.8.1 release did not have an up-to-date lock file. The rubyfmt
|
||||
# version in Cargo.toml was bumped, but it wasn't updated in the lock file.
|
||||
./0001-cargo-lock-update-version.patch
|
||||
|
||||
# Avoid checking whether ruby gitsubmodule is up-to-date.
|
||||
./0002-remove-dependency-on-git.patch
|
||||
];
|
||||
|
||||
cargoHash = "sha256-keeIonGNgE0U0IVi8DeXAy6ygTXVXH+WDjob36epUDI=";
|
||||
cargoHash = "sha256-QZ26GmsKyENkzdCGg2peie/aJhEt7KQAF/lwsibonDk=";
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fdeclspec";
|
||||
|
||||
preFixup = ''
|
||||
mv $out/bin/rubyfmt{-main,}
|
||||
@ -74,5 +74,10 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/fables-tales/rubyfmt";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ bobvanderlinden ];
|
||||
# = note: Undefined symbols for architecture x86_64:
|
||||
# "_utimensat", referenced from:
|
||||
# _utime_internal in librubyfmt-3c969812b3b27083.rlib(file.o)
|
||||
broken = stdenv.isDarwin && stdenv.isx86_64;
|
||||
mainProgram = "rubyfmt";
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-expand";
|
||||
version = "1.0.66";
|
||||
version = "1.0.67";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dtolnay";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-nkE8N0O+aBJPNPGjsp55KnpkaQum11InYHks/Pae+A0=";
|
||||
sha256 = "sha256-l8cEtDb6FlYMqxJyxKxyuwjvLJdefiPRmDnVzRydFPM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-To36pZW6AkV5HLhYJ0Wke7q9JYgguTBWYehitLJVY6w=";
|
||||
cargoHash = "sha256-IWPd4gG4vI7peXxn4ti93fJeHfJoSxEr0+EKEJWw+IE=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code";
|
||||
|
||||
@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
|
||||
sha256 = "0r2d1drg2zvwmn3zg0qb32i9mh03r5di9q1yszx23r32rsax9mxh";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ python3Packages.pygpgme ];
|
||||
propagatedBuildInputs = [ python3Packages.gpgme ];
|
||||
installPhase = ''
|
||||
install -Dm755 $src/zeyple/zeyple.py $out/bin/zeyple
|
||||
'';
|
||||
|
||||
44
pkgs/tools/audio/dl-librescore/default.nix
Normal file
44
pkgs/tools/audio/dl-librescore/default.nix
Normal file
@ -0,0 +1,44 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
, darwin
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "dl-librescore";
|
||||
version = "0.34.47";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LibreScore";
|
||||
repo = "dl-librescore";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-yXreyQiIKmZEw2HcpnCW4TxCTHzdq+KuPSlFPFZy2oU=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-qKu7xViApKg/4EubS4tsZEtNoW62rpC4e6xmBugSkek=";
|
||||
|
||||
# see https://github.com/LibreScore/dl-librescore/pull/32
|
||||
# TODO can be removed with next update
|
||||
postPatch = ''
|
||||
substituteInPlace package-lock.json \
|
||||
--replace 50c7a1508cd9358757c30794e14ba777e6faa8aa b4cb32eb1734a2f73ba2d92743647b1a91c0e2a8
|
||||
'';
|
||||
|
||||
makeCacheWritable = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.cctools
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Download sheet music";
|
||||
homepage = "https://github.com/LibreScore/dl-librescore";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "dl-librescore";
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
@ -16,16 +16,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "broot";
|
||||
version = "1.25.0";
|
||||
version = "1.25.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Canop";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TLphJr1DhJ30Mu3x3/9pNe1IiI9prafFMg1dDtbgqlE=";
|
||||
hash = "sha256-CgWng5b0w6LGt2m9bx3IVMxOXwqYjgsIddTQdBnN/IY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-dtNy3rWz6hMkatiV4z2gB4Z00gjtzREqjy7E48tmcdk=";
|
||||
cargoHash = "sha256-xcUDg2vfGq4nmdbN6kFfWwbwaH/WqdLpIO0qrvQ7/t4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
42
pkgs/tools/misc/hsd/default.nix
Normal file
42
pkgs/tools/misc/hsd/default.nix
Normal file
@ -0,0 +1,42 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
, unbound
|
||||
, darwin
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "hsd";
|
||||
version = "6.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "handshake-org";
|
||||
repo = "hsd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4dWCCybhcdrkLFqUVTajRMnhzNgjpXUN2a+TNIi+Dqo=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-ZbBu9hnRsC9LrHozny3OlHhgcDbp6ACjXRV4UHneHQc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.cctools
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
unbound
|
||||
];
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/handshake-org/hsd/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "Implementation of the Handshake protocol";
|
||||
homepage = "https://github.com/handshake-org/hsd";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ d-xo ];
|
||||
};
|
||||
}
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "slingshot";
|
||||
version = "0.2.3";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "caio-ishikawa";
|
||||
repo = "slingshot";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PbcpvSBYoRs8TMkbbQjG284BWr+PSaTStPOg4a1GIrw=";
|
||||
hash = "sha256-XI6uf54sEJ0htfY43aF8/X1/OF9m6peHUGDS+2nK3xA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Y0H88paBe2yyUyTdwxXO58YFDdH04kK+nHvi1qyYVF0=";
|
||||
cargoHash = "sha256-NZyO6oXmgTUszp2Vc9iVAnCvM78/BJ8IfpeTrsOMvlo=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Lightweight command line tool to quickly navigate across folders";
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "star-history";
|
||||
version = "1.0.13";
|
||||
version = "1.0.14";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-WOdiBN/qyszAI4GNFB/RuZd9EV0uj9l5yUnryZ6cqSE=";
|
||||
sha256 = "sha256-bdu0LLH6f5rLwzNw1wz0J9zEspYmAOlJYCWOdamWjyw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-sET5Gf4vLJAvgdslT+bov9vzCKuTKCEJ0/+JR2GfhmY=";
|
||||
cargoSha256 = "sha256-Z7zq93Orx7Mb2b9oZxAIPn6qObzYPGOx4N86naUvqtg=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -10,34 +10,13 @@ let
|
||||
poetry = self.callPackage ./unwrapped.nix { };
|
||||
|
||||
# version overrides required by poetry and its plugins
|
||||
cachecontrol = super.cachecontrol.overridePythonAttrs (old: rec {
|
||||
version = "0.12.14";
|
||||
format = "setuptools";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ionrock";
|
||||
repo = "cachecontrol";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BuBaKP7OAYoT+SPVhtE6l9U/KmN21OKTL6poV5a6+0c=";
|
||||
};
|
||||
nativeCheckInputs = old.nativeCheckInputs ++ [
|
||||
self.lockfile
|
||||
];
|
||||
});
|
||||
keyring = super.keyring.overridePythonAttrs (old: rec {
|
||||
version = "23.13.1";
|
||||
src = fetchPypi {
|
||||
inherit (old) pname;
|
||||
inherit version;
|
||||
hash = "sha256-ui4VqbNeIZCNCq9OCkesxS1q4zRE3w2itJ1BpG721ng=";
|
||||
};
|
||||
});
|
||||
poetry-core = super.poetry-core.overridePythonAttrs (old: rec {
|
||||
version = "1.6.1";
|
||||
version = "1.7.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-poetry";
|
||||
repo = "poetry-core";
|
||||
rev = version;
|
||||
hash = "sha256-Gc22Y2T4uO39jiOqEUFeOfnVCbknuDjmzFPZgk2eY74=";
|
||||
hash = "sha256-OfY2zc+5CgOrgbiPVnvMdT4h1S7Aek8S7iThl6azmsk=";
|
||||
};
|
||||
});
|
||||
} // (plugins self);
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "poetry-plugin-export";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-poetry";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-okI91Z9u5w7IHpPb9jL4Hb8+MkYJEF2qm0mqqCdyKbk=";
|
||||
hash = "sha256-bX7Mqpe7SYQQVrPNVOl8Bwmeiq7owIiUhw0sp5+Gwck=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -4,17 +4,15 @@
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, pythonRelaxDepsHook
|
||||
, build
|
||||
, cachecontrol
|
||||
, cleo
|
||||
, crashtest
|
||||
, dulwich
|
||||
, filelock
|
||||
, html5lib
|
||||
, installer
|
||||
, jsonschema
|
||||
, keyring
|
||||
, lockfile
|
||||
, packaging
|
||||
, pexpect
|
||||
, pkginfo
|
||||
@ -27,7 +25,6 @@
|
||||
, shellingham
|
||||
, tomlkit
|
||||
, trove-classifiers
|
||||
, urllib3
|
||||
, virtualenv
|
||||
, xattr
|
||||
, tomli
|
||||
@ -44,20 +41,26 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "poetry";
|
||||
version = "1.5.1";
|
||||
version = "1.6.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-poetry";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-1zqfGzSI5RDACSNcz0tLA4VKMFwE5uD/YqOkgpzg2nQ=";
|
||||
hash = "sha256-/OvYT4Vix1t5Yx/Tx0z3E9L9qJ4OdI4maQqUVl8H524=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
# only pinned to avoid dependency on Rust
|
||||
"jsonschema"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -66,12 +69,9 @@ buildPythonPackage rec {
|
||||
cleo
|
||||
crashtest
|
||||
dulwich
|
||||
filelock
|
||||
html5lib
|
||||
installer
|
||||
jsonschema
|
||||
keyring
|
||||
lockfile
|
||||
packaging
|
||||
pexpect
|
||||
pkginfo
|
||||
@ -84,7 +84,6 @@ buildPythonPackage rec {
|
||||
shellingham
|
||||
tomlkit
|
||||
trove-classifiers
|
||||
urllib3
|
||||
virtualenv
|
||||
] ++ lib.optionals (stdenv.isDarwin) [
|
||||
xattr
|
||||
@ -130,6 +129,7 @@ buildPythonPackage rec {
|
||||
"load"
|
||||
"vcs"
|
||||
"prereleases_if_they_are_compatible"
|
||||
"test_builder_setup_generation_runs_with_pip_editable"
|
||||
"test_executor"
|
||||
# requires git history to work correctly
|
||||
"default_with_excluded_data"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# frozen_string_literal: true
|
||||
source "https://rubygems.org"
|
||||
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.31"
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.32"
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
GIT
|
||||
remote: https://github.com/rapid7/metasploit-framework
|
||||
revision: a97e8a0e2a3b15f3b3710f04def1178139ae0fa2
|
||||
ref: refs/tags/6.3.31
|
||||
revision: d644909dcaa8814f9d8ef53d18bf7fa63d197897
|
||||
ref: refs/tags/6.3.32
|
||||
specs:
|
||||
metasploit-framework (6.3.31)
|
||||
metasploit-framework (6.3.32)
|
||||
actionpack (~> 7.0)
|
||||
activerecord (~> 7.0)
|
||||
activesupport (~> 7.0)
|
||||
@ -462,4 +462,4 @@ DEPENDENCIES
|
||||
metasploit-framework!
|
||||
|
||||
BUNDLED WITH
|
||||
2.4.17
|
||||
2.4.19
|
||||
|
||||
@ -15,13 +15,13 @@ let
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "metasploit-framework";
|
||||
version = "6.3.31";
|
||||
version = "6.3.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapid7";
|
||||
repo = "metasploit-framework";
|
||||
rev = version;
|
||||
sha256 = "sha256-X0QJ4edzqLh01qAhmpcdiuk8xdAkccoJAZmxeTh3q48=";
|
||||
sha256 = "sha256-3aiHBaYxrpe/KSF2LiafcANIgWvZEp1kgRXry3/uWvY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -654,12 +654,12 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
fetchSubmodules = false;
|
||||
rev = "a97e8a0e2a3b15f3b3710f04def1178139ae0fa2";
|
||||
sha256 = "13xbfww7kccr044wlw94s32krsca3nbrl8d0srsbia3kwzhhji2z";
|
||||
rev = "d644909dcaa8814f9d8ef53d18bf7fa63d197897";
|
||||
sha256 = "1xjsxrzwpsqmh5j9s4nrdf0lh0vhkwk2wxi156zrgbiilq2qga6x";
|
||||
type = "git";
|
||||
url = "https://github.com/rapid7/metasploit-framework";
|
||||
};
|
||||
version = "6.3.31";
|
||||
version = "6.3.32";
|
||||
};
|
||||
metasploit-model = {
|
||||
groups = ["default"];
|
||||
|
||||
@ -17,14 +17,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
# Don't forget to update go.d.plugin.nix as well
|
||||
version = "1.42.1";
|
||||
version = "1.42.2";
|
||||
pname = "netdata";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netdata";
|
||||
repo = "netdata";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uVr897LF5F+ZGz2rzrTBLhoOOFE+BrE69xztQM8Lq8Q=";
|
||||
hash = "sha256-8L8PhPgNIHvw+Dcx2D6OE8fp2+GEYOc9wEIoPJSqXME=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -1833,6 +1833,8 @@ with pkgs;
|
||||
|
||||
hostmux = callPackage ../tools/misc/hostmux { };
|
||||
|
||||
hsd = callPackage ../tools/misc/hsd { };
|
||||
|
||||
httm = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/httm { };
|
||||
|
||||
hyperpotamus = callPackage ../tools/misc/hyperpotamus { };
|
||||
@ -2158,6 +2160,8 @@ with pkgs;
|
||||
|
||||
darcs-to-git = callPackage ../applications/version-management/darcs-to-git { };
|
||||
|
||||
degit = callPackage ../applications/version-management/degit { };
|
||||
|
||||
delta = darwin.apple_sdk_11_0.callPackage ../applications/version-management/delta { };
|
||||
|
||||
diff-so-fancy = callPackage ../applications/version-management/diff-so-fancy { };
|
||||
@ -3711,6 +3715,8 @@ with pkgs;
|
||||
|
||||
dkimpy = with python3Packages; toPythonApplication dkimpy;
|
||||
|
||||
dl-librescore = callPackage ../tools/audio/dl-librescore { };
|
||||
|
||||
dontgo403 = callPackage ../tools/security/dontgo403 { };
|
||||
|
||||
dpt-rp1-py = callPackage ../tools/misc/dpt-rp1-py { };
|
||||
@ -18207,8 +18213,8 @@ with pkgs;
|
||||
|
||||
rbenv = callPackage ../development/ruby-modules/rbenv { };
|
||||
|
||||
rubyfmt = callPackage ../development/tools/rubyfmt {
|
||||
inherit (darwin.apple_sdk.frameworks) Foundation Security;
|
||||
rubyfmt = darwin.apple_sdk_11_0.callPackage ../development/tools/rubyfmt {
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security;
|
||||
inherit (darwin) libobjc;
|
||||
};
|
||||
|
||||
@ -18532,6 +18538,8 @@ with pkgs;
|
||||
|
||||
docker-compose-language-service = callPackage ../development/tools/language-servers/docker-compose-language-service { };
|
||||
|
||||
dockerfile-language-server-nodejs = callPackage ../development/tools/language-servers/dockerfile-language-server-nodejs { };
|
||||
|
||||
dot-language-server = callPackage ../development/tools/language-servers/dot-language-server { };
|
||||
|
||||
emmet-ls = callPackage ../development/tools/language-servers/emmet-ls { };
|
||||
@ -19507,6 +19515,8 @@ with pkgs;
|
||||
|
||||
gpuvis = callPackage ../development/tools/misc/gpuvis { };
|
||||
|
||||
gqlint = callPackage ../development/tools/gqlint { };
|
||||
|
||||
gradle-packages = import ../development/tools/build-managers/gradle {
|
||||
inherit jdk8 jdk11 jdk17;
|
||||
};
|
||||
@ -19613,6 +19623,8 @@ with pkgs;
|
||||
|
||||
jacoco = callPackage ../development/tools/analysis/jacoco { };
|
||||
|
||||
jake = callPackage ../development/tools/jake { };
|
||||
|
||||
inherit (callPackage ../development/tools/build-managers/jam { })
|
||||
jam
|
||||
ftjam;
|
||||
@ -20085,6 +20097,8 @@ with pkgs;
|
||||
|
||||
rdocker = callPackage ../development/tools/rdocker { };
|
||||
|
||||
react-static = callPackage ../development/tools/react-static { };
|
||||
|
||||
redis-dump = callPackage ../development/tools/redis-dump { };
|
||||
|
||||
redis-plus-plus = callPackage ../development/libraries/redis-plus-plus { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user