diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-07-04 00:15:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-04 00:15:48 +0000 |
| commit | 1787fe13b9d2e7937f0be3af4883237d43bde6c3 (patch) | |
| tree | ddc181664c0294b81646ab07774d038d4c89689e | |
| parent | Merge release-22.11 into staging-next-22.11 (diff) | |
| parent | Merge pull request #234621 from risicle/ris-mutagen-0.16.6-r22.11 (diff) | |
| download | nixpkgs-origin/staging-next-22.11.tar.gz | |
Merge release-22.11 into staging-next-22.11origin/staging-next-22.11
| -rw-r--r-- | pkgs/tools/misc/mutagen-compose/1.16.5-CVE-2023-30844.patch | 24 | ||||
| -rw-r--r-- | pkgs/tools/misc/mutagen-compose/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/tools/misc/mutagen/default.nix | 8 |
3 files changed, 35 insertions, 7 deletions
diff --git a/pkgs/tools/misc/mutagen-compose/1.16.5-CVE-2023-30844.patch b/pkgs/tools/misc/mutagen-compose/1.16.5-CVE-2023-30844.patch new file mode 100644 index 000000000000..7ce597288ddf --- /dev/null +++ b/pkgs/tools/misc/mutagen-compose/1.16.5-CVE-2023-30844.patch @@ -0,0 +1,24 @@ +--- a/go.mod ++++ b/go.mod +@@ -8,7 +8,7 @@ require ( + github.com/docker/compose/v2 v2.15.1 + github.com/docker/docker v20.10.20+incompatible + github.com/mitchellh/mapstructure v1.5.0 +- github.com/mutagen-io/mutagen v0.16.5 ++ github.com/mutagen-io/mutagen v0.16.6 + github.com/spf13/cobra v1.6.1 + github.com/spf13/pflag v1.0.5 + ) +--- a/go.sum ++++ b/go.sum +@@ -431,8 +431,8 @@ github.com/mutagen-io/fsevents v0.0.0-20180903111129-10556809b434 h1:PYeqqury0vV + github.com/mutagen-io/fsevents v0.0.0-20180903111129-10556809b434/go.mod h1:kmTyqetTEgYl9KF5JlHLKL6LXnhs2/oK5100pcMZRn8= + github.com/mutagen-io/gopass v0.0.0-20170602182606-9a121bec1ae7 h1:0PaUmAw6e54jseSG0ob2U9P1p6p+Sppw3sanphmM4LY= + github.com/mutagen-io/gopass v0.0.0-20170602182606-9a121bec1ae7/go.mod h1:MyZ/hSGB6tVRgiUqOL62QdM31Sy+B8hvbA1roNTHmOc= +-github.com/mutagen-io/mutagen v0.16.5 h1:mqMQFItJ6pJzKtVpQ3OJAH/g/TxW80mh+4lc4uxFEtI= +-github.com/mutagen-io/mutagen v0.16.5/go.mod h1:tZAhU0FIM0ZtFhlx1F4kzx2fZjNs0XAFHR4u8NLhJJ4= ++github.com/mutagen-io/mutagen v0.16.6 h1:BirKTTueGD0qMvq4tjdq4GzQX1eIStvGriCLpMTcUy8= ++github.com/mutagen-io/mutagen v0.16.6/go.mod h1:tZAhU0FIM0ZtFhlx1F4kzx2fZjNs0XAFHR4u8NLhJJ4= + github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= + github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= + github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= diff --git a/pkgs/tools/misc/mutagen-compose/default.nix b/pkgs/tools/misc/mutagen-compose/default.nix index 8fb8a19dabee..8a589f8519be 100644 --- a/pkgs/tools/misc/mutagen-compose/default.nix +++ b/pkgs/tools/misc/mutagen-compose/default.nix @@ -2,16 +2,20 @@ buildGoModule rec { pname = "mutagen-compose"; - version = "0.16.2"; + version = "0.16.5"; src = fetchFromGitHub { owner = "mutagen-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-x8tgdrb4WtjCaa28A4+fL/lUgMYaN71bEyQ1iDayNHM="; + sha256 = "sha256-Rn3aXwez/WUGpuRvA6lkuECchpYek8KDMh6xzZOV9v0="; }; - vendorSha256 = "sha256-FJEB7rii6DcWyGqrmPEKOZTy27tG+CkZ2xUY+cpKakE="; + patches = [ + ./1.16.5-CVE-2023-30844.patch + ]; + + vendorSha256 = "sha256-LhZlwWVb3Xix7h6ja1UTBr/4Py6tNEZT/lMgBeUmrHA="; doCheck = false; diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix index 2758b348610c..30da78dcc238 100644 --- a/pkgs/tools/misc/mutagen/default.nix +++ b/pkgs/tools/misc/mutagen/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mutagen"; - version = "0.16.0"; + version = "0.16.6"; src = fetchFromGitHub { owner = "mutagen-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nKt/A1LIr+cPWASWFYiOebxsuWcbzd23CQ32GgnWvLA="; + sha256 = "sha256-uBQzDZ2+rbk0up9nDeIFFJ5dMOo3Cq/acC+1jqo8Mqw="; }; - vendorSha256 = "sha256-feQOrZmJ656yD3HsxnN8JFXoP/XM2Gobyzj5MHyH/Xw="; + vendorSha256 = "sha256-iLLxGDdC4KHfbPFDRMmC7CV/HFpaBvx3c7FqQoNl/io="; agents = fetchzip { name = "mutagen-agents-${version}"; @@ -21,7 +21,7 @@ buildGoModule rec { postFetch = '' rm $out/mutagen # Keep only mutagen-agents.tar.gz. ''; - sha256 = "sha256-QkleSf/Npbqrx2049tKxxwJk+996gM5AU/BIoyplDYo="; + sha256 = "sha256-gAAO8+8ZbFTbf/QoWMtxcOi/+Zijh+QiQze+hP21fBE="; }; doCheck = false; |