colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'staging/nixpkgs-2023-06-15'

Browse Source
This commit is contained in:
Colin 2023-06-17 10:13:21 +00:00
commit 0605094461
3 changed files with 18 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
flake.lock
View File

@ -66,27 +66,27 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1686392259, "lastModified": 1686885751,
"narHash": "sha256-hqSS9hKhWldIZr1bBp9xKhIznnGPICGKzuehd2LH0UA=", "narHash": "sha256-KcbYp2KuKbXgNaYVziwKUc6AKRhgJ1G8Qq5gjAbQ3uw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ef24b2fa0c5f290a35064b847bc211f25cb85c88", "rev": "aa4b53f79d961a7cbba0b24f791401a34c18011a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "release-22.11", "ref": "release-23.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unpatched": { "nixpkgs-unpatched": {
"locked": { "locked": {
"lastModified": 1686592866, "lastModified": 1686869522,
"narHash": "sha256-riGg89eWhXJcPNrQGcSwTEEm7CGxWC06oSX44hajeMw=", "narHash": "sha256-tbJ9B8WLCTnVP/LwESRlg0dII6Zyg2LmUU/mB9Lu98E=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0eeebd64de89e4163f4d3cf34ffe925a5cf67a05", "rev": "7c67f006ea0e7d0265f16d7df07cc076fdffd91f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -113,11 +113,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1686453485, "lastModified": 1686902322,
"narHash": "sha256-75iPAcS6xuw4SNfqLmFCi9wWG1JmDNKaC8l3WJUkmDk=", "narHash": "sha256-Vogj2MsipA+Uzr0M3d8300JeKQDHhPy6NEuTQXVdWu0=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "cb85e297937af1bd1434cf5f85a3f86a21dc8207", "rev": "1e2bae54870a06aa9364f8d33a5b9a0869d792fc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -134,11 +134,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1684528780, "lastModified": 1686876043,
"narHash": "sha256-QdYxjcTCCLPv++1v9tJBL98nn/AFx0fmzlgzcLK6KRE=", "narHash": "sha256-71SNPU2aeeJx29JSeW4JCJb8HXAuZRvL7sbh+c3wgkk=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "f3747a1dad3d34880613821faf26357ba432d3d7", "rev": "0e0aa12aca143639f158b3a5c0c00349fcc2166c",
"revCount": 194, "revCount": 199,
"type": "git", "type": "git",
"url": "https://git.uninsane.org/colin/uninsane" "url": "https://git.uninsane.org/colin/uninsane"
}, },

8
nixpatches/2023-06-10-lemmy-downgrade.patch
View File

@ -4,12 +4,12 @@ index 5b7b9aa49a5..6cd30d294d8 100644
+++ b/pkgs/servers/web-apps/lemmy/pin.json +++ b/pkgs/servers/web-apps/lemmy/pin.json
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
{ {
- "version": "0.17.3", - "version": "0.17.4",
- "serverSha256": "sha256-BOYJQLxamzfHKzfbzJEL3BEwPAlJegc+BBi0eSxuTW4=", - "serverSha256": "sha256-nztT6o5Tur64dMWII+wf5CBVJBJ59MGXKdS5OJO0SSc=",
- "serverCargoSha256": "sha256-gYWcaSIPR8FXk6blzEnuN27v5fushwk4LJEl6g3W+W8=", - "serverCargoSha256": "sha256-3In2W+cSVtMkaKrn1hWOVL/V/qkKlH30qGPi3rNdpQI=",
+ "version": "88a0d2feec3f9b4a06f2d8d090894111afcbd9e2", + "version": "88a0d2feec3f9b4a06f2d8d090894111afcbd9e2",
+ "serverSha256": "sha256-jVa7SckpH21TG+i1yjJOkhEgjnZ0Zgk2IUP7sCdtv1Y=", + "serverSha256": "sha256-jVa7SckpH21TG+i1yjJOkhEgjnZ0Zgk2IUP7sCdtv1Y=",
+ "serverCargoSha256": "sha256-trp/TCGtAtZlKdZk2CaJ3E9Lj95cq797PLWUF/DD6/M=", + "serverCargoSha256": "sha256-trp/TCGtAtZlKdZk2CaJ3E9Lj95cq797PLWUF/DD6/M=",
"uiSha256": "sha256-MsQjfX0hS1eZMQql7xWQZKAM2H4EzbbLKZcAw4mfiCE=", "uiSha256": "sha256-Ebc4VzuCJhPoO16qCgSVyYFXH7YcymxcGcN/Sgyg5Gs=",
"uiYarnDepsSha256": "sha256-aZAclSaFZJvuK+FpCBWboGaVEOEJTxq2jnWk0A6iAFw=" "uiYarnDepsSha256": "sha256-aZAclSaFZJvuK+FpCBWboGaVEOEJTxq2jnWk0A6iAFw="
} }

17
nixpatches/list.nix
View File

@ -65,11 +65,6 @@ in [
hash = "sha256-Z1HOps3w/WvxAiyUAHWszKqwS9EwA6rf4XfgPGp+2sQ="; hash = "sha256-Z1HOps3w/WvxAiyUAHWszKqwS9EwA6rf4XfgPGp+2sQ=";
}) })
(fetchpatch' {
title = "feedbackd: 0.1.0 -> 0.2.0";
saneCommit = "a0186a5782708a640cd6eaad6e9742b9cccebe9d";
hash = "sha256-f8he7pQow4fZkTVVqU/A5KgovZA7m7MccRQNTnDxw5o=";
})
# (fetchpatch' { # (fetchpatch' {
# # phoc: 0.25.0 -> 0.27.0 # # phoc: 0.25.0 -> 0.27.0
# # TODO: move wayland-scanner & glib to nativeBuildInputs # # TODO: move wayland-scanner & glib to nativeBuildInputs
@ -162,18 +157,6 @@ in [
# hash = "sha256-cu8L30ZiUJnWFGRR/SK917TC7TalzpGkurGkUAAxl54="; # hash = "sha256-cu8L30ZiUJnWFGRR/SK917TC7TalzpGkurGkUAAxl54=";
# }) # })
# (fetchpatch' {
# title = "gpodder: 3.10.21 -> 3.11.1";
# saneCommit = "865f67ec1f1ed25a65ffb3afdf05fcb3979399e8";
# hash = "sha256-QUR9eu5Ob4/iPMn2x0ACRsC7y0xVZ+vA7AXUjkF0p/s=";
# })
(fetchpatch' {
title = "gpodder: 3.10.21 -> 3.11.1";
prUrl = "https://github.com/NixOS/nixpkgs/pull/237526";
hash = "sha256-sSCAmmI5RI0WtcLqXIf8YgPw9Yw3tOD0kQJlE675ahs=";
})
(fetchpatch' { (fetchpatch' {
title = "sequoia: 0.28.0 -> 0.30.1"; title = "sequoia: 0.28.0 -> 0.30.1";
prUrl = "https://github.com/NixOS/nixpkgs/pull/237698"; prUrl = "https://github.com/NixOS/nixpkgs/pull/237698";