···

       
1
       
 
       
diff --git a/script/generate-licenses b/script/generate-licenses

     

       
2
       
-
       
index 51749a91e2..d3fd7ee351 100755

     

       
3
       
 
       
--- a/script/generate-licenses

     

       
4
       
 
       
+++ b/script/generate-licenses

     

       
5
       
-
       
@@ -16,28 +16,17 @@ cat assets/icons/LICENSES >> $OUTPUT_FILE

     

       
6
       
-
       
 

     

       
7
       
-
       
 echo -e "\n# ###### CODE LICENSES ######\n" >> $OUTPUT_FILE

     

       
8
       
 
       
 

     

       
9
       
 
       
-if ! cargo install --list | grep "cargo-about v$CARGO_ABOUT_VERSION" > /dev/null; then

     

       
10
       
 
       
-  echo "Installing cargo-about@$CARGO_ABOUT_VERSION..."

     
···

       
12
       
 
       
-else

     

       
13
       
 
       
-  echo "cargo-about@$CARGO_ABOUT_VERSION is already installed."

     

       
14
       
 
       
-fi

     

       
15
       
-
       
 

     

       
16
       
 
       
 echo "Generating cargo licenses"

     

       
17
       
-
       
 

     

       
18
       
-
       
 stderr_file=$(mktemp)

     

       
19
       
 
       
 

     

       
20
       
 
       
 cargo about generate \

     

       
21
       
 
       
-    --fail \

     

       
22
       
 
       
     -c script/licenses/zed-licenses.toml \

     

       
23
       
-
       
     "${TEMPLATE_FILE}" \

     

       
24
       
-
       
     2> >(tee "$stderr_file") \

     

       
25
       
-
       
     >> $OUTPUT_FILE

     

       
26
       
 
       
 

     

       
27
       
-
       
-if cat "$stderr_file" | grep -v "\[WARN\]" > /dev/null; then

     

       
28
       
-
       
-    echo "Error: License check failed - warnings found" >&2

     

       
29
       
-
       
-    exit 1

     

       
30
       
-
       
-fi

     

       
31
       
-
       
 

     

       
32
       
-
       
 sed -i.bak 's/"/"/g' $OUTPUT_FILE

     

       
33
       
-
       
 sed -i.bak 's/'/'\''/g' $OUTPUT_FILE # The ` '\'' ` thing ends the string, appends a single quote, and re-opens the string

     

···

       
1
       
 
       
diff --git a/script/generate-licenses b/script/generate-licenses

     

       
2
       
+
       
index 368f63b..c2bf3a5 100644

     

       
3
       
 
       
--- a/script/generate-licenses

     

       
4
       
 
       
+++ b/script/generate-licenses

     

       
5
       
+
       
@@ -18,17 +18,9 @@ echo -n "" > "$OUTPUT_FILE"

     

       
6
       
+
       
     echo -e "\n# ###### CODE LICENSES ######\n"

     

       
7
       
+
       
 } >> "$OUTPUT_FILE"

     

       
8
       
 
       
 

     

       
9
       
 
       
-if ! cargo install --list | grep "cargo-about v$CARGO_ABOUT_VERSION" > /dev/null; then

     

       
10
       
 
       
-  echo "Installing cargo-about@$CARGO_ABOUT_VERSION..."

     
···

       
12
       
 
       
-else

     

       
13
       
 
       
-  echo "cargo-about@$CARGO_ABOUT_VERSION is already installed."

     

       
14
       
 
       
-fi

     

       
15
       
+
       
-

     

       
16
       
 
       
 echo "Generating cargo licenses"

     

       
0
       
 
       

     

       
0
       
 
       

     

       
17
       
 
       
 

     

       
18
       
 
       
 cargo about generate \

     

       
19
       
 
       
-    --fail \

     

       
20
       
 
       
     -c script/licenses/zed-licenses.toml \

     

       
21
       
+
       
     "$TEMPLATE_FILE" >> "$OUTPUT_FILE"

     

       
0
       
 
       

     

       
0
       
 
       

     

       
22
       
 
       
 

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

···

       
96
       
 
       
in

     

       
97
       
 
       
rustPlatform.buildRustPackage rec {

     

       
98
       
 
       
  pname = "zed-editor";

     

       
99
       
-
       
  version = "0.175.5";

     

       
100
       
 
       


     

       
101
       
 
       
  outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server";

     

       
102
       
 
       


     
···

       
104
       
 
       
    owner = "zed-industries";

     

       
105
       
 
       
    repo = "zed";

     

       
106
       
 
       
    tag = "v${version}";

     

       
107
       
-
       
    hash = "sha256-CeuZv5GFZ9tttpj+4JAgQZcKtPpbE+NxawcW5W0CFws=";

     

       
108
       
 
       
  };

     

       
109
       
 
       


     

       
110
       
 
       
  patches = [

     
···

       
130
       
 
       
  '';

     

       
131
       
 
       


     

       
132
       
 
       
  useFetchCargoVendor = true;

     

       
133
       
-
       
  cargoHash = "sha256-UJAH1hCf/p974GNJtvNMzZs8RkxtJQeLhUBCJjLsapU=";

     

       
134
       
 
       


     

       
135
       
 
       
  nativeBuildInputs =

     

       
136
       
 
       
    [

     

···

       
96
       
 
       
in

     

       
97
       
 
       
rustPlatform.buildRustPackage rec {

     

       
98
       
 
       
  pname = "zed-editor";

     

       
99
       
+
       
  version = "0.176.1";

     

       
100
       
 
       


     

       
101
       
 
       
  outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server";

     

       
102
       
 
       


     
···

       
104
       
 
       
    owner = "zed-industries";

     

       
105
       
 
       
    repo = "zed";

     

       
106
       
 
       
    tag = "v${version}";

     

       
107
       
+
       
    hash = "sha256-Onf3mce327oLbvBPTkJIzJNAf145/ogFK+J6+Asuh9w=";

     

       
108
       
 
       
  };

     

       
109
       
 
       


     

       
110
       
 
       
  patches = [

     
···

       
130
       
 
       
  '';

     

       
131
       
 
       


     

       
132
       
 
       
  useFetchCargoVendor = true;

     

       
133
       
+
       
  cargoHash = "sha256-hlX4IMpsEqwYrzDvzFUhh6PVqM9U+4kp/bBYG08BPQA=";

     

       
134
       
 
       


     

       
135
       
 
       
  nativeBuildInputs =

     

       
136
       
 
       
    [