···

       
8
       
 
       
 1 file changed, 2 insertions(+), 2 deletions(-)

     

       
9
       
 
       


     

       
10
       
 
       
diff --git a/basis/io/standard-paths/unix/unix-tests.factor b/basis/io/standard-paths/unix/unix-tests.factor

     

       
11
       
-
       
index 986c0564d2..f0772fdcc9 100644

     

       
12
       
 
       
--- a/basis/io/standard-paths/unix/unix-tests.factor

     

       
13
       
 
       
+++ b/basis/io/standard-paths/unix/unix-tests.factor

     

       
14
       
-
       
@@ -5,12 +5,12 @@ sequences tools.test ;

     

       
15
       
-
       
 

     

       
16
       
 
       
 { f } [ "" find-in-path ] unit-test

     

       
17
       
 
       
 { t } [

     

       
18
       
 
       
-    "ls" find-in-path { "/bin/ls" "/usr/bin/ls" } member?

     

       
19
       
 
       
+    "ls" find-in-path not not

     

       
20
       
 
       
 ] unit-test

     

       
21
       
-
       
 

     

       
22
       
 
       
 { t } [

     

       
23
       
 
       
     "/sbin:" "PATH" os-env append "PATH" [

     

       
24
       
 
       
         "ps" find-in-path

     
···

       
26
       
 
       
+        not not

     

       
27
       
 
       
     ] with-os-env

     

       
28
       
 
       
 ] unit-test

     

       
29
       
-
       
-- 

     

       
30
       
-
       
2.19.2

     

       
31
       
-
       


     

···

       
8
       
 
       
 1 file changed, 2 insertions(+), 2 deletions(-)

     

       
9
       
 
       


     

       
10
       
 
       
diff --git a/basis/io/standard-paths/unix/unix-tests.factor b/basis/io/standard-paths/unix/unix-tests.factor

     

       
11
       
+
       
index acd5029..870537f 100644

     

       
12
       
 
       
--- a/basis/io/standard-paths/unix/unix-tests.factor

     

       
13
       
 
       
+++ b/basis/io/standard-paths/unix/unix-tests.factor

     

       
14
       
+
       
@@ -5,13 +5,13 @@ sequences tools.test ;

     

       
15
       
+
       


     

       
16
       
 
       
 { f } [ "" find-in-path ] unit-test

     

       
17
       
 
       
 { t } [

     

       
18
       
 
       
-    "ls" find-in-path { "/bin/ls" "/usr/bin/ls" } member?

     

       
19
       
 
       
+    "ls" find-in-path not not

     

       
20
       
 
       
 ] unit-test

     

       
21
       
+
       


     

       
22
       
 
       
 { t } [

     

       
23
       
 
       
     "/sbin:" "PATH" os-env append "PATH" [

     

       
24
       
 
       
         "ps" find-in-path

     
···

       
26
       
 
       
+        not not

     

       
27
       
 
       
     ] with-os-env

     

       
28
       
 
       
 ] unit-test

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

···

       
83
       
 
       
    ${wrapFactorScript { from = "./factor"; inherit runtimeLibs; }}

     

       
84
       
 
       
    ln -sf factor.image .factor-wrapped.image

     

       
85
       
 
       
  '';

     

       
86
       
-
       
  rev = "7999e72aecc3c5bc4019d43dc4697f49678cc3b4";

     

       
87
       
-
       
  version = "0.98";

     

       
88
       
 
       


     

       
89
       
 
       
in

     

       
90
       
 
       
stdenv.mkDerivation {

     
···

       
93
       
 
       


     

       
94
       
 
       
  src = fetchurl {

     

       
95
       
 
       
    url = "https://downloads.factorcode.org/releases/${version}/factor-src-${version}.zip";

     

       
96
       
-
       
    sha256 = "01ip9mbnar4sv60d2wcwfz62qaamdvbykxw3gbhzqa25z36vi3ri";

     

       
97
       
 
       
  };

     

       
98
       
 
       


     

       
99
       
 
       
  patches = [

     

       
100
       
-
       
    ./staging-command-line-0.98-pre.patch

     

       
101
       
-
       
    ./workdir-0.98-pre.patch

     

       
102
       
 
       
    ./adjust-paths-in-unit-tests.patch

     

       
103
       
 
       
  ];

     

       
104
       
 
       


     
···

       
150
       
 
       
      done)> $out/lib/factor/ld.so.cache

     

       
151
       
 
       


     

       
152
       
 
       
    make -j$NIX_BUILD_CORES linux-x86-64

     

       
153
       
-
       
    printf "First build from upstream boot image\n" >&2

     

       
154
       
-
       
    ./build.sh bootstrap

     

       
155
       
-
       
    printf "Rebuild boot image\n" >&2

     

       
156
       
-
       
    ./factor -script -e='"unix-x86.64" USING: system bootstrap.image memory ; make-image save 0 exit'

     

       
157
       
-
       
    printf "Second build from local boot image\n" >&2

     

       
158
       
 
       
    ./build.sh bootstrap

     

       
159
       
 
       
    runHook postBuild

     

       
160
       
 
       
  '';

     
···

       
219
       
 
       
    license = licenses.bsd2;

     

       
220
       
 
       
    maintainers = with maintainers; [ vrthra spacefrogg ];

     

       
221
       
 
       
    platforms = lib.intersectLists platforms.x86_64 platforms.linux;

     

       
222
       
-
       
    mainProgram = "factor";

     

       
223
       
 
       
  };

     

       
224
       
 
       
}

     

···

       
83
       
 
       
    ${wrapFactorScript { from = "./factor"; inherit runtimeLibs; }}

     

       
84
       
 
       
    ln -sf factor.image .factor-wrapped.image

     

       
85
       
 
       
  '';

     

       
86
       
+
       
  rev = "e10b64dbc53a8583098e73580a1eb9ff4ce0c709";

     

       
87
       
+
       
  version = "0.99";

     

       
88
       
 
       


     

       
89
       
 
       
in

     

       
90
       
 
       
stdenv.mkDerivation {

     
···

       
93
       
 
       


     

       
94
       
 
       
  src = fetchurl {

     

       
95
       
 
       
    url = "https://downloads.factorcode.org/releases/${version}/factor-src-${version}.zip";

     

       
96
       
+
       
    sha256 = "f5626bb3119bd77de9ac3392fdbe188bffc26557fab3ea34f7ca21e372a8443e";

     

       
97
       
 
       
  };

     

       
98
       
 
       


     

       
99
       
 
       
  patches = [

     

       
100
       
+
       
    ./staging-command-line-0.99-pre.patch

     

       
101
       
+
       
    ./workdir-0.99-pre.patch

     

       
102
       
 
       
    ./adjust-paths-in-unit-tests.patch

     

       
103
       
 
       
  ];

     

       
104
       
 
       


     
···

       
150
       
 
       
      done)> $out/lib/factor/ld.so.cache

     

       
151
       
 
       


     

       
152
       
 
       
    make -j$NIX_BUILD_CORES linux-x86-64

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
153
       
 
       
    ./build.sh bootstrap

     

       
154
       
 
       
    runHook postBuild

     

       
155
       
 
       
  '';

     
···

       
214
       
 
       
    license = licenses.bsd2;

     

       
215
       
 
       
    maintainers = with maintainers; [ vrthra spacefrogg ];

     

       
216
       
 
       
    platforms = lib.intersectLists platforms.x86_64 platforms.linux;

     

       
0
       
 
       

     

       
217
       
 
       
  };

     

       
218
       
 
       
}

     

···

       
5
       
 
       
  inside = (self:

     

       
6
       
 
       
  let callPackage = pkgs.newScope self;

     

       
7
       
 
       
  in rec {

     

       
8
       
-
       
    interpreter = callPackage ./factor98.nix { inherit (pkgs) stdenv; };

     

       
9
       
 
       


     

       
10
       
 
       
    # Convenience access for using the returned attribute the same way as the

     

       
11
       
 
       
    # interpreter derivation. Takes a list of runtime libraries as its only

     

···

       
5
       
 
       
  inside = (self:

     

       
6
       
 
       
  let callPackage = pkgs.newScope self;

     

       
7
       
 
       
  in rec {

     

       
8
       
+
       
    interpreter = callPackage ./factor99.nix { inherit (pkgs) stdenv; };

     

       
9
       
 
       


     

       
10
       
 
       
    # Convenience access for using the returned attribute the same way as the

     

       
11
       
 
       
    # interpreter derivation. Takes a list of runtime libraries as its only

     

···

       
1
       
 
       
diff --git a/basis/tools/deploy/backend/backend.factor b/basis/tools/deploy/backend/backend.factor

     

       
2
       
-
       
index ec86089dbe..b146168ec9 100644

     

       
3
       
 
       
--- a/basis/tools/deploy/backend/backend.factor

     

       
4
       
 
       
+++ b/basis/tools/deploy/backend/backend.factor

     

       
5
       
-
       
@@ -69,7 +69,7 @@ ERROR: can't-deploy-library-file library ;

     

       
6
       
 
       
             [ staging-image-name "-output-image=" prepend , ]

     

       
7
       
-
       
             [ " " join "-include=" prepend , ] bi

     

       
8
       
 
       
         ] [

     

       
9
       
 
       
-            input-image-name "-i=" prepend ,

     

       
10
       
 
       
+            input-image-name resource-path "-i=" prepend ,

     

···

       
1
       
 
       
diff --git a/basis/tools/deploy/backend/backend.factor b/basis/tools/deploy/backend/backend.factor

     

       
2
       
+
       
index cfcca0d..87a2b01 100644

     

       
3
       
 
       
--- a/basis/tools/deploy/backend/backend.factor

     

       
4
       
 
       
+++ b/basis/tools/deploy/backend/backend.factor

     

       
5
       
+
       
@@ -72,7 +72,7 @@ ERROR: can't-deploy-library-file library ;

     

       
6
       
 
       
             [ staging-image-name "-output-image=" prepend , ]

     

       
7
       
+
       
             [ join-words "-include=" prepend , ] bi

     

       
8
       
 
       
         ] [

     

       
9
       
 
       
-            input-image-name "-i=" prepend ,

     

       
10
       
 
       
+            input-image-name resource-path "-i=" prepend ,

     

···

       
1
       
-
       
diff --git a/core/io/pathnames/pathnames.factor b/core/io/pathnames/pathnames.factor

     

       
2
       
-
       
index 2d382e49d1..d4d9228d6c 100644

     

       
3
       
-
       
--- a/core/io/pathnames/pathnames.factor

     

       
4
       
-
       
+++ b/core/io/pathnames/pathnames.factor

     

       
5
       
-
       
@@ -144,7 +144,10 @@ GENERIC: vocab-path ( path -- newpath )

     

       
6
       
-
       
 GENERIC: absolute-path ( path -- path' )

     

       
7
       
-
       
 

     

       
8
       
-
       
 M: string absolute-path

     

       
9
       
-
       
-    "resource:" ?head [

     

       
10
       
-
       
+    "resource:work" ?head [

     

       
11
       
-
       
+        trim-head-separators "/var/lib/factor" prepend-path

     

       
12
       
-
       
+        absolute-path ]

     

       
13
       
-
       
+    [ "resource:" ?head [

     

       
14
       
-
       
         trim-head-separators resource-path

     

       
15
       
-
       
         absolute-path

     

       
16
       
-
       
     ] [

     

       
17
       
-
       
@@ -158,6 +161,7 @@ M: string absolute-path

     

       
18
       
-
       
         ] [

     

       
19
       
-
       
             current-directory get prepend-path

     

       
20
       
-
       
         ] if ] if

     

       
21
       
-
       
+      ] if

     

       
22
       
-
       
     ] if ;

     

       
23
       
-
       
 

     

       
24
       
-
       
 M: object normalize-path ( path -- path' )

     

···

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

···

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

···

       
1
       
+
       
diff --git a/core/io/pathnames/pathnames.factor b/core/io/pathnames/pathnames.factor

     

       
2
       
+
       
index a172fe4..40858bc 100644

     

       
3
       
+
       
--- a/core/io/pathnames/pathnames.factor

     

       
4
       
+
       
+++ b/core/io/pathnames/pathnames.factor

     

       
5
       
+
       
@@ -166,6 +166,8 @@ GENERIC: absolute-path ( path -- path' )

     

       
6
       
+
       


     

       
7
       
+
       
 M: string absolute-path

     

       
8
       
+
       
     {

     

       
9
       
+
       
+        { [ "resource:work" ?head ]

     

       
10
       
+
       
+          [ trim-head-separators "/var/lib/factor" prepend-path absolute-path ] }

     

       
11
       
+
       
         { [ "resource:" ?head ] [ trim-head-separators resource-path absolute-path ] }

     

       
12
       
+
       
         { [ "vocab:" ?head ] [ trim-head-separators vocab-path absolute-path ] }

     

       
13
       
+
       
         { [ "~" ?head ] [ trim-head-separators home prepend-path absolute-path ] }