diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-07-07 06:01:26 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-07 06:01:26 +0000 |
commit | cdb00fdc73710619ee12b33894fdb073481ee5ca (patch) | |
tree | 5e65c1ac44d2af24478ef0ef2e09a77e5a564ecc /pkgs/development | |
parent | c0f0122ec54ded86155ed878777af128ba21d0bd (diff) | |
parent | c63bad16180a55d3b04bdfba5a7830d55db9bb63 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/development')
6 files changed, 57 insertions, 44 deletions
diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index e801a9c0ee55a..23cac5f0cfe9a 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nix-plugins"; - version = "10.0.0"; + version = "11.0.0"; src = fetchFromGitHub { owner = "shlevy"; repo = "nix-plugins"; rev = version; - hash = "sha256-7Lo+YxpiRz0+ZLFDvYMJWWK2j0CyPDRoP1wAc+OaPJY="; + hash = "sha256-sJL8g+UVFvJTqujS9F6gy8tairYUztHCSILkQlwDADU"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index aa903a5637c08..b18248c7d61b8 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -56,9 +56,9 @@ let else let gem = gems.${pname}; - version = gem.version; + suffix = gem.suffix; in - "${pname}-${version}"; + "${pname}-${suffix}"; pname' = if pname != null then pname @@ -118,6 +118,7 @@ let passthru = rec { inherit ruby bundler gems confFiles envPaths; + inherit (gems.${pname}) gemType; wrappedRuby = stdenv.mkDerivation { name = "wrapped-ruby-${pname'}"; diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix index 5bb9e47cf5a68..01e90ba53f1ff 100644 --- a/pkgs/development/ruby-modules/bundler-app/default.nix +++ b/pkgs/development/ruby-modules/bundler-app/default.nix @@ -68,7 +68,10 @@ in ${lib.optionalString installManpages '' for section in {1..9}; do mandir="$out/share/man/man$section" - find -L ${basicEnv}/${ruby.gemPath}/gems/${basicEnv.name} \( -wholename "*/man/*.$section" -o -wholename "*/man/man$section/*.$section" \) -print -execdir mkdir -p $mandir \; -execdir cp '{}' $mandir \; + + # See: https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/ruby-modules/gem/default.nix#L184-L200 + # See: https://github.com/rubygems/rubygems/blob/7a7b234721c375874b7e22b1c5b14925b943f04e/bundler/lib/bundler.rb#L285-L291 + find -L ${basicEnv}/${ruby.gemPath}/${lib.optionalString (basicEnv.gemType == "git" || basicEnv.gemType == "url") "bundler/"}gems/${basicEnv.name} \( -wholename "*/man/*.$section" -o -wholename "*/man/man$section/*.$section" \) -print -execdir mkdir -p $mandir \; -execdir cp '{}' $mandir \; done ''} '' diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index 7105663413a2b..b33758486eed1 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -75,6 +75,14 @@ let else throw "buildRubyGem: don't know how to build a gem of type \"${type}\"" ); + + # See: https://github.com/rubygems/rubygems/blob/7a7b234721c375874b7e22b1c5b14925b943f04e/bundler/lib/bundler/source/git.rb#L103 + suffix = + if type == "git" then + builtins.substring 0 12 attrs.source.rev + else + version; + documentFlag = if document == [] then "-N" @@ -86,6 +94,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { inherit ruby; inherit dontBuild; inherit dontStrip; + inherit suffix; gemType = type; nativeBuildInputs = [ @@ -100,7 +109,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { ++ buildInputs; #name = builtins.trace (attrs.name or "no attr.name" ) "${namePrefix}${gemName}-${version}"; - name = attrs.name or "${namePrefix}${gemName}-${version}"; + name = attrs.name or "${namePrefix}${gemName}-${suffix}"; inherit src; diff --git a/pkgs/development/tools/language-servers/millet/Cargo.lock b/pkgs/development/tools/language-servers/millet/Cargo.lock index bffb17a546567..b4899f0c79d1a 100644 --- a/pkgs/development/tools/language-servers/millet/Cargo.lock +++ b/pkgs/development/tools/language-servers/millet/Cargo.lock @@ -28,7 +28,7 @@ dependencies = [ [[package]] name = "analysis" -version = "0.12.2" +version = "0.12.4" dependencies = [ "config", "diagnostic", @@ -108,7 +108,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chain-map" -version = "0.12.2" +version = "0.12.4" dependencies = [ "fast-hash", "str-util", @@ -121,7 +121,7 @@ source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e [[package]] name = "cm-syntax" -version = "0.12.2" +version = "0.12.4" dependencies = [ "lex-util", "paths", @@ -150,7 +150,7 @@ dependencies = [ [[package]] name = "config" -version = "0.12.2" +version = "0.12.4" dependencies = [ "fast-hash", "serde", @@ -178,7 +178,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "cov-mark" -version = "0.12.2" +version = "0.12.4" dependencies = [ "fast-hash", "once_cell", @@ -415,7 +415,7 @@ dependencies = [ [[package]] name = "input" -version = "0.12.2" +version = "0.12.4" dependencies = [ "cm-syntax", "config", @@ -475,7 +475,7 @@ checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306" [[package]] name = "lang-srv" -version = "0.12.2" +version = "0.12.4" dependencies = [ "analysis", "anyhow", @@ -503,7 +503,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lex-util" -version = "0.12.2" +version = "0.12.4" [[package]] name = "libc" @@ -575,7 +575,7 @@ dependencies = [ [[package]] name = "millet-cli" -version = "0.12.2" +version = "0.12.4" dependencies = [ "analysis", "codespan-reporting", @@ -593,7 +593,7 @@ dependencies = [ [[package]] name = "millet-ls" -version = "0.12.2" +version = "0.12.4" dependencies = [ "anyhow", "env_logger", @@ -622,7 +622,7 @@ dependencies = [ [[package]] name = "mlb-hir" -version = "0.12.2" +version = "0.12.4" dependencies = [ "fast-hash", "paths", @@ -633,7 +633,7 @@ dependencies = [ [[package]] name = "mlb-statics" -version = "0.12.2" +version = "0.12.4" dependencies = [ "config", "diagnostic", @@ -657,7 +657,7 @@ dependencies = [ [[package]] name = "mlb-syntax" -version = "0.12.2" +version = "0.12.4" dependencies = [ "lex-util", "paths", @@ -729,7 +729,7 @@ dependencies = [ [[package]] name = "panic-hook" -version = "0.12.2" +version = "0.12.4" dependencies = [ "better-panic", ] @@ -923,7 +923,7 @@ dependencies = [ [[package]] name = "slash-var-path" -version = "0.12.2" +version = "0.12.4" dependencies = [ "fast-hash", "str-util", @@ -931,14 +931,14 @@ dependencies = [ [[package]] name = "sml-comment" -version = "0.12.2" +version = "0.12.4" dependencies = [ "sml-syntax", ] [[package]] name = "sml-dynamics" -version = "0.12.2" +version = "0.12.4" dependencies = [ "fast-hash", "fmt-util", @@ -949,7 +949,7 @@ dependencies = [ [[package]] name = "sml-dynamics-tests" -version = "0.12.2" +version = "0.12.4" dependencies = [ "config", "pretty_assertions", @@ -965,7 +965,7 @@ dependencies = [ [[package]] name = "sml-file-syntax" -version = "0.12.2" +version = "0.12.4" dependencies = [ "config", "elapsed", @@ -979,7 +979,7 @@ dependencies = [ [[package]] name = "sml-fixity" -version = "0.12.2" +version = "0.12.4" dependencies = [ "fast-hash", "once_cell", @@ -988,7 +988,7 @@ dependencies = [ [[package]] name = "sml-hir" -version = "0.12.2" +version = "0.12.4" dependencies = [ "la-arena", "sml-lab", @@ -999,7 +999,7 @@ dependencies = [ [[package]] name = "sml-hir-lower" -version = "0.12.2" +version = "0.12.4" dependencies = [ "config", "cov-mark", @@ -1014,14 +1014,14 @@ dependencies = [ [[package]] name = "sml-lab" -version = "0.12.2" +version = "0.12.4" dependencies = [ "str-util", ] [[package]] name = "sml-lex" -version = "0.12.2" +version = "0.12.4" dependencies = [ "cov-mark", "diagnostic", @@ -1036,7 +1036,7 @@ source = "git+https://github.com/azdavis/sml-libs.git#3948485e5bf5649e50271caf3e [[package]] name = "sml-naive-fmt" -version = "0.12.2" +version = "0.12.4" dependencies = [ "fast-hash", "sml-comment", @@ -1045,11 +1045,11 @@ dependencies = [ [[package]] name = "sml-namespace" -version = "0.12.2" +version = "0.12.4" [[package]] name = "sml-parse" -version = "0.12.2" +version = "0.12.4" dependencies = [ "diagnostic", "event-parse", @@ -1061,14 +1061,14 @@ dependencies = [ [[package]] name = "sml-path" -version = "0.12.2" +version = "0.12.4" dependencies = [ "str-util", ] [[package]] name = "sml-scon" -version = "0.12.2" +version = "0.12.4" dependencies = [ "num-bigint", "num-traits", @@ -1077,7 +1077,7 @@ dependencies = [ [[package]] name = "sml-statics" -version = "0.12.2" +version = "0.12.4" dependencies = [ "chain-map", "config", @@ -1100,7 +1100,7 @@ dependencies = [ [[package]] name = "sml-statics-types" -version = "0.12.2" +version = "0.12.4" dependencies = [ "chain-map", "code-h2-md-map", @@ -1119,7 +1119,7 @@ dependencies = [ [[package]] name = "sml-symbol-kind" -version = "0.12.2" +version = "0.12.4" dependencies = [ "sml-namespace", "sml-statics-types", @@ -1127,7 +1127,7 @@ dependencies = [ [[package]] name = "sml-syntax" -version = "0.12.2" +version = "0.12.4" dependencies = [ "char-name", "code-h2-md-map", @@ -1140,7 +1140,7 @@ dependencies = [ [[package]] name = "sml-ty-var-scope" -version = "0.12.2" +version = "0.12.4" dependencies = [ "fast-hash", "sml-hir", @@ -1208,7 +1208,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.12.2" +version = "0.12.4" dependencies = [ "analysis", "cm-syntax", @@ -1552,7 +1552,7 @@ dependencies = [ [[package]] name = "xtask" -version = "0.12.2" +version = "0.12.4" dependencies = [ "anyhow", "flate2", diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index e35e8c69defb3..59175f153e77b 100644 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.12.2"; + version = "0.12.4"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-qfBDwbAbj4XoZeH0hyS09iUfg0G1X1RjpVOSd+2twT0="; + hash = "sha256-RSi6rJL0RG1A1mKn4BznQjBfPlBvEC73vx0YevqvZ3E="; }; cargoLock = { |