From e0d0d1c0938f97f082f47d2af95990ef9b1fa900 Mon Sep 17 00:00:00 2001 From: Evangelos Paterakis Date: Tue, 11 Oct 2022 14:41:41 +0300 Subject: [PATCH 01/74] crystal: 1.2 -> 1.6 --- .../development/compilers/crystal/default.nix | 102 ++++++++---------- pkgs/top-level/all-packages.nix | 5 +- 2 files changed, 48 insertions(+), 59 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 88274ef73c94..372615dfec69 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -2,7 +2,6 @@ , callPackage , fetchFromGitHub , fetchurl -, fetchpatch , lib # Dependencies , boehmgc @@ -10,11 +9,11 @@ , git , gmp , hostname -, libatomic_ops , libevent , libiconv , libxml2 , libyaml +, libffi , llvmPackages , makeWrapper , openssl @@ -31,21 +30,21 @@ let archs = { x86_64-linux = "linux-x86_64"; - i686-linux = "linux-i686"; - x86_64-darwin = "darwin-x86_64"; + #i686-linux = "linux-i686"; + #x86_64-darwin = "darwin-x86_64"; + x86_64-darwin = "darwin-universal"; aarch64-darwin = "darwin-universal"; - aarch64-linux = "linux-aarch64"; + #aarch64-linux = "linux-aarch64"; }; arch = archs.${stdenv.system} or (throw "system ${stdenv.system} not supported"); - isAarch64Darwin = stdenv.system == "aarch64-darwin"; - checkInputs = [ git gmp openssl readline libxml2 libyaml ]; + checkInputs = [ git gmp openssl readline libxml2 libyaml libffi ]; binaryUrl = version: rel: - if arch == archs.aarch64-linux then - "https://dev.alpinelinux.org/archive/crystal/crystal-${version}-aarch64-alpine-linux-musl.tar.gz" - else + # if arch == archs.aarch64-linux then + # "https://dev.alpinelinux.org/archive/crystal/crystal-${version}-aarch64-alpine-linux-musl.tar.gz" + # else "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz"; genericBinary = { version, sha256s, rel ? 1 }: @@ -63,13 +62,10 @@ let tar --strip-components=1 -C $out -xf ${src} patchShebangs $out/bin/crystal ''; - - meta.broken = lib.versionOlder version "1.2.0" && isAarch64Darwin; }; commonBuildInputs = extraBuildInputs: [ boehmgc - libatomic_ops pcre libevent libyaml @@ -98,21 +94,12 @@ let inherit sha256; }; - patches = lib.optionals (lib.versionOlder version "1.2.0") [ - # add support for DWARF5 debuginfo, fixes builds on recent compilers - # the PR is 8 commits from 2019, so just fetch the whole thing - # and hope it doesn't change - (fetchpatch { - url = "https://github.com/crystal-lang/crystal/pull/11399.patch"; - sha256 = "sha256-CjNpkQQ2UREADmlyLUt7zbhjXf0rTjFhNbFYLwJKkc8="; - }) - ]; - outputs = [ "out" "lib" "bin" ]; postPatch = '' export TMP=$(mktemp -d) export HOME=$TMP + export TMPDIR=$TMP mkdir -p $HOME/test # Add dependency of crystal to docs to avoid issue on flag changes between releases @@ -123,8 +110,6 @@ let substituteInPlace src/crystal/system/unix/time.cr \ --replace /usr/share/zoneinfo ${tzdata}/share/zoneinfo - ln -sf spec/compiler spec/std - mkdir -p $TMP/crystal substituteInPlace spec/std/file_spec.cr \ @@ -163,12 +148,12 @@ let makeFlags = [ "CRYSTAL_CONFIG_VERSION=${version}" + "progress=1" ]; LLVM_CONFIG = "${llvmPackages.llvm.dev}/bin/llvm-config"; FLAGS = [ - "--release" "--single-module" # needed for deterministic builds ]; @@ -220,6 +205,7 @@ let export PATH=${lib.makeBinPath checkInputs}:$PATH ''; + passthru.buildBinary = binary; passthru.buildCrystalPackage = callPackage ./build-package.nix { crystal = compiler; }; @@ -230,48 +216,52 @@ let homepage = "https://crystal-lang.org/"; license = licenses.asl20; maintainers = with maintainers; [ david50407 manveru peterhoeg ]; - platforms = let archNames = builtins.attrNames archs; in - if (lib.versionOlder version "1.2.0") then remove "aarch64-darwin" archNames else archNames; + platforms = let archNames = builtins.attrNames archs; in archNames; }; }) ); in rec { - binaryCrystal_1_0 = genericBinary { - version = "1.0.0"; + #binaryCrystal_1_0 = genericBinary { + # version = "1.0.0"; + # sha256s = { + # x86_64-linux = "1949argajiyqyq09824yj3wjyv88gd8wbf20xh895saqfykiq880"; + # i686-linux = "0w0f4fwr2ijhx59i7ppicbh05hfmq7vffmgl7lal6im945m29vch"; + # x86_64-darwin = "01n0rf8zh551vv8wq3h0ifnsai0fz9a77yq87xx81y9dscl9h099"; + # aarch64-linux = "0sns7l4q3z82qi3dc2r4p63f4s8hvifqzgq56ykwyrvawynjhd53"; + # }; + #}; + + #binaryCrystal_1_2 = genericBinary { + # version = "1.2.0"; + # sha256s = { + # aarch64-darwin = "1hrs8cpjxdkcf8mr9qgzilwbg6bakq87sd4yydfsk2f4pqd6g7nf"; + # }; + #}; + + binaryCrystal_1_5 = genericBinary { + version = "1.5.0"; sha256s = { - x86_64-linux = "1949argajiyqyq09824yj3wjyv88gd8wbf20xh895saqfykiq880"; - i686-linux = "0w0f4fwr2ijhx59i7ppicbh05hfmq7vffmgl7lal6im945m29vch"; - x86_64-darwin = "01n0rf8zh551vv8wq3h0ifnsai0fz9a77yq87xx81y9dscl9h099"; - aarch64-linux = "0sns7l4q3z82qi3dc2r4p63f4s8hvifqzgq56ykwyrvawynjhd53"; + x86_64-linux = "sha256-YnNg8PyAUgLYAxAAfVA8ei/AdFsdsiEVN9f1TpqZQ0c="; + #i686-linux = ""; no prebuilt binaries since 1.2.0 + x86_64-darwin = "sha256-KU6+HLFlpYJSJS4F1zlHBeBt/rzxb7U57GmqRQnLm0Y=="; + #aarch64-linux = ""; not available yet + aarch64-darwin = "sha256-KU6+HLFlpYJSJS4F1zlHBeBt/rzxb7U57GmqRQnLm0Y=="; }; }; - binaryCrystal_1_2 = genericBinary { - version = "1.2.0"; - sha256s = { - aarch64-darwin = "1hrs8cpjxdkcf8mr9qgzilwbg6bakq87sd4yydfsk2f4pqd6g7nf"; - }; + crystal_1_5 = generic { + version = "1.5.0"; + sha256 = "sha256-twDWnJBLc5tvkg3HvbxXJsCPTMJr9vGvvHvfukMXGyA="; + binary = binaryCrystal_1_5; }; - crystal_1_0 = generic { - version = "1.0.0"; - sha256 = "sha256-RI+a3w6Rr+uc5jRf7xw0tOenR+q6qii/ewWfID6dbQ8="; - binary = binaryCrystal_1_0; + crystal_1_6 = generic { + version = "1.6.0"; + sha256 = "sha256-B6Pq2J1r+PbYT1C+2u9rNzRR5zOnbmN1/RG7mVpVHQk="; + binary = binaryCrystal_1_5; }; - crystal_1_1 = generic { - version = "1.1.1"; - sha256 = "sha256-hhhT3reia8acZiPsflwfuD638Ll2JiXwMfES1TyGyNQ="; - binary = crystal_1_0; - }; - - crystal_1_2 = generic { - version = "1.2.2"; - sha256 = "sha256-nyOXhsutVBRdtJlJHe2dALl//BUXD1JeeQPgHU4SwiU="; - binary = if isAarch64Darwin then binaryCrystal_1_2 else crystal_1_1; - }; - - crystal = crystal_1_2; + crystal = crystal_1_6; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a63f783a98e0..b045cd4f8d2c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13444,9 +13444,8 @@ with pkgs; inherit (callPackages ../development/compilers/crystal { llvmPackages = if stdenv.system == "aarch64-darwin" then llvmPackages_11 else llvmPackages_10; }) - crystal_1_0 - crystal_1_1 - crystal_1_2 + crystal_1_5 + crystal_1_6 crystal; crystal2nix = callPackage ../development/compilers/crystal2nix { }; From 9b6172aa2deb23c280e250fbf50781bc51aa5132 Mon Sep 17 00:00:00 2001 From: Evangelos Paterakis Date: Sat, 22 Oct 2022 23:37:53 +0300 Subject: [PATCH 02/74] fix: re-enable 1.0.x - 1.2.x feat: bump 1.6.x to 1.6.1 fix: fetch 12601 patch for 1.3.x-1.6.0 fix: darwin url for versions < 1.2.0 --- .../development/compilers/crystal/default.nix | 94 ++++++++++++++----- pkgs/top-level/all-packages.nix | 3 + 2 files changed, 74 insertions(+), 23 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 372615dfec69..d761431326fe 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -2,6 +2,7 @@ , callPackage , fetchFromGitHub , fetchurl +, fetchpatch , lib # Dependencies , boehmgc @@ -9,6 +10,7 @@ , git , gmp , hostname +, libatomic_ops , libevent , libiconv , libxml2 @@ -30,21 +32,23 @@ let archs = { x86_64-linux = "linux-x86_64"; - #i686-linux = "linux-i686"; - #x86_64-darwin = "darwin-x86_64"; + i686-linux = "linux-i686"; x86_64-darwin = "darwin-universal"; aarch64-darwin = "darwin-universal"; - #aarch64-linux = "linux-aarch64"; + aarch64-linux = "linux-aarch64"; }; arch = archs.${stdenv.system} or (throw "system ${stdenv.system} not supported"); + isAarch64Darwin = stdenv.system == "aarch64-darwin"; checkInputs = [ git gmp openssl readline libxml2 libyaml libffi ]; binaryUrl = version: rel: - # if arch == archs.aarch64-linux then - # "https://dev.alpinelinux.org/archive/crystal/crystal-${version}-aarch64-alpine-linux-musl.tar.gz" - # else + if arch == archs.aarch64-linux then + "https://dev.alpinelinux.org/archive/crystal/crystal-${version}-aarch64-alpine-linux-musl.tar.gz" + else if arch == archs.x86_64-darwin && lib.versionOlder version "1.2.0" then + "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-darwin-x86_64.tar.gz" + else "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz"; genericBinary = { version, sha256s, rel ? 1 }: @@ -62,6 +66,8 @@ let tar --strip-components=1 -C $out -xf ${src} patchShebangs $out/bin/crystal ''; + + meta.broken = lib.versionOlder version "1.2.0" && isAarch64Darwin; }; commonBuildInputs = extraBuildInputs: [ @@ -94,6 +100,25 @@ let inherit sha256; }; + patches = [ ] + ++ lib.optionals (lib.versionOlder version "1.2.0") [ + # add support for DWARF5 debuginfo, fixes builds on recent compilers + # the PR is 8 commits from 2019, so just fetch the whole thing + # and hope it doesn't change + (fetchpatch { + url = "https://github.com/crystal-lang/crystal/pull/11399.patch"; + sha256 = "sha256-CjNpkQQ2UREADmlyLUt7zbhjXf0rTjFhNbFYLwJKkc8="; + }) + ] ++ lib.optionals (lib.versionAtLeast version "1.3.0" && lib.versionOlder version "1.6.1") [ + # fixes an issue that prevented tests from passing when ran with + # the --release flag + # the PR has been merged since version 1.6.1 + (fetchpatch { + url = "https://github.com/crystal-lang/crystal/pull/12601.patch"; + sha256 = "sha256-3NiUC4EyP/jSn62sv38eieKcVw9zUfRB78aAvnxV57E="; + }) + ]; + outputs = [ "out" "lib" "bin" ]; postPatch = '' @@ -148,6 +173,7 @@ let makeFlags = [ "CRYSTAL_CONFIG_VERSION=${version}" + "release=1" "progress=1" ]; @@ -216,29 +242,30 @@ let homepage = "https://crystal-lang.org/"; license = licenses.asl20; maintainers = with maintainers; [ david50407 manveru peterhoeg ]; - platforms = let archNames = builtins.attrNames archs; in archNames; + platforms = let archNames = builtins.attrNames archs; in + if (lib.versionOlder version "1.2.0") then remove "aarch64-darwin" archNames else archNames; }; }) ); in rec { - #binaryCrystal_1_0 = genericBinary { - # version = "1.0.0"; - # sha256s = { - # x86_64-linux = "1949argajiyqyq09824yj3wjyv88gd8wbf20xh895saqfykiq880"; - # i686-linux = "0w0f4fwr2ijhx59i7ppicbh05hfmq7vffmgl7lal6im945m29vch"; - # x86_64-darwin = "01n0rf8zh551vv8wq3h0ifnsai0fz9a77yq87xx81y9dscl9h099"; - # aarch64-linux = "0sns7l4q3z82qi3dc2r4p63f4s8hvifqzgq56ykwyrvawynjhd53"; - # }; - #}; + binaryCrystal_1_0 = genericBinary { + version = "1.0.0"; + sha256s = { + x86_64-linux = "1949argajiyqyq09824yj3wjyv88gd8wbf20xh895saqfykiq880"; + i686-linux = "0w0f4fwr2ijhx59i7ppicbh05hfmq7vffmgl7lal6im945m29vch"; + x86_64-darwin = "01n0rf8zh551vv8wq3h0ifnsai0fz9a77yq87xx81y9dscl9h099"; + aarch64-linux = "0sns7l4q3z82qi3dc2r4p63f4s8hvifqzgq56ykwyrvawynjhd53"; + }; + }; - #binaryCrystal_1_2 = genericBinary { - # version = "1.2.0"; - # sha256s = { - # aarch64-darwin = "1hrs8cpjxdkcf8mr9qgzilwbg6bakq87sd4yydfsk2f4pqd6g7nf"; - # }; - #}; + binaryCrystal_1_2 = genericBinary { + version = "1.2.0"; + sha256s = { + aarch64-darwin = "1hrs8cpjxdkcf8mr9qgzilwbg6bakq87sd4yydfsk2f4pqd6g7nf"; + }; + }; binaryCrystal_1_5 = genericBinary { version = "1.5.0"; @@ -251,6 +278,27 @@ rec { }; }; + crystal_1_0 = generic { + version = "1.0.0"; + sha256 = "sha256-RI+a3w6Rr+uc5jRf7xw0tOenR+q6qii/ewWfID6dbQ8="; + binary = binaryCrystal_1_0; + extraBuildInputs = [ libatomic_ops ]; + }; + + crystal_1_1 = generic { + version = "1.1.1"; + sha256 = "sha256-hhhT3reia8acZiPsflwfuD638Ll2JiXwMfES1TyGyNQ="; + binary = crystal_1_0; + extraBuildInputs = [ libatomic_ops ]; + }; + + crystal_1_2 = generic { + version = "1.2.2"; + sha256 = "sha256-nyOXhsutVBRdtJlJHe2dALl//BUXD1JeeQPgHU4SwiU="; + binary = if isAarch64Darwin then binaryCrystal_1_2 else crystal_1_1; + extraBuildInputs = [ libatomic_ops ]; + }; + crystal_1_5 = generic { version = "1.5.0"; sha256 = "sha256-twDWnJBLc5tvkg3HvbxXJsCPTMJr9vGvvHvfukMXGyA="; @@ -258,7 +306,7 @@ rec { }; crystal_1_6 = generic { - version = "1.6.0"; + version = "1.6.1"; sha256 = "sha256-B6Pq2J1r+PbYT1C+2u9rNzRR5zOnbmN1/RG7mVpVHQk="; binary = binaryCrystal_1_5; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b045cd4f8d2c..49d1abbf9d05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13444,6 +13444,9 @@ with pkgs; inherit (callPackages ../development/compilers/crystal { llvmPackages = if stdenv.system == "aarch64-darwin" then llvmPackages_11 else llvmPackages_10; }) + crystal_1_0 + crystal_1_1 + crystal_1_2 crystal_1_5 crystal_1_6 crystal; From ffa22c68ea210b041efe56d7a0bffc194711fe64 Mon Sep 17 00:00:00 2001 From: Evangelos Paterakis Date: Sun, 23 Oct 2022 00:19:47 +0300 Subject: [PATCH 03/74] fix: mark broken if > 1.3.x and 1686-linux or > 1.5.x and aarch64-linux --- pkgs/development/compilers/crystal/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index d761431326fe..67b9296b5d68 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -67,7 +67,7 @@ let patchShebangs $out/bin/crystal ''; - meta.broken = lib.versionOlder version "1.2.0" && isAarch64Darwin; + meta.broken = (lib.versionOlder version "1.2.0" && isAarch64Darwin) || (lib.versionAtLeast version "1.3.0" && stdenv.system == "i686-linux") || (lib.versionAtLeast version "1.5.0" && stdenv.system == "aarch64-linux"); }; commonBuildInputs = extraBuildInputs: [ From 89dab4d1843129be23308c4ae6587ad4696d71f7 Mon Sep 17 00:00:00 2001 From: Evangelos Paterakis Date: Sat, 12 Nov 2022 12:24:43 +0200 Subject: [PATCH 04/74] feat: bump 1.6.x to 1.6.2 --- pkgs/development/compilers/crystal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 67b9296b5d68..ff04bc9f6708 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -306,8 +306,8 @@ rec { }; crystal_1_6 = generic { - version = "1.6.1"; - sha256 = "sha256-B6Pq2J1r+PbYT1C+2u9rNzRR5zOnbmN1/RG7mVpVHQk="; + version = "1.6.2"; + sha256 = "sha256-WgU6Y8ww1IYyB0vd5tXwmWBEL5RiPjHA7YzPd21jlsY="; binary = binaryCrystal_1_5; }; From 4bd897e55011adf9662a76f10ba2e15cc1e68ecf Mon Sep 17 00:00:00 2001 From: Evangelos Paterakis Date: Sat, 12 Nov 2022 12:27:54 +0200 Subject: [PATCH 05/74] fix: add another patch for < 1.6.0 so 12601 gets applied successfully --- pkgs/development/compilers/crystal/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index ff04bc9f6708..db0ac01891d9 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -109,6 +109,12 @@ let url = "https://github.com/crystal-lang/crystal/pull/11399.patch"; sha256 = "sha256-CjNpkQQ2UREADmlyLUt7zbhjXf0rTjFhNbFYLwJKkc8="; }) + ] ++ lib.optionals (lib.versionAtLeast version "1.3.0" && lib.versionOlder version "1.6.0") [ + # needed for #12601 to get applied successfully + (fetchpatch { + url = "https://github.com/crystal-lang/crystal/commit/bf4009dacbf67a63a1cbaffddbdc99549bb70a03.patch"; + sha256 = "sha256-KpMA5Zdy0QI+HcfuZVRT2gLPS7oH2D4MsdYEnHGDt/0="; + }) ] ++ lib.optionals (lib.versionAtLeast version "1.3.0" && lib.versionOlder version "1.6.1") [ # fixes an issue that prevented tests from passing when ran with # the --release flag From b8ae9f94aa85b154963779cc5e75f1937525a8bd Mon Sep 17 00:00:00 2001 From: ento <21108+ento@users.noreply.github.com> Date: Sat, 12 Nov 2022 12:32:28 +0200 Subject: [PATCH 06/74] fix: supported platforms per version --- pkgs/development/compilers/crystal/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index db0ac01891d9..9423e9c7e4fc 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -67,7 +67,7 @@ let patchShebangs $out/bin/crystal ''; - meta.broken = (lib.versionOlder version "1.2.0" && isAarch64Darwin) || (lib.versionAtLeast version "1.3.0" && stdenv.system == "i686-linux") || (lib.versionAtLeast version "1.5.0" && stdenv.system == "aarch64-linux"); + meta.platforms = lib.attrNames sha256s; }; commonBuildInputs = extraBuildInputs: [ @@ -243,13 +243,11 @@ let }; meta = with lib; { - broken = stdenv.isDarwin; + inherit (binary.meta) platforms; description = "A compiled language with Ruby like syntax and type inference"; homepage = "https://crystal-lang.org/"; license = licenses.asl20; maintainers = with maintainers; [ david50407 manveru peterhoeg ]; - platforms = let archNames = builtins.attrNames archs; in - if (lib.versionOlder version "1.2.0") then remove "aarch64-darwin" archNames else archNames; }; }) ); From ce5ce4bfefca34ef220c242c21d4de1858bdf5da Mon Sep 17 00:00:00 2001 From: "M. Ian Graham" <704580+miangraham@users.noreply.github.com> Date: Mon, 21 Nov 2022 04:31:27 +0200 Subject: [PATCH 07/74] fix: downstreams --- pkgs/development/tools/ameba/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/ameba/default.nix b/pkgs/development/tools/ameba/default.nix index 4239f5c0056a..27068cbc4c49 100644 --- a/pkgs/development/tools/ameba/default.nix +++ b/pkgs/development/tools/ameba/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "ameba"; - version = "1.0.1"; + version = "1.3.1"; src = fetchFromGitHub { owner = "crystal-ameba"; repo = "ameba"; rev = "v${version}"; - hash = "sha256-dvhGk6IbSV3pxtoIV7+0+qf47hz2TooPhsSwFd2+xkw="; + hash = "sha256-SZ2sBQeZgtPOYioH9eK5MveFtWVGPvgKMrqsCfjoRGM="; }; format = "make"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49d1abbf9d05..ed61424497ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13455,7 +13455,7 @@ with pkgs; icr = callPackage ../development/tools/icr { }; - scry = callPackage ../development/tools/scry { }; + scry = callPackage ../development/tools/scry { crystal = crystal_1_2; }; dasm = callPackage ../development/compilers/dasm { }; @@ -14500,7 +14500,7 @@ with pkgs; millet = callPackage ../development/tools/millet {}; - mint = callPackage ../development/compilers/mint { }; + mint = callPackage ../development/compilers/mint { crystal = crystal_1_2; }; mitscheme = callPackage ../development/compilers/mit-scheme { stdenv = gcc10StdenvCompat; texLive = texlive.combine { inherit (texlive) scheme-small epsf texinfo; }; }; From 8a4536cba8feb567471da7d9174c6523eb91e375 Mon Sep 17 00:00:00 2001 From: Evangelos Paterakis Date: Mon, 21 Nov 2022 21:04:41 +0200 Subject: [PATCH 08/74] fix: make kakoune-cr use crystal 1.2 Co-authored-by: M. Ian Graham <704580+miangraham@users.noreply.github.com> --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed61424497ce..a89076f081c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8134,7 +8134,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - kakoune-cr = callPackage ../tools/misc/kakoune-cr { }; + kakoune-cr = callPackage ../tools/misc/kakoune-cr { crystal = crystal_1_2; }; kbdd = callPackage ../applications/window-managers/kbdd { }; From b1be734009b3b9aa217d8561846fce9c9beafb37 Mon Sep 17 00:00:00 2001 From: Evangelos Paterakis Date: Mon, 21 Nov 2022 22:30:19 +0200 Subject: [PATCH 09/74] fix: disable ffi on < 1.6.1 instead of patching the spec --- pkgs/development/compilers/crystal/default.nix | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 9423e9c7e4fc..4fac18debfc9 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -109,20 +109,6 @@ let url = "https://github.com/crystal-lang/crystal/pull/11399.patch"; sha256 = "sha256-CjNpkQQ2UREADmlyLUt7zbhjXf0rTjFhNbFYLwJKkc8="; }) - ] ++ lib.optionals (lib.versionAtLeast version "1.3.0" && lib.versionOlder version "1.6.0") [ - # needed for #12601 to get applied successfully - (fetchpatch { - url = "https://github.com/crystal-lang/crystal/commit/bf4009dacbf67a63a1cbaffddbdc99549bb70a03.patch"; - sha256 = "sha256-KpMA5Zdy0QI+HcfuZVRT2gLPS7oH2D4MsdYEnHGDt/0="; - }) - ] ++ lib.optionals (lib.versionAtLeast version "1.3.0" && lib.versionOlder version "1.6.1") [ - # fixes an issue that prevented tests from passing when ran with - # the --release flag - # the PR has been merged since version 1.6.1 - (fetchpatch { - url = "https://github.com/crystal-lang/crystal/pull/12601.patch"; - sha256 = "sha256-3NiUC4EyP/jSn62sv38eieKcVw9zUfRB78aAvnxV57E="; - }) ]; outputs = [ "out" "lib" "bin" ]; @@ -187,6 +173,9 @@ let FLAGS = [ "--single-module" # needed for deterministic builds + ] ++ lib.optionals (lib.versionAtLeast version "1.3.0" && lib.versionOlder version "1.6.1") [ + # ffi is only used by the interpreter and its spec are broken on < 1.6.1 + "-Dwithout_ffi" ]; # This makes sure we don't keep depending on the previous version of From 5564346d68f6696e18dab41cf3546325e7b4647a Mon Sep 17 00:00:00 2001 From: Evangelos Paterakis Date: Mon, 21 Nov 2022 22:30:48 +0200 Subject: [PATCH 10/74] feat: use release mode only on the compiler and not the specs --- pkgs/development/compilers/crystal/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 4fac18debfc9..c1d6b5bf83ad 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -87,7 +87,7 @@ let , binary , doCheck ? true , extraBuildInputs ? [ ] - , buildFlags ? [ "all" "docs" ] + , buildFlags ? [ "all" "docs" "release=1"] }: lib.fix (compiler: stdenv.mkDerivation { pname = "crystal"; @@ -165,7 +165,6 @@ let makeFlags = [ "CRYSTAL_CONFIG_VERSION=${version}" - "release=1" "progress=1" ]; From 392df0cf61d6d2ea4a370d266a32dad0eb61adda Mon Sep 17 00:00:00 2001 From: Evangelos Paterakis Date: Mon, 21 Nov 2022 22:44:54 +0200 Subject: [PATCH 11/74] feat: 1.5.0 -> 1.5.1 and enable aarch64-linux builds --- pkgs/development/compilers/crystal/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index c1d6b5bf83ad..548c72cab7ec 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -260,13 +260,13 @@ rec { }; binaryCrystal_1_5 = genericBinary { - version = "1.5.0"; + version = "1.5.1"; sha256s = { - x86_64-linux = "sha256-YnNg8PyAUgLYAxAAfVA8ei/AdFsdsiEVN9f1TpqZQ0c="; + x86_64-linux = "sha256-pHXD2Z2+Dy1actRx+iXgPBJLWZ5HM27tdGlztLTXh7w="; #i686-linux = ""; no prebuilt binaries since 1.2.0 - x86_64-darwin = "sha256-KU6+HLFlpYJSJS4F1zlHBeBt/rzxb7U57GmqRQnLm0Y=="; - #aarch64-linux = ""; not available yet - aarch64-darwin = "sha256-KU6+HLFlpYJSJS4F1zlHBeBt/rzxb7U57GmqRQnLm0Y=="; + x86_64-darwin = "sha256-QywvyZIkf2Ztt+VfsVUJRBUQgxpyvro0r/otdrby4JI="; + aarch64-linux = "sha256-SdgHd3e5R+/gF7OYz3MEaC7ezI/jcyfpCWmZ3qPeRBI="; + aarch64-darwin = "sha256-QywvyZIkf2Ztt+VfsVUJRBUQgxpyvro0r/otdrby4JI="; }; }; @@ -292,7 +292,7 @@ rec { }; crystal_1_5 = generic { - version = "1.5.0"; + version = "1.5.1"; sha256 = "sha256-twDWnJBLc5tvkg3HvbxXJsCPTMJr9vGvvHvfukMXGyA="; binary = binaryCrystal_1_5; }; From 159ddb54957e58b52588ce592f995f57f02f2a77 Mon Sep 17 00:00:00 2001 From: Evangelos Paterakis Date: Tue, 22 Nov 2022 04:20:28 +0200 Subject: [PATCH 12/74] feat: get rid of unused versions feat: use 1.2.2 to build 1_2 and 1_6 feat: use llvm 13 --- .../development/compilers/crystal/default.nix | 52 +++---------------- pkgs/top-level/all-packages.nix | 5 +- 2 files changed, 8 insertions(+), 49 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 548c72cab7ec..f8765466328b 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -242,65 +242,27 @@ let in rec { - binaryCrystal_1_0 = genericBinary { - version = "1.0.0"; - sha256s = { - x86_64-linux = "1949argajiyqyq09824yj3wjyv88gd8wbf20xh895saqfykiq880"; - i686-linux = "0w0f4fwr2ijhx59i7ppicbh05hfmq7vffmgl7lal6im945m29vch"; - x86_64-darwin = "01n0rf8zh551vv8wq3h0ifnsai0fz9a77yq87xx81y9dscl9h099"; - aarch64-linux = "0sns7l4q3z82qi3dc2r4p63f4s8hvifqzgq56ykwyrvawynjhd53"; - }; - }; - binaryCrystal_1_2 = genericBinary { - version = "1.2.0"; + version = "1.2.2"; sha256s = { - aarch64-darwin = "1hrs8cpjxdkcf8mr9qgzilwbg6bakq87sd4yydfsk2f4pqd6g7nf"; + x86_64-linux = "sha256-sW5nhihW/6Dkq95i3vJNWs2D1CtQhujhxVbgQCAas6E="; + aarch64-darwin = "sha256-4VB4yYGl1/YeYSsHOZq7fdeQ8IQMfloAPhEU0iKrvxs="; + x86_64-darwin = "sha256-4VB4yYGl1/YeYSsHOZq7fdeQ8IQMfloAPhEU0iKrvxs="; + aarch64-linux = "sha256-QgPKUDFyodqY1+b85AybSpbbr0RmfISdNpB08Wf34jo="; }; }; - binaryCrystal_1_5 = genericBinary { - version = "1.5.1"; - sha256s = { - x86_64-linux = "sha256-pHXD2Z2+Dy1actRx+iXgPBJLWZ5HM27tdGlztLTXh7w="; - #i686-linux = ""; no prebuilt binaries since 1.2.0 - x86_64-darwin = "sha256-QywvyZIkf2Ztt+VfsVUJRBUQgxpyvro0r/otdrby4JI="; - aarch64-linux = "sha256-SdgHd3e5R+/gF7OYz3MEaC7ezI/jcyfpCWmZ3qPeRBI="; - aarch64-darwin = "sha256-QywvyZIkf2Ztt+VfsVUJRBUQgxpyvro0r/otdrby4JI="; - }; - }; - - crystal_1_0 = generic { - version = "1.0.0"; - sha256 = "sha256-RI+a3w6Rr+uc5jRf7xw0tOenR+q6qii/ewWfID6dbQ8="; - binary = binaryCrystal_1_0; - extraBuildInputs = [ libatomic_ops ]; - }; - - crystal_1_1 = generic { - version = "1.1.1"; - sha256 = "sha256-hhhT3reia8acZiPsflwfuD638Ll2JiXwMfES1TyGyNQ="; - binary = crystal_1_0; - extraBuildInputs = [ libatomic_ops ]; - }; - crystal_1_2 = generic { version = "1.2.2"; sha256 = "sha256-nyOXhsutVBRdtJlJHe2dALl//BUXD1JeeQPgHU4SwiU="; - binary = if isAarch64Darwin then binaryCrystal_1_2 else crystal_1_1; + binary = binaryCrystal_1_2; extraBuildInputs = [ libatomic_ops ]; }; - crystal_1_5 = generic { - version = "1.5.1"; - sha256 = "sha256-twDWnJBLc5tvkg3HvbxXJsCPTMJr9vGvvHvfukMXGyA="; - binary = binaryCrystal_1_5; - }; - crystal_1_6 = generic { version = "1.6.2"; sha256 = "sha256-WgU6Y8ww1IYyB0vd5tXwmWBEL5RiPjHA7YzPd21jlsY="; - binary = binaryCrystal_1_5; + binary = binaryCrystal_1_2; }; crystal = crystal_1_6; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a89076f081c2..c8c75c610138 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13442,12 +13442,9 @@ with pkgs; copper = callPackage ../development/compilers/copper {}; inherit (callPackages ../development/compilers/crystal { - llvmPackages = if stdenv.system == "aarch64-darwin" then llvmPackages_11 else llvmPackages_10; + llvmPackages = llvmPackages_13; }) - crystal_1_0 - crystal_1_1 crystal_1_2 - crystal_1_5 crystal_1_6 crystal; From eab3f4d896caa291fbe824efa9e2e1f2cbf6ed16 Mon Sep 17 00:00:00 2001 From: Evangelos Paterakis Date: Sun, 18 Dec 2022 16:53:29 +0200 Subject: [PATCH 13/74] fix: darwin compile errors Co-authored-by: Brian J. Cardiff <459923+bcardiff@users.noreply.github.com> --- pkgs/development/compilers/crystal/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index f8765466328b..720e64469cdd 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -149,6 +149,11 @@ let # See https://github.com/crystal-lang/crystal/issues/8629 substituteInPlace spec/std/socket/udp_socket_spec.cr \ --replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"' + + '' + lib.optionalString (stdenv.isDarwin && versionOlder version "1.3.0") '' + # See https://github.com/NixOS/nixpkgs/pull/195606#issuecomment-1356491277 + substituteInPlace spec/compiler/loader/unix_spec.cr \ + --replace 'it "parses file paths"' 'pending "parses file paths"' ''; # Defaults are 4 @@ -156,6 +161,7 @@ let export CRYSTAL_WORKERS=$NIX_BUILD_CORES export threads=$NIX_BUILD_CORES export CRYSTAL_CACHE_DIR=$TMP + export MACOSX_DEPLOYMENT_TARGET="10.11" ''; From 3efc4e5f0365462048da25bed62d1b237f733a55 Mon Sep 17 00:00:00 2001 From: GeopJr Date: Sun, 18 Dec 2022 17:22:59 +0200 Subject: [PATCH 14/74] fix: versionOlder => lib.versionOlder --- pkgs/development/compilers/crystal/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 720e64469cdd..f1143572956b 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -150,7 +150,7 @@ let substituteInPlace spec/std/socket/udp_socket_spec.cr \ --replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"' - '' + lib.optionalString (stdenv.isDarwin && versionOlder version "1.3.0") '' + '' + lib.optionalString (stdenv.isDarwin && lib.versionOlder version "1.3.0") '' # See https://github.com/NixOS/nixpkgs/pull/195606#issuecomment-1356491277 substituteInPlace spec/compiler/loader/unix_spec.cr \ --replace 'it "parses file paths"' 'pending "parses file paths"' From 44073f6d1667ba1c723a6240b91ebacb3e72ee05 Mon Sep 17 00:00:00 2001 From: GeopJr Date: Sun, 18 Dec 2022 18:42:51 +0200 Subject: [PATCH 15/74] fix: version limits on unix_spec --- pkgs/development/compilers/crystal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index f1143572956b..ef835ff69f0a 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -150,7 +150,7 @@ let substituteInPlace spec/std/socket/udp_socket_spec.cr \ --replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"' - '' + lib.optionalString (stdenv.isDarwin && lib.versionOlder version "1.3.0") '' + '' + lib.optionalString (stdenv.isDarwin && lib.versionAtLeast version "1.3.0" && lib.versionOlder version "1.7.0") '' # See https://github.com/NixOS/nixpkgs/pull/195606#issuecomment-1356491277 substituteInPlace spec/compiler/loader/unix_spec.cr \ --replace 'it "parses file paths"' 'pending "parses file paths"' @@ -161,7 +161,7 @@ let export CRYSTAL_WORKERS=$NIX_BUILD_CORES export threads=$NIX_BUILD_CORES export CRYSTAL_CACHE_DIR=$TMP - export MACOSX_DEPLOYMENT_TARGET="10.11" + export MACOSX_DEPLOYMENT_TARGET=10.11 ''; From a979bd9214a622ef444a20e2023d37c268c43ea4 Mon Sep 17 00:00:00 2001 From: Evangelos Paterakis Date: Wed, 21 Dec 2022 16:30:37 +0200 Subject: [PATCH 16/74] fix(tzdata): prepend to ZONE_SOURCES instead of substituting in place --- pkgs/development/compilers/crystal/default.nix | 11 +++++++---- pkgs/development/compilers/crystal/tzdata.patch | 12 ++++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/compilers/crystal/tzdata.patch diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index ef835ff69f0a..e642e8ee7bc5 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -4,6 +4,7 @@ , fetchurl , fetchpatch , lib +, substituteAll # Dependencies , boehmgc , coreutils @@ -100,7 +101,12 @@ let inherit sha256; }; - patches = [ ] + patches = [ + (substituteAll { + src = ./tzdata.patch; + inherit tzdata; + }) + ] ++ lib.optionals (lib.versionOlder version "1.2.0") [ # add support for DWARF5 debuginfo, fixes builds on recent compilers # the PR is 8 commits from 2019, so just fetch the whole thing @@ -124,9 +130,6 @@ let substituteInPlace Makefile \ --replace 'docs: ## Generate standard library documentation' 'docs: crystal ## Generate standard library documentation' - substituteInPlace src/crystal/system/unix/time.cr \ - --replace /usr/share/zoneinfo ${tzdata}/share/zoneinfo - mkdir -p $TMP/crystal substituteInPlace spec/std/file_spec.cr \ diff --git a/pkgs/development/compilers/crystal/tzdata.patch b/pkgs/development/compilers/crystal/tzdata.patch new file mode 100644 index 000000000000..b687336753ad --- /dev/null +++ b/pkgs/development/compilers/crystal/tzdata.patch @@ -0,0 +1,12 @@ +diff --git a/src/crystal/system/unix/time.cr b/src/crystal/system/unix/time.cr +index 333b66075..1c29a0e55 100644 +--- a/src/crystal/system/unix/time.cr ++++ b/src/crystal/system/unix/time.cr +@@ -43,6 +43,7 @@ module Crystal::System::Time + # Many systems use /usr/share/zoneinfo, Solaris 2 has + # /usr/share/lib/zoneinfo, IRIX 6 has /usr/lib/locale/TZ. + ZONE_SOURCES = { ++ "@tzdata@/share/zoneinfo/", + "/usr/share/zoneinfo/", + "/usr/share/lib/zoneinfo/", + "/usr/lib/locale/TZ/", From f29f0d07982c8ec766adef7106b69c5af42882f8 Mon Sep 17 00:00:00 2001 From: Evangelos Paterakis Date: Mon, 9 Jan 2023 22:41:18 +0200 Subject: [PATCH 17/74] feat: 1.7.0 --- pkgs/development/compilers/crystal/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index e642e8ee7bc5..24832bdaa106 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -268,11 +268,11 @@ rec { extraBuildInputs = [ libatomic_ops ]; }; - crystal_1_6 = generic { - version = "1.6.2"; - sha256 = "sha256-WgU6Y8ww1IYyB0vd5tXwmWBEL5RiPjHA7YzPd21jlsY="; + crystal_1_7 = generic { + version = "1.7.0"; + sha256 = "sha256-no6b6PGmc/dhicMLVZIHwi/HOKCVTiWHZ5I+ImBjoQc="; binary = binaryCrystal_1_2; }; - crystal = crystal_1_6; + crystal = crystal_1_7; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b22223300cf..7d4bc26d16d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13892,7 +13892,7 @@ with pkgs; llvmPackages = llvmPackages_13; }) crystal_1_2 - crystal_1_6 + crystal_1_7 crystal; crystal2nix = callPackage ../development/compilers/crystal2nix { }; From 12c63ab03c3b552ac00ac487d2710c969b412581 Mon Sep 17 00:00:00 2001 From: kilianar Date: Wed, 11 Jan 2023 16:42:17 +0100 Subject: [PATCH 18/74] xdot: fix Gtk error Move gobject-introspection to nativeBuildInputs to fix the fallowing runtime error: ValueError: Namespace Gtk not available --- pkgs/development/python-modules/xdot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix index a07235006c9a..ef413e79c2a8 100644 --- a/pkgs/development/python-modules/xdot/default.nix +++ b/pkgs/development/python-modules/xdot/default.nix @@ -11,8 +11,8 @@ buildPythonPackage rec { }; disabled = !isPy3k; - nativeBuildInputs = [ wrapGAppsHook ]; - propagatedBuildInputs = [ gobject-introspection pygobject3 graphviz gtk3 numpy ]; + nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + propagatedBuildInputs = [ pygobject3 graphviz gtk3 numpy ]; checkInputs = [ xvfb-run ]; postInstall = '' From 5c79c4289a298280d554efa8a7a4a0ec95195b2e Mon Sep 17 00:00:00 2001 From: Majiir Paktu Date: Fri, 13 Jan 2023 23:24:01 -0500 Subject: [PATCH 19/74] octoprint: fix overlay composition --- pkgs/applications/misc/octoprint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index e63273b13108..25a53575cf8e 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -83,7 +83,7 @@ let hash = "sha256-DCUesPy4/g7DYN/9CDRvwAWHcv4dFsF+gsysg5UWThQ="; }; - propagatedBuildInputs = with super; [ + propagatedBuildInputs = with self; [ argon2-cffi blinker cachelib @@ -136,7 +136,7 @@ let py.pkgs.appdirs ]; - checkInputs = with super; [ + checkInputs = with self; [ ddt mock pytestCheckHook @@ -146,7 +146,7 @@ let # substitute pip and let it find out, that it can't write anywhere (substituteAll { src = ./pip-path.patch; - pip = "${super.pip}/bin/pip"; + pip = "${self.pip}/bin/pip"; }) # hardcore path to ffmpeg and hide related settings From d7989b431b747a486ea3c317ee3eb747268a60c9 Mon Sep 17 00:00:00 2001 From: toastal Date: Thu, 5 Jan 2023 17:22:21 +0700 Subject: [PATCH 20/74] =?UTF-8?q?lightningcss:=200.17.1=20=E2=86=92=200.18?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/lightningcss/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/lightningcss/default.nix b/pkgs/development/tools/lightningcss/default.nix index 366efcf3f9d4..c2bb6828bc2a 100644 --- a/pkgs/development/tools/lightningcss/default.nix +++ b/pkgs/development/tools/lightningcss/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "lightningcss"; - version = "1.17.1"; + version = "1.18.0"; src = fetchFromGitHub { owner = "parcel-bundler"; repo = "lightningcss"; rev = "refs/tags/v${version}"; - hash = "sha256-sQXkKTzyzyyCpqoJPKfBd0CUbaKvNjbzTmdBo/RlBcs="; + sha256 = "sha256-JULVX5gyMJhnBwGQxmMObtUaenu37rIE5yDbA5fHsCY="; }; - cargoHash = "sha256-Vtsrjks3rdzTPBAtnYWWfMD4Vany9ErTubqPtuyVqR4="; + cargoHash = "sha256-PQbN0qsCf4eia5sD71ltP7Y955smZPwkof+uEQATvNQ="; buildFeatures = [ "cli" From 8b3aad8e14146557df2223af55fc909a8b8d6ca2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Jan 2023 12:53:06 +0000 Subject: [PATCH 21/74] python310Packages.rq: 1.11.1 -> 1.12.0 --- pkgs/development/python-modules/rq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index 49c55c5d9734..526b862ab203 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "rq"; - version = "1.11.1"; + version = "1.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "rq"; repo = "rq"; rev = "refs/tags/v${version}"; - hash = "sha256-7l/ckkDchs+iRDZLHrm4TYwA9wAJAnw9kYSaAbSo0jY="; + hash = "sha256-hV9Rntgt1Y4TBWGlunoXDKy8A2/9tum8aII8kFIZznU="; }; propagatedBuildInputs = [ From 3ed01b0ddadeb1346d7c0db28575b0904be59b1b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 16 Jan 2023 14:24:16 +0100 Subject: [PATCH 22/74] python310Packages.rq: add changelog to meta --- pkgs/development/python-modules/rq/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index 526b862ab203..d0caa8741dc1 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for creating background jobs and processing them"; homepage = "https://github.com/nvie/rq/"; + changelog = "https://github.com/rq/rq/releases/tag/v${version}"; license = licenses.bsd2; maintainers = with maintainers; [ mrmebelman ]; }; From 52c3f58bad18601cee8bbef1fe1cb78f5c305c4e Mon Sep 17 00:00:00 2001 From: Evangelos Paterakis Date: Tue, 17 Jan 2023 20:51:42 +0200 Subject: [PATCH 23/74] feat: 1.7.1 --- pkgs/development/compilers/crystal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 24832bdaa106..af4d3a19337c 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -269,8 +269,8 @@ rec { }; crystal_1_7 = generic { - version = "1.7.0"; - sha256 = "sha256-no6b6PGmc/dhicMLVZIHwi/HOKCVTiWHZ5I+ImBjoQc="; + version = "1.7.1"; + sha256 = "sha256-PaeqqY+rSxntzz+30mJnjxzj2Xgu/BNkolw3Y30aZgk="; binary = binaryCrystal_1_2; }; From 3597e7e518b2a1c8f0ce3a2324e7fab687194f9f Mon Sep 17 00:00:00 2001 From: Evangelos Paterakis Date: Tue, 17 Jan 2023 22:14:03 +0200 Subject: [PATCH 24/74] fix(darwin): use sdk 11 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e4c50b01490..ce7abad052b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13973,6 +13973,7 @@ with pkgs; inherit (callPackages ../development/compilers/crystal { llvmPackages = llvmPackages_13; + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }) crystal_1_2 crystal_1_7 From 5d576715464a8f0d5952f6111669666940decf98 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 18 Jan 2023 09:31:21 +0100 Subject: [PATCH 25/74] =?UTF-8?q?Revert=20"Revert=20"pythonPackages.nbxmpp?= =?UTF-8?q?:=204.0.0=20=E2=86=92=204.0.1;=20gajim:=201.6.0=20=E2=86=92=201?= =?UTF-8?q?.6.1""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/instant-messengers/gajim/default.nix | 8 ++++---- pkgs/development/python-modules/nbxmpp/default.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 67f294ea6a55..035d8bad2616 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -22,11 +22,11 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - hash = "sha256-gHRB3thDH+CKRXTgrD37e2zf0rVDIVl4Zhxf5lsLjyc="; + hash = "sha256-3D87Ou/842WqbaUiJV1hRZFVkZzQ12GXCpRc8F3rKPQ="; }; buildInputs = [ @@ -61,8 +61,8 @@ python3.pkgs.buildPythonApplication rec { checkPhase = '' xvfb-run dbus-run-session \ --config-file=${dbus}/share/dbus-1/session.conf \ - ${python3.interpreter} -m unittest discover -s test/gtk -v - ${python3.interpreter} -m unittest discover -s test/no_gui -v + ${python3.interpreter} -m unittest discover -s test/gui -v + ${python3.interpreter} -m unittest discover -s test/common -v ''; # necessary for wrapGAppsHook diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 1ce72428c10c..3c09458e874c 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "4.0.0"; + version = "4.0.1"; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "gajim"; repo = "python-nbxmpp"; rev = version; - hash = "sha256-6PYJGlNOZMwHMXwf05IWekJ+haMfg+ooH5On+aYOWSI="; + hash = "sha256-PL+qNxeNubGSLqSci4uhRWtOIqs10p+A1VPfTwCLu84="; }; nativeBuildInputs = [ From 9ee9a0f5ee1b580db53fd2552428f72b62472ae5 Mon Sep 17 00:00:00 2001 From: Sunghoon Kang Date: Wed, 18 Jan 2023 23:41:42 +0900 Subject: [PATCH 26/74] upbound: 0.12.2 -> 0.15.0 Signed-off-by: Sunghoon Kang --- pkgs/development/tools/upbound/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/upbound/default.nix b/pkgs/development/tools/upbound/default.nix index e1ff9841353d..59f0c9d247cf 100644 --- a/pkgs/development/tools/upbound/default.nix +++ b/pkgs/development/tools/upbound/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "upbound"; - version = "0.12.2"; + version = "0.15.0"; src = fetchFromGitHub { owner = pname; repo = "up"; rev = "v${version}"; - sha256 = "sha256-tbYUxqDtMIlHJ+bIE9PDDhPTSQKaZYObuRFSyRkh8+Y="; + sha256 = "sha256-0nCGBHyaAgSKn+gkiORe3PCuJFiPEN9yRO3vn0tyji8="; }; - vendorSha256 = "sha256-EeGNH/ka9Mt0vVtZfizXdTqf1f3H1aM5GITUyp+2FxM="; + vendorSha256 = "sha256-eueYdAlcH1hqE6EKrwpOrchVYhZg76Fgn9oh8sbNuxU="; subPackages = [ "cmd/docker-credential-up" "cmd/up" ]; From 0d103826a5e888939dd9e65a3d2abc5ff3b1f7ed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 18 Jan 2023 15:46:12 +0100 Subject: [PATCH 27/74] python310Packages.archinfo: 9.2.33 -> 9.2.34 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 1ef304b1bf17..edb5b10c7c4c 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.33"; + version = "9.2.34"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-6y5GkoC/U2tNHnKxLPyDxrf3zZkDNPbje0RQRkaKDuY="; + hash = "sha256-RsIknVuhDzPbVJudjilNnMjBTH6cxPROQEXxRiAbDEs="; }; nativeBuildInputs = [ From 4815d0d0ca62775f78c2babd94f2ef0f7c1bdb72 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 18 Jan 2023 15:46:18 +0100 Subject: [PATCH 28/74] python310Packages.ailment: 9.2.33 -> 9.2.34 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 241f46b0d682..47fe8d1bad77 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.33"; + version = "9.2.34"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-PngFhzeBm3lm69KKjcj4NvFb1DVspdkQaiVSg0FZnV4="; + hash = "sha256-qFnr+HzDqzhub9MKHjmpbEI3CGMuUkpwX763ykoP9No="; }; nativeBuildInputs = [ From 506f02f3b34f981776bb3c32e6f7ba8ede66d6a1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 18 Jan 2023 15:46:23 +0100 Subject: [PATCH 29/74] python310Packages.pyvex: 9.2.33 -> 9.2.34 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 356105590204..2c69497dfbcd 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.33"; + version = "9.2.34"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-RDCNoP3B1+kyyEBszAbAm9G+G+4LE3ceojB5uQup7Ng="; + hash = "sha256-3IWhMhiaGm0LXxgVy1HgCxNIBYuGzCJKf3Nual13xe8="; }; nativeBuildInputs = [ From b6989d766d0457080e31c5acb2ac387170c56ffd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 18 Jan 2023 15:46:29 +0100 Subject: [PATCH 30/74] python310Packages.claripy: 9.2.33 -> 9.2.34 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 8e508bbe8b64..7d67d603ab52 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.33"; + version = "9.2.34"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ItWL2DGoMkOMOMsTTfal8W9DZCmXMuZs0cZbYESlFU4="; + hash = "sha256-2oUUIPHBT/pAAWUy+8fuEqZv0pG1OHDn6eaphOsrevE="; }; nativeBuildInputs = [ From 59fa268bee0847da5b141bfe85f4caefe95b2584 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 18 Jan 2023 15:46:35 +0100 Subject: [PATCH 31/74] python310Packages.cle: 9.2.33 -> 9.2.34 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index aa713ed4a768..beb97d2a61b0 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.33"; + version = "9.2.34"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-Abh6kSHnTtz/pz5xPJeg0UZcRQDah4D0tlsLnkyI2lE="; + hash = "sha256-mbYitM0ibUSxBRhbF1ecB1MOryhWRPZZ1ujRFD8iiWs="; }; nativeBuildInputs = [ From b7acb2c497dabee573ba6f84a71c0a2cc1ad87a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 18 Jan 2023 15:46:42 +0100 Subject: [PATCH 32/74] python310Packages.angr: 9.2.33 -> 9.2.34 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index d56a99685cd1..64da0be72e25 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.33"; + version = "9.2.34"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-Uq/weFiqbfGLqYlu5hH/l++YglqCGpL2NtNccI3gOqQ="; + hash = "sha256-Ar74eYEUinHmAosec7r5C9Rg6iqYl2uLZo87UdOquJY="; }; propagatedBuildInputs = [ From 9f60ca8dcfd3cba3a9b8b09e054da98c5ef113c9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 18 Jan 2023 23:26:13 +0100 Subject: [PATCH 33/74] python310Packages.total-connect-client: 2022.10 -> 2023.1 Changelog: https://github.com/craigjmidwinter/total-connect-client/releases/tag/2023.1 --- .../total-connect-client/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/total-connect-client/default.nix b/pkgs/development/python-modules/total-connect-client/default.nix index 9c6396d55c11..d36e40482123 100644 --- a/pkgs/development/python-modules/total-connect-client/default.nix +++ b/pkgs/development/python-modules/total-connect-client/default.nix @@ -3,23 +3,28 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools , zeep }: buildPythonPackage rec { pname = "total-connect-client"; - version = "2022.10"; - format = "setuptools"; + version = "2023.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "craigjmidwinter"; repo = "total-connect-client"; - rev = version; - hash = "sha256-HNX+8TIfXOEy4KCmOjsNvOvLBdF8iQT0NJLBDD+XWsA="; + rev = "refs/tags/${version}"; + hash = "sha256-BZEL/cIAeiwxQor3TbzY8cJ08PYSkXxMl/4XkIEXncg="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ zeep ]; @@ -35,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Interact with Total Connect 2 alarm systems"; homepage = "https://github.com/craigjmidwinter/total-connect-client"; + changelog = "https://github.com/craigjmidwinter/total-connect-client/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; From 7f299d7e9bab27188cc4cf937959214ec79b00dc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 Jan 2023 00:24:37 +0100 Subject: [PATCH 34/74] python310Packages.pubnub: 7.0.2 -> 7.1.0 Diff: https://github.com/pubnub/python/compare/refs/tags/7.0.2...7.1.0 Changelog: https://github.com/pubnub/python/releases/tag/7.1.0 --- pkgs/development/python-modules/pubnub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index b3c8c2367856..d934d688f9ba 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pubnub"; - version = "7.0.2"; + version = "7.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = "python"; rev = "refs/tags/${version}"; - hash = "sha256-LVkP9og9Xru1Xuw4boI2pLwZ0RE2RvtUx0AHoJa6o9c="; + hash = "sha256-+g/VBxv0XfqqwTEKtgBAy7Pfakll00JXMFBS2q3pHn8="; }; propagatedBuildInputs = [ From 4ffcd4540ac472cb7b505d977d994ec8db722ffb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 01:40:22 +0000 Subject: [PATCH 35/74] eksctl: 0.124.0 -> 0.125.0 --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 991573417f3a..361ad07858f0 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.124.0"; + version = "0.125.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-XFT05iJsrCLV4V2dqwr6QwVK+ARl2v3U4Omgjj6YZ8o="; + sha256 = "sha256-3hyhb1/vWIKFSw6rmdiszux+WFeMvUE79NkzyazClEg="; }; - vendorSha256 = "sha256-+tVD09XN67Ea7+Mz4E1bdAImUCwWDHelecBms9z/DUc="; + vendorHash = "sha256-PufNlNG3Ixkq1OPnEeod8BvWF1Ee0AdpzJIxsvLPOA4="; doCheck = false; From 1472d6a372ceea131f128719451b8a129ca8c136 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 10:12:38 +0000 Subject: [PATCH 36/74] python310Packages.thespian: 3.10.6 -> 3.10.7 --- pkgs/development/python-modules/thespian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix index 7a4f0e5ee855..eeea8f5bd4a2 100644 --- a/pkgs/development/python-modules/thespian/default.nix +++ b/pkgs/development/python-modules/thespian/default.nix @@ -1,13 +1,13 @@ { fetchPypi, buildPythonPackage, lib }: buildPythonPackage rec { - version = "3.10.6"; + version = "3.10.7"; pname = "thespian"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c987a8042ba2303e22371f38a67354593dd81c4c11ba1eba7f6657409288d5ed"; + sha256 = "sha256-HcHvZtMpBtNXq9Yp2ayeHTuIf7gpBUb6xZqjaECbfgo="; }; # Do not run the test suite: it takes a long time and uses From 5b8a88106f8d1a4eb341a46048b4742198bc454a Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Thu, 19 Jan 2023 11:42:05 +0100 Subject: [PATCH 37/74] vscode-extensions.esbenp.prettier-vscode: 9.10.3 -> 9.10.4 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index ea6206bf39af..e90c8bf6b53c 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -998,8 +998,8 @@ let mktplcRef = { name = "prettier-vscode"; publisher = "esbenp"; - version = "9.10.3"; - sha256 = "sha256-BTuTTElPYRtbzQvUC3iMYlj7NDkGSDa/IppOGBXjfUM="; + version = "9.10.4"; + sha256 = "sha256-khtyB0Qbm+iuM1GsAaF32YRv1VBTIy7daeCKdgwCIC8="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; From 95ab55f851da3c65d4953c7346dd2f749fd91e40 Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Thu, 19 Jan 2023 11:45:13 +0100 Subject: [PATCH 38/74] vscode-extensions.davidanson.vscode-markdownlint: 0.48.1 -> 0.49.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index ea6206bf39af..b1eacb4aabb4 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -762,8 +762,8 @@ let mktplcRef = { name = "vscode-markdownlint"; publisher = "DavidAnson"; - version = "0.48.1"; - sha256 = "sha256-3TpZGvas+pfabHayaA6Yd9nOO2MbfXbCvCiTcbja9Vo="; + version = "0.49.0"; + sha256 = "sha256-Mh/OoRK410aXEr3sK2CYFDsXGSqFT+JOWi9jHOdK01Y="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog"; From 43ed3951fe4f17c4f6ad8788d4fafa75f7fdeaf4 Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Thu, 19 Jan 2023 12:06:48 +0100 Subject: [PATCH 39/74] vscode-extensions.elixir-lsp.vscode-elixir-ls: 0.12.0 -> 0.13.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index ea6206bf39af..91218c9f86a6 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1438,8 +1438,8 @@ let mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; - version = "0.12.0"; - sha256 = "sha256-ZwdGcsvmEKDH5ZAkKiLEV/3ru74BittnxibMWbdkaco="; + version = "0.13.0"; + sha256 = "sha256-1uaLFTMvkcYrYAt9qDdISJneKxHo9qsris70iowGW2s="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; From 3a0d3ccb2b2bfdd001742ca1329a45a66736afe3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 12:27:44 +0000 Subject: [PATCH 40/74] cinny-desktop: 2.2.2 -> 2.2.3 --- .../networking/instant-messengers/cinny-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix index 09e73514ab78..d0679a07e024 100644 --- a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { name = "cinny-desktop"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { url = "https://github.com/cinnyapp/cinny-desktop/releases/download/v${version}/Cinny_desktop-x86_64.deb"; - sha256 = "sha256-TdKxVvhz6DTJ9ZST/OBc37DcH9lpoKrY5yP8skTO9eQ="; + sha256 = "sha256-siEAIZ9cCIJZTkeZkvT5yrPjRGoOl7vjU98AUrhgJNw="; }; nativeBuildInputs = [ From 54ad73f8ba7540cd7489f24aac0946f60edeaa91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 13:13:24 +0000 Subject: [PATCH 41/74] python310Packages.bpython: 0.23 -> 0.24 --- pkgs/development/python-modules/bpython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index 56c30df15eec..bf883b6e570d 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "bpython"; - version = "0.23"; + version = "0.24"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nwB4q8iHxIrwiGkeL2R5fWyplKwPS8A8ONBvZX18BSo="; + hash = "sha256-mHNv/XqMSP0r+1PYmKR19CQb3gtnISVwavBNnQj9Pb0="; }; propagatedBuildInputs = [ From 7383ecc1debe64c04df4aa2bc4d7329b22bde115 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 Jan 2023 14:20:10 +0100 Subject: [PATCH 42/74] python310Packages.pontos: 23.1.1 -> 23.1.3 Diff: https://github.com/greenbone/pontos/compare/refs/tags/v23.1.1...v23.1.3 Changelog: https://github.com/greenbone/pontos/releases/tag/v23.1.3 --- pkgs/development/python-modules/pontos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index 0f7e59403878..5c7e6eaa0364 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "23.1.1"; + version = "23.1.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-TNjkNitQy7Wrkw3FyKs3QNFW0/XMk9M+BG3PoXldVPk="; + hash = "sha256-qmgfEsB3Mg6xjQxQLR2JMXATzurtuOem2kdIkD0WQXI="; }; nativeBuildInputs = [ From 0ec843104a57acd6d02013bcaf91b55fdb6e5463 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 Jan 2023 14:23:24 +0100 Subject: [PATCH 43/74] qovery-cli: 0.48.3 -> 0.48.4 Diff: https://github.com/Qovery/qovery-cli/compare/v0.48.3...v0.48.4 Changelog: https://github.com/Qovery/qovery-cli/releases/tag/v0.48.4 --- pkgs/tools/admin/qovery-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index c7aaea9ba6b3..5354feea8c6e 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.48.3"; + version = "0.48.4"; src = fetchFromGitHub { owner = "Qovery"; repo = pname; rev = "v${version}"; - hash = "sha256-1qX/Ec4KJzEzjqxO83/Fhed1kOoKNGja5+1oULGvkaw="; + hash = "sha256-NAdY4JdUWDnawKl9D6Z4DXQP6ibn+4jHap08p0vu3Mc="; }; vendorHash = "sha256-6/TT3/98wBH9oMbPOzgvwN2nxj4RSbL2vxSMFlM5sgo="; From 77d99717a6ca9e1686597d383d8954244a912dfd Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Thu, 19 Jan 2023 18:08:56 +0400 Subject: [PATCH 44/74] kotatogram-desktop: fix build on Darwin after #210062 --- .../telegram/kotatogram-desktop/default.nix | 13 +- .../kotatogram-desktop/kotato-10.12-sdk.patch | 424 ------------------ .../kotatogram-desktop/tg_owt-10.12-sdk.patch | 68 --- .../telegram/kotatogram-desktop/tg_owt.nix | 8 - pkgs/top-level/all-packages.nix | 6 +- 5 files changed, 6 insertions(+), 513 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kotato-10.12-sdk.patch delete mode 100644 pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt-10.12-sdk.patch diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index 11ce5854dc2f..58c6501a1ffb 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -69,14 +69,11 @@ with lib; let tg_owt = callPackage ./tg_owt.nix { - abseil-cpp = (abseil-cpp.override { + abseil-cpp = abseil-cpp.override { # abseil-cpp should use the same compiler inherit stdenv; cxxStandard = "20"; - }).overrideAttrs (_: { - # https://github.com/NixOS/nixpkgs/issues/130963 - NIX_LDFLAGS = optionalString stdenv.isDarwin "-lc++abi"; - }); + }; # tg_owt should use the same compiler inherit stdenv; @@ -100,8 +97,6 @@ stdenv.mkDerivation rec { patches = [ ./kf594.patch ./shortcuts-binary-path.patch - # let it build with nixpkgs 10.12 sdk - ./kotato-10.12-sdk.patch ]; postPatch = optionalString stdenv.isLinux '' @@ -112,6 +107,7 @@ stdenv.mkDerivation rec { substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ --replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' '' + optionalString stdenv.isDarwin '' + sed -i "13i#import " Telegram/lib_webrtc/webrtc/mac/webrtc_media_devices_mac.mm substituteInPlace Telegram/CMakeLists.txt \ --replace 'COMMAND iconutil' 'COMMAND png2icns' \ --replace '--convert icns' "" \ @@ -189,9 +185,6 @@ stdenv.mkDerivation rec { libicns ]; - # https://github.com/NixOS/nixpkgs/issues/130963 - NIX_LDFLAGS = optionalString stdenv.isDarwin "-lc++abi"; - enableParallelBuilding = true; cmakeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kotato-10.12-sdk.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kotato-10.12-sdk.patch deleted file mode 100644 index 8c80cafc6dad..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kotato-10.12-sdk.patch +++ /dev/null @@ -1,424 +0,0 @@ -diff --git a/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm b/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm -index 9e9a1744b..ae55f873f 100644 ---- a/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm -+++ b/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm -@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - - #include - #include -+#undef check - - namespace Platform { - namespace { -diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.mm b/Telegram/SourceFiles/platform/mac/specific_mac.mm -index 1d68457bb..ac8c4e0ab 100644 ---- a/Telegram/SourceFiles/platform/mac/specific_mac.mm -+++ b/Telegram/SourceFiles/platform/mac/specific_mac.mm -@@ -118,6 +118,7 @@ PermissionStatus GetPermissionStatus(PermissionType type) { - switch (type) { - case PermissionType::Microphone: - case PermissionType::Camera: -+#if 0 - const auto nativeType = (type == PermissionType::Microphone) - ? AVMediaTypeAudio - : AVMediaTypeVideo; -@@ -132,6 +133,7 @@ PermissionStatus GetPermissionStatus(PermissionType type) { - return PermissionStatus::Denied; - } - } -+#endif - break; - } - return PermissionStatus::Granted; -@@ -141,6 +143,7 @@ void RequestPermission(PermissionType type, Fn resultCal - switch (type) { - case PermissionType::Microphone: - case PermissionType::Camera: -+#if 0 - const auto nativeType = (type == PermissionType::Microphone) - ? AVMediaTypeAudio - : AVMediaTypeVideo; -@@ -151,6 +154,7 @@ void RequestPermission(PermissionType type, Fn resultCal - }); - }]; - } -+#endif - break; - } - resultCallback(PermissionStatus::Granted); -diff --git a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_formatter_item.h b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_formatter_item.h -index a537929c8..82ef2b837 100644 ---- a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_formatter_item.h -+++ b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_formatter_item.h -@@ -9,8 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - - #import - #import -+#undef check - --API_AVAILABLE(macos(10.12.2)) - @interface TextFormatPopover : NSPopoverTouchBarItem - - (id)init:(NSTouchBarItemIdentifier)identifier; - @end -diff --git a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.h b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.h -index c6a4b886f..d2e0936c0 100644 ---- a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.h -+++ b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.h -@@ -8,12 +8,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - #pragma once - - #include -+#undef check - - namespace Main { - class Session; - } // namespace Main - --API_AVAILABLE(macos(10.12.2)) - @interface PinnedDialogsPanel : NSImageView - - (id)init:(not_null)session - destroyEvent:(rpl::producer<>)touchBarSwitches; -diff --git a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.h b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.h -index 27b04467c..b1a7dfbd9 100644 ---- a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.h -+++ b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.h -@@ -9,12 +9,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - - #import - #import -+#undef check - - namespace Window { - class Controller; - } // namespace Window - --API_AVAILABLE(macos(10.12.2)) - @interface StickerEmojiPopover : NSPopoverTouchBarItem - - (id)init:(not_null)controller - identifier:(NSTouchBarItemIdentifier)identifier; -diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_audio.h b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_audio.h -index ec4596c67..972461aef 100644 ---- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_audio.h -+++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_audio.h -@@ -8,8 +8,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - #pragma once - - #import -+#undef check - --API_AVAILABLE(macos(10.12.2)) - @interface TouchBarAudioPlayer : NSTouchBar - - (rpl::producer<>)closeRequests; - @end -diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_common.h b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_common.h -index 52b54de12..ac3857f9b 100644 ---- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_common.h -+++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_common.h -@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - - #import - #import -+#undef check - - namespace TouchBar { - -diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.h b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.h -index 1cc8c832f..c2178c975 100644 ---- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.h -+++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.h -@@ -20,19 +20,19 @@ struct TrackState; - - namespace TouchBar { - --[[nodiscard]] API_AVAILABLE(macos(10.12.2)) -+[[nodiscard]] - NSButton *CreateTouchBarButton( - NSImage *image, - rpl::lifetime &lifetime, - Fn callback); - --[[nodiscard]] API_AVAILABLE(macos(10.12.2)) -+[[nodiscard]] - NSButton *CreateTouchBarButton( - const style::icon &icon, - rpl::lifetime &lifetime, - Fn callback); - --[[nodiscard]] API_AVAILABLE(macos(10.12.2)) -+[[nodiscard]] - NSButton *CreateTouchBarButtonWithTwoStates( - NSImage *icon1, - NSImage *icon2, -@@ -41,7 +41,7 @@ NSButton *CreateTouchBarButtonWithTwoStates( - bool firstState, - rpl::producer stateChanged = rpl::never()); - --[[nodiscard]] API_AVAILABLE(macos(10.12.2)) -+[[nodiscard]] - NSButton *CreateTouchBarButtonWithTwoStates( - const style::icon &icon1, - const style::icon &icon2, -@@ -50,14 +50,14 @@ NSButton *CreateTouchBarButtonWithTwoStates( - bool firstState, - rpl::producer stateChanged = rpl::never()); - --[[nodiscard]] API_AVAILABLE(macos(10.12.2)) -+[[nodiscard]] - NSSliderTouchBarItem *CreateTouchBarSlider( - NSString *itemId, - rpl::lifetime &lifetime, - Fn callback, - rpl::producer stateChanged); - --[[nodiscard]] API_AVAILABLE(macos(10.12.2)) -+[[nodiscard]] - NSCustomTouchBarItem *CreateTouchBarTrackPosition( - NSString *itemId, - rpl::producer stateChanged); -diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_main.h b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_main.h -index f03546eaf..bc8c63678 100644 ---- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_main.h -+++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_main.h -@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - #pragma once - - #import -+#undef check - - namespace Window { - class Controller; -@@ -21,7 +22,6 @@ const auto kPopoverPickerItemIdentifier = @"pickerButtons"; - - } // namespace TouchBar::Main - --API_AVAILABLE(macos(10.12.2)) - @interface TouchBarMain : NSTouchBar - - (id)init:(not_null)controller - touchBarSwitches:(rpl::producer<>)touchBarSwitches; -diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.h b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.h -index 464f87c9c..9a008c75e 100644 ---- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.h -+++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.h -@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - #pragma once - - #import -+#undef check - - namespace Main { - class Domain; -@@ -17,7 +18,6 @@ namespace Window { - class Controller; - } // namespace Window - --API_AVAILABLE(macos(10.12.2)) - @interface RootTouchBar : NSTouchBar - - (id)init:(rpl::producer)canApplyMarkdown - controller:(not_null)controller -Submodule Telegram/ThirdParty/tgcalls contains modified content -diff --git a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoDecoderFactory.mm b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoDecoderFactory.mm -index b280c1b..a1ed0d2 100644 ---- a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoDecoderFactory.mm -+++ b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoDecoderFactory.mm -@@ -71,7 +71,7 @@ - if (@available(iOS 11.0, *)) { - [result addObject:h265Info]; - } --#else // WEBRTC_IOS -+#elif 0 // WEBRTC_IOS - if (@available(macOS 10.13, *)) { - [result addObject:h265Info]; - } -@@ -101,7 +101,7 @@ - return [[TGRTCVideoDecoderH265 alloc] init]; - } - } --#else // WEBRTC_IOS -+#elif 0 // WEBRTC_IOS - if (@available(macOS 10.13, *)) { - if ([info.name isEqualToString:kRTCVideoCodecH265Name]) { - return [[TGRTCVideoDecoderH265 alloc] init]; -diff --git a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoEncoderFactory.mm b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoEncoderFactory.mm -index 9960607..f3659b3 100644 ---- a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoEncoderFactory.mm -+++ b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoEncoderFactory.mm -@@ -89,7 +89,7 @@ - [result addObject:h265Info]; - } - } --#else // WEBRTC_IOS -+#elif 0 // WEBRTC_IOS - if (@available(macOS 10.13, *)) { - if ([[AVAssetExportSession allExportPresets] containsObject:AVAssetExportPresetHEVCHighestQuality]) { - [result addObject:h265Info]; -@@ -129,7 +129,7 @@ - return [[TGRTCVideoEncoderH265 alloc] initWithCodecInfo:info]; - } - } --#else // WEBRTC_IOS -+#elif 0 // WEBRTC_IOS - if (@available(macOS 10.13, *)) { - if ([info.name isEqualToString:kRTCVideoCodecH265Name]) { - return [[TGRTCVideoEncoderH265 alloc] initWithCodecInfo:info]; -diff --git a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoCameraCapturerMac.mm b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoCameraCapturerMac.mm -index bf99063..b717645 100644 ---- a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoCameraCapturerMac.mm -+++ b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoCameraCapturerMac.mm -@@ -507,8 +507,7 @@ static tgcalls::DarwinVideoTrackSource *getObjCVideoSource(const rtc::scoped_ref - - (void)captureOutput:(AVCaptureOutput *)captureOutput - didDropSampleBuffer:(CMSampleBufferRef)sampleBuffer - fromConnection:(AVCaptureConnection *)connection { -- NSString *droppedReason = -- (__bridge NSString *)CMGetAttachment(sampleBuffer, kCMSampleBufferAttachmentKey_DroppedFrameReason, nil); -+ NSString *droppedReason = nil; - RTCLogError(@"Dropped sample buffer. Reason: %@", droppedReason); - } - -@@ -682,7 +681,7 @@ static tgcalls::DarwinVideoTrackSource *getObjCVideoSource(const rtc::scoped_ref - int closest = -1; - CMTime result; - for (int i = 0; i < format.videoSupportedFrameRateRanges.count; i++) { -- const auto rateRange = format.videoSupportedFrameRateRanges[i]; -+ const AVFrameRateRange *rateRange = format.videoSupportedFrameRateRanges[i]; - int gap = abs(rateRange.minFrameRate - target); - if (gap <= closest || closest == -1) { - closest = gap; -diff --git a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoMetalViewMac.mm b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoMetalViewMac.mm -index 4ef8630..3fc753c 100644 ---- a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoMetalViewMac.mm -+++ b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoMetalViewMac.mm -@@ -243,9 +243,11 @@ private: - layer.framebufferOnly = true; - layer.opaque = false; - // layer.cornerRadius = 4; -+#if 0 - if (@available(macOS 10.13, *)) { - layer.displaySyncEnabled = NO; - } -+#endif - // layer.presentsWithTransaction = YES; - layer.backgroundColor = [NSColor clearColor].CGColor; - layer.contentsGravity = kCAGravityResizeAspectFill; -@@ -332,9 +334,7 @@ private: - - (RTCVideoRotation)rtcFrameRotation { - if (_rotationOverride) { - RTCVideoRotation rotation; -- if (@available(macOS 10.13, *)) { -- [_rotationOverride getValue:&rotation size:sizeof(rotation)]; -- } else { -+ { - [_rotationOverride getValue:&rotation]; - } - return rotation; -Submodule Telegram/lib_base contains modified content -diff --git a/Telegram/lib_base/base/platform/mac/base_global_shortcuts_mac.mm b/Telegram/lib_base/base/platform/mac/base_global_shortcuts_mac.mm -index 5491702..32befc6 100644 ---- a/Telegram/lib_base/base/platform/mac/base_global_shortcuts_mac.mm -+++ b/Telegram/lib_base/base/platform/mac/base_global_shortcuts_mac.mm -@@ -128,6 +128,7 @@ bool Available() { - } - - bool Allowed() { -+#if 0 - if (@available(macOS 10.15, *)) { - // Input Monitoring is required on macOS 10.15 an later. - // Even if user grants access, restart is required. -@@ -141,6 +142,7 @@ bool Allowed() { - return AXIsProcessTrustedWithOptions( - (__bridge CFDictionaryRef)options); - } -+#endif - return true; - } - -diff --git a/Telegram/lib_base/base/platform/mac/base_info_mac.mm b/Telegram/lib_base/base/platform/mac/base_info_mac.mm -index f1f259a..6629eb6 100644 ---- a/Telegram/lib_base/base/platform/mac/base_info_mac.mm -+++ b/Telegram/lib_base/base/platform/mac/base_info_mac.mm -@@ -226,16 +226,20 @@ void Finish() { - } - - void OpenInputMonitoringPrivacySettings() { -+#if 0 - if (@available(macOS 10.15, *)) { - IOHIDRequestAccess(kIOHIDRequestTypeListenEvent); - } -+#endif - [[NSWorkspace sharedWorkspace] openURL:PrivacySettingsUrl("Privacy_ListenEvent")]; - } - - void OpenDesktopCapturePrivacySettings() { -+#if 0 - if (@available(macOS 11.0, *)) { - CGRequestScreenCaptureAccess(); - } -+#endif - [[NSWorkspace sharedWorkspace] openURL:PrivacySettingsUrl("Privacy_ScreenCapture")]; - } - -diff --git a/Telegram/lib_base/base/platform/mac/base_system_media_controls_mac.mm b/Telegram/lib_base/base/platform/mac/base_system_media_controls_mac.mm -index 6102705..8981239 100644 ---- a/Telegram/lib_base/base/platform/mac/base_system_media_controls_mac.mm -+++ b/Telegram/lib_base/base/platform/mac/base_system_media_controls_mac.mm -@@ -277,6 +277,7 @@ void SystemMediaControls::setThumbnail(const QImage &thumbnail) { - if (thumbnail.isNull()) { - return; - } -+#if 0 - if (@available(macOS 10.13.2, *)) { - const auto copy = thumbnail; - [_private->info -@@ -290,6 +291,7 @@ void SystemMediaControls::setThumbnail(const QImage &thumbnail) { - forKey:MPMediaItemPropertyArtwork]; - updateDisplay(); - } -+#endif - } - - void SystemMediaControls::setDuration(int duration) { -@@ -308,10 +310,12 @@ void SystemMediaControls::setVolume(float64 volume) { - } - - void SystemMediaControls::clearThumbnail() { -+#if 0 - if (@available(macOS 10.13.2, *)) { - [_private->info removeObjectForKey:MPMediaItemPropertyArtwork]; - updateDisplay(); - } -+#endif - } - - void SystemMediaControls::clearMetadata() { -@@ -373,9 +377,11 @@ bool SystemMediaControls::volumeSupported() const { - } - - bool SystemMediaControls::Supported() { -+#if 0 - if (@available(macOS 10.12.2, *)) { - return true; - } -+#endif - return false; - } - -Submodule Telegram/lib_webrtc contains modified content -diff --git a/Telegram/lib_webrtc/webrtc/mac/webrtc_media_devices_mac.mm b/Telegram/lib_webrtc/webrtc/mac/webrtc_media_devices_mac.mm -index 21e93f7..10a3890 100644 ---- a/Telegram/lib_webrtc/webrtc/mac/webrtc_media_devices_mac.mm -+++ b/Telegram/lib_webrtc/webrtc/mac/webrtc_media_devices_mac.mm -@@ -397,6 +397,7 @@ void MacMediaDevices::videoInputRefreshed() { - } - - bool MacDesktopCaptureAllowed() { -+#if 0 - if (@available(macOS 11.0, *)) { - // Screen Recording is required on macOS 10.15 an later. - // Even if user grants access, restart is required. -@@ -421,6 +422,7 @@ bool MacDesktopCaptureAllowed() { - CFRelease(stream); - return true; - } -+#endif - return true; - } - diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt-10.12-sdk.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt-10.12-sdk.patch deleted file mode 100644 index af1d47a3b44e..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt-10.12-sdk.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/src/rtc_base/async_resolver.cc b/src/rtc_base/async_resolver.cc -index ad1598f2..fe9c3832 100644 ---- a/src/rtc_base/async_resolver.cc -+++ b/src/rtc_base/async_resolver.cc -@@ -57,7 +57,7 @@ void GlobalGcdRunTask(void* context) { - - // Post a task into the system-defined global concurrent queue. - void PostTaskToGlobalQueue(std::unique_ptr task) { -- dispatch_queue_global_t global_queue = -+ dispatch_queue_t global_queue = - dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0); - webrtc::QueuedTask* context = task.release(); - dispatch_async_f(global_queue, context, &GlobalGcdRunTask); -diff --git a/src/rtc_base/system/gcd_helpers.m b/src/rtc_base/system/gcd_helpers.m -index fd9a361f..3a63be6d 100644 ---- a/src/rtc_base/system/gcd_helpers.m -+++ b/src/rtc_base/system/gcd_helpers.m -@@ -13,9 +13,6 @@ - dispatch_queue_t RTCDispatchQueueCreateWithTarget(const char *label, - dispatch_queue_attr_t attr, - dispatch_queue_t target) { -- if (@available(iOS 10, macOS 10.12, tvOS 10, watchOS 3, *)) { -- return dispatch_queue_create_with_target(label, attr, target); -- } - dispatch_queue_t queue = dispatch_queue_create(label, attr); - dispatch_set_target_queue(queue, target); - return queue; -diff --git a/src/sdk/objc/components/video_codec/nalu_rewriter.cc b/src/sdk/objc/components/video_codec/nalu_rewriter.cc -index 1121c921..f21926b0 100644 ---- a/src/sdk/objc/components/video_codec/nalu_rewriter.cc -+++ b/src/sdk/objc/components/video_codec/nalu_rewriter.cc -@@ -242,10 +242,7 @@ bool H265CMSampleBufferToAnnexBBuffer( - int nalu_header_size = 0; - size_t param_set_count = 0; - OSStatus status = noErr; -- if (__builtin_available(macOS 10.13, *)) { -- status = CMVideoFormatDescriptionGetHEVCParameterSetAtIndex( -- description, 0, nullptr, nullptr, ¶m_set_count, &nalu_header_size); -- } else { -+ { - RTC_LOG(LS_ERROR) << "Not supported."; - return false; - } -@@ -268,10 +265,7 @@ bool H265CMSampleBufferToAnnexBBuffer( - size_t param_set_size = 0; - const uint8_t* param_set = nullptr; - for (size_t i = 0; i < param_set_count; ++i) { -- if (__builtin_available(macOS 10.13, *)) { -- status = CMVideoFormatDescriptionGetHEVCParameterSetAtIndex( -- description, i, ¶m_set, ¶m_set_size, nullptr, nullptr); -- } else { -+ { - RTC_LOG(LS_ERROR) << "Not supported."; - return false; - } -@@ -501,11 +495,7 @@ CMVideoFormatDescriptionRef CreateH265VideoFormatDescription( - // Parse the SPS and PPS into a CMVideoFormatDescription. - CMVideoFormatDescriptionRef description = nullptr; - OSStatus status = noErr; -- if (__builtin_available(macOS 10.13, *)) { -- status = CMVideoFormatDescriptionCreateFromHEVCParameterSets( -- kCFAllocatorDefault, 3, param_set_ptrs, param_set_sizes, 4, nullptr, -- &description); -- } else { -+ { - RTC_LOG(LS_ERROR) << "Not supported."; - return nullptr; - } diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix index e171622616ae..7346d2071e76 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -56,11 +56,6 @@ stdenv.mkDerivation { fetchSubmodules = true; }; - patches = [ - # let it build with nixpkgs 10.12 sdk - ./tg_owt-10.12-sdk.patch - ]; - postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace src/modules/desktop_capture/linux/egl_dmabuf.cc \ --replace '"libEGL.so.1"' '"${libGL}/lib/libEGL.so.1"' \ @@ -115,9 +110,6 @@ stdenv.mkDerivation { ApplicationServices ]; - # https://github.com/NixOS/nixpkgs/issues/130963 - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lc++abi"; - enableParallelBuilding = true; meta.license = lib.licenses.bsd3; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07515b4087ce..b83d508af6fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30316,14 +30316,14 @@ with pkgs; kooha = callPackage ../applications/video/kooha { }; kotatogram-desktop = libsForQt5.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { - inherit (darwin.apple_sdk.frameworks) Cocoa CoreFoundation CoreServices CoreText CoreGraphics + inherit (darwin.apple_sdk_11_0.frameworks) Cocoa CoreFoundation CoreServices CoreText CoreGraphics CoreMedia OpenGL AudioUnit ApplicationServices Foundation AGL Security SystemConfiguration Carbon AudioToolbox VideoToolbox VideoDecodeAcceleration AVFoundation CoreAudio CoreVideo CoreMediaIO QuartzCore AppKit CoreWLAN WebKit IOKit GSS MediaPlayer IOSurface Metal MetalKit; - # C++20 is required, darwin has Clang 7 by default, aarch64 has gcc 9 by default + # C++20 is required, aarch64 has gcc 9 by default stdenv = if stdenv.isDarwin - then llvmPackages_12.stdenv + then darwin.apple_sdk_11_0.stdenv else if stdenv.isAarch64 then gcc10Stdenv else stdenv; # tdesktop has random crashes when jemalloc is built with gcc. From 3a62853dfe2618d9a7501ae63cb28c3700f08314 Mon Sep 17 00:00:00 2001 From: Mislav Zanic Date: Thu, 19 Jan 2023 15:58:42 +0100 Subject: [PATCH 45/74] terminal-stocks: init at 1.0.14 --- .../misc/terminal-stocks/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/misc/terminal-stocks/default.nix diff --git a/pkgs/applications/misc/terminal-stocks/default.nix b/pkgs/applications/misc/terminal-stocks/default.nix new file mode 100644 index 000000000000..b1d4c67ac89b --- /dev/null +++ b/pkgs/applications/misc/terminal-stocks/default.nix @@ -0,0 +1,25 @@ +{ lib, buildNpmPackage, fetchFromGitHub, nix-update-script }: + +buildNpmPackage rec { + pname = "terminal-stocks"; + version = "1.0.14"; + + src = fetchFromGitHub { + owner = "shweshi"; + repo = pname; + rev = "v${version}"; + hash = "sha256-AzLMqp5t9u1ne+xCKp0dq/3V3DKJ1Ou9riAN+KqkStg="; + }; + + npmDepsHash = "sha256-GOg6B8BWkWegxeYmlHSJjFNrb/frb6jdzjjNSGF38Zo="; + dontNpmBuild = true; + + passthru.updateScript = nix-update-script {}; + + meta = with lib; { + description = "Terminal based application that provides stock price information"; + homepage = "https://github.com/shweshi/terminal-stocks"; + maintainers = with maintainers; [ mislavzanic ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bd9165aca44..d8d25aa03516 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33062,6 +33062,8 @@ with pkgs; twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { }; + terminal-stocks = callPackage ../applications/misc/terminal-stocks { }; + terminal-typeracer = callPackage ../applications/misc/terminal-typeracer { inherit (darwin.apple_sdk.frameworks) Security; }; From d19bb2a22aa374a25ee787036be9598ce0090eec Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 19 Jan 2023 13:29:00 -0500 Subject: [PATCH 46/74] kubernetes-helm: enable fish completion --- pkgs/applications/networking/cluster/helm/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index a7508491a2da..60f6c3ddb5ea 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -37,7 +37,8 @@ buildGoModule rec { postInstall = '' $out/bin/helm completion bash > helm.bash $out/bin/helm completion zsh > helm.zsh - installShellCompletion helm.{bash,zsh} + $out/bin/helm completion fish > helm.fish + installShellCompletion helm.{bash,zsh,fish} ''; meta = with lib; { From 586a2865866baebf1eb54b2053ff7918aeeee0f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 19 Jan 2023 12:10:04 -0800 Subject: [PATCH 47/74] python310Packages.timezonefinder: update dependencies --- pkgs/development/python-modules/timezonefinder/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix index c747cac05c02..d5ad9696a427 100644 --- a/pkgs/development/python-modules/timezonefinder/default.nix +++ b/pkgs/development/python-modules/timezonefinder/default.nix @@ -1,12 +1,14 @@ { lib , buildPythonPackage , fetchFromGitHub +, cffi , h3 , numba , numpy , poetry-core , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -24,10 +26,13 @@ buildPythonPackage rec { }; nativeBuildInputs = [ + cffi poetry-core + setuptools ]; propagatedBuildInputs = [ + cffi h3 numpy ]; From bfbb8b3d3781471aac9dc716ce6001990fc25b0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 19 Jan 2023 12:11:03 -0800 Subject: [PATCH 48/74] python310Packages.timezonefinder: add meta.changelog --- pkgs/development/python-modules/timezonefinder/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix index d5ad9696a427..355fa0270c99 100644 --- a/pkgs/development/python-modules/timezonefinder/default.nix +++ b/pkgs/development/python-modules/timezonefinder/default.nix @@ -57,6 +57,7 @@ buildPythonPackage rec { ''; meta = with lib; { + changelog = "https://github.com/jannikmi/timezonefinder/blob/${version}/CHANGELOG.rst"; description = "Module for finding the timezone of any point on earth (coordinates) offline"; homepage = "https://github.com/MrMinimal64/timezonefinder"; license = licenses.mit; From a8480b03a3148ca79ad89b03ed30ae583453a02c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 22:02:20 +0000 Subject: [PATCH 49/74] klaus: 2.0.1 -> 2.0.2 --- pkgs/development/python-modules/klaus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/klaus/default.nix b/pkgs/development/python-modules/klaus/default.nix index ef5a5a7832e0..e20c83265471 100644 --- a/pkgs/development/python-modules/klaus/default.nix +++ b/pkgs/development/python-modules/klaus/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "klaus"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "jonashaag"; repo = pname; rev = version; - sha256 = "sha256-a0MbKjDqPSMakjmGS5gfaDaPegQpK4QA+ZdG7skd9QU="; + sha256 = "sha256-kQcza2beyekJhRT9RwSdMIkeyapcUDtjgkapK3rocvg="; }; prePatch = '' From 305cec3e7ed4899fada9fcebfbb14928fe3e07c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 23:00:26 +0000 Subject: [PATCH 50/74] git-trim: 0.4.2 -> 0.4.4 --- pkgs/applications/version-management/git-trim/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-trim/default.nix b/pkgs/applications/version-management/git-trim/default.nix index a20c750ade10..0ef5a678ee8e 100644 --- a/pkgs/applications/version-management/git-trim/default.nix +++ b/pkgs/applications/version-management/git-trim/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-trim"; - version = "0.4.2"; + version = "0.4.4"; src = fetchFromGitHub { owner = "foriequal0"; repo = pname; rev = "v${version}"; - sha256 = "1rb9dhj7b7mjrhsvm9vw5gzjfxj10idnzv488jkfdz7sfhd3fcvz"; + sha256 = "sha256-XAO3Qg5I2lYZVNx4+Z5jKHRIFdNwBJsUQwJXFb4CbvM="; }; - cargoSha256 = "1gy77c1cnm2qpgf0fr03alvxi3936x36c032865a6ch8bzns7k5v"; + cargoHash = "sha256-KCLMb8NXxjscrmKXkP/RbV+LsJqOG7zaClJGFiQ4o9k="; nativeBuildInputs = [ pkg-config ]; From 3526abb3e144d0e08ef72da972b1a641b9e4c7d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 02:34:01 +0000 Subject: [PATCH 51/74] python310Packages.flake8-bugbear: 22.12.6 -> 23.1.17 --- pkgs/development/python-modules/flake8-bugbear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flake8-bugbear/default.nix b/pkgs/development/python-modules/flake8-bugbear/default.nix index d1abca2b6e53..0f6e27e637a6 100644 --- a/pkgs/development/python-modules/flake8-bugbear/default.nix +++ b/pkgs/development/python-modules/flake8-bugbear/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "flake8-bugbear"; - version = "22.12.6"; + version = "23.1.17"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-/XV0dwCkp1kOrXepEaPPEWefBphGB6rQPeTWmo3cHPY="; + hash = "sha256-XfHBQWtx8Chf23U6oxOl9yUsoenxWE3EYV0/edJobAM="; }; propagatedBuildInputs = [ From f47d1ee9afd472cd89006d67600a7623b8bf124e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 05:49:23 +0000 Subject: [PATCH 52/74] ddosify: 0.11.0 -> 0.12.0 --- pkgs/development/tools/ddosify/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ddosify/default.nix b/pkgs/development/tools/ddosify/default.nix index e84cd012fd37..43207e5a9c9d 100644 --- a/pkgs/development/tools/ddosify/default.nix +++ b/pkgs/development/tools/ddosify/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ddosify"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-fIY9nOMEauMalGj6DiRNf/ov4RSzpe96cem0IgiStNY="; + sha256 = "sha256-peqLeZ8RxkvaqUER2FBQeTdy1AQ/+Bcz9gGOGz1CACc="; }; - vendorSha256 = "sha256-rBSS7NUFA2ErWAKimlJzljdwUh1/g3zsmkPLzotJ7VI="; + vendorHash = "sha256-3y5ppTtvGqwWhgnVBpP4gf26DHKPnSNYK4jfhBiYDwY="; ldflags = [ "-s" "-w" From 5c0d5541111b556c7985f8e7e02037a3723dc46b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Jan 2023 22:02:38 -0800 Subject: [PATCH 53/74] mdbook-mermaid: 0.12.1 -> 0.12.6 --- pkgs/tools/text/mdbook-mermaid/default.nix | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/text/mdbook-mermaid/default.nix b/pkgs/tools/text/mdbook-mermaid/default.nix index 222c3ddf9365..9ca9669fa201 100644 --- a/pkgs/tools/text/mdbook-mermaid/default.nix +++ b/pkgs/tools/text/mdbook-mermaid/default.nix @@ -1,24 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }: +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, CoreServices +}: rustPlatform.buildRustPackage rec { pname = "mdbook-mermaid"; - version = "0.12.1"; + version = "0.12.6"; src = fetchFromGitHub { owner = "badboy"; repo = pname; - rev = "v${version}"; - hash = "sha256-22JmV4cFfUTwiweQP0Em2VbqmTUui2yWnbhKagprQ4Q="; + rev = "refs/tags/v${version}"; + hash = "sha256-1mSSnAfsg9AEnDAgINrSLIeu9O2vLqchZPSH12cjATk="; }; - cargoHash = "sha256-tztzmfWOtqFGWERMWgBSAqvT+hKfhBWL9KW4awixXk0="; + cargoHash = "sha256-9PMBHVpf8bDuSIYKrIFZjmBE2icejPTML+hhZ4DLq/Y="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.isDarwin [ + CoreServices + ]; meta = with lib; { description = "A preprocessor for mdbook to add mermaid.js support"; homepage = "https://github.com/badboy/mdbook-mermaid"; - license = [ licenses.mpl20 ]; + changelog = "https://github.com/badboy/mdbook-mermaid/blob/v${version}/CHANGELOG.md"; + license = licenses.mpl20; maintainers = with maintainers; [ xrelkd ]; }; } From 899efc4b921afb20166e10d1c6ada644321f03be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 01:27:47 +0000 Subject: [PATCH 54/74] unpackerr: 0.10.1 -> 0.11.1 --- pkgs/servers/unpackerr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/unpackerr/default.nix b/pkgs/servers/unpackerr/default.nix index 569a814d222b..5e17bd750e70 100644 --- a/pkgs/servers/unpackerr/default.nix +++ b/pkgs/servers/unpackerr/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "unpackerr"; - version = "0.10.1"; + version = "0.11.1"; src = fetchFromGitHub { owner = "davidnewhall"; repo = "unpackerr"; rev = "v${version}"; - sha256 = "sha256-GcuVFLqMDZo4fm/WspEMyoaYKu7g+HMXXrsvRYS+cAs="; + sha256 = "sha256-qoaJYCJoN8RcOM7Bk2zwNYqnKXB/GAlt29VZjY/MchU="; }; - vendorSha256 = "sha256-xoIqhkPOwlBzgaqejU3efK77EcjgvgLKCUZq1bmyokU="; + vendorHash = "sha256-ArWeVNFHM37bmFFLNzqpXKmK9/DUi7+ZsRHpuLNfL0A="; buildInputs = lib.optionals stdenv.isDarwin [ Cocoa WebKit ]; From af036885aa5a69527b1b45aa04e7f4adcb29803f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 05:47:17 +0000 Subject: [PATCH 55/74] chamber: 2.11.0 -> 2.11.1 --- pkgs/tools/admin/chamber/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/chamber/default.nix b/pkgs/tools/admin/chamber/default.nix index 96934ba366bf..c1cbadeaa5ff 100644 --- a/pkgs/tools/admin/chamber/default.nix +++ b/pkgs/tools/admin/chamber/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "chamber"; - version = "2.11.0"; + version = "2.11.1"; src = fetchFromGitHub { owner = "segmentio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QoFdcPfwbcX8rVqX5yHg0B7sIAKE3iLWzwLV991t7a0="; + sha256 = "sha256-0SiHJ86fW4QahIBfcFD7FJONbN4ImYyF7yqw3URmcd8="; }; CGO_ENABLED = 0; - vendorSha256 = "sha256-ENsKm3D3URCrRUiqqebkgFS//2h9SlLbAQHdjisdGlE="; + vendorHash = "sha256-ENsKm3D3URCrRUiqqebkgFS//2h9SlLbAQHdjisdGlE="; ldflags = [ "-s" "-w" "-X main.Version=v${version}" ]; From 94f05c26057978eac06daf3919a4591cbf8e5e86 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Fri, 20 Jan 2023 07:09:29 +0100 Subject: [PATCH 56/74] sage: backport intermittent test fix --- pkgs/applications/science/math/sage/sage-src.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index a8cd49819fb1..d68a2c8a107a 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -89,6 +89,14 @@ stdenv.mkDerivation rec { # To help debug the transient error in # https://trac.sagemath.org/ticket/23087 when it next occurs. ./patches/configurationpy-error-verbose.patch + + # https://trac.sagemath.org/ticket/33907 + (fetchSageDiff { + name = "interfaces-expectpy-intermittent.patch"; + base = "9.8.beta6"; + rev = "6f5c1c2fc8bcfb5e6555716d05ce70511795ffa1"; + sha256 = "sha256-z8FQxtrk62MHzPjrUTad+fMAE6XV8GTsLWKgGOM3zBg="; + }) ]; # Patches needed because of package updates. We could just pin the versions of From 3c0bdfb5391aa18ac5a65914c08e0ed9097bae14 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 06:39:59 +0000 Subject: [PATCH 57/74] zinc: 0.3.5 -> 0.3.6 --- pkgs/servers/search/zinc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/search/zinc/default.nix b/pkgs/servers/search/zinc/default.nix index 464960fad5dd..3c844ee5eb8f 100644 --- a/pkgs/servers/search/zinc/default.nix +++ b/pkgs/servers/search/zinc/default.nix @@ -4,12 +4,12 @@ , buildNpmPackage }: let - version = "0.3.5"; + version = "0.3.6"; src = fetchFromGitHub { owner = "zinclabs"; repo = "zinc"; rev = "v${version}"; - sha256 = "sha256-qu3foI5Rnt2sf+B+roJOwUNvOfawKmcKq7UrmviQsHA="; + sha256 = "sha256-7pPVX/jdHN7EMss6/uRZqJO+zDfDLZv/iG5iboB+s64="; }; webui = buildNpmPackage { @@ -36,7 +36,7 @@ buildGoModule rec { cp -r ${webui}/share/zinc-ui web/dist ''; - vendorSha256 = "sha256-akjb0cxHbITKS26c+7lVSHWO/KRoQVVKzAOra+tdAD8="; + vendorHash = "sha256-akjb0cxHbITKS26c+7lVSHWO/KRoQVVKzAOra+tdAD8="; subPackages = [ "cmd/zinc" ]; CGO_ENABLED = 0; From 94d3d94a57cfa9077500116e7bf72174f1b563b6 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 20 Jan 2023 14:13:08 +0800 Subject: [PATCH 58/74] vsmtp: fix build --- pkgs/servers/mail/vsmtp/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/servers/mail/vsmtp/default.nix b/pkgs/servers/mail/vsmtp/default.nix index f9b595ec8f9e..521e6dafd834 100644 --- a/pkgs/servers/mail/vsmtp/default.nix +++ b/pkgs/servers/mail/vsmtp/default.nix @@ -1,6 +1,7 @@ { lib , rustPlatform , fetchFromGitHub +, fetchpatch , installShellFiles , testers , vsmtp @@ -17,6 +18,16 @@ rustPlatform.buildRustPackage rec { hash = "sha256-uyu2NpHFDqJDcfQukG6TdRH7KuZnrYTULvLiABdvAog="; }; + patches = [ + # https://github.com/viridIT/vSMTP/pull/952 + # treewide: set GIT_HASH to unknown if git rev-parse HEAD fails + (fetchpatch { + url = "https://github.com/viridIT/vSMTP/commit/0ac4820c079e459f515825dfb451980119eaae9e.patch"; + includes = [ "src/vsmtp/vsmtp-core/build.rs" "src/vqueue/build.rs" ]; + hash = "sha256-kGjXsVokP6039rksaxw1EM/0zOlKIus1EaIEsFJvLE8="; + }) + ]; + cargoHash = "sha256-A0Q6ciZJL13VzJgZIWZalrRElSNGHUN/9b8Csj4Tdak="; nativeBuildInputs = [ installShellFiles ]; From d1a7d1769beab676796dbf2669ec2face1816844 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 02:18:59 +0000 Subject: [PATCH 59/74] infracost: 0.10.15 -> 0.10.16 --- pkgs/tools/misc/infracost/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix index 95088e00c9ab..f4629f4867fd 100644 --- a/pkgs/tools/misc/infracost/default.nix +++ b/pkgs/tools/misc/infracost/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "infracost"; - version = "0.10.15"; + version = "0.10.16"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-Ddw778u1qSNRKaf3Yvn0HXBag/ji7yTlGbx7FP8CUas="; + sha256 = "sha256-HvDUL6hrWLJtwPA2gPiCLVmNA+O29+bIAMNNgBHu+XA="; }; - vendorSha256 = "sha256-S51NwHeJm3gSJ+9r8RgGY3zHJFddI8uNfYSpQl33M3M="; + vendorHash = "sha256-S51NwHeJm3gSJ+9r8RgGY3zHJFddI8uNfYSpQl33M3M="; ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ]; From b3bf6dc11212f56e9ad5bd6ab73f9ae940620e37 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 20 Jan 2023 14:17:34 +0800 Subject: [PATCH 60/74] python3Packages.cryptg: fix build on darwin --- pkgs/development/python-modules/cryptg/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/cryptg/default.nix b/pkgs/development/python-modules/cryptg/default.nix index 3d321a0a41c2..ab5996351996 100644 --- a/pkgs/development/python-modules/cryptg/default.nix +++ b/pkgs/development/python-modules/cryptg/default.nix @@ -1,9 +1,11 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , pythonOlder , rustPlatform , setuptools-rust +, libiconv }: buildPythonPackage rec { @@ -32,6 +34,10 @@ buildPythonPackage rec { rust.cargo ]; + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + ]; + # has no tests doCheck = false; From d949e698241675e47c0500c4b3844729351548f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 01:59:37 +0000 Subject: [PATCH 61/74] strawberry: 1.0.13 -> 1.0.14 --- pkgs/applications/audio/strawberry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index e6dc8e13a715..eeed1e1837cd 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation rec { pname = "strawberry"; - version = "1.0.13"; + version = "1.0.14"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - hash = "sha256-szvCI1olC7GccJUGwR2Cx+FNGvfxeESsiSwWPTXWbc0="; + hash = "sha256-ThfycS5yNpp6+mE33qPqEWlhSB3OIF7d/t2XvI+rF2E="; }; # the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead From 71aab73352a716213aae0ab11005fc0432f8df38 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 20 Jan 2023 03:15:55 +0000 Subject: [PATCH 62/74] =?UTF-8?q?terraform-providers.alicloud:=201.196.0?= =?UTF-8?q?=20=E2=86=92=201.197.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index bb84ad69104c..3ff472a97cbb 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -48,11 +48,11 @@ "vendorHash": "sha256-pz+h8vbdCEgNSH9AoPlIP7zprViAMawXk64SV0wnVPo=" }, "alicloud": { - "hash": "sha256-OXgvI9NbZLvCrXEMW6FcJsGmM5VUgRGCbrWuRAOeDbY=", + "hash": "sha256-sG241dMkFL9YllVGuQ7KlZ8Ta3hz9v8VdyOOcjOKie0=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.196.0", + "rev": "v1.197.0", "spdx": "MPL-2.0", "vendorHash": null }, From 2a4408cdb40673cf5abf97c9cad218e2ab398040 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 20 Jan 2023 03:17:26 +0000 Subject: [PATCH 63/74] =?UTF-8?q?terraform-providers.azuread:=202.32.0=20?= =?UTF-8?q?=E2=86=92=202.33.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3ff472a97cbb..92ce9687c422 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -121,11 +121,11 @@ "vendorHash": "sha256-OhBrq6zHGBQYTXOxGih0O1udv9Rb1vcRBqD/zomKHww=" }, "azuread": { - "hash": "sha256-N+ty5O7sJbCp/rdQrwytOHzPFkaIvT5+1pOcoBQF1aw=", + "hash": "sha256-Byr6AJ1kP6fBxBCD8vLxQD5tz8fI3Z1fcCa0rXS9rhs=", "homepage": "https://registry.terraform.io/providers/hashicorp/azuread", "owner": "hashicorp", "repo": "terraform-provider-azuread", - "rev": "v2.32.0", + "rev": "v2.33.0", "spdx": "MPL-2.0", "vendorHash": null }, From f191ad0f3e49d7c9c3591a181ddc482ebe952d62 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 20 Jan 2023 03:23:46 +0000 Subject: [PATCH 64/74] =?UTF-8?q?terraform-providers.newrelic:=203.12.0=20?= =?UTF-8?q?=E2=86=92=203.13.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 92ce9687c422..34db49aa8baa 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -770,11 +770,11 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-l5jVkMTqlTJmXn3HZmwhUl96gdFK5FXiTdm9UfRLbPQ=", + "hash": "sha256-lWjXsIeYpe07+kIHr8qS8SmChs0tnfzxWy/K1KNJ5oo=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.12.0", + "rev": "v3.13.0", "spdx": "MPL-2.0", "vendorHash": "sha256-Ptjd4A/P2pZL5wP8IGHN385jngfS56w7FN1g/EpknRw=" }, From c0776f77e141ae834932b5bfb0b97b087ed1b64d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 20 Jan 2023 03:26:48 +0000 Subject: [PATCH 65/74] =?UTF-8?q?terraform-providers.sentry:=200.11.1=20?= =?UTF-8?q?=E2=86=92=200.11.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 34db49aa8baa..ce9b8107e438 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -996,11 +996,11 @@ "vendorHash": "sha256-0UOC70RWcEb/YqPrrc7k+dY7jBuTZLWvUTNxuUZIyu4=" }, "sentry": { - "hash": "sha256-RJ0PtrV/0ASYnHM53J6pyP/xaerotcFSvdDQeCYp5l0=", + "hash": "sha256-L/aZ4/xCVZk3C6AGglzCj5T9XnoI/uiLbRASNAHwcro=", "homepage": "https://registry.terraform.io/providers/jianyuan/sentry", "owner": "jianyuan", "repo": "terraform-provider-sentry", - "rev": "v0.11.1", + "rev": "v0.11.2", "spdx": "MIT", "vendorHash": "sha256-5XAetSjMtRffP/xExRUXfclDutEFV0VL3drusaB4rnM=" }, From 05277dd276dae0a056ce5d780fb6059aa1049ddf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 20 Jan 2023 03:28:14 +0000 Subject: [PATCH 66/74] =?UTF-8?q?terraform-providers.aws:=204.50.0=20?= =?UTF-8?q?=E2=86=92=204.51.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ce9b8107e438..c097ec8b7fc3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -112,13 +112,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-1ez/xzbFviTavUDfkCdI+s/r/NmaIMx+G8fiCTPAm9o=", + "hash": "sha256-J+x3D7EpV/Kzp98AuhK8pqR26xhItG+JyfkHKc+2IA0=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v4.50.0", + "rev": "v4.51.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-OhBrq6zHGBQYTXOxGih0O1udv9Rb1vcRBqD/zomKHww=" + "vendorHash": "sha256-iL03vDNHPQTAbTRoEutRtQllFgD1wn7qFleuZ4n99q8=" }, "azuread": { "hash": "sha256-Byr6AJ1kP6fBxBCD8vLxQD5tz8fI3Z1fcCa0rXS9rhs=", From bddd68ac46a93818f202765896d47e88126c6a97 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 20 Jan 2023 03:28:57 +0000 Subject: [PATCH 67/74] =?UTF-8?q?terraform-providers.spotinst:=201.94.0=20?= =?UTF-8?q?=E2=86=92=201.95.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c097ec8b7fc3..b934ba3cd247 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1050,13 +1050,13 @@ "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" }, "spotinst": { - "hash": "sha256-Hur+PXYDZpkh3tpF8WOCi0uBFAUFj9DDQag6VFT4PtA=", + "hash": "sha256-lRElAmLXm6SqZlxT6gD1HwhdjfGest1Bic7T1MCLAK4=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.94.0", + "rev": "v1.95.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-odKLOe7efrTfH4bi7AfbAODEqPJGI65id+FFQawJVok=" + "vendorHash": "sha256-vW+1tH+3bT70RrHOTKemM23e0EoX3AO5AMXOAuyyKPA=" }, "stackpath": { "hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=", From bb2b9506a3baf9d2dadcb4e59ba0094e1b46699f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 06:45:26 +0000 Subject: [PATCH 68/74] python310Packages.pyoctoprintapi: 0.1.10 -> 0.1.11 --- pkgs/development/python-modules/pyoctoprintapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyoctoprintapi/default.nix b/pkgs/development/python-modules/pyoctoprintapi/default.nix index af9a437e4c2a..4b75f3a5d491 100644 --- a/pkgs/development/python-modules/pyoctoprintapi/default.nix +++ b/pkgs/development/python-modules/pyoctoprintapi/default.nix @@ -12,7 +12,7 @@ let pname = "pyoctoprintapi"; - version = "0.1.10"; + version = "0.1.11"; in buildPythonPackage { inherit pname version; @@ -22,7 +22,7 @@ buildPythonPackage { owner = "rfleming71"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-aXT8BY7D7Tx3UG7Brfpk8yQv1opXQUsgJteNkBwHeYY="; + hash = "sha256-MlFL8yUCkiMnxPbMGr4jwCs0kYwRM+VGBRQUcQ5Hd6A="; }; propagatedBuildInputs = [ From 48a9628207806f57b563090ccb67088ff89f520c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 20 Jan 2023 14:52:30 +1000 Subject: [PATCH 69/74] kubernetes: 1.26.0 -> 1.26.1 https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.26.md#changelog-since-v1260 --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 5e89ce36d3a4..c1436fbefcc6 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -20,13 +20,13 @@ buildGoModule rec { pname = "kubernetes"; - version = "1.26.0"; + version = "1.26.1"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "sha256-tdt5F6KCsIPurkwG9acOHvm1tV2ERBNYtcvheJR+wLA="; + sha256 = "sha256-bC2Q4jWBh27bqLGhvG4JcuHIAQmiGz5jDt9Me9qbVpk="; }; vendorSha256 = null; From fdea32eab1a8cf44595ad0a70fadfea193762258 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 20 Jan 2023 09:19:49 +0100 Subject: [PATCH 70/74] python310Packages.pysoma: 0.0.12 -> 0.0.13 --- pkgs/development/python-modules/pysoma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysoma/default.nix b/pkgs/development/python-modules/pysoma/default.nix index d62afa646860..ebb87a4612a1 100644 --- a/pkgs/development/python-modules/pysoma/default.nix +++ b/pkgs/development/python-modules/pysoma/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "pysoma"; - version = "0.0.12"; + version = "0.0.13"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-me/A3BIAFJ8CxyiF5RvANdC/NbSYGmcjCFbpybkTxKM="; + hash = "sha256-1bS9zafuqxwcuqpM/AA3ZjNbFpxBNXtoHYFsQOWmLXQ="; }; # Project has no test From 4f6cc496ba5e8532fe5bdbe019ad7713422be622 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 20 Jan 2023 09:24:51 +0100 Subject: [PATCH 71/74] python310Packages.atenpdu: 0.4.0 -> 0.5.0 --- pkgs/development/python-modules/atenpdu/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/atenpdu/default.nix b/pkgs/development/python-modules/atenpdu/default.nix index e95e2811eda8..9726239e0609 100644 --- a/pkgs/development/python-modules/atenpdu/default.nix +++ b/pkgs/development/python-modules/atenpdu/default.nix @@ -2,25 +2,25 @@ , buildPythonPackage , fetchPypi , async-timeout -, pysnmp +, pysnmplib , pythonOlder }: buildPythonPackage rec { pname = "atenpdu"; - version = "0.4.0"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mn44nChWy6z/B+gLc3MDndkRb2+geoojT/4AqwKpLXM="; + hash = "sha256-uUi6NtiHt3wWU4hrC6RNVEDBcoBCgkpwKyePq1VxO0c="; }; propagatedBuildInputs = [ async-timeout - pysnmp + pysnmplib ]; # Project has no test From 5354b758193ce9f3e0ab933455f5e8e06db0243c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 20 Jan 2023 09:27:24 +0100 Subject: [PATCH 72/74] python310Packages.asysocks: 0.2.3 -> 0.2.5 Changelog: https://github.com/skelsec/asysocks/releases/tag/0.2.5 --- pkgs/development/python-modules/asysocks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asysocks/default.nix b/pkgs/development/python-modules/asysocks/default.nix index 863a2fd5417f..c8d8f6afbf9b 100644 --- a/pkgs/development/python-modules/asysocks/default.nix +++ b/pkgs/development/python-modules/asysocks/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "asysocks"; - version = "0.2.3"; + version = "0.2.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JHGkQmxt/29GRnVS/GLU1g5Yc+q6voKNOh3n3LfcfcY="; + hash = "sha256-A8m6WA1SjD5awRdHtXsZNaG5vzSrtH2C23lzA1FhWlo="; }; propagatedBuildInputs = [ From 9c1a01601f186bd9ecfbaaa476e450aa690cac6e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 20 Jan 2023 09:27:35 +0100 Subject: [PATCH 73/74] python310Packages.asyauth: 0.0.10 -> 0.0.11 Changelog: https://github.com/skelsec/asyauth/releases/tag/0.0.11 --- pkgs/development/python-modules/asyauth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyauth/default.nix b/pkgs/development/python-modules/asyauth/default.nix index 743c2a3bb448..3e157887f65d 100644 --- a/pkgs/development/python-modules/asyauth/default.nix +++ b/pkgs/development/python-modules/asyauth/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "asyauth"; - version = "0.0.10"; + version = "0.0.11"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-C8JoaQMQMtbu+spRuQEnFyUvTKVhnqcAVgRESsRO33k="; + hash = "sha256-KCG+SdAtpenwDf+5nA2+p8eKrWiJQSdiRyCU+lGf/1o="; }; propagatedBuildInputs = [ From 59a8503c6ce84cdeedf59146d870a605b900cee5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 20 Jan 2023 09:31:41 +0100 Subject: [PATCH 74/74] memray: 1.5.0 -> 1.6.0 Diff: https://github.com/bloomberg/memray/compare/refs/tags/v1.5.0...v1.6.0 Changelog: https://github.com/bloomberg/memray/releases/tag/v1.6.0 --- pkgs/development/tools/memray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/memray/default.nix b/pkgs/development/tools/memray/default.nix index ee62838dc8c3..0d4a9c6ccfbf 100644 --- a/pkgs/development/tools/memray/default.nix +++ b/pkgs/development/tools/memray/default.nix @@ -8,14 +8,14 @@ python3.pkgs.buildPythonApplication rec { pname = "memray"; - version = "1.5.0"; + version = "1.6.0"; format = "setuptools"; src = fetchFromGitHub { owner = "bloomberg"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BnsboMjlMDfDsqR3UU/bxQpyUaqCDuglaqwTPOF79Fc="; + hash = "sha256-iIbx8vK4xAFfTVO4oJ5ELNKn19Tw6LPgwEi6eFOA5yo="; }; nativeBuildInputs = [