diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-02-13 00:15:28 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-02-13 00:15:28 +0000 |
commit | c6c7493c3be5b040e303121d72b291f98f1afc8b (patch) | |
tree | aaf9e0a4bd843b57304b6b46b322f6a44240c60a /pkgs/applications/networking | |
parent | 15f0d4ccd57e88ccadbaa92582f23c25e81fa9e1 (diff) | |
parent | 6693a5229e56439e60dbca1a8e866547951ed2f7 (diff) |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/development/python-modules/pyarrow/default.nix
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r-- | pkgs/applications/networking/go-graft/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/discord/default.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/networking/go-graft/default.nix b/pkgs/applications/networking/go-graft/default.nix index 88319182a648f..2285a11bbf021 100644 --- a/pkgs/applications/networking/go-graft/default.nix +++ b/pkgs/applications/networking/go-graft/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "go-graft"; - version = "0.2.16"; + version = "0.2.17"; src = fetchFromGitHub { owner = "mzz2017"; repo = "gg"; rev = "v${version}"; - sha256 = "sha256-zdOcQ/+WXS7pDfnvYdb/FDjMT3yJdwnS8DoH2MIDcDs="; + sha256 = "sha256-UhRsgUz9au7e47cS6yrIJXc/8ZxVDpMHWBjoAcw+oCM="; }; CGO_ENABLED = 0; ldflags = [ "-X github.com/mzz2017/gg/cmd.Version=${version}" "-s" "-w" "-buildid=" ]; - vendorHash = "sha256-kx94B1XIXWJOY9Y69lNb/sHWVjsuFuOXrdtJFJrUuAs="; + vendorHash = "sha256-EiBt2SxUQY05Wr7KJbK+fs3U3iSmqECJ0glS8B2Ox9Q="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index fdfb992192b33..87eb241686c65 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -3,7 +3,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.24"; ptb = "0.0.38"; - canary = "0.0.146"; + canary = "0.0.148"; } else { stable = "0.0.264"; ptb = "0.0.59"; @@ -22,7 +22,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "sha256-5GiG+RGqwHUdIeSVWpbaIw3sTuZbvIQeetXSEvSqTls="; + sha256 = "sha256-2ZrSDyPj3AHriCWZ/bb303H3J97TTun//WjmInNEmwk="; }; }; x86_64-darwin = { |