From 1b0e903593e95e86d084451bfa99d27245b2e3c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 13 Mar 2023 17:00:06 +0100 Subject: [PATCH 1/7] datalad: fix src hash --- pkgs/applications/version-management/datalad/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/datalad/default.nix b/pkgs/applications/version-management/datalad/default.nix index cd2c26ea8d42..dfbb4e7db9e0 100644 --- a/pkgs/applications/version-management/datalad/default.nix +++ b/pkgs/applications/version-management/datalad/default.nix @@ -8,7 +8,7 @@ python3.pkgs.buildPythonApplication rec { owner = "datalad"; repo = pname; rev = version; - hash = "sha256-6uWOKsYeNZJ64WqoGHL7AsoK4iZd24TQOJ1ECw+K28Y="; + hash = "sha256-F5UFW0/XqntrHclpj3TqoAwuHJbiiv5a7/4MnFoJ1dE="; }; nativeBuildInputs = [ installShellFiles git ]; From 90040062f206fb5259a8577d2fdf2fc5cf89fed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 13 Mar 2023 17:01:45 +0100 Subject: [PATCH 2/7] python310Packages.annexremote: fix src hash --- pkgs/development/python-modules/annexremote/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/annexremote/default.nix b/pkgs/development/python-modules/annexremote/default.nix index c38a32c81d19..46e937eb8dae 100644 --- a/pkgs/development/python-modules/annexremote/default.nix +++ b/pkgs/development/python-modules/annexremote/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Lykos153"; repo = "AnnexRemote"; rev = "v${version}"; - sha256 = "08myswj1vqkl4s1glykq6xn76a070nv5mxj0z8ibl6axz89bvypi"; + sha256 = "sha256-h03gkRAMmOq35zzAq/OuctJwPAbP0Idu4Lmeu0RycDc="; }; nativeCheckInputs = [ From 614ad50d03739214a64e36c26eff6f49007c94c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 13 Mar 2023 17:04:44 +0100 Subject: [PATCH 3/7] dvc: fix src hash --- pkgs/applications/version-management/dvc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix index f76f413ea661..d83cf81e73de 100644 --- a/pkgs/applications/version-management/dvc/default.nix +++ b/pkgs/applications/version-management/dvc/default.nix @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { owner = "iterative"; repo = pname; rev = version; - hash = "sha256-2h+fy4KMxFrVtKJBtA1RmJDZv0OVm1BxO1akZzAw95Y="; + hash = "sha256-P0J+3TNHGqMw3krfs1uLnf8nEiIBK6UrrB37mY+fBA0="; }; postPatch = '' From 6176066e29ee936eed44d7e6d041cc916116a01b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 13 Mar 2023 17:15:51 +0100 Subject: [PATCH 4/7] python310Packages.debugpy: fix src hash --- pkgs/development/python-modules/debugpy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 95f2d8b21eef..236a4982f67e 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "debugpy"; rev = "refs/tags/v${version}"; - hash = "sha256-GanRWzGyg0Efa+kuU7Q0IOmO0ohXZIjuz8RZYERTpzo="; + hash = "sha256-jEhvpPO3QeKjPiOMxg2xOWitWtZ6UCWyM1WvnbrKnFI="; }; patches = [ From b1fe611fa9c69a54717de94b41e1a563b264aecb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 13 Mar 2023 17:16:07 +0100 Subject: [PATCH 5/7] coursier: remove zsh completion which was removed upstream, remove nixfmt formatting in update script --- pkgs/development/tools/coursier/default.nix | 35 ++++----------------- 1 file changed, 6 insertions(+), 29 deletions(-) diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index 3374d4ee7fa0..af5edab074bf 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -1,24 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, writeScript, common-updater-scripts , coreutils, git, gnused, nix, nixfmt }: -let +stdenv.mkDerivation rec { + pname = "coursier"; version = "2.1.0-RC6"; - zshCompletion = fetchurl { - url = - "https://raw.githubusercontent.com/coursier/coursier/v${version}/modules/cli/src/main/resources/completions/zsh"; - sha256 = "0afxzrk9w1qinfsz55jjrxydw0fcv6p722g1q955dl7f6xbab1jh"; - }; - - repo = "git@github.com:coursier/coursier.git"; -in stdenv.mkDerivation rec { - inherit version; - - pname = "coursier"; - src = fetchurl { - url = - "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; + url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; sha256 = "0b52qp0jb2bhb649r6cca0yd1cj8wsyp0f1j3pnmir6rizjwkm5q"; }; @@ -28,28 +16,18 @@ in stdenv.mkDerivation rec { install -Dm555 $src $out/bin/cs patchShebangs $out/bin/cs wrapProgram $out/bin/cs --prefix PATH ":" ${jre}/bin - - # copy zsh completion - install -Dm755 ${zshCompletion} $out/share/zsh/site-functions/_cs ''; passthru.updateScript = writeScript "update.sh" '' #!${stdenv.shell} set -o errexit - PATH=${ - lib.makeBinPath [ common-updater-scripts coreutils git gnused nix nixfmt ] - } + PATH=${lib.makeBinPath [ common-updater-scripts coreutils git gnused nix ]} oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" - latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags ${repo} 'v*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')" + latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags https://github.com/coursier/coursier.git 'v*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')" if [ "$oldVersion" != "$latestTag" ]; then nixpkgs="$(git rev-parse --show-toplevel)" default_nix="$nixpkgs/pkgs/development/tools/coursier/default.nix" update-source-version ${pname} "$latestTag" --version-key=version --print-changes - url="${builtins.head zshCompletion.urls}" - completion_url=$(echo $url | sed "s|$oldVersion|$latestTag|g") - completion_sha256="$(nix-prefetch-url --type sha256 $completion_url)" - sed -i "s|${zshCompletion.outputHash}|$completion_sha256|g" "$default_nix" - nixfmt "$default_nix" else echo "${pname} is already up-to-date" fi @@ -57,8 +35,7 @@ in stdenv.mkDerivation rec { meta = with lib; { homepage = "https://get-coursier.io/"; - description = - "A Scala library to fetch dependencies from Maven / Ivy repositories"; + description = "Scala library to fetch dependencies from Maven / Ivy repositories"; license = licenses.asl20; maintainers = with maintainers; [ adelbertc nequissimus ]; }; From 5907b939fb25847873f2530eee15124ae45c692b Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Mon, 13 Mar 2023 17:45:13 -0400 Subject: [PATCH 6/7] python311Packages.debugpy: disable 3.11 build until supported --- pkgs/development/python-modules/debugpy/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 236a4982f67e..69097a585be6 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , pythonOlder +, pythonAtLeast , fetchFromGitHub , fetchpatch , substituteAll @@ -22,7 +23,9 @@ buildPythonPackage rec { version = "1.6.6"; format = "setuptools"; - disabled = pythonOlder "3.7"; + # Currently doesn't support 3.11: + # https://github.com/microsoft/debugpy/issues/1107 + disabled = pythonOlder "3.7" || pythonAtLeast "3.11"; src = fetchFromGitHub { owner = "microsoft"; From c685b5a98915360742c9c1398affd9538455eace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 23 Mar 2023 14:58:36 +0100 Subject: [PATCH 7/7] dvc: mark broken due to none existing dependency --- pkgs/applications/version-management/dvc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix index d83cf81e73de..47cd6eb099c6 100644 --- a/pkgs/applications/version-management/dvc/default.nix +++ b/pkgs/applications/version-management/dvc/default.nix @@ -98,5 +98,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://dvc.org"; license = licenses.asl20; maintainers = with maintainers; [ cmcdragonkai fab ]; + broken = true; # requires new python package: dvc-studio-client }; }