diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/admin')
18 files changed, 151 insertions, 167 deletions
diff --git a/nixpkgs/pkgs/tools/admin/aliyun-cli/default.nix b/nixpkgs/pkgs/tools/admin/aliyun-cli/default.nix index 402af6119636..d237e4f748f9 100644 --- a/nixpkgs/pkgs/tools/admin/aliyun-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.177"; + version = "3.0.179"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-A63cRbIEXsX8mmbbXqsT7athWN8vrZLRnUyurb0HNDA="; + sha256 = "sha256-AQsmk5Kl/uGUeT3hNEuqg28q+hXtkz3E7J2Q0FOdr8U="; }; vendorHash = "sha256-81z4bflVzDCl6IiYnTwFPsLHXq87OiKv4aDmZq05Nqc="; diff --git a/nixpkgs/pkgs/tools/admin/amazon-ec2-utils/default.nix b/nixpkgs/pkgs/tools/admin/amazon-ec2-utils/default.nix index 1225005cfb79..ed472b2a930e 100644 --- a/nixpkgs/pkgs/tools/admin/amazon-ec2-utils/default.nix +++ b/nixpkgs/pkgs/tools/admin/amazon-ec2-utils/default.nix @@ -1,30 +1,33 @@ { stdenv , lib , fetchFromGitHub -, curl -, gawk +, bash , python3 , installShellFiles -, bash +, gawk +, curl }: + stdenv.mkDerivation rec { pname = "amazon-ec2-utils"; - version = "2.0"; + version = "2.1.0"; src = fetchFromGitHub { - owner = "aws"; + owner = "amazonlinux"; repo = "amazon-ec2-utils"; - rev = "v${version}"; - hash = "sha256-u1rHBV8uVcCywvQNYagtDleYB12tmhyqDbXTBzt45dk="; + rev = "refs/tags/v${version}"; + hash = "sha256-Yr6pVwyvyVGV4xrjL7VFSkRH8d1w8VLPMTVjXfneJUM="; }; outputs = [ "out" "man" ]; strictDeps = true; + buildInputs = [ - python3 bash + python3 ]; + nativeBuildInputs = [ installShellFiles ]; @@ -66,9 +69,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/aws/amazon-ec2-utils"; + changelog = "https://github.com/amazonlinux/amazon-ec2-utils/releases/tag/v${version}"; description = "Contains a set of utilities and settings for Linux deployments in EC2"; + homepage = "https://github.com/amazonlinux/amazon-ec2-utils"; license = licenses.mit; - maintainers = with maintainers; [ ketzacoatl thefloweringash ]; + maintainers = with maintainers; [ ketzacoatl thefloweringash anthonyroussel ]; }; } diff --git a/nixpkgs/pkgs/tools/admin/ansible/lint.nix b/nixpkgs/pkgs/tools/admin/ansible/lint.nix index f62b3f4b3941..c28892bc8260 100644 --- a/nixpkgs/pkgs/tools/admin/ansible/lint.nix +++ b/nixpkgs/pkgs/tools/admin/ansible/lint.nix @@ -6,12 +6,12 @@ python3.pkgs.buildPythonApplication rec { pname = "ansible-lint"; - version = "6.17.1"; + version = "6.18.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-804zPzVVyZ/zTHePYdRw0eOh623HYJDQ3XuVsslHRcI="; + hash = "sha256-VHRO5/j9DsOAUfC23yFTUjk5o5HuS7SPCIW1/N2C+bk="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/admin/aws-sso-cli/default.nix b/nixpkgs/pkgs/tools/admin/aws-sso-cli/default.nix index c381d05bb4ff..18b312c6a1c0 100644 --- a/nixpkgs/pkgs/tools/admin/aws-sso-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/aws-sso-cli/default.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "aws-sso-cli"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "synfinatic"; repo = pname; rev = "v${version}"; - hash = "sha256-RshR1GA3BvvPwwkVxrM98FfgW3kNaMM0Vqr7iEuoFek="; + hash = "sha256-mINJtjSOmU6oUNIPa5Hl5fG5FqTFM8AJg9jH8WmIAHE="; }; vendorHash = "sha256-skFENAr5XjdKoAyVwXYJVZH+IviqfyZmMIdgHq+7IPs="; diff --git a/nixpkgs/pkgs/tools/admin/awscli2/default.nix b/nixpkgs/pkgs/tools/admin/awscli2/default.nix index ef44da70227b..c2465ea95914 100644 --- a/nixpkgs/pkgs/tools/admin/awscli2/default.nix +++ b/nixpkgs/pkgs/tools/admin/awscli2/default.nix @@ -3,7 +3,6 @@ , groff , less , fetchFromGitHub -, fetchpatch , nix-update-script , testers , awscli2 @@ -24,31 +23,27 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.13.7"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.13.13"; # N.B: if you change this, check if overrides are still up-to-date format = "pyproject"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; - rev = version; - hash = "sha256-SQ9ggHSpQioptic5qjrhCB63t9pld7KGAeCNtq4OJyQ="; + rev = "refs/tags/${version}"; + hash = "sha256-0Wx/Ze6W0Fa8OzM79PFu2liSxl1UwuUqIoYT0WhTk5k="; }; - patches = [ - # https://github.com/aws/aws-cli/pull/7912 - (fetchpatch { - name = "update-flit-core.patch"; - url = "https://github.com/aws/aws-cli/commit/83412a4b2ec750bada640a34a87bfe07ce41fb50.patch"; - hash = "sha256-uhO6aOSptsARYWuXXEFhx+6rCW5/uGn2KQ15BnhzH68="; - }) - ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace 'cryptography>=3.3.2,<40.0.2' 'cryptography>=3.3.2' \ - --replace 'flit_core>=3.7.1,<3.8.1' 'flit_core>=3.7.1' + --replace 'flit_core>=3.7.1,<3.8.1' 'flit_core>=3.7.1' \ + --replace 'awscrt>=0.16.4,<=0.16.16' 'awscrt>=0.16.4' + + substituteInPlace requirements-base.txt \ + --replace "wheel==0.38.4" "wheel>=0.38.4" \ + --replace "flit_core==3.8.0" "flit_core>=3.8.0" - # upstream needs pip to build and install dependencies and validates this + # Upstream needs pip to build and install dependencies and validates this # with a configure script, but we don't as we provide all of the packages # through PYTHONPATH sed -i '/pip>=/d' requirements/bootstrap.txt @@ -61,18 +56,18 @@ with py.pkgs; buildPythonApplication rec { propagatedBuildInputs = [ awscrt bcdoc + botocore colorama cryptography distro docutils groff + jmespath less prompt-toolkit + python-dateutil pyyaml - rsa ruamel-yaml - python-dateutil - jmespath urllib3 ]; @@ -131,9 +126,9 @@ with py.pkgs; buildPythonApplication rec { }; meta = with lib; { + description = "Unified tool to manage your AWS services"; homepage = "https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2.html"; changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst"; - description = "Unified tool to manage your AWS services"; license = licenses.asl20; maintainers = with maintainers; [ bhipple davegallant bryanasdev000 devusb anthonyroussel ]; mainProgram = "aws"; diff --git a/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix b/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix index 625d68dabc0a..392063126229 100644 --- a/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix @@ -5,7 +5,7 @@ let overrideAzureMgmtPackage = package: version: extension: hash: # check to make sure overriding is even necessary - package.overrideAttrs(oldAttrs: rec { + package.overridePythonAttrs (oldAttrs: rec { inherit version; src = fetchPypi { @@ -121,6 +121,11 @@ let azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "4.0.0" "zip" "sha256-AiTjLJ28g80xnrRFLfPUevJgeaxLpuGmvkd3+FskNiw="; + azure-mgmt-appcontainers = (overrideAzureMgmtPackage super.azure-mgmt-appcontainers "2.0.0" "zip" + "sha256-ccdIdvdgTYPWEZCWqkLc8lEuMuAEERvl5B1huJyBkvU=").overridePythonAttrs (attrs: { + propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ]; + }); + azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "17.0.0" "zip" "sha256-hkM4WVLuwxj4qgXsY8Ya7zu7/v37gKdP0Xbf2EqrsWo="; @@ -164,7 +169,7 @@ let "sha256-eNQ3rbKFdPRIyDjtXwH5ztN4GWCYBh3rWdn3AxcEwX4="; azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "25.0.0" "zip" - "sha256-je7O92bklsbIlfsTUF2TXUqztAZxn8ep4ezCUHeLuhE="; + "sha256-je7O92bklsbIlfsTUF2TXUqztAZxn8ep4ezCUHeLuhE="; azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "9.2.0" "zip" "sha256-PAaBkR77Ho2YI5I+lmazR/8vxEZWpbvM427yRu1ET0k="; @@ -205,8 +210,10 @@ let azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "13.0.0b4" "zip" "sha256-Jm1t7v5vyFjNNM/evVaEI9sXJKNwJk6XAXuJSRSnKHk="; - azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "21.0.1" "zip" - "sha256-7PduPg0JK4f/3q/b5pq58TjqVk+Iu+vxa+aJKDnScy8="; + azure-mgmt-network = (overrideAzureMgmtPackage super.azure-mgmt-network "21.0.1" "zip" + "sha256-7PduPg0JK4f/3q/b5pq58TjqVk+Iu+vxa+aJKDnScy8=").overridePythonAttrs (attrs: { + propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ]; + }); azure-mgmt-maps = overrideAzureMgmtPackage super.azure-mgmt-maps "2.0.0" "zip" "sha256-OE4X92potwCk+YhHiUXDqXIXEcBAByWv38tjz4ToXw4="; @@ -223,7 +230,7 @@ let azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "9.0.0" "zip" "sha256-TI7l8sSQ2QUgPqiE3Cu/F67Wna+KHbQS3fuIjOb95ZM="; - azure-mgmt-msi = super.azure-mgmt-msi.overridePythonAttrs(old: rec { + azure-mgmt-msi = super.azure-mgmt-msi.overridePythonAttrs (old: rec { version = "7.0.0"; src = old.src.override { inherit version; @@ -282,8 +289,10 @@ let azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "10.1.0" "zip" "sha256-VrX9YfYNvlA8+eNqHCp35BAeQZzQKakZs7ZZKwT8oYc="; - azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "5.0.0" "zip" - "sha256-eL9KJowxTF7hZJQQQCNJZ7l+rKPFM8wP5vEigt3ZFGE="; + azure-mgmt-monitor = (overrideAzureMgmtPackage super.azure-mgmt-monitor "5.0.0" "zip" + "sha256-eL9KJowxTF7hZJQQQCNJZ7l+rKPFM8wP5vEigt3ZFGE=").overridePythonAttrs (attrs: { + propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ]; + }); azure-mgmt-advisor = overrideAzureMgmtPackage super.azure-mgmt-advisor "9.0.0" "zip" "sha256-/ECLNzFf6EeBtRkST4yxuKwQsvQkHkOdDT4l/WyhjXs="; @@ -312,7 +321,7 @@ let azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "1.2.0" "tar.gz" "sha256-CQuoWHeh0EMitTRsvifotrTwpWd/Q9LWWD7jZ2w9r8I="; - azure-appconfiguration = super.azure-appconfiguration.overrideAttrs(oldAttrs: rec { + azure-appconfiguration = super.azure-appconfiguration.overrideAttrs (oldAttrs: rec { version = "1.1.1"; src = fetchPypi { @@ -323,7 +332,7 @@ let }; }); - azure-graphrbac = super.azure-graphrbac.overrideAttrs(oldAttrs: rec { + azure-graphrbac = super.azure-graphrbac.overrideAttrs (oldAttrs: rec { version = "0.60.0"; src = fetchPypi { @@ -334,7 +343,7 @@ let }; }); - azure-storage-blob = super.azure-storage-blob.overrideAttrs(oldAttrs: rec { + azure-storage-blob = super.azure-storage-blob.overrideAttrs (oldAttrs: rec { version = "1.5.0"; src = fetchPypi { inherit (oldAttrs) pname; @@ -343,7 +352,7 @@ let }; }); - azure-storage-common = super.azure-storage-common.overrideAttrs(oldAttrs: rec { + azure-storage-common = super.azure-storage-common.overrideAttrs (oldAttrs: rec { version = "1.4.2"; src = fetchPypi { inherit (oldAttrs) pname; @@ -352,7 +361,7 @@ let }; }); - azure-synapse-artifacts = super.azure-synapse-artifacts.overrideAttrs(oldAttrs: rec { + azure-synapse-artifacts = super.azure-synapse-artifacts.overrideAttrs (oldAttrs: rec { version = "0.15.0"; src = fetchPypi { inherit (oldAttrs) pname; @@ -365,7 +374,7 @@ let ]; }); - azure-synapse-accesscontrol = super.azure-synapse-accesscontrol.overrideAttrs(oldAttrs: rec { + azure-synapse-accesscontrol = super.azure-synapse-accesscontrol.overrideAttrs (oldAttrs: rec { version = "0.5.0"; src = fetchPypi { inherit (oldAttrs) pname; @@ -375,7 +384,7 @@ let }; }); - azure-synapse-managedprivateendpoints = super.azure-synapse-managedprivateendpoints.overrideAttrs(oldAttrs: rec { + azure-synapse-managedprivateendpoints = super.azure-synapse-managedprivateendpoints.overrideAttrs (oldAttrs: rec { version = "0.4.0"; src = fetchPypi { inherit (oldAttrs) pname; @@ -385,7 +394,7 @@ let }; }); - azure-synapse-spark = super.azure-synapse-spark.overrideAttrs(oldAttrs: rec { + azure-synapse-spark = super.azure-synapse-spark.overrideAttrs (oldAttrs: rec { version = "0.2.0"; src = fetchPypi { inherit (oldAttrs) pname; @@ -395,7 +404,7 @@ let }; }); - azure-keyvault = super.azure-keyvault.overrideAttrs(oldAttrs: rec { + azure-keyvault = super.azure-keyvault.overrideAttrs (oldAttrs: rec { version = "1.1.0"; src = fetchPypi { inherit (oldAttrs) pname; @@ -415,7 +424,7 @@ let pythonImportsCheck = [ ]; }); - azure-keyvault-administration = super.azure-keyvault-administration.overridePythonAttrs(oldAttrs: rec { + azure-keyvault-administration = super.azure-keyvault-administration.overridePythonAttrs (oldAttrs: rec { version = "4.3.0"; src = fetchPypi { inherit (oldAttrs) pname; @@ -425,7 +434,7 @@ let }; }); - azure-keyvault-keys = super.azure-keyvault-keys.overridePythonAttrs(oldAttrs: rec { + azure-keyvault-keys = super.azure-keyvault-keys.overridePythonAttrs (oldAttrs: rec { version = "4.8.0b2"; src = fetchPypi { inherit (oldAttrs) pname; @@ -437,7 +446,7 @@ let # part of azure.mgmt.datalake namespace - azure-mgmt-datalake-analytics = super.azure-mgmt-datalake-analytics.overrideAttrs(oldAttrs: rec { + azure-mgmt-datalake-analytics = super.azure-mgmt-datalake-analytics.overrideAttrs (oldAttrs: rec { version = "0.2.1"; src = fetchPypi { @@ -454,7 +463,7 @@ let ''; }); - azure-mgmt-datalake-store = super.azure-mgmt-datalake-store.overrideAttrs(oldAttrs: rec { + azure-mgmt-datalake-store = super.azure-mgmt-datalake-store.overrideAttrs (oldAttrs: rec { version = "0.5.0"; src = fetchPypi { @@ -471,7 +480,7 @@ let ''; }); - adal = super.adal.overridePythonAttrs(oldAttrs: rec { + adal = super.adal.overridePythonAttrs (oldAttrs: rec { version = "1.2.7"; src = fetchPypi { @@ -484,7 +493,7 @@ let doCheck = false; }); - msal = super.msal.overridePythonAttrs(oldAttrs: rec { + msal = super.msal.overridePythonAttrs (oldAttrs: rec { version = "1.24.0b1"; src = fetchPypi { @@ -494,7 +503,7 @@ let }; }); - semver = super.semver.overridePythonAttrs(oldAttrs: rec { + semver = super.semver.overridePythonAttrs (oldAttrs: rec { version = "2.13.0"; src = fetchPypi { @@ -504,7 +513,7 @@ let }; }); - jsondiff = super.jsondiff.overridePythonAttrs(oldAttrs: rec { + jsondiff = super.jsondiff.overridePythonAttrs (oldAttrs: rec { version = "2.0.0"; src = oldAttrs.src.override { @@ -513,7 +522,7 @@ let }; }); - knack = super.knack.overridePythonAttrs(oldAttrs: rec { + knack = super.knack.overridePythonAttrs (oldAttrs: rec { version = "0.11.0"; src = fetchPypi { @@ -523,7 +532,7 @@ let }; }); - argcomplete = super.argcomplete.overridePythonAttrs(oldAttrs: rec { + argcomplete = super.argcomplete.overridePythonAttrs (oldAttrs: rec { version = "3.1.1"; src = fetchPypi { @@ -533,7 +542,7 @@ let }; }); - sshtunnel = super.sshtunnel.overridePythonAttrs(oldAttrs: rec { + sshtunnel = super.sshtunnel.overridePythonAttrs (oldAttrs: rec { name = "sshtunnel-${version}"; version = "0.1.5"; @@ -544,7 +553,7 @@ let }; }); - websocket-client = super.websocket-client.overridePythonAttrs(oldAttrs: rec { + websocket-client = super.websocket-client.overridePythonAttrs (oldAttrs: rec { version = "1.3.1"; src = oldAttrs.src.override { @@ -553,7 +562,7 @@ let }; }); - azure-mgmt-resource = super.azure-mgmt-resource.overridePythonAttrs(oldAttrs: rec { + azure-mgmt-resource = super.azure-mgmt-resource.overridePythonAttrs (oldAttrs: rec { version = "23.1.0b2"; src = oldAttrs.src.override { @@ -564,4 +573,4 @@ let }; }; in - py +py diff --git a/nixpkgs/pkgs/tools/admin/balena-cli/default.nix b/nixpkgs/pkgs/tools/admin/balena-cli/default.nix index 827d4e162b51..bb674a83f322 100644 --- a/nixpkgs/pkgs/tools/admin/balena-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/balena-cli/default.nix @@ -1,47 +1,49 @@ { lib , stdenv -, fetchzip +, buildNpmPackage +, fetchFromGitHub , testers +, balena-cli +, nodePackages +, python3 +, udev +, darwin }: -let - inherit (stdenv.hostPlatform) system; - throwSystem = throw "Unsupported system: ${system}"; - plat = { - x86_64-linux = "linux-x64"; - x86_64-darwin = "macOS-x64"; - # Balena only packages for x86 so we rely on Rosetta for Apple Silicon - aarch64-darwin = "macOS-x64"; - }.${system} or throwSystem; - - sha256 = { - x86_64-linux = "sha256-USljQ/cnbSabzsZWXlZ0eeZSqkTr3wVP0ktXqZ7Fw4U="; - x86_64-darwin = "sha256-NWzJPB+HzlsB6yTcEMwTg8pioonGWPOU96jyIpiZiTY="; - aarch64-darwin = "sha256-NWzJPB+HzlsB6yTcEMwTg8pioonGWPOU96jyIpiZiTY="; - }.${system} or throwSystem; - - version = "16.7.6"; - src = fetchzip { - url = "https://github.com/balena-io/balena-cli/releases/download/v${version}/balena-cli-v${version}-${plat}-standalone.zip"; - inherit sha256; - }; -in -stdenv.mkDerivation (finalAttrs: { +buildNpmPackage rec { pname = "balena-cli"; - inherit version src; + version = "17.0.0"; - installPhase = '' - runHook preInstall + src = fetchFromGitHub { + owner = "balena-io"; + repo = "balena-cli"; + rev = "v${version}"; + hash = "sha256-sNpxjSumiP+4fX6b3j+HEl/lr4pvudrhfTzr2TYastE="; + }; - mkdir -p $out/bin - cp -r ./* $out/ - ln -s $out/balena $out/bin/balena + npmDepsHash = "sha256-q2Yc6e5dEiP2Q4tFIeqj4mswM1/pX1pdGeoagyiupvs="; - runHook postInstall + postPatch = '' + ln -s npm-shrinkwrap.json package-lock.json ''; + makeCacheWritable = true; + + nativeBuildInputs = [ + nodePackages.node-gyp + python3 + ] ++ lib.optionals stdenv.isDarwin [ + darwin.cctools + ]; + + buildInputs = lib.optionals stdenv.isLinux [ + udev + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + darwin.apple_sdk.frameworks.Cocoa + ]; passthru.tests.version = testers.testVersion { - package = finalAttrs.finalPackage; + package = balena-cli; command = '' # Override default cache directory so Balena CLI's unavoidable update check does not fail due to write permissions BALENARC_DATA_DIRECTORY=./ balena --version @@ -49,46 +51,6 @@ stdenv.mkDerivation (finalAttrs: { inherit version; }; - # https://github.com/NixOS/nixpkgs/pull/48193/files#diff-b65952dbe5271c002fbc941b01c3586bf5050ad0e6aa6b2fcc74357680e103ea - preFixup = - if stdenv.isLinux then - let - libPath = lib.makeLibraryPath [ stdenv.cc.cc ]; - in - '' - orig_size=$(stat --printf=%s $out/balena) - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/balena - patchelf --set-rpath ${libPath} $out/balena - chmod +x $out/balena - new_size=$(stat --printf=%s $out/balena) - ###### zeit-pkg fixing starts here. - # we're replacing plaintext js code that looks like - # PAYLOAD_POSITION = '1234 ' | 0 - # [...] - # PRELUDE_POSITION = '1234 ' | 0 - # ^-----20-chars-----^^------22-chars------^ - # ^-- grep points here - # - # var_* are as described above - # shift_by seems to be safe so long as all patchelf adjustments occur - # before any locations pointed to by hardcoded offsets - var_skip=20 - var_select=22 - shift_by=$(expr $new_size - $orig_size) - function fix_offset { - # $1 = name of variable to adjust - location=$(grep -obUam1 "$1" $out/bin/balena | cut -d: -f1) - location=$(expr $location + $var_skip) - value=$(dd if=$out/balena iflag=count_bytes,skip_bytes skip=$location \ - bs=1 count=$var_select status=none) - value=$(expr $shift_by + $value) - echo -n $value | dd of=$out/balena bs=1 seek=$location conv=notrunc - } - fix_offset PAYLOAD_POSITION - fix_offset PRELUDE_POSITION - '' else ''''; - dontStrip = true; - meta = with lib; { description = "A command line interface for balenaCloud or openBalena"; longDescription = '' @@ -100,9 +62,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/balena-io/balena-cli"; changelog = "https://github.com/balena-io/balena-cli/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = [ maintainers.kalebpace ]; - platforms = platforms.linux ++ platforms.darwin; - sourceProvenance = [ sourceTypes.binaryNativeCode ]; + maintainers = [ maintainers.kalebpace maintainers.doronbehar ]; mainProgram = "balena"; }; -}) +} diff --git a/nixpkgs/pkgs/tools/admin/coldsnap/default.nix b/nixpkgs/pkgs/tools/admin/coldsnap/default.nix index 93f9baa3de85..417bbd14c139 100644 --- a/nixpkgs/pkgs/tools/admin/coldsnap/default.nix +++ b/nixpkgs/pkgs/tools/admin/coldsnap/default.nix @@ -9,15 +9,15 @@ rustPlatform.buildRustPackage rec { pname = "coldsnap"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - hash = "sha256-WqNGajtezhBDYmgUayKjdNAZSyKirIYeYOnozMCIya4="; + hash = "sha256-zXLt16ffqbExU23uRI7U99nUwpSKTIf039dDq+k2KAA="; }; - cargoHash = "sha256-av9hsvY8xsB+HlIRLYNFDJc9eyBfOyBZ347vWoVsDmM="; + cargoHash = "sha256-RRyAzD9eiscZ9kB5tFh5vUnGk6XYYKy0/TAjcaygmG4="; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix b/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix index a9cd2230ed8d..b7176656363a 100644 --- a/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "copilot-cli"; - version = "1.29.1"; + version = "1.30.0"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Mfh3Bym9aVvCaRHcSyg68KqA1Zx0tt7x52IOzvC+61M="; + hash = "sha256-Q495MJlvElm5yrX4QWrwvB62Tdzq0W5pTYsTXyw9Idw="; }; - vendorHash = "sha256-0QPUvKGuR4fhXUoak6PqkBXsg+WkAOlSluci6/+ULB8="; + vendorHash = "sha256-/2uUiFL2wL+gAzqY2S3sqytPLKB5+QkYXCBNLqSJSWU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/nixpkgs/pkgs/tools/admin/eksctl/default.nix index 9153e4c4ecfc..d3472f4dae51 100644 --- a/nixpkgs/pkgs/tools/admin/eksctl/default.nix +++ b/nixpkgs/pkgs/tools/admin/eksctl/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.151.0"; + version = "0.154.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-XZo4g66r/pvIHT5XqvQYcwPzrYUGoQKNE2h5skhPzU4="; + hash = "sha256-GPJym+U6wBEJSvDYoXAwgCFqzTvXSVK2i/AN+X1S6Oo="; }; - vendorHash = "sha256-p+zCwVKUP6igQLR5GycsmF2oNyDfP/EEgg89kBDS1VU="; + vendorHash = "sha256-/aL1mweWPJRjjqzGBcGc7UHcH0ymVANdu2LkpoCTkh0="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/admin/gimme-aws-creds/default.nix b/nixpkgs/pkgs/tools/admin/gimme-aws-creds/default.nix index 8d35085eb454..e33587b94670 100644 --- a/nixpkgs/pkgs/tools/admin/gimme-aws-creds/default.nix +++ b/nixpkgs/pkgs/tools/admin/gimme-aws-creds/default.nix @@ -42,14 +42,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "gimme-aws-creds"; - version = "2.7.1"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.7.2"; # N.B: if you change this, check if overrides are still up-to-date format = "setuptools"; src = fetchFromGitHub { owner = "Nike-Inc"; repo = "gimme-aws-creds"; rev = "v${version}"; - hash = "sha256-vn3DzDqu19g6Z/RcWsktJxmeg6oK9NIEyjpH9g1tXNs="; + hash = "sha256-ydzGaUQ43vvQqU9xvhPJqHG/2PUtBbASIVpZCDnsR60="; }; nativeBuildInputs = with python.pkgs; [ @@ -71,6 +71,11 @@ python.pkgs.buildPythonApplication rec { pyjwt ]; + preCheck = '' + # Disable using platform's keyring unavailable in sandbox + export PYTHON_KEYRING_BACKEND="keyring.backends.fail.Keyring" + ''; + checkInputs = with python.pkgs; [ pytestCheckHook responses diff --git a/nixpkgs/pkgs/tools/admin/granted/default.nix b/nixpkgs/pkgs/tools/admin/granted/default.nix index cfea2994df6b..907d440174ff 100644 --- a/nixpkgs/pkgs/tools/admin/granted/default.nix +++ b/nixpkgs/pkgs/tools/admin/granted/default.nix @@ -1,7 +1,10 @@ { bash , buildGoModule , fetchFromGitHub + +, withFish ? false , fish + , lib , makeWrapper , xdg-utils @@ -36,6 +39,8 @@ buildGoModule rec { ]; postInstall = '' + ln -s $out/bin/granted $out/bin/assumego + # Install shell script install -Dm755 $src/scripts/assume $out/bin/assume substituteInPlace $out/bin/assume \ @@ -44,6 +49,7 @@ buildGoModule rec { wrapProgram $out/bin/assume \ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} + '' + lib.optionalString withFish '' # Install fish script install -Dm755 $src/scripts/assume.fish $out/share/assume.fish substituteInPlace $out/share/assume.fish \ @@ -56,5 +62,10 @@ buildGoModule rec { changelog = "https://github.com/common-fate/granted/releases/tag/${version}"; license = licenses.mit; maintainers = [ maintainers.ivankovnatsky ]; + # Could not figure out how to use this application without any hustle. Weird + # linking of binary, aliases for god knows what. + # https://docs.commonfate.io/granted/usage/assuming-roles. + # Will mark as broken until maybe someone fixes it. Switched to aws-sso. + broken = true; }; } diff --git a/nixpkgs/pkgs/tools/admin/hop-cli/default.nix b/nixpkgs/pkgs/tools/admin/hop-cli/default.nix index eea6a9e73661..794b5be90ef4 100644 --- a/nixpkgs/pkgs/tools/admin/hop-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/hop-cli/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "hop-cli"; - version = "0.2.52"; + version = "0.2.53"; src = fetchFromGitHub { owner = "hopinc"; repo = "cli"; rev = "v${version}"; - hash = "sha256-xuOkW5jetl+8obeFJnbkVZa+wYWfTNiTOmcrzC8+wGE="; + hash = "sha256-DyM8OEgO2OtD/PD/I6Ys2Yg0gQMB21OnjFdDkWKw+Io="; }; - cargoHash = "sha256-ePUlw4UzsQ2lNuJ5g5OAYh6nKTIoHdDMb34Jzuqtas8="; + cargoHash = "sha256-R6Dbje6OEndJxyWJ8cR/QcfdIBw88Vfbve+EYGozWNc="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/tools/admin/lxd/default.nix b/nixpkgs/pkgs/tools/admin/lxd/default.nix index 427d60f3edf6..5e123ff6685b 100644 --- a/nixpkgs/pkgs/tools/admin/lxd/default.nix +++ b/nixpkgs/pkgs/tools/admin/lxd/default.nix @@ -18,11 +18,11 @@ buildGoModule rec { pname = "lxd-unwrapped"; - version = "5.16"; + version = "5.17"; src = fetchurl { url = "https://github.com/canonical/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz"; - hash = "sha256-evtNPZvnx8rzr/tJkEp0E7BhUBWHBSJdMtZJQk3VZI8="; + hash = "sha256-21pw8Q8UYjuxdaKzNXoTanxxyTNRXXbuerIZPIQK4yg="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix b/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix index 971e47d3ad61..9c88c2d39b89 100644 --- a/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.65.1"; + version = "0.67.1"; src = fetchFromGitHub { owner = "Qovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-0Wg6E89+k7YKx+DpIcO76NJ+VzGPQc07PoR0FvmYeKg="; + hash = "sha256-mVn+Q4XZ+jJjHR+V5Rl/rPUZN/Tv7vVX7u6IDuJNdO0="; }; vendorHash = "sha256-Fcm/f54zGgA742yhIVJxjv7Y2T8DblC71+hw5HTmOf0="; diff --git a/nixpkgs/pkgs/tools/admin/simplotask/default.nix b/nixpkgs/pkgs/tools/admin/simplotask/default.nix index ac5ccbaa89e2..127fd46f7814 100644 --- a/nixpkgs/pkgs/tools/admin/simplotask/default.nix +++ b/nixpkgs/pkgs/tools/admin/simplotask/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "simplotask"; - version = "1.11.3"; + version = "1.11.4"; src = fetchFromGitHub { owner = "umputun"; repo = "spot"; rev = "v${version}"; - hash = "sha256-sNYC8QQmVdBjHU3/pDD4TGLDxKsMLyMmZa7wBVlWnGM="; + hash = "sha256-G/T7LF8ujlCSbK1Lv2h43OZVx52yrLDr+6e/WxhaHOo="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix b/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix index 5d31ab07fdad..727f6f605cbe 100644 --- a/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.17.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - hash = "sha256-F+mnFarlrlQ+bq7q6CoyDPPQ7uv5y9pBRT072JRlS/4="; + hash = "sha256-5j2DHbBLHQWtkQP8qTTxD949alo5mh88Vgv5cus8C/w="; }; vendorHash = "sha256-DYA6cu2KzEBZ4wsT7wjcdY1endQQOZlj2aOwu6iGLew="; @@ -29,7 +29,7 @@ buildGoModule rec { rm pkg/cmd/resources_test.go rm pkg/cmd/root_test.go - # TODO: no clue why it's broken (1.17.0), remove for now. + # TODO: no clue why it's broken (1.17.1), remove for now. rm pkg/login/client_login_test.go rm pkg/git/editor_test.go rm pkg/rpcservice/sample_create_test.go diff --git a/nixpkgs/pkgs/tools/admin/syft/default.nix b/nixpkgs/pkgs/tools/admin/syft/default.nix index c8f91dc0fe65..0f823492d32c 100644 --- a/nixpkgs/pkgs/tools/admin/syft/default.nix +++ b/nixpkgs/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.87.0"; + version = "0.88.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - hash = "sha256-qDeUo/xAGCy/Ih5B8AyiJ7q9aCd5iWNkW7T+0OqAfTY="; + hash = "sha256-A9EYbZigG6TmyYhMjqhpZRaYnR7KzCJpaOBEEaSXWQ4="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -22,7 +22,7 @@ buildGoModule rec { }; # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-7lrim4N3hT2qkpTIVF1A/GUu5BfJ3Z8A6H1nd8yHwaw="; + vendorHash = "sha256-7KL/Z95Gg2Cy6oUIVS8KLS3DvQYcLCZaxgKbtzR1M1U="; nativeBuildInputs = [ installShellFiles ]; |