Merge branch 'master' into emiflake/stake-locking

This commit is contained in:
Emily Martins 2022-04-01 12:39:35 +02:00
commit d064e14c8b
2 changed files with 16 additions and 15 deletions

26
flake.lock generated
View file

@ -76,17 +76,17 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1647683439, "lastModified": 1648746740,
"narHash": "sha256-r76rHhZSZsazHxTBHbqK7zlMB9rjjGmGWOUbR0fuxn8=", "narHash": "sha256-C2gQrd5hFvQ+BsjAJs6V0iP9PRzd9dZMKtpk7kOjhwc=",
"owner": "jhodgdev", "owner": "mlabs-haskell",
"repo": "apropos", "repo": "apropos",
"rev": "c6c580aeab8b5c2a6512a49823dd17936e87b70a", "rev": "3734bb3baa297ed990725a5ef14efcbb6a1c1c23",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "jhodgdev", "owner": "mlabs-haskell",
"repo": "apropos", "repo": "apropos",
"rev": "c6c580aeab8b5c2a6512a49823dd17936e87b70a", "rev": "3734bb3baa297ed990725a5ef14efcbb6a1c1c23",
"type": "github" "type": "github"
} }
}, },
@ -103,17 +103,17 @@
"plutus": "plutus" "plutus": "plutus"
}, },
"locked": { "locked": {
"lastModified": 1647684164, "lastModified": 1648805998,
"narHash": "sha256-spKe45P4XNJ6iZvSb2ircBh1OlF95o+im+Se2hlCbkQ=", "narHash": "sha256-TWEiUifHkhgCHqe70aNn9j6LdFFWv2nMbSWV8hR59oE=",
"owner": "jhodgdev", "owner": "jhodgdev",
"repo": "apropos-tx", "repo": "apropos-tx",
"rev": "582496d0dfb88ce007bb0d2a2dcbc72ea0bb1cd1", "rev": "4eca3fac23c339caee04ea6176e641a4b3857a25",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "jhodgdev", "owner": "jhodgdev",
"repo": "apropos-tx", "repo": "apropos-tx",
"rev": "582496d0dfb88ce007bb0d2a2dcbc72ea0bb1cd1", "rev": "4eca3fac23c339caee04ea6176e641a4b3857a25",
"type": "github" "type": "github"
} }
}, },
@ -1381,11 +1381,11 @@
}, },
"nixpkgs-2111_3": { "nixpkgs-2111_3": {
"locked": { "locked": {
"lastModified": 1648608655, "lastModified": 1648744337,
"narHash": "sha256-pTjZg9DwU89ZZ1fdtt6/i1X4vSNXoRJYUArgVZPh9F8=", "narHash": "sha256-bYe1dFJAXovjqiaPKrmAbSBEK5KUkgwVaZcTbSoJ7hg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ba93b1d8253ed4b359b9e81d10e02c106d3f8b11", "rev": "0a58eebd8ec65ffdef2ce9562784123a73922052",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -19,11 +19,11 @@
# inputs to follow a commit on those master branches. For more # inputs to follow a commit on those master branches. For more
# info, see: https://github.com/mlabs-haskell/apropos-tx/pull/37 # info, see: https://github.com/mlabs-haskell/apropos-tx/pull/37
inputs.apropos-tx.url = inputs.apropos-tx.url =
"github:jhodgdev/apropos-tx?rev=582496d0dfb88ce007bb0d2a2dcbc72ea0bb1cd1"; "github:jhodgdev/apropos-tx?rev=4eca3fac23c339caee04ea6176e641a4b3857a25";
inputs.apropos-tx.inputs.nixpkgs.follows = inputs.apropos-tx.inputs.nixpkgs.follows =
"plutarch/haskell-nix/nixpkgs-unstable"; "plutarch/haskell-nix/nixpkgs-unstable";
inputs.apropos.url = inputs.apropos.url =
"github:jhodgdev/apropos?rev=c6c580aeab8b5c2a6512a49823dd17936e87b70a"; "github:mlabs-haskell/apropos?rev=3734bb3baa297ed990725a5ef14efcbb6a1c1c23";
inputs.apropos.inputs.nixpkgs.follows = inputs.apropos.inputs.nixpkgs.follows =
"plutarch/haskell-nix/nixpkgs-unstable"; "plutarch/haskell-nix/nixpkgs-unstable";
@ -101,6 +101,7 @@
ps.plutarch ps.plutarch
ps.tasty-quickcheck ps.tasty-quickcheck
ps.apropos-tx ps.apropos-tx
ps.apropos
ps.plutarch-extra ps.plutarch-extra
ps.plutarch-numeric ps.plutarch-numeric
ps.plutarch-safemoney ps.plutarch-safemoney