flake: update lock file and drop gopass overlay

This commit is contained in:
Jez Cope 2022-07-28 14:15:43 +01:00
parent 09805cf35e
commit 094fc2b023
2 changed files with 13 additions and 50 deletions

View File

@ -8,11 +8,11 @@
]
},
"locked": {
"lastModified": 1658859882,
"narHash": "sha256-y15h05wrN+BWifRhBjTno3VpVmD0ditH3NwFW2j8UCA=",
"lastModified": 1658918399,
"narHash": "sha256-77OGFLb22D81I17Ualq47BZjDhEiWFwt8VsVS4XWuG4=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "560bb95b7831ae6ad643e41f1281af1dc595c045",
"rev": "a12c123fd91e3206e136f5ed6f91b5390845a107",
"type": "github"
},
"original": {
@ -44,11 +44,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1658751516,
"narHash": "sha256-Y/3dHoTjbvYBtWd+TTBQJUIgDPO9d+Gqt05C5dyR7E4=",
"lastModified": 1658924727,
"narHash": "sha256-Fhh9FK9CvuCLxG1WkWJPoendDeXKI4gHYTfezo1n2Zg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "dbed4c794d20d51027fc1107f063ec5be027dafc",
"rev": "0e2f7876d2f2ae98a67d89a8bef8c49332aae5af",
"type": "github"
},
"original": {
@ -59,11 +59,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1658737577,
"narHash": "sha256-xosJ5nJT9HX+b6UWsSX6R+ap4AdZOCrl/r+IKFp2ASQ=",
"lastModified": 1658826464,
"narHash": "sha256-94ZTF0uIX/iZdiD4RJ5f933ak/OM4XLl7hF+gCa4Iuk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5a0e0d73b944157328d54c4ded1cf2f0146a86a5",
"rev": "ce49cb7792a7ffd65ef352dda1110a4e4a204eac",
"type": "github"
},
"original": {
@ -74,11 +74,11 @@
},
"nur": {
"locked": {
"lastModified": 1658862603,
"narHash": "sha256-cPm6LdtKaoDrYjsJoW5VyYeUYZWFCXcwj8u88GQNV64=",
"lastModified": 1658932052,
"narHash": "sha256-qCX8Q0ZhbBqrNcrdOU+cp2x7SkMNPPSbbN6ZySsi4vY=",
"owner": "nix-community",
"repo": "NUR",
"rev": "7368f482355bf01e256414cf1b31d9f6d7ae00d9",
"rev": "08060458b308efaf17d5a21db54ce490dbca980d",
"type": "github"
},
"original": {

View File

@ -1,41 +1,4 @@
final: prev:
let
inherit (final) callPackage fetchpatch buildPackages;
# custom override for go 1.18 including the revert of CL411617, CL417615.
# Can be dropped if/once go 1.18.5 is released with CL417615.
# or when staging go 1.18.4 includes the revert.
__buildGo118ModuleCL417615 = let
fetchBase64Patch = args:
(fetchpatch args).overrideAttrs
(o: { postFetch = "mv $out p; base64 -d p > $out; " + o.postFetch; });
in prev.buildGo118Module.override {
go = buildPackages.go_1_18.overrideAttrs (oldAttrs: rec {
patches = oldAttrs.patches or [ ] ++ [
# https://go-review.googlesource.com/c/go/+/417615/
(fetchBase64Patch {
url =
"https://go-review.googlesource.com/changes/go~417615/revisions/3/patch";
sha256 = "sha256-Gu5eZUwGGch7et75A/BNynbs4VlQUBClVUxjxPkdjOs=";
})
];
});
};
in {
gopass = prev.gopass.override { buildGoModule = __buildGo118ModuleCL417615; };
gopass-hibp =
prev.gopass-hibp.override { buildGoModule = __buildGo118ModuleCL417615; };
gopass-jsonapi = prev.gopass-jsonapi.override {
buildGoModule = __buildGo118ModuleCL417615;
};
git-credential-gopass = prev.git-credential-gopass.override {
buildGoModule = __buildGo118ModuleCL417615;
};
gopass-summon-provider = prev.gopass-summon-provider.override {
buildGoModule = __buildGo118ModuleCL417615;
};
{
}