From 4ee143230e8e5ef85d37f4826d074c8115626d3d Mon Sep 17 00:00:00 2001
From: Emelie Graven <e.graven@famedly.com>
Date: Tue, 23 Aug 2022 20:42:25 +0200
Subject: [PATCH] fix perms

---
 config/hosts/wind/data/secrets/secrets.nix | Bin 963 -> 977 bytes
 config/sources/nix/sources.json            |   6 +++---
 config/sources/nix/sources.nix             |  22 ++++++++++++++++++++-
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/config/hosts/wind/data/secrets/secrets.nix b/config/hosts/wind/data/secrets/secrets.nix
index 063fd3a8371eadd236eca8f600bca97aa6f28686..b00061f2e447a3f121aedda3a1f0048dad8d45e4 100644
GIT binary patch
literal 977
zcmZQ@_Y83kiVO&0DAE?V-18x*!Ryz|;-Hl5H@f#kf0ngwa9Vk&!SLOx_qWXb7zA#$
z%zM8-e{WSfcfQ5G*IW|{3J)gSI6Y&oTUih1#swZt7k}o5*ydLA&RUpz<oB0zY_|XF
zzFdC#@A`AOhV*ULk3^pHi?5r@WGr=g*4p!lky+xLho;&b%X2*@YIs_AY0Q5$tJ4_?
zvzjg>26ApLmwfxHRdkV4Xt<)DU=)9s<f4-y{gGK;o_}3&BmRDJpTdNvkrJgAQze;Z
z>oZlkUR3R>6lHv5@RcX9!QztH^>dRsp0{>t39Z&X+o<s)eaG4t`l~uuo=y2|`n0p+
zLeJ*Cp35DYjv3v1>bZp{GyT=VlM;^$DmfO{+}-}|NcHOJwhKMB8QeZMDcWP%mB%{;
z{UldhV}Gx>bhY13-V4Q+DLLDB@4CN=tKI7_SAf+G{tsfWoHrzu>*r1_uYRz>FGb7h
z7wdev$5U6zwBNm+c}DuPLXG17Er(uAes%n3!+Il*?S8i}m;7EBrR}M~k^lSJ=1&iW
zEw~I9x!6zA68dx^>E!#Q#XroiuAZWy@$l!IoT(>Uy5xo4EUK7#W3~A2G|lN@XZ&RZ
zcD8x8RCQPyzuCdP=>5S-WgG7~=tu>3y-8a>Rh8whaK{{p8m3V0TmP0-PTneQ-!`Lg
z%>{Xf)NWNS$?e-0Sn)4Rkng_p$$R;dZ@0hxSheKyOV3%Kv$;6Fn19?;9Li#9{Yf}c
zU)}A2LUgKC`ld%$#5ONB%RMg1yzfwkBJ0s==PgW}Z)BIx@vojVS$wa-+r}?R+Ui?2
zxLWkFBuw-?X2q=YTE<J`jn-G$1%JMkFk2nBJjHd#ZeLPB-@lW(-%FoNlGDC?Jj(d-
zww-?4KP0yOW?khX(9tcPALh2`*GdL8L$xDi-pb1ym@lZvncS@w{AV(6|F$=MZm&d=
zu6{`Rc{Av?h~;Th_bcr)?a%fFKd=4yX7c~#MymUm|1l-oi(lEbWbNs^ob)T-S1oid
zJig~)*H2TAACnl5ZjQZLoM@9{_tWv9VeH8hTh_C`R^PznR;1n6d9N_qb?PgIqj?T4
z9ip190`vE2&FVTJ5<Q6}roQt<hR}wGNAi#T-&#`DBT(4;d8Jv6?x{m;?bWYCQuwaB
z?zz;svyHR(bN<X7w`-JZ-({>@a%FGH@+s0+8E;L`&}Lu1bMMtd4pIANWJ>m@d^mDW
zaBDATiu$kn23J1|vwU6lYq_}0w}%PglfL*o{l90WJA-15#0`f}tM^{{QgP-@4x{<i
yjaN=<h__v0`;c;(;kGraaNBdqz6G2W((AqFu2Mc`{OD&zskG?l=F|35gIWOJ0_rIM

literal 963
zcmZQ@_Y83kiVO&0keKr4t>xP9t+CAl&3Ecv=Na2eemYtk^>ae3mgQV`!^G0spzU8Y
zwm2>nt}2#(Y_~y9YRat>@og8{yT2y|9Ok<{=huynuI!yVZ*SDAdH8yxl*s(EE?2ZP
zvez(3x}3@QXKtu|-8!?wUDYFK^^?bkZfWUlKmWN{C19`1(QNUf>=8Ll0bAo=t&p4H
z?fg@GiuLY|`Pu&S7qbe!&bxA0bymij-Cfi7-W6ioQ+D|7>5l)M&ObMCe~B$WWI6A4
z+4_&u{~eq=#c^j~is;F(6aVHa{4`56a@Zkcyz;iHj_rzfb@~T3d*&-KeV(z(uSS~b
z-n%u90u_wg9?Lkz7;zYR$Tpmdh<W$vo{)gdx?nB83rATqyv>T%n$`%i{W|rC*|6&7
zbz!yacdwsFhkuZl=X}jo@~L9#yoc;6Dlrq*&YinFBgd=ue&afsnO;gyYegsc+MUQx
zi*9e>dbGl4;)WXn*~XeBS`S{zvQ)BP=Pq0=<y~9xKyC5n<n0xqb8Gay6Sur$dGsS%
z(eL4^$yF~adMA2I<T$$?y}hgW;WYPO?hmx4UoXhz<#plX7k~Qp@XF7Yil+~JFEu(^
z?m5Hg$=2MmvTGZ)%opvnDb8Rka_^kM>%sOQ@~4UagH2xrtoJnTG;ZS)NSb`uu;#;A
zwMo}(e(yDzzvpG-3tqLeY;m$l7cQUVzkkZNpQB1^>FTt?>B=4c<=cD}*2Xpz>tB)O
zV3#aScgZu{x&Ld@`(vkOi7pQ1k1ey>Vt2^?W0SPUXU9vubq*gVN-&)~S0W_C`)>Bn
zZtX*sPW#u*oitHZB~kr8Z>w{3YUkpri{EGb{`^<8P;7E*XXp&BM>b)K`8!LNF6GO(
z<}P5*)1cJ*vBpPpamw=~F{fE~<vxU2`z~k6Y%>*CO)Ohl5F2ag!M2!3kWnmSr_u*&
z6~QvM)1Kx`M?@l96;ijDHb4IpvuN@R&VQ<VwfbK@yO8C$`D}=TNadEZftT61syFXv
ze3ySEsY-L1P2>J83%4JfWL>}8@%_?|71b<9AA2S+P4(T>(?50P=8LNhtwk#SFWK;j
zW5G7gQirfoYmJf@|JJH2JlgcHLNx8S=7;c?1{)gdIV(F4z01=6`7}{QYK_AagLro5
zX0y5mg&BYT-t@>VKA#`Cr#a4h+Oq{0{s^(&7xiD-vE*z6zsWq|3(I~t_Wvr)+NDr!
z$YH(huFLz)F(MXcW8Am$-fjBk@adE4^8kmBZY~WRHrmYUe^;(Gc;D;7{QTe1?n};#
f-mE*RZ6;;4u2^A3lIhi)i3d&Mezv<zO??OeX4cNj

diff --git a/config/sources/nix/sources.json b/config/sources/nix/sources.json
index a544f32..bef4006 100644
--- a/config/sources/nix/sources.json
+++ b/config/sources/nix/sources.json
@@ -29,10 +29,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "22b6dc7dbd0fed58f41c117123494c6ed691fdb8",
-        "sha256": "1p88904pshasnivgw44m3vv14gwrq6cf25301spx3vpw89f48d2a",
+        "rev": "580d1ea22a647908f159fb6b138083dfe5c8c7b0",
+        "sha256": "1gsrpc7gg6844sncryx3rbaly0rfd2bkwrrzyvl03b7g29mwvdvb",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/22b6dc7dbd0fed58f41c117123494c6ed691fdb8.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/580d1ea22a647908f159fb6b138083dfe5c8c7b0.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixus": {
diff --git a/config/sources/nix/sources.nix b/config/sources/nix/sources.nix
index 1938409..9a01c8a 100644
--- a/config/sources/nix/sources.nix
+++ b/config/sources/nix/sources.nix
@@ -31,8 +31,28 @@ let
           if spec ? branch then "refs/heads/${spec.branch}" else
             if spec ? tag then "refs/tags/${spec.tag}" else
               abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!";
+      submodules = if spec ? submodules then spec.submodules else false;
+      submoduleArg =
+        let
+          nixSupportsSubmodules = builtins.compareVersions builtins.nixVersion "2.4" >= 0;
+          emptyArgWithWarning =
+            if submodules == true
+            then
+              builtins.trace
+                (
+                  "The niv input \"${name}\" uses submodules "
+                  + "but your nix's (${builtins.nixVersion}) builtins.fetchGit "
+                  + "does not support them"
+                )
+                {}
+            else {};
+        in
+          if nixSupportsSubmodules
+          then { inherit submodules; }
+          else emptyArgWithWarning;
     in
-      builtins.fetchGit { url = spec.repo; inherit (spec) rev; inherit ref; };
+      builtins.fetchGit
+        ({ url = spec.repo; inherit (spec) rev; inherit ref; } // submoduleArg);
 
   fetch_local = spec: spec.path;