ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-28 11:40:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/philip/roller' into naive/roller

Browse Source
This commit is contained in:
yosoyubik 2021-11-15 05:48:57 +01:00
commit 0d592f67d1
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/arvo/lib/hood/kiln.hoon
View File

@ -408,8 +408,6 @@
.^([rev=@ud @da] %cw /(scot %p our)/[d]/(scot %da now)) .^([rev=@ud @da] %cw /(scot %p our)/[d]/(scot %da now))
== ==
take-commit:(abed:vats %base) take-commit:(abed:vats %base)
=? kiln ?=(^ wef)
(bump:vats u.wef (get-unblockers ark.old) force=%.n)
=. wef ~ =. wef ~
abet:kiln abet:kiln
:: ::

5
pkg/base-dev/sur/hood.hoon
View File

@ -191,7 +191,7 @@
== ==
^- [jolt=(list dude) idle=(list dude)] ^- [jolt=(list dude) idle=(list dude)]
=/ all=(list dude) (read-bill local) =/ all=(list dude) (read-bill local)
=/ want (get-apps-want all rein) =/ want (get-apps-want local all rein)
=/ have (get-apps-live local) =/ have (get-apps-live local)
[want (skip have ~(has in (sy want)))] [want (skip have ~(has in (sy want)))]
:: ::
@ -223,9 +223,10 @@
:: +get-apps-want: find which apps should be running on a desk :: +get-apps-want: find which apps should be running on a desk
:: ::
++ get-apps-want ++ get-apps-want
|= [duz=(list dude) =rein] |= [local=[our=ship =desk now=@da] duz=(list dude) =rein]
^- (list dude) ^- (list dude)
?. liv.rein ~ ?. liv.rein ~
?. |(=(`zuse+zuse (read-kelvin-local local)) =(%base desk.local)) ~
=. duz (skip duz ~(has in sub.rein)) =. duz (skip duz ~(has in sub.rein))
=. duz (weld duz (skip ~(tap in add.rein) ~(has in (sy duz)))) =. duz (weld duz (skip ~(tap in add.rein) ~(has in (sy duz))))
duz duz

2
pkg/urbit/vere/disk.c
View File

@ -751,7 +751,7 @@ u3_disk_init(c3_c* pax_c, u3_disk_cb cb_u)
// "[..] on 64-bit there is no penalty for making this huge (say 1TB)." // "[..] on 64-bit there is no penalty for making this huge (say 1TB)."
// //
{ {
#if defined(U3_CPU_aarch64) && defined(U3_OS_linux) #if (defined(U3_CPU_aarch64) && defined(U3_OS_linux)) || defined(U3_OS_mingw)
const size_t siz_i = 64424509440; const size_t siz_i = 64424509440;
#else #else
const size_t siz_i = 1099511627776; const size_t siz_i = 1099511627776;