greg
/
nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge fort-nix/nix-bitcoin#521: update nixpkgs 

1276c40aaa update nixpkgs (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 1276c40aaa

Tree-SHA512: 6ea60b1a0e9259cd77742722b5e803a25f5889b09fc989c64c750692f68c83f78784ffa4b72618e2506330a650bad40a6d7b5eb9e390a6d69b0e7fa4198cf79a
This commit is contained in:
Jonas Nick 2022-07-22 14:59:07 +00:00
parent 541c12e8fe 1276c40aaa
commit 7ec248dba1
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
flake.lock
View File

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1656065134, "lastModified": 1656928814,
"narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=", "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c", "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -17,11 +17,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1656679828, "lastModified": 1658406394,
"narHash": "sha256-akGA97pR1BAQew1FrVTCME3p8qvYxJXB2X3a13aBphs=", "narHash": "sha256-hgibXbbmxucpVJy9eOXKn7HxQtVkpeZ8euSnWl6c9Mk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "915f5a5b3cc4f8ba206afd0b70e52ba4c6a2796b", "rev": "c93e5ab157b45adbb6165bd85a9d8f67e49ff31d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -33,11 +33,11 @@
}, },
"nixpkgsUnstable": { "nixpkgsUnstable": {
"locked": { "locked": {
"lastModified": 1656755932, "lastModified": 1658430343,
"narHash": "sha256-TGThfOxr+HjFK464+UoUE6rClp2cwxjiKvHcBVdIGSQ=", "narHash": "sha256-cZ7dw+dyHELMnnMQvCE9HTJ4liqwpsIt2VFbnC+GNNk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "660ac43ff9ab1f12e28bfb31d4719795777fe152", "rev": "e2b34f0f11ed8ad83d9ec9c14260192c3bcccb0d",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
pkgs/python-packages/jmclient/default.nix
View File

@ -14,7 +14,7 @@ buildPythonPackage rec {
substituteInPlace setup.py \ substituteInPlace setup.py \
--replace "'klein==20.6.0'" "'klein==21.8.0'" --replace "'klein==20.6.0'" "'klein==21.8.0'"
substituteInPlace setup.py \ substituteInPlace setup.py \
--replace "'pyjwt==2.1.0'" "'pyjwt==2.3.0'" --replace "'pyjwt==2.1.0'" "'pyjwt==2.4.0'"
''; '';
meta = with lib; { meta = with lib; {

24
test/nixos-search/flake.lock
View File

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1656065134, "lastModified": 1656928814,
"narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=", "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c", "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -18,11 +18,11 @@
"nixos-org-configurations": { "nixos-org-configurations": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1656005614, "lastModified": 1656929512,
"narHash": "sha256-82JwxcIkNj+tGt1zIhMna6LfcshPiuP/qsq/EuQ4UPA=", "narHash": "sha256-BFNcb2ABeIhrgJJJFrDsd9UJBsj444Xjs22hJi+xmzo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-org-configurations", "repo": "nixos-org-configurations",
"rev": "a5e623b9729601da2b51368287bb623afd7b9ffc", "rev": "a02a620f56cee88299d479f51676ca3f2a6c4a82",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -38,11 +38,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1656581004, "lastModified": 1658399241,
"narHash": "sha256-CHNw9tuckso6+5JZmeHAX1ApL121XWYcrEPf7bo2Sdk=", "narHash": "sha256-pMS2rzVvkC2+kByjo17XzoDRnAc2HfcTOyR4VnSwmto=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-search", "repo": "nixos-search",
"rev": "398253d3ebc67cb1ee7c65e80dcb2fd7894927d0", "rev": "c43ed8c85f11b041db2624cc249f3f1fb68760b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -53,11 +53,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1655983783, "lastModified": 1656753965,
"narHash": "sha256-0h1FzkYWei24IdKNpCX93onkF/FMiXQG8SdEbTc0r8A=", "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6141b8932a5cf376fe18fcd368cecd9ad946cb68", "rev": "0ea7a8f1b939d74e5df8af9a8f7342097cdf69eb",
"type": "github" "type": "github"
}, },
"original": { "original": {