diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-07-17 06:01:34 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-17 06:01:34 +0000 |
| commit | c11601cdcd3ca4248906e2d06453076359b3280d (patch) | |
| tree | 770fc054a93d89762f9384e32117f8a73028b40f /pkgs/development | |
| parent | 8df1eb061afb6575e7c618b1ea15b4d52ef0494b (diff) | |
| parent | 36fbe238d5f83335cea5510ac3ddfc821ad6ce67 (diff) | |
| download | nixpkgs-c11601cdcd3ca4248906e2d06453076359b3280d.tar nixpkgs-c11601cdcd3ca4248906e2d06453076359b3280d.tar.gz nixpkgs-c11601cdcd3ca4248906e2d06453076359b3280d.tar.bz2 nixpkgs-c11601cdcd3ca4248906e2d06453076359b3280d.tar.lz nixpkgs-c11601cdcd3ca4248906e2d06453076359b3280d.tar.xz nixpkgs-c11601cdcd3ca4248906e2d06453076359b3280d.tar.zst nixpkgs-c11601cdcd3ca4248906e2d06453076359b3280d.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development')
4 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 0e3fb180c81..ec4df7927f2 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -10,23 +10,23 @@ let rev = "v3.0.0"; sha256 = "O6p2PFB7c2KE9VqWvmTaFywbW1hSzAP5V42EuemX+ls="; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "nlohmann_json"; version = "3.10.5"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "DTsZrdB9GcaNkx7ZKxcgCA3A9ShM5icSF0xyGguJNbk="; }; nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DBuildTests=${if doCheck then "ON" else "OFF"}" + "-DBuildTests=${if finalAttrs.doCheck then "ON" else "OFF"}" "-DJSON_MultipleHeaders=ON" - ] ++ lib.optional doCheck "-DJSON_TestDataDirectory=${testData}"; + ] ++ lib.optional finalAttrs.doCheck "-DJSON_TestDataDirectory=${testData}"; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; @@ -44,4 +44,4 @@ in stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.all; }; -} +}) diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 1b55414ca5b..eca91def231 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.7.0"; + version = "1.7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = version; - hash = "sha256-Wee4toHLbiwYXMtsxALetAJ+JxxN/DsNPIiZeeWNuI0="; + hash = "sha256-0VQ1P3xWC1keoXaPfIzh+uGXvRAK3nOrc6fLKIhfiHk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/transmission-rpc/default.nix b/pkgs/development/python-modules/transmission-rpc/default.nix index 1e510db9722..2788d0ec8cb 100644 --- a/pkgs/development/python-modules/transmission-rpc/default.nix +++ b/pkgs/development/python-modules/transmission-rpc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "transmission-rpc"; - version = "3.3.0"; + version = "3.3.2"; disabled = pythonOlder "3.6"; format = "pyproject"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Trim21"; repo = "transmission-rpc"; - rev = "v${version}"; - sha256 = "sha256-Ys9trQMCHqxBSaTobWt8WZwi1F8HKTUKaIxvyo6ZPP0="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-GkhNOKatT/hJFw1l1xrf43jtgxvJ+WVvhz83Oe0MZ6w="; }; # remove once upstream has tagged version with dumped typing-extensions diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 7ab8f7edc8b..6b05b8f83c0 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-n5DprvSbli7wEV+oRA+U5UnaAGPit2Zd2gFb9fCgG8A="; + hash = "sha256-BTb01EKPBBTZR8g3RkW0llj169wk6Y7Ui4UoCR+YWsc="; }; propagatedBuildInputs = with python3.pkgs; [ |