diff options
Diffstat (limited to 'pkgs/shells')
-rw-r--r-- | pkgs/shells/murex/default.nix | 4 | ||||
-rw-r--r-- | pkgs/shells/nushell/plugins/formats.nix | 25 | ||||
-rw-r--r-- | pkgs/shells/nushell/plugins/gstat.nix | 25 | ||||
-rw-r--r-- | pkgs/shells/nushell/plugins/query.nix | 20 | ||||
-rw-r--r-- | pkgs/shells/powershell/default.nix | 10 | ||||
-rw-r--r-- | pkgs/shells/zsh/antidote/default.nix | 4 |
6 files changed, 50 insertions, 38 deletions
diff --git a/pkgs/shells/murex/default.nix b/pkgs/shells/murex/default.nix index aa8ddafd40358..81b585b28fdf5 100644 --- a/pkgs/shells/murex/default.nix +++ b/pkgs/shells/murex/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "murex"; - version = "5.0.9310"; + version = "5.1.2210"; src = fetchFromGitHub { owner = "lmorg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gwaNz4OgYs5mAMi/HtLOXoIJA/iHPKX+eiVBP2l2YFU="; + sha256 = "sha256-N0sWTWZJT4hjivTreYfG5VkxiWgTjlH+/9VZD6YKQXY="; }; vendorHash = "sha256-PClKzvpztpry8xsYLfWB/9s/qI5k2m8qHBxkxY0AJqI="; diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix index f55c8c5eae2a2..5f75951b8c955 100644 --- a/pkgs/shells/nushell/plugins/formats.nix +++ b/pkgs/shells/nushell/plugins/formats.nix @@ -5,25 +5,32 @@ , pkg-config , IOKit , Foundation +, nix-update-script }: -let +rustPlatform.buildRustPackage rec { pname = "nushell_plugin_formats"; -in -rustPlatform.buildRustPackage { - inherit pname; - version = "0.85.0"; - src = nushell.src; + inherit (nushell) version src; cargoHash = "sha256-WS8VRpJnn/VWS7GUkGowFf51ifUx0SbEZzcoTfx2dp0="; + nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals stdenv.isDarwin [ IOKit Foundation ]; cargoBuildFlags = [ "--package nu_plugin_formats" ]; - doCheck = false; + + checkPhase = '' + cargo test --manifest-path crates/nu_plugin_formats/Cargo.toml + ''; + + passthru.updateScript = nix-update-script { + # Skip the version check and only check the hash because we inherit version from nushell. + extraArgs = [ "--version=skip" ]; + }; + meta = with lib; { description = "A formats plugin for Nushell"; - homepage = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_formats"; + homepage = "https://github.com/nushell/nushell/tree/${version}/crates/nu_plugin_formats"; license = licenses.mpl20; - maintainers = with maintainers; [ viraptor ]; + maintainers = with maintainers; [ viraptor aidalgol ]; platforms = with platforms; all; }; } diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix index 589eda96b069d..bf788098a5eb9 100644 --- a/pkgs/shells/nushell/plugins/gstat.nix +++ b/pkgs/shells/nushell/plugins/gstat.nix @@ -5,25 +5,32 @@ , nushell , pkg-config , Security +, nix-update-script }: -let +rustPlatform.buildRustPackage rec { pname = "nushell_plugin_gstat"; -in -rustPlatform.buildRustPackage { - inherit pname; - version = "0.85.0"; - src = nushell.src; + inherit (nushell) version src; cargoHash = "sha256-6luY3SIRRd9vaY9KIJcj8Q974FW0LtAvRjVpdpzkdLo="; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; cargoBuildFlags = [ "--package nu_plugin_gstat" ]; - doCheck = false; # some tests fail + + checkPhase = '' + cargo test --manifest-path crates/nu_plugin_gstat/Cargo.toml + ''; + + passthru.updateScript = nix-update-script { + # Skip the version check and only check the hash because we inherit version from nushell. + extraArgs = [ "--version=skip" ]; + }; + meta = with lib; { description = "A git status plugin for Nushell"; - homepage = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gstat"; + homepage = "https://github.com/nushell/nushell/tree/${version}/crates/nu_plugin_gstat"; license = licenses.mpl20; - maintainers = with maintainers; [ mrkkrp ]; + maintainers = with maintainers; [ mrkkrp aidalgol ]; platforms = with platforms; all; }; } diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index feaeb7f63d11b..25097a5d6297b 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -9,28 +9,26 @@ rustPlatform.buildRustPackage { pname = "nushell_plugin_query"; - version = "0.85.0"; - - src = nushell.src; - + inherit (nushell) version src; cargoHash = "sha256-xyty3GfI+zNkuHs7LYHBctqXUHZ4/MNNcnnfYvI18do="; buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ]; - cargoBuildFlags = [ "--package nu_plugin_query" ]; - # compilation fails with a missing symbol - doCheck = false; + checkPhase = '' + cargo test --manifest-path crates/nu_plugin_query/Cargo.toml + ''; - passthru = { - updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + # Skip the version check and only check the hash because we inherit version from nushell. + extraArgs = [ "--version=skip" ]; }; meta = with lib; { description = "A Nushell plugin to query JSON, XML, and various web data"; - homepage = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_query"; + homepage = "https://github.com/nushell/nushell/tree/${version}/crates/nu_plugin_query"; license = licenses.mpl20; - maintainers = with maintainers; [ happysalada ]; + maintainers = with maintainers; [ happysalada aidalgol ]; platforms = with platforms; all; }; } diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index 0366dac5b944f..b84cfb5be7a60 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -29,7 +29,7 @@ let in stdenv.mkDerivation rec { pname = "powershell"; - version = "7.3.7"; + version = "7.3.8"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -88,19 +88,19 @@ stdenv.mkDerivation rec { sources = { aarch64-darwin = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-arm64.tar.gz"; - hash = "sha256-KSBsYw369fURSmoD/YyZm9CLEIbhDR12mRp1xLCJ4Wc="; + hash = "sha256-0FyTt+tn3mpr6LxC3oQvmULNO8+Jp7qsjISRdTesCCI="; }; aarch64-linux = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-arm64.tar.gz"; - hash = "sha256-GaAu3nD0xRqqE0Lm7Z5Da6YUQGiCFc5xHuJYDLKySGc="; + hash = "sha256-BNf157sdXg7pV6Hfg9luw3Xi03fTekesBQCwDFeO8ZI="; }; x86_64-darwin = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-x64.tar.gz"; - hash = "sha256-+6cy4PLpt3ZR7ui3H9rAg3C39kVryPtqE5HKzMpBa24="; + hash = "sha256-Ts+nF6tPQZfYgJAvPtijvYBGSrg5mxCeNEa0X74/g4M="; }; x86_64-linux = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-x64.tar.gz"; - hash = "sha256-GKsAH+A89/M1fxvw4C4yb7+ITcfD6Y4Oicb1K8AswwI="; + hash = "sha256-iELDoFTy/W6Wm0gNJmywwvp811WycjffBTMDRtrWdVU="; }; }; tests.version = testers.testVersion { diff --git a/pkgs/shells/zsh/antidote/default.nix b/pkgs/shells/zsh/antidote/default.nix index a1bb818f6d8f7..3506f0853f5ff 100644 --- a/pkgs/shells/zsh/antidote/default.nix +++ b/pkgs/shells/zsh/antidote/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation (finalAttrs: { - version = "1.9.1"; + version = "1.9.2"; pname = "antidote"; src = fetchFromGitHub { owner = "mattmc3"; repo = "antidote"; rev = "v${finalAttrs.version}"; - hash = "sha256-wRLMjaBpzttQ6MUgl1AFC2SRlEEwjASdEnguGlP+XgU="; + hash = "sha256-h+Gay1InnOY6tc8Iir5QzCC7FQj9cVWSn5YViEAHraU="; }; dontPatch = true; |