chore: npins update
This commit is contained in:
parent
353026c8d6
commit
b959325436
3 changed files with 52 additions and 44 deletions
|
@ -12,19 +12,19 @@ diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/module
|
|||
index f9720c362..5d68f4a7b 100644
|
||||
--- a/nixos/modules/services/web-servers/nginx/default.nix
|
||||
+++ b/nixos/modules/services/web-servers/nginx/default.nix
|
||||
@@ -372,6 +372,7 @@ let
|
||||
location @acme-fallback {
|
||||
auth_basic off;
|
||||
auth_request off;
|
||||
+ ${optionalString (vhost.acmeFallbackRecommendedProxySettings) "include ${recommendedProxyConfig};"}
|
||||
proxy_pass http://${vhost.acmeFallbackHost};
|
||||
}
|
||||
''}
|
||||
@@ -444,6 +444,7 @@ let
|
||||
location @acme-fallback {
|
||||
auth_basic off;
|
||||
auth_request off;
|
||||
+ ${optionalString (vhost.acmeFallbackRecommendedProxySettings) "include ${recommendedProxyConfig};"}
|
||||
proxy_pass http://${vhost.acmeFallbackHost};
|
||||
}
|
||||
''}
|
||||
diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix
|
||||
index 24fcb101c..272d2e364 100644
|
||||
--- a/nixos/modules/services/web-servers/nginx/vhost-options.nix
|
||||
+++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix
|
||||
@@ -132,6 +132,13 @@ with lib;
|
||||
@@ -150,6 +150,13 @@ with lib;
|
||||
specify here.
|
||||
'';
|
||||
};
|
||||
|
|
|
@ -24,25 +24,32 @@ diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.n
|
|||
index 84d0d4032c01..ed7a64f61b5e 100644
|
||||
--- a/pkgs/top-level/ocaml-packages.nix
|
||||
+++ b/pkgs/top-level/ocaml-packages.nix
|
||||
@@ -1,10 +1,10 @@
|
||||
-{ lib, newScope, pkgs, config }:
|
||||
+{ lib, newScope, pkgs, ocamlPackagesExtensions, config }:
|
||||
@@ -1,16 +1,16 @@
|
||||
{
|
||||
lib,
|
||||
newScope,
|
||||
pkgs,
|
||||
config,
|
||||
+ ocamlPackagesExtensions,
|
||||
}:
|
||||
|
||||
let
|
||||
liftJaneStreet = self: super: super.janeStreet // super;
|
||||
|
||||
- mkOcamlPackages = ocaml:
|
||||
- (lib.makeScope newScope (self: with self;
|
||||
+ base-packages = ocaml:
|
||||
+ self: with self;
|
||||
{
|
||||
inherit ocaml;
|
||||
- mkOcamlPackages =
|
||||
+ base-packages =
|
||||
ocaml:
|
||||
- (lib.makeScope newScope (
|
||||
self: with self; {
|
||||
inherit ocaml;
|
||||
|
||||
@@ -2053,7 +2053,12 @@ let
|
||||
@@ -2257,10 +2257,13 @@ let
|
||||
|
||||
### End ###
|
||||
### End ###
|
||||
|
||||
- })).overrideScope liftJaneStreet;
|
||||
- }
|
||||
- )).overrideScope
|
||||
- liftJaneStreet;
|
||||
+ };
|
||||
+
|
||||
+ mkOcamlPackages = ocaml:
|
||||
|
@ -50,8 +57,9 @@ index 84d0d4032c01..ed7a64f61b5e 100644
|
|||
+ lib.extends (lib.composeManyExtensions ocamlPackagesExtensions) (base-packages ocaml)
|
||||
+ )).overrideScope liftJaneStreet;
|
||||
|
||||
in let inherit (pkgs) callPackage; in rec
|
||||
{
|
||||
in
|
||||
let
|
||||
inherit (pkgs) callPackage;
|
||||
--
|
||||
2.47.0
|
||||
|
||||
|
|
|
@ -8,9 +8,9 @@
|
|||
},
|
||||
"branch": "main",
|
||||
"submodules": false,
|
||||
"revision": "1fcc0844cad4e21ebf34435559004763286e75d9",
|
||||
"revision": "f04a1aa6bca545567e4f35b705eb2cdc54028755",
|
||||
"url": null,
|
||||
"hash": "11lldyb8bdpgcjl8iy27bhx80a8a00wd1jplm5lh7rplbx2810qv"
|
||||
"hash": "16qsijak4vkkzi51wifbwmnq0v1v9ihd0sa0cqg8i9kw889nkyqn"
|
||||
},
|
||||
"disko": {
|
||||
"type": "GitRelease",
|
||||
|
@ -37,9 +37,9 @@
|
|||
},
|
||||
"branch": "release-24.11",
|
||||
"submodules": false,
|
||||
"revision": "0948aeedc296f964140d9429223c7e4a0702a1ff",
|
||||
"url": "https://github.com/nix-community/home-manager/archive/0948aeedc296f964140d9429223c7e4a0702a1ff.tar.gz",
|
||||
"hash": "156hc11bb6xiypj65q6gzkhw1gw31dwv6dfh6rnv20hgig1sbfld"
|
||||
"revision": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f",
|
||||
"url": "https://github.com/nix-community/home-manager/archive/b4e98224ad1336751a2ac7493967a4c9f6d9cb3f.tar.gz",
|
||||
"hash": "0qk1qn04willw5qrzfjs9b7815np8mr6ci68a2787g3q7444bdxp"
|
||||
},
|
||||
"home-manager-unstable": {
|
||||
"type": "Git",
|
||||
|
@ -50,9 +50,9 @@
|
|||
},
|
||||
"branch": "master",
|
||||
"submodules": false,
|
||||
"revision": "ad0614a1ec9cce3b13169e20ceb7e55dfaf2a818",
|
||||
"url": "https://github.com/nix-community/home-manager/archive/ad0614a1ec9cce3b13169e20ceb7e55dfaf2a818.tar.gz",
|
||||
"hash": "0nrj6v5pg69hpbd3drmzrz6cz6405pz2pzxxnnv0vyp0z90g608x"
|
||||
"revision": "543caa313abe45b56520efdaa35d379703f79e3a",
|
||||
"url": "https://github.com/nix-community/home-manager/archive/543caa313abe45b56520efdaa35d379703f79e3a.tar.gz",
|
||||
"hash": "0lmwi6jgyvsgkn5aqg2656mh8gfdblba83l7nzh9xx0bzf302bd9"
|
||||
},
|
||||
"kat-pkgs": {
|
||||
"type": "Git",
|
||||
|
@ -105,9 +105,9 @@
|
|||
},
|
||||
"branch": "main",
|
||||
"submodules": false,
|
||||
"revision": "fbb1a8684d45fb05a57e6b4207964a625587b484",
|
||||
"url": "https://github.com/nix-community/nixos-images/archive/fbb1a8684d45fb05a57e6b4207964a625587b484.tar.gz",
|
||||
"hash": "13xlnn31cd8gwvwq7bz8gdm47j2nncrvywz2yq40cfs7yr9d0zy1"
|
||||
"revision": "55f83f47dde5a4457cfefc76c54463e570a67f3c",
|
||||
"url": "https://github.com/nix-community/nixos-images/archive/55f83f47dde5a4457cfefc76c54463e570a67f3c.tar.gz",
|
||||
"hash": "0c5h3cq5c1zg42x5fi3909qbrdky3mxky2j8pmhidxfp53ikssdv"
|
||||
},
|
||||
"nixos-mailserver": {
|
||||
"type": "Git",
|
||||
|
@ -125,14 +125,14 @@
|
|||
"nixpkgs-stable": {
|
||||
"type": "Channel",
|
||||
"name": "nixos-24.11",
|
||||
"url": "https://releases.nixos.org/nixos/24.11/nixos-24.11.716027.f0946fa5f1fb/nixexprs.tar.xz",
|
||||
"hash": "1a0p872cyv9mph166k2zjlqrmcfraxgyqmyjidx0vn7vhxs55ksm"
|
||||
"url": "https://releases.nixos.org/nixos/24.11/nixos-24.11.716868.60e405b241ed/nixexprs.tar.xz",
|
||||
"hash": "111zrdbnd2b7w64q07773ksf4gfbm4gq7riggxld1gmxpimprj0j"
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"type": "Channel",
|
||||
"name": "nixpkgs-unstable",
|
||||
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.05pre772677.dd613136ee91/nixexprs.tar.xz",
|
||||
"hash": "0i17wax628hbykkizfax94cr2vlqrz8h6q9w12zckzwb9znyjq1q"
|
||||
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.05pre781221.6a39c6e495ee/nixexprs.tar.xz",
|
||||
"hash": "0wmzr2jqylipx3d1ibgywc7dnygp1m20gd5crmwl0mpg8604q95z"
|
||||
},
|
||||
"nixvim-stable": {
|
||||
"type": "Git",
|
||||
|
@ -143,9 +143,9 @@
|
|||
},
|
||||
"branch": "nixos-24.11",
|
||||
"submodules": false,
|
||||
"revision": "b73beb7bb8c5ec5e559bb5222af9994e7ee4bdbd",
|
||||
"url": "https://github.com/nix-community/nixvim/archive/b73beb7bb8c5ec5e559bb5222af9994e7ee4bdbd.tar.gz",
|
||||
"hash": "1njgasbzfgzdgn2y0bzpf12ccpz37mgaqrgwsvbk7vgwix2hjyfd"
|
||||
"revision": "d209a04d349febe85c777078ca2eeea5e8bbc8a1",
|
||||
"url": "https://github.com/nix-community/nixvim/archive/d209a04d349febe85c777078ca2eeea5e8bbc8a1.tar.gz",
|
||||
"hash": "1qfvp4qsjzny0yk5y2j8vpj8w3mc2c6wqbpp7pysvjvxcx89n00a"
|
||||
},
|
||||
"nixvim-unstable": {
|
||||
"type": "Git",
|
||||
|
@ -156,9 +156,9 @@
|
|||
},
|
||||
"branch": "main",
|
||||
"submodules": false,
|
||||
"revision": "35ec52f1d98c379747a5c884a54822c9508da221",
|
||||
"url": "https://github.com/nix-community/nixvim/archive/35ec52f1d98c379747a5c884a54822c9508da221.tar.gz",
|
||||
"hash": "0akrp3s6fbxymfc0khaa1d9s1niw30nzrzmx17yqhik6bfzi299g"
|
||||
"revision": "9bc29e6a9b2b7d5dc4c6757b17e849085f6c7a97",
|
||||
"url": "https://github.com/nix-community/nixvim/archive/9bc29e6a9b2b7d5dc4c6757b17e849085f6c7a97.tar.gz",
|
||||
"hash": "0fya73chcaqlkn19pk5sydxxh0ch4mdpz3axzc29gppjgi4b2abl"
|
||||
}
|
||||
},
|
||||
"version": 5
|
||||
|
|
Loading…
Add table
Reference in a new issue