diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8673fa9b9bf2..117cdc3e4753 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14675,6 +14675,12 @@ githubId = 60079945; keys = [ { fingerprint = "7590 C9DD E19D 4497 9EE9 0B14 CE96 9670 FB4B 4A56"; } ]; }; + madeddie = { + email = "edwin@madtech.cx"; + github = "madeddie"; + githubId = 140660; + name = "Edwin Hermans"; + }; madjar = { email = "georges.dubus@compiletoi.net"; github = "madjar"; diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix index 2f57f15fd49a..80e901cf0670 100644 --- a/pkgs/development/tools/devbox/default.nix +++ b/pkgs/development/tools/devbox/default.nix @@ -7,19 +7,19 @@ }: buildGoModule rec { pname = "devbox"; - version = "0.14.0"; + version = "0.14.2"; src = fetchFromGitHub { - owner = "jetpack-io"; + owner = "jetify-com"; repo = pname; rev = version; - hash = "sha256-ka3knS57Nc9LvGxr2DitcfI7VlkqsVXIi/llFFMb14g="; + hash = "sha256-bnquJceB1zaW1ZWU5yOWP35fkpgZWW8QQA6wzsq+RKc="; }; ldflags = [ "-s" "-w" - "-X go.jetpack.io/devbox/internal/build.Version=${version}" + "-X go.jetify.com/devbox/internal/build.Version=${version}" ]; subPackages = [ "cmd/devbox" ]; @@ -27,7 +27,7 @@ buildGoModule rec { # integration tests want file system access doCheck = false; - vendorHash = "sha256-og8FrWOC3Cq3KucXYcpiI1BHQS9kRPQkxyaDypFYdn0="; + vendorHash = "sha256-zqkuq8MlUCELjo4Z/uJhs65XUYyH755/ohgz1Ao4UAQ="; nativeBuildInputs = [ installShellFiles ]; @@ -40,11 +40,12 @@ buildGoModule rec { meta = with lib; { description = "Instant, easy, predictable shells and containers"; - homepage = "https://www.jetpack.io/devbox"; + homepage = "https://www.jetify.com/devbox"; license = licenses.asl20; maintainers = with maintainers; [ urandom lagoja + madeddie ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9980abb870f3..6215f373cde0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7257,7 +7257,7 @@ with pkgs; dbt = with python3Packages; toPythonApplication dbt-core; - devbox = callPackage ../development/tools/devbox { buildGoModule = buildGo123Module; }; + devbox = callPackage ../development/tools/devbox { buildGoModule = buildGo124Module; }; libcxx = llvmPackages.libcxx;