diff --git a/flake.lock b/flake.lock index f6b6364..b2a007b 100644 --- a/flake.lock +++ b/flake.lock @@ -40,11 +40,11 @@ ] }, "locked": { - "lastModified": 1749158376, - "narHash": "sha256-uirStFNxauh0lxzBowcp28X+Sq7JgsBIDnbwbAfZwf8=", + "lastModified": 1752002763, + "narHash": "sha256-JYAkdZvpdSx9GUoHPArctYMypSONob4DYKRkOubUWtY=", "owner": "nlewo", "repo": "nix2container", - "rev": "0f8974c58755dba441df03598eefd1e1cd50e341", + "rev": "4f2437f6a1844b843b380d483087ae6d461240ee", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745804731, - "narHash": "sha256-v/sK3AS0QKu/Tu5sHIfddiEHCvrbNYPv8X10Fpux68g=", + "lastModified": 1753399495, + "narHash": "sha256-7XG/QBqhrYOyA2houjRTL2NMa7IKZZ/somBqr+Q/6Wo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "29335f23bea5e34228349ea739f31ee79e267b88", + "rev": "0d00f23f023b7215b3f1035adb5247c8ec180dbc", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 08700d5..7a93832 100644 --- a/flake.nix +++ b/flake.nix @@ -60,14 +60,14 @@ oapi-codegen nhost-cli skopeo - postgresql_14_17-client - postgresql_15_12-client - postgresql_16_8-client - postgresql_17_4-client - postgresql_14_17 - postgresql_15_12 - postgresql_16_8 - postgresql_17_4 + postgresql_14_18-client + postgresql_15_13-client + postgresql_16_9-client + postgresql_17_5-client + postgresql_14_18 + postgresql_15_13 + postgresql_16_9 + postgresql_17_5 ]; }; }; diff --git a/overlays/go.nix b/overlays/go.nix index a99e485..cda669d 100644 --- a/overlays/go.nix +++ b/overlays/go.nix @@ -1,41 +1,37 @@ final: prev: rec { go = prev.go_1_24.overrideAttrs (finalAttrs: previousAttrs: rec { - version = "1.24.4"; + version = "1.24.5"; src = final.fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - sha256 = "sha256-WoaoOjH5+oFJC4xUIKw4T9PZWj5x+6Zlx7P5XR3+8rQ="; + sha256 = "sha256-dP2wnyNS4rJbeUPlaDbJtHNj0o3sHItWxKlXDzC49Z8="; }; }); buildGoModule = prev.buildGoModule.override { go = go; }; - golangci-lint = prev.golangci-lint.override { - buildGo124Module = args: final.buildGo124Module (args // rec { - version = "1.64.8"; - src = prev.fetchFromGitHub { - owner = "golangci"; - repo = "golangci-lint"; - rev = "v${version}"; - sha256 = "sha256-H7IdXAleyzJeDFviISitAVDNJmiwrMysYcGm6vAoWso="; - }; - - vendorHash = "sha256-i7ec4U4xXmRvHbsDiuBjbQ0xP7xRuilky3gi+dT1H10="; - - ldflags = [ - "-s" - "-w" - "-X main.version=${version}" - "-X main.commit=v${version}" - "-X main.date=19700101-00:00:00" - ]; - }); - }; - - golines = final.buildGoModule { - name = "golines"; + golangci-lint = prev.golangci-lint.overrideAttrs (oldAttrs: rec { + version = "2.3.0"; + src = prev.fetchFromGitHub { + owner = "golangci"; + repo = "golangci-lint"; + rev = "v${version}"; + sha256 = "sha256-Kr4nkoqlCGyuaa4X1BLqe/WZA+ofYkWPizPMzcZQDQg="; + }; + vendorHash = "sha256-SsKypfsr1woHah9rIyFnUNdp0mTde7k++E2CfE22LK4="; + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + "-X main.commit=v${version}" + "-X main.date=19700101-00:00:00" + ]; + }); + + golines = final.buildGoModule rec { + pname = "golines"; version = "0.13.0-beta"; src = final.fetchFromGitHub { owner = "segmentio"; @@ -44,7 +40,6 @@ final: prev: rec { sha256 = "sha256-ZdCR4ZC1+Llyt/rcX0RGisM98u6rq9/ECUuHEMV+Kkc="; }; vendorHash = "sha256-mmdaHm3YL/2eB/r3Sskd9liljKAe3/c8T0z5KIUHeK0="; - meta = with final.lib; { description = "A golang formatter that fixes long lines"; homepage = "https://github.com/segmentio/golines"; @@ -53,8 +48,7 @@ final: prev: rec { }; }; - govulncheck = final.buildGoModule rec { - name = "govulncheck"; + govulncheck = prev.govulncheck.overrideAttrs (oldAttrs: rec { version = "v1.1.4"; src = final.fetchFromGitHub { owner = "golang"; @@ -63,59 +57,33 @@ final: prev: rec { sha256 = "sha256-d1JWh/K+65p0TP5vAQbSyoatjN4L5nm3VEA+qBSrkAA="; }; vendorHash = "sha256-MSTKDeWVxD2Fa6fNoku4EwFwC90XZ5acnM67crcgXDg="; - doCheck = false; + }); - meta = with final.lib; { - description = "the database client and tools for the Go vulnerability database"; - homepage = "https://github.com/golang/vuln"; - maintainers = [ "nhost" ]; - platforms = platforms.linux ++ platforms.darwin; - }; - }; - - gqlgen = final.buildGoModule rec { - pname = "gqlgen"; - version = "0.17.72"; - + gqlgen = prev.gqlgen.overrideAttrs (oldAttrs: rec { + version = "0.17.76"; src = final.fetchFromGitHub { owner = "99designs"; - repo = pname; + repo = "gqlgen"; rev = "v${version}"; - sha256 = "sha256-7jnUzU+6kHu9uU2dbxqV9FzDIrw1tTP03ecbQHcHoak="; + sha256 = "sha256-b226pRpO693e48OlzVwSaDlPM5RAivIoX/KHXESVEJI="; }; - - vendorHash = "sha256-Q9voEyziSlq9Ele4fz/obQS4ufapa4zK3cTd493XJgU="; - + vendorHash = "sha256-cqNRfKPneq4BxVA+kGAxSalwfeNI/hFxsrOgVhkUbLs="; doCheck = false; - - subPackages = [ "./." ]; - - meta = with final.lib; { - description = "go generate based graphql server library"; - homepage = "https://gqlgen.com"; - license = licenses.mit; - maintainers = [ "@nhost" ]; - }; - }; + }); gqlgenc = final.buildGoModule rec { pname = "gqlgenc"; - version = "0.32.0"; - + version = "0.33.0"; src = final.fetchFromGitHub { owner = "Yamashou"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3Qz1o91IPKjhzIYzKcdl456AWn6nsrcQ04VglBlpe54="; + sha256 = "sha256-SLFfLt41MAGcyHG/XVWehaXGknOJbWltVWG+IYUHCz8="; }; - - vendorHash = "sha256-Ax5MA4wqQdXSDEIkiG5TcvFIN6YtyXuiJOdQGPYIb+Y="; - + vendorHash = "sha256-Y2miO13zTW8VWA7vUbfQxTPbZvaaq+fNsKKNFw8iYJY="; doCheck = false; - subPackages = [ "./." ]; - meta = with final.lib; { description = "This is Go library for building GraphQL client with gqlgen"; homepage = "https://github.com/Yamashou/gqlgenc"; @@ -124,18 +92,14 @@ final: prev: rec { }; }; - oapi-codegen = prev.oapi-codegen.override { - buildGoModule = args: final.buildGoModule (args // rec { - version = "2.4.1"; - src = final.fetchFromGitHub { - owner = "oapi-codegen"; - repo = "oapi-codegen"; - rev = "v${version}"; - hash = "sha256-21VhHSyfF+NHkXlr2svjwBNZmfS1O448POBP9XUQxak="; - }; - - vendorHash = "sha256-bp5sFZNJFQonwfF1RjCnOMKZQkofHuqG0bXdG5Hf3jU="; - }); - }; - + oapi-codegen = prev.oapi-codegen.overrideAttrs (oldAttrs: rec { + version = "2.5.0"; + src = final.fetchFromGitHub { + owner = "oapi-codegen"; + repo = "oapi-codegen"; + rev = "v${version}"; + hash = "sha256-Z10rJMancQLefyW0wXWaODIKfSY+4b3T+TAro//xsAQ="; + }; + vendorHash = "sha256-obpY7ZATebI/7bkPMidC83xnN60P0lZsJhSuKr2A5T4="; + }); } diff --git a/overlays/postgres.nix b/overlays/postgres.nix index c32df1f..18a0c05 100644 --- a/overlays/postgres.nix +++ b/overlays/postgres.nix @@ -1,131 +1,108 @@ final: prev: rec { - postgresql_14_17 = prev.postgresql_14.overrideAttrs + postgresql_14_18 = prev.postgresql_14.overrideAttrs (finalAttrs: previousAttrs: rec { pname = "postgresql"; - version = "14.17"; - - withSystemdSupport = false; - - doCheck = false; - doInstallCheck = false; + version = "14.18"; src = final.fetchurl { url = "mirror://postgresql/source/v${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-bODM1kA79/Dy7d0zPi7pugLt+pd8ZmYO2bSxBX52MKE="; + hash = "sha256-g6sp1r/D3Fiy7TxmQRT9++tqBFDEuNf6aa7pHjyhT44="; }; + + doCheck = false; + doInstallCheck = false; }); - postgresql_14_17-client = final.stdenv.mkDerivation { + postgresql_14_18-client = final.stdenv.mkDerivation { pname = "postgresql-client"; - version = postgresql_14_17.version; - - buildInputs = [ postgresql_14_17 ]; + version = postgresql_14_18.version; phases = [ "installPhase" ]; installPhase = '' mkdir -p $out/bin - cp ${postgresql_14_17}/bin/psql $out/bin/ - cp ${postgresql_14_17}/bin/pg_dump $out/bin/ - cp ${postgresql_14_17}/bin/pg_dumpall $out/bin/ - cp ${postgresql_14_17}/bin/pg_restore $out/bin/ + cp ${postgresql_14_18}/bin/psql $out/bin/ + cp ${postgresql_14_18}/bin/pg_dump $out/bin/ + cp ${postgresql_14_18}/bin/pg_dumpall $out/bin/ + cp ${postgresql_14_18}/bin/pg_restore $out/bin/ ''; }; - postgresql_15_12 = prev.postgresql_15.overrideAttrs + postgresql_15_13 = prev.postgresql_15.overrideAttrs (finalAttrs: previousAttrs: rec { pname = "postgresql"; - version = "15.12"; - - withSystemdSupport = false; - - doCheck = false; - doInstallCheck = false; + version = "15.13"; src = final.fetchurl { url = "mirror://postgresql/source/v${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-O8hGKjjKCFcnDMiLlJo/Zlnw1cRMApxII1WDW2Gg9vc="; + hash = "sha256-T2LhM9IuoIoEAbCECSDiZphkTQGoDDQ0H7cy3QqQyl0="; }; }); - postgresql_15_12-client = final.stdenv.mkDerivation { + postgresql_15_13-client = final.stdenv.mkDerivation { pname = "postgresql-client"; - version = postgresql_15_12.version; - - buildInputs = [ postgresql_15_12 ]; + version = postgresql_15_13.version; phases = [ "installPhase" ]; installPhase = '' mkdir -p $out/bin - cp ${postgresql_15_12}/bin/psql $out/bin/ - cp ${postgresql_15_12}/bin/pg_dump $out/bin/ - cp ${postgresql_15_12}/bin/pg_dumpall $out/bin/ - cp ${postgresql_15_12}/bin/pg_restore $out/bin/ + cp ${postgresql_15_13}/bin/psql $out/bin/ + cp ${postgresql_15_13}/bin/pg_dump $out/bin/ + cp ${postgresql_15_13}/bin/pg_dumpall $out/bin/ + cp ${postgresql_15_13}/bin/pg_restore $out/bin/ ''; }; - postgresql_16_8 = prev.postgresql_16.overrideAttrs + postgresql_16_9 = prev.postgresql_16.overrideAttrs (finalAttrs: previousAttrs: rec { pname = "postgresql"; - version = "16.8"; - - withSystemdSupport = false; - - doCheck = false; - doInstallCheck = false; + version = "16.9"; src = final.fetchurl { url = "mirror://postgresql/source/v${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-lGgIOlbODufSlGAbdNrT3Z/GnYev9h8Kn7Y8gT/379g="; + hash = "sha256-B8APuCTfCgwpXySfRGkbhuMmZ1OzgMlvYzwzEeEL0AU="; }; }); - postgresql_16_8-client = final.stdenv.mkDerivation { + postgresql_16_9-client = final.stdenv.mkDerivation { pname = "postgresql-client"; - version = postgresql_16_8.version; - - buildInputs = [ postgresql_16_8 ]; + version = postgresql_16_9.version; phases = [ "installPhase" ]; installPhase = '' mkdir -p $out/bin - cp ${postgresql_16_8}/bin/psql $out/bin/ - cp ${postgresql_16_8}/bin/pg_dump $out/bin/ - cp ${postgresql_16_8}/bin/pg_dumpall $out/bin/ - cp ${postgresql_16_8}/bin/pg_restore $out/bin/ + cp ${postgresql_16_9}/bin/psql $out/bin/ + cp ${postgresql_16_9}/bin/pg_dump $out/bin/ + cp ${postgresql_16_9}/bin/pg_dumpall $out/bin/ + cp ${postgresql_16_9}/bin/pg_restore $out/bin/ ''; }; - postgresql_17_4 = prev.postgresql_17.overrideAttrs + postgresql_17_5 = prev.postgresql_17.overrideAttrs (finalAttrs: previousAttrs: rec { pname = "postgresql"; - version = "17.4"; - - withSystemdSupport = false; - doCheck = false; + version = "17.5"; src = final.fetchurl { url = "mirror://postgresql/source/v${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-xGBbc/6hGWNAZpn5Sblm5dFzp+4Myu+JON7AyoqZX+c="; + hash = "sha256-/LerOOI7Jk0ZAssl5q2vtFJabry9AVQ0ru+e2oD1KNg="; }; }); - postgresql_17_4-client = final.stdenv.mkDerivation { + postgresql_17_5-client = final.stdenv.mkDerivation { pname = "postgresql-client"; - version = postgresql_17_4.version; - - buildInputs = [ postgresql_17_4 ]; + version = postgresql_17_5.version; phases = [ "installPhase" ]; installPhase = '' mkdir -p $out/bin - cp ${postgresql_17_4}/bin/psql $out/bin/ - cp ${postgresql_17_4}/bin/pg_dump $out/bin/ - cp ${postgresql_17_4}/bin/pg_dumpall $out/bin/ - cp ${postgresql_17_4}/bin/pg_restore $out/bin/ + cp ${postgresql_17_5}/bin/psql $out/bin/ + cp ${postgresql_17_5}/bin/pg_dump $out/bin/ + cp ${postgresql_17_5}/bin/pg_dumpall $out/bin/ + cp ${postgresql_17_5}/bin/pg_restore $out/bin/ ''; }; }