commit 1b36d2850fd0d71261af2885d11e1bd46d97ab48 · pyrox.dev/nixpkgs

+6 -17

pkgs/by-name/ze/zed-editor/0001-generate-licenses.patch

···

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

     

       2
       2
       -
       index 51749a91e2..d3fd7ee351 100755

     

       2
       2
       +
       index 368f63b..c2bf3a5 100644

     

       3
       3
        
       --- a/script/generate-licenses

     

       4
       4
        
       +++ b/script/generate-licenses

     

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

     

       6
       6
       -
        

     

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

     

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

     

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

     

       7
       7
       +
        } >> "$OUTPUT_FILE"

     

       8
       8
        
        

     

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

     

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

     
···

       12
       12
        
       -else

     

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

     

       14
       14
        
       -fi

     

       15
       15
       -
        

     

       15
       15
       +
       -

     

       16
       16
        
        echo "Generating cargo licenses"

     

       17
       17
       -
        

     

       18
       18
       -
        stderr_file=$(mktemp)

     

       19
       17
        
        

     

       20
       18
        
        cargo about generate \

     

       21
       19
        
       -    --fail \

     

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

     

       23
       23
       -
            "${TEMPLATE_FILE}" \

     

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

     

       25
       25
       -
            >> $OUTPUT_FILE

     

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

     

       26
       22
        
        

     

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

     

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

     

       29
       29
       -
       -    exit 1

     

       30
       30
       -
       -fi

     

       31
       31
       -
        

     

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

     

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

+3 -3

pkgs/by-name/ze/zed-editor/package.nix

···

       96
       96
        
       in

     

       97
       97
        
       rustPlatform.buildRustPackage rec {

     

       98
       98
        
         pname = "zed-editor";

     

       99
       99
       -
         version = "0.175.5";

     

       99
       99
       +
         version = "0.176.1";

     

       100
       100
        
       

     

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

     

       102
       102
        
       

     
···

       104
       104
        
           owner = "zed-industries";

     

       105
       105
        
           repo = "zed";

     

       106
       106
        
           tag = "v${version}";

     

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

     

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

     

       108
       108
        
         };

     

       109
       109
        
       

     

       110
       110
        
         patches = [

     
···

       130
       130
        
         '';

     

       131
       131
        
       

     

       132
       132
        
         useFetchCargoVendor = true;

     

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

     

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

     

       134
       134
        
       

     

       135
       135
        
         nativeBuildInputs =

     

       136
       136
        
           [