diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-05-26 12:01:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-26 12:01:27 +0000 |
| commit | a2cd4a67fdf62abebc0c97c962d5d9efecfb793e (patch) | |
| tree | dada4b7269ce9f15f5b5983ec78a58205957986e /pkgs/misc | |
| parent | 0e8a6f241bd28733cc4cfee24a56fcc54b63ab0f (diff) | |
| parent | 25d265d433a3d456a8556483b5ff3d5ede8c72ac (diff) | |
| download | nixpkgs-a2cd4a67fdf62abebc0c97c962d5d9efecfb793e.tar nixpkgs-a2cd4a67fdf62abebc0c97c962d5d9efecfb793e.tar.gz nixpkgs-a2cd4a67fdf62abebc0c97c962d5d9efecfb793e.tar.bz2 nixpkgs-a2cd4a67fdf62abebc0c97c962d5d9efecfb793e.tar.lz nixpkgs-a2cd4a67fdf62abebc0c97c962d5d9efecfb793e.tar.xz nixpkgs-a2cd4a67fdf62abebc0c97c962d5d9efecfb793e.tar.zst nixpkgs-a2cd4a67fdf62abebc0c97c962d5d9efecfb793e.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/fastly/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/misc/ite-backlight/default.nix | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index e06777c1325..2eec7227fc6 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "fastly"; - version = "10.0.1"; + version = "10.1.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-khGg6TcbyJMn+hiBANhHA6IU6aODTA94AV7yCaELqrs="; + hash = "sha256-gMSKk5igNy8W7Qb1xtKgfpzftiPVZaAv/oKIdinTMGA="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -52,8 +52,8 @@ buildGoModule rec { ]; preBuild = let cliConfigToml = fetchurl { - url = "https://web.archive.org/web/20230412222811/https://developer.fastly.com/api/internal/cli-config"; - hash = "sha256-NACjeBGOvBL6kUBZtSx4ChZgn7V69f4K2yyDCwTZsbU="; + url = "https://web.archive.org/web/20230523192914/https://developer.fastly.com/api/internal/cli-config"; + hash = "sha256-zgZ3m69dRvuc1S7hHeLxzrM/Z/u0PKUn0XbyQOYO3es="; }; in '' cp ${cliConfigToml} ./pkg/config/config.toml diff --git a/pkgs/misc/ite-backlight/default.nix b/pkgs/misc/ite-backlight/default.nix index 033ff0f2055..aa53ecabff3 100644 --- a/pkgs/misc/ite-backlight/default.nix +++ b/pkgs/misc/ite-backlight/default.nix @@ -7,7 +7,7 @@ , boost , fetchFromGitHub , pkg-config -, microsoft_gsl +, microsoft-gsl }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ninja pkg-config meson - microsoft_gsl + microsoft-gsl ]; buildInputs = [ |