Unverified Commit 7eefea6d authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #295077 from katexochen/go120/remove

parents de90a6c7 28e94c51
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -15,6 +15,13 @@ buildGoModule rec {

  subPackages = [ "." ];

  checkFlags = [
    # Test fails with:
    # 'x509_test.go:201: server did not report bad certificate error;
    # instead errored with [...] tls: unknown certificate authority (*url.Error)'
    "-skip=^TestUntrustedClientCert$"
  ];

  meta = {
    homepage = "https://decred.org";
    description = "A secure Decred wallet daemon written in Go (golang)";
+3 −1
Original line number Diff line number Diff line
@@ -36,8 +36,10 @@ buildGoModule rec {
  passthru.tests = { inherit (nixosTests) magnetico; };

  meta = with lib; {
    # Build fails with Go >=1.21, couldn't be fixed by updating module dependencies.
    broken = true;
    description  = "Autonomous (self-hosted) BitTorrent DHT search engine suite";
    homepage     = "https://github.com/boramalper/magnetico";
    homepage     = "https://github.com/ireun/magnetico";
    license      = licenses.agpl3;
    badPlatforms = platforms.darwin;
    maintainers  = with maintainers; [ rnhmjoj ];
+6 −0
Original line number Diff line number Diff line
@@ -36,6 +36,12 @@ buildGoModule rec {
  doCheck = false;

  meta = with lib; {
    # butler cannot be build with Go >=1.21
    # See https://github.com/itchio/butler/issues/256
    # and https://github.com/itchio/dmcunrar-go/issues/1
    # The dependency causing the issue is marked as 'no maintainence intended'.
    # Last butler release is from 05/2021.
    broken = true;
    description = "Command-line itch.io helper";
    homepage = "https://github.com/itchio/butler";
    license = licenses.mit;
+5 −5
Original line number Diff line number Diff line
{ lib
, buildGo120Module
, buildGoModule
, fetchFromGitHub
, substituteAll
, v2ray-domain-list-community
@@ -11,18 +11,18 @@ let
    geosite_data = "${v2ray-domain-list-community}/share/v2ray/geosite.dat";
  };
in
buildGo120Module {
buildGoModule {
  pname = "sing-geosite";
  inherit (v2ray-domain-list-community) version;

  src = fetchFromGitHub {
    owner = "SagerNet";
    repo = "sing-geosite";
    rev = "4a32d56c1705f77668beb5828df0b0a051efdeb9";
    hash = "sha256-P/EBcwJI2G9327BNi84R+q6BABx9DEKpN6ETTp8Q4NU=";
    rev = "bbd9f11bb9245463bf9d5614b74014fe5803b989";
    hash = "sha256-UQChYKgN5JZk+KZ2c5Ffh/rQi6/TVeFQkbH6mpLx4x8=";
  };

  vendorHash = "sha256-uQOmUXT2wd40DwwTCMnFFKd47eu+BPBDjiCGtUNFoKY=";
  vendorHash = "sha256-C6idJDUp6AFe50tQ+4mmZsxuOKH8JSeC1p7XVRZ224E=";

  patchPhase = ''
    sed -i -e '/func main()/,/^}/d' -e '/"io"/a "io/ioutil"' main.go
+6 −5
Original line number Diff line number Diff line
{ lib
, stdenvNoCC
, fetchpatch
, fetchFromGitHub
, pkgsBuildBuild
, jq
@@ -8,18 +9,18 @@
}:

let
  generator = pkgsBuildBuild.buildGo120Module {
  generator = pkgsBuildBuild.buildGoModule rec {
    pname = "v2ray-geoip";
    version = "unstable-2023-10-11";
    version = "202403140037";

    src = fetchFromGitHub {
      owner = "v2fly";
      repo = "geoip";
      rev = "3182dda7b38c900f28505b91a44b09ec486e6f36";
      hash = "sha256-KSRgof78jScwnUeMtryj34J0mBsM/x9hFE4H9WtZUuM=";
      rev = version;
      hash = "sha256-nqobjgeDvD5RYvCVVd14XC/tb/+SVfvdQUFZ3gfeDrI=";
    };

    vendorHash = "sha256-rlRazevKnWy/Ig143s8TZgV3JlQMlHID9rnncLYhQDc=";
    vendorHash = "sha256-cuKcrYAzjIt6Z4wYg5R6JeL413NDwTub2fZndXEKdTo=";

    meta = with lib; {
      description = "GeoIP for V2Ray";
Loading