Merge master into staging-next

authored by github-actions[bot] and committed by GitHub 2b20c287 b2f85dbf

+569 -324
+18 -14
nixos/lib/test-driver/test_driver/machine.py
··· 734 ) 735 return output 736 737 - def wait_until_tty_matches(self, tty: str, regexp: str) -> None: 738 """Wait until the visible output on the chosen TTY matches regular 739 expression. Throws an exception on timeout. 740 """ ··· 750 return len(matcher.findall(text)) > 0 751 752 with self.nested(f"waiting for {regexp} to appear on tty {tty}"): 753 - retry(tty_matches) 754 755 def send_chars(self, chars: str, delay: Optional[float] = 0.01) -> None: 756 """ ··· 762 for char in chars: 763 self.send_key(char, delay, log=False) 764 765 - def wait_for_file(self, filename: str) -> None: 766 """ 767 Waits until the file exists in the machine's file system. 768 """ ··· 772 return status == 0 773 774 with self.nested(f"waiting for file '{filename}'"): 775 - retry(check_file) 776 777 - def wait_for_open_port(self, port: int, addr: str = "localhost") -> None: 778 """ 779 Wait until a process is listening on the given TCP port and IP address 780 (default `localhost`). ··· 785 return status == 0 786 787 with self.nested(f"waiting for TCP port {port} on {addr}"): 788 - retry(port_is_open) 789 790 - def wait_for_closed_port(self, port: int, addr: str = "localhost") -> None: 791 """ 792 Wait until nobody is listening on the given TCP port and IP address 793 (default `localhost`). ··· 798 return status != 0 799 800 with self.nested(f"waiting for TCP port {port} on {addr} to be closed"): 801 - retry(port_is_closed) 802 803 def start_job(self, jobname: str, user: Optional[str] = None) -> Tuple[int, str]: 804 return self.systemctl(f"start {jobname}", user) ··· 972 """ 973 return self._get_screen_text_variants([2])[0] 974 975 - def wait_for_text(self, regex: str) -> None: 976 """ 977 Wait until the supplied regular expressions matches the textual 978 contents of the screen by using optical character recognition (see ··· 995 return False 996 997 with self.nested(f"waiting for {regex} to appear on screen"): 998 - retry(screen_matches) 999 1000 def wait_for_console_text(self, regex: str, timeout: int | None = None) -> None: 1001 """ ··· 1146 self.send_key("ctrl-alt-delete") 1147 self.connected = False 1148 1149 - def wait_for_x(self) -> None: 1150 """ 1151 Wait until it is possible to connect to the X server. 1152 """ ··· 1163 return status == 0 1164 1165 with self.nested("waiting for the X11 server"): 1166 - retry(check_x) 1167 1168 def get_window_names(self) -> List[str]: 1169 return self.succeed( 1170 r"xwininfo -root -tree | sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d'" 1171 ).splitlines() 1172 1173 - def wait_for_window(self, regexp: str) -> None: 1174 """ 1175 Wait until an X11 window has appeared whose name matches the given 1176 regular expression, e.g., `wait_for_window("Terminal")`. ··· 1188 return any(pattern.search(name) for name in names) 1189 1190 with self.nested("waiting for a window to appear"): 1191 - retry(window_is_visible) 1192 1193 def sleep(self, secs: int) -> None: 1194 # We want to sleep in *guest* time, not *host* time.
··· 734 ) 735 return output 736 737 + def wait_until_tty_matches(self, tty: str, regexp: str, timeout: int = 900) -> None: 738 """Wait until the visible output on the chosen TTY matches regular 739 expression. Throws an exception on timeout. 740 """ ··· 750 return len(matcher.findall(text)) > 0 751 752 with self.nested(f"waiting for {regexp} to appear on tty {tty}"): 753 + retry(tty_matches, timeout) 754 755 def send_chars(self, chars: str, delay: Optional[float] = 0.01) -> None: 756 """ ··· 762 for char in chars: 763 self.send_key(char, delay, log=False) 764 765 + def wait_for_file(self, filename: str, timeout: int = 900) -> None: 766 """ 767 Waits until the file exists in the machine's file system. 768 """ ··· 772 return status == 0 773 774 with self.nested(f"waiting for file '{filename}'"): 775 + retry(check_file, timeout) 776 777 + def wait_for_open_port( 778 + self, port: int, addr: str = "localhost", timeout: int = 900 779 + ) -> None: 780 """ 781 Wait until a process is listening on the given TCP port and IP address 782 (default `localhost`). ··· 787 return status == 0 788 789 with self.nested(f"waiting for TCP port {port} on {addr}"): 790 + retry(port_is_open, timeout) 791 792 + def wait_for_closed_port( 793 + self, port: int, addr: str = "localhost", timeout: int = 900 794 + ) -> None: 795 """ 796 Wait until nobody is listening on the given TCP port and IP address 797 (default `localhost`). ··· 802 return status != 0 803 804 with self.nested(f"waiting for TCP port {port} on {addr} to be closed"): 805 + retry(port_is_closed, timeout) 806 807 def start_job(self, jobname: str, user: Optional[str] = None) -> Tuple[int, str]: 808 return self.systemctl(f"start {jobname}", user) ··· 976 """ 977 return self._get_screen_text_variants([2])[0] 978 979 + def wait_for_text(self, regex: str, timeout: int = 900) -> None: 980 """ 981 Wait until the supplied regular expressions matches the textual 982 contents of the screen by using optical character recognition (see ··· 999 return False 1000 1001 with self.nested(f"waiting for {regex} to appear on screen"): 1002 + retry(screen_matches, timeout) 1003 1004 def wait_for_console_text(self, regex: str, timeout: int | None = None) -> None: 1005 """ ··· 1150 self.send_key("ctrl-alt-delete") 1151 self.connected = False 1152 1153 + def wait_for_x(self, timeout: int = 900) -> None: 1154 """ 1155 Wait until it is possible to connect to the X server. 1156 """ ··· 1167 return status == 0 1168 1169 with self.nested("waiting for the X11 server"): 1170 + retry(check_x, timeout) 1171 1172 def get_window_names(self) -> List[str]: 1173 return self.succeed( 1174 r"xwininfo -root -tree | sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d'" 1175 ).splitlines() 1176 1177 + def wait_for_window(self, regexp: str, timeout: int = 900) -> None: 1178 """ 1179 Wait until an X11 window has appeared whose name matches the given 1180 regular expression, e.g., `wait_for_window("Terminal")`. ··· 1192 return any(pattern.search(name) for name in names) 1193 1194 with self.nested("waiting for a window to appear"): 1195 + retry(window_is_visible, timeout) 1196 1197 def sleep(self, secs: int) -> None: 1198 # We want to sleep in *guest* time, not *host* time.
+2 -2
pkgs/applications/audio/baudline/default.nix
··· 13 src = 14 if stdenv.hostPlatform.system == "x86_64-linux" then 15 fetchurl { 16 - url = "http://www.baudline.com/baudline_${version}_linux_x86_64.tar.gz"; 17 sha256 = "09fn0046i69in1jpizkzbaq5ggij0mpflcsparyskm3wh71mbzvr"; 18 } 19 else if stdenv.hostPlatform.system == "i686-linux" then 20 fetchurl { 21 - url = "http://www.baudline.com/baudline_${version}_linux_i686.tar.gz"; 22 sha256 = "1waip5pmcf5ffcfvn8lf1rvsaq2ab66imrbfqs777scz7k8fhhjb"; 23 } 24 else
··· 13 src = 14 if stdenv.hostPlatform.system == "x86_64-linux" then 15 fetchurl { 16 + url = "https://www.baudline.com/baudline_${version}_linux_x86_64.tar.gz"; 17 sha256 = "09fn0046i69in1jpizkzbaq5ggij0mpflcsparyskm3wh71mbzvr"; 18 } 19 else if stdenv.hostPlatform.system == "i686-linux" then 20 fetchurl { 21 + url = "https://www.baudline.com/baudline_${version}_linux_i686.tar.gz"; 22 sha256 = "1waip5pmcf5ffcfvn8lf1rvsaq2ab66imrbfqs777scz7k8fhhjb"; 23 } 24 else
+59
pkgs/applications/editors/jetbrains/default.nix
··· 291 }; 292 }); 293 294 buildWebStorm = { pname, version, src, license, description, wmClass, buildNumber, ... }: 295 (mkJetBrainsProduct { 296 inherit pname version src wmClass jdk buildNumber; ··· 498 }; 499 wmClass = "jetbrains-rubymine"; 500 update-channel = products.ruby-mine.update-channel; 501 }; 502 503 webstorm = buildWebStorm rec {
··· 291 }; 292 }); 293 294 + buildRustRover = { pname, version, src, license, description, wmClass, buildNumber, ... }: 295 + (mkJetBrainsProduct { 296 + inherit pname version src wmClass jdk buildNumber; 297 + product = "RustRover"; 298 + meta = with lib; { 299 + homepage = "https://www.jetbrains.com/rust/"; 300 + inherit description license platforms; 301 + longDescription = description; 302 + }; 303 + }).overrideAttrs (attrs: { 304 + nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ lib.optionals (stdenv.isLinux) [ 305 + autoPatchelfHook 306 + ]; 307 + buildInputs = (attrs.buildInputs or [ ]) ++ lib.optionals (stdenv.isLinux) [ 308 + python3 309 + stdenv.cc.cc 310 + libdbusmenu 311 + openssl.out 312 + libxcrypt-legacy 313 + ]; 314 + dontAutoPatchelf = true; 315 + postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.isLinux) '' 316 + ( 317 + cd $out/rust-rover 318 + 319 + # Copied over from clion (gdb seems to have a couple of patches) 320 + ls -d $PWD/bin/gdb/linux/x64/lib/python3.8/lib-dynload/* | 321 + xargs patchelf \ 322 + --replace-needed libssl.so.10 libssl.so \ 323 + --replace-needed libcrypto.so.10 libcrypto.so 324 + 325 + ls -d $PWD/bin/lldb/linux/x64/lib/python3.8/lib-dynload/* | 326 + xargs patchelf \ 327 + --replace-needed libssl.so.10 libssl.so \ 328 + --replace-needed libcrypto.so.10 libcrypto.so 329 + 330 + autoPatchelf $PWD/bin 331 + 332 + interp="$(cat $NIX_CC/nix-support/dynamic-linker)" 333 + patchelf --set-interpreter $interp $PWD/plugins/intellij-rust/bin/linux/x86-64/intellij-rust-native-helper 334 + chmod +x $PWD/plugins/intellij-rust/bin/linux/x86-64/intellij-rust-native-helper 335 + ) 336 + ''; 337 + }); 338 + 339 buildWebStorm = { pname, version, src, license, description, wmClass, buildNumber, ... }: 340 (mkJetBrainsProduct { 341 inherit pname version src wmClass jdk buildNumber; ··· 543 }; 544 wmClass = "jetbrains-rubymine"; 545 update-channel = products.ruby-mine.update-channel; 546 + }; 547 + 548 + rust-rover = buildRustRover rec { 549 + pname = "rust-rover"; 550 + version = products.rust-rover.version; 551 + buildNumber = products.rust-rover.build_number; 552 + description = "Rust IDE"; 553 + license = lib.licenses.unfree; 554 + src = fetchurl { 555 + url = products.rust-rover.url; 556 + sha256 = products.rust-rover.sha256; 557 + }; 558 + wmClass = "jetbrains-rustrover"; 559 + update-channel = products.rust-rover.update-channel; 560 }; 561 562 webstorm = buildWebStorm rec {
+76 -24
pkgs/applications/editors/jetbrains/plugins/plugins.json
··· 13 "pycharm-professional", 14 "rider", 15 "ruby-mine", 16 "webstorm" 17 ], 18 "builds": { ··· 22 "232.9559.61": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", 23 "232.9559.64": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", 24 "232.9921.42": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", 25 - "232.9921.47": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip" 26 }, 27 "name": "ideavim" 28 }, ··· 48 "pycharm-professional", 49 "rider", 50 "ruby-mine", 51 "webstorm" 52 ], 53 "builds": { ··· 57 "232.9559.61": null, 58 "232.9559.64": null, 59 "232.9921.42": null, 60 - "232.9921.47": null 61 }, 62 "name": "kotlin" 63 }, ··· 74 "pycharm-professional", 75 "rider", 76 "ruby-mine", 77 "webstorm" 78 ], 79 "builds": { ··· 83 "232.9559.61": "https://plugins.jetbrains.com/files/6981/383851/ini-232.9559.64.zip", 84 "232.9559.64": "https://plugins.jetbrains.com/files/6981/383851/ini-232.9559.64.zip", 85 "232.9921.42": "https://plugins.jetbrains.com/files/6981/393737/ini-232.9921.36.zip", 86 - "232.9921.47": "https://plugins.jetbrains.com/files/6981/393737/ini-232.9921.36.zip" 87 }, 88 "name": "ini" 89 }, ··· 114 "datagrip", 115 "goland", 116 "idea-community", 117 - "rider" 118 ], 119 "builds": { 120 "232.9559.28": "https://plugins.jetbrains.com/files/7322/381781/python-ce-232.9559.62.zip", 121 "232.9559.61": "https://plugins.jetbrains.com/files/7322/381781/python-ce-232.9559.62.zip", 122 - "232.9559.64": "https://plugins.jetbrains.com/files/7322/381781/python-ce-232.9559.62.zip", 123 - "232.9921.47": "https://plugins.jetbrains.com/files/7322/395441/python-ce-232.9921.47.zip" 124 }, 125 "name": "python-community-edition" 126 }, ··· 141 ], 142 "builds": { 143 "223.8836.1185": "https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip", 144 - "232.9559.28": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip", 145 - "232.9559.58": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip", 146 - "232.9559.61": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip", 147 - "232.9559.64": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip", 148 - "232.9921.42": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip", 149 - "232.9921.47": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip" 150 }, 151 "name": "-deprecated-rust" 152 }, ··· 172 "232.9559.61": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", 173 "232.9559.64": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", 174 "232.9921.42": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", 175 - "232.9921.47": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip" 176 }, 177 "name": "-deprecated-rust-beta" 178 }, ··· 188 ], 189 "builds": { 190 "232.9559.58": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip", 191 - "232.9559.64": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip", 192 - "232.9921.47": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip" 193 }, 194 "name": "ide-features-trainer" 195 }, ··· 206 "pycharm-professional", 207 "rider", 208 "ruby-mine", 209 "webstorm" 210 ], 211 "builds": { ··· 215 "232.9559.61": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", 216 "232.9559.64": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", 217 "232.9921.42": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", 218 - "232.9921.47": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip" 219 }, 220 "name": "nixidea" 221 }, ··· 241 "pycharm-professional", 242 "rider", 243 "ruby-mine", 244 "webstorm" 245 ], 246 "builds": { ··· 250 "232.9559.61": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", 251 "232.9559.64": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", 252 "232.9921.42": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", 253 - "232.9921.47": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip" 254 }, 255 "name": "csv-editor" 256 }, ··· 267 "pycharm-professional", 268 "rider", 269 "ruby-mine", 270 "webstorm" 271 ], 272 "builds": { ··· 276 "232.9559.61": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", 277 "232.9559.64": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", 278 "232.9921.42": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", 279 - "232.9921.47": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip" 280 }, 281 "name": "vscode-keymap" 282 }, ··· 293 "pycharm-professional", 294 "rider", 295 "ruby-mine", 296 "webstorm" 297 ], 298 "builds": { ··· 302 "232.9559.61": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", 303 "232.9559.64": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", 304 "232.9921.42": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", 305 - "232.9921.47": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip" 306 }, 307 "name": "eclipse-keymap" 308 }, ··· 319 "pycharm-professional", 320 "rider", 321 "ruby-mine", 322 "webstorm" 323 ], 324 "builds": { ··· 328 "232.9559.61": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", 329 "232.9559.64": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", 330 "232.9921.42": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", 331 - "232.9921.47": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip" 332 }, 333 "name": "visual-studio-keymap" 334 }, ··· 345 "pycharm-professional", 346 "rider", 347 "ruby-mine", 348 "webstorm" 349 ], 350 "builds": { ··· 354 "232.9559.61": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", 355 "232.9559.64": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", 356 "232.9921.42": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", 357 - "232.9921.47": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" 358 }, 359 "name": "darcula-pitch-black" 360 }, ··· 371 "pycharm-professional", 372 "rider", 373 "ruby-mine", 374 "webstorm" 375 ], 376 "builds": { ··· 380 "232.9559.61": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", 381 "232.9559.64": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", 382 "232.9921.42": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", 383 - "232.9921.47": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip" 384 }, 385 "name": "github-copilot" 386 }, ··· 397 "pycharm-professional", 398 "rider", 399 "ruby-mine", 400 "webstorm" 401 ], 402 "builds": { ··· 406 "232.9559.61": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", 407 "232.9559.64": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", 408 "232.9921.42": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", 409 - "232.9921.47": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" 410 }, 411 "name": "netbeans-6-5-keymap" 412 } ··· 435 "https://plugins.jetbrains.com/files/7322/395441/python-ce-232.9921.47.zip": "sha256-2oRXtVv9ima8W6vywkDX4IeUGwfVNEo4rsqYBmmWhKc=", 436 "https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip": "sha256-AgaKH4ZaxLhumk1P9BVJGpvluKnpYIulCDIRQpaWlKA=", 437 "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip": "sha256-ZlSfPvhPixEz5JxU9qyG0nL3jiSjr4gKaf/xYcQI1vQ=", 438 - "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip": "sha256-NeAF3umfaSODjpd6J1dT8Ei5hF8g8OA+sgk7VjBodoU=", 439 "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip": "sha256-HpdQdWJLTWuoYnHFmDB8JIlcuiu+hVfvUsRwvMcQqzw=", 440 "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip": "sha256-pq9gFDjNmgZAXe11f6SNdN6g0xu18h/06J5L2lxUwgk=", 441 "https://plugins.jetbrains.com/files/9568/390449/go-plugin-232.9921.28.zip": "sha256-NgF2KFglAczb2Aw5NMlbzFBylGW9LDWpNvnZlX+Pt3o="
··· 13 "pycharm-professional", 14 "rider", 15 "ruby-mine", 16 + "rust-rover", 17 "webstorm" 18 ], 19 "builds": { ··· 23 "232.9559.61": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", 24 "232.9559.64": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", 25 "232.9921.42": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", 26 + "232.9921.46": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", 27 + "232.9921.47": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", 28 + "232.9921.48": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", 29 + "232.9921.53": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip" 30 }, 31 "name": "ideavim" 32 }, ··· 52 "pycharm-professional", 53 "rider", 54 "ruby-mine", 55 + "rust-rover", 56 "webstorm" 57 ], 58 "builds": { ··· 62 "232.9559.61": null, 63 "232.9559.64": null, 64 "232.9921.42": null, 65 + "232.9921.46": null, 66 + "232.9921.47": null, 67 + "232.9921.48": null, 68 + "232.9921.53": null 69 }, 70 "name": "kotlin" 71 }, ··· 82 "pycharm-professional", 83 "rider", 84 "ruby-mine", 85 + "rust-rover", 86 "webstorm" 87 ], 88 "builds": { ··· 92 "232.9559.61": "https://plugins.jetbrains.com/files/6981/383851/ini-232.9559.64.zip", 93 "232.9559.64": "https://plugins.jetbrains.com/files/6981/383851/ini-232.9559.64.zip", 94 "232.9921.42": "https://plugins.jetbrains.com/files/6981/393737/ini-232.9921.36.zip", 95 + "232.9921.46": "https://plugins.jetbrains.com/files/6981/393737/ini-232.9921.36.zip", 96 + "232.9921.47": "https://plugins.jetbrains.com/files/6981/393737/ini-232.9921.36.zip", 97 + "232.9921.48": "https://plugins.jetbrains.com/files/6981/393737/ini-232.9921.36.zip", 98 + "232.9921.53": "https://plugins.jetbrains.com/files/6981/393737/ini-232.9921.36.zip" 99 }, 100 "name": "ini" 101 }, ··· 126 "datagrip", 127 "goland", 128 "idea-community", 129 + "rider", 130 + "rust-rover" 131 ], 132 "builds": { 133 "232.9559.28": "https://plugins.jetbrains.com/files/7322/381781/python-ce-232.9559.62.zip", 134 "232.9559.61": "https://plugins.jetbrains.com/files/7322/381781/python-ce-232.9559.62.zip", 135 + "232.9921.46": "https://plugins.jetbrains.com/files/7322/395441/python-ce-232.9921.47.zip", 136 + "232.9921.47": "https://plugins.jetbrains.com/files/7322/395441/python-ce-232.9921.47.zip", 137 + "232.9921.53": "https://plugins.jetbrains.com/files/7322/395441/python-ce-232.9921.47.zip" 138 }, 139 "name": "python-community-edition" 140 }, ··· 155 ], 156 "builds": { 157 "223.8836.1185": "https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip", 158 + "232.9559.28": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", 159 + "232.9559.58": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", 160 + "232.9559.61": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", 161 + "232.9559.64": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", 162 + "232.9921.42": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", 163 + "232.9921.47": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", 164 + "232.9921.48": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", 165 + "232.9921.53": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip" 166 }, 167 "name": "-deprecated-rust" 168 }, ··· 188 "232.9559.61": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", 189 "232.9559.64": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", 190 "232.9921.42": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", 191 + "232.9921.47": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", 192 + "232.9921.48": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", 193 + "232.9921.53": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip" 194 }, 195 "name": "-deprecated-rust-beta" 196 }, ··· 206 ], 207 "builds": { 208 "232.9559.58": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip", 209 + "232.9921.42": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip", 210 + "232.9921.47": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip", 211 + "232.9921.48": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip", 212 + "232.9921.53": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip" 213 }, 214 "name": "ide-features-trainer" 215 }, ··· 226 "pycharm-professional", 227 "rider", 228 "ruby-mine", 229 + "rust-rover", 230 "webstorm" 231 ], 232 "builds": { ··· 236 "232.9559.61": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", 237 "232.9559.64": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", 238 "232.9921.42": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", 239 + "232.9921.46": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", 240 + "232.9921.47": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", 241 + "232.9921.48": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", 242 + "232.9921.53": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip" 243 }, 244 "name": "nixidea" 245 }, ··· 265 "pycharm-professional", 266 "rider", 267 "ruby-mine", 268 + "rust-rover", 269 "webstorm" 270 ], 271 "builds": { ··· 275 "232.9559.61": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", 276 "232.9559.64": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", 277 "232.9921.42": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", 278 + "232.9921.46": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", 279 + "232.9921.47": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", 280 + "232.9921.48": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", 281 + "232.9921.53": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip" 282 }, 283 "name": "csv-editor" 284 }, ··· 295 "pycharm-professional", 296 "rider", 297 "ruby-mine", 298 + "rust-rover", 299 "webstorm" 300 ], 301 "builds": { ··· 305 "232.9559.61": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", 306 "232.9559.64": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", 307 "232.9921.42": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", 308 + "232.9921.46": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", 309 + "232.9921.47": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", 310 + "232.9921.48": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", 311 + "232.9921.53": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip" 312 }, 313 "name": "vscode-keymap" 314 }, ··· 325 "pycharm-professional", 326 "rider", 327 "ruby-mine", 328 + "rust-rover", 329 "webstorm" 330 ], 331 "builds": { ··· 335 "232.9559.61": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", 336 "232.9559.64": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", 337 "232.9921.42": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", 338 + "232.9921.46": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", 339 + "232.9921.47": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", 340 + "232.9921.48": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", 341 + "232.9921.53": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip" 342 }, 343 "name": "eclipse-keymap" 344 }, ··· 355 "pycharm-professional", 356 "rider", 357 "ruby-mine", 358 + "rust-rover", 359 "webstorm" 360 ], 361 "builds": { ··· 365 "232.9559.61": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", 366 "232.9559.64": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", 367 "232.9921.42": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", 368 + "232.9921.46": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", 369 + "232.9921.47": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", 370 + "232.9921.48": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", 371 + "232.9921.53": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip" 372 }, 373 "name": "visual-studio-keymap" 374 }, ··· 385 "pycharm-professional", 386 "rider", 387 "ruby-mine", 388 + "rust-rover", 389 "webstorm" 390 ], 391 "builds": { ··· 395 "232.9559.61": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", 396 "232.9559.64": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", 397 "232.9921.42": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", 398 + "232.9921.46": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", 399 + "232.9921.47": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", 400 + "232.9921.48": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", 401 + "232.9921.53": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" 402 }, 403 "name": "darcula-pitch-black" 404 }, ··· 415 "pycharm-professional", 416 "rider", 417 "ruby-mine", 418 + "rust-rover", 419 "webstorm" 420 ], 421 "builds": { ··· 425 "232.9559.61": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", 426 "232.9559.64": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", 427 "232.9921.42": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", 428 + "232.9921.46": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", 429 + "232.9921.47": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", 430 + "232.9921.48": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", 431 + "232.9921.53": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip" 432 }, 433 "name": "github-copilot" 434 }, ··· 445 "pycharm-professional", 446 "rider", 447 "ruby-mine", 448 + "rust-rover", 449 "webstorm" 450 ], 451 "builds": { ··· 455 "232.9559.61": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", 456 "232.9559.64": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", 457 "232.9921.42": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", 458 + "232.9921.46": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", 459 + "232.9921.47": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", 460 + "232.9921.48": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", 461 + "232.9921.53": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" 462 }, 463 "name": "netbeans-6-5-keymap" 464 } ··· 487 "https://plugins.jetbrains.com/files/7322/395441/python-ce-232.9921.47.zip": "sha256-2oRXtVv9ima8W6vywkDX4IeUGwfVNEo4rsqYBmmWhKc=", 488 "https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip": "sha256-AgaKH4ZaxLhumk1P9BVJGpvluKnpYIulCDIRQpaWlKA=", 489 "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip": "sha256-ZlSfPvhPixEz5JxU9qyG0nL3jiSjr4gKaf/xYcQI1vQ=", 490 + "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip": "sha256-pVwBEyUCx/DJET9uIm8vxFeChE8FskWyfLjDpfg2mAE=", 491 "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip": "sha256-HpdQdWJLTWuoYnHFmDB8JIlcuiu+hVfvUsRwvMcQqzw=", 492 "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip": "sha256-pq9gFDjNmgZAXe11f6SNdN6g0xu18h/06J5L2lxUwgk=", 493 "https://plugins.jetbrains.com/files/9568/390449/go-plugin-232.9921.28.zip": "sha256-NgF2KFglAczb2Aw5NMlbzFBylGW9LDWpNvnZlX+Pt3o="
+1
pkgs/applications/editors/jetbrains/plugins/tests.nix
··· 18 pycharm-professional 19 rider 20 ruby-mine 21 webstorm 22 ]; 23 paths = builtins.concatStringsSep " " ides;
··· 18 pycharm-professional 19 rider 20 ruby-mine 21 + rust-rover 22 webstorm 23 ]; 24 paths = builtins.concatStringsSep " " ides;
+1
pkgs/applications/editors/jetbrains/plugins/update_plugins.py
··· 36 "pycharm-professional": "PYCHARM", 37 "rider": "RIDER", 38 "ruby-mine": "RUBYMINE", 39 "webstorm": "WEBSTORM" 40 } 41 PLUGIN_TO_FRIENDLY = {j: i for i, j in FRIENDLY_TO_PLUGIN.items()}
··· 36 "pycharm-professional": "PYCHARM", 37 "rider": "RIDER", 38 "ruby-mine": "RUBYMINE", 39 + "rust-rover": "RUST", 40 "webstorm": "WEBSTORM" 41 } 42 PLUGIN_TO_FRIENDLY = {j: i for i, j in FRIENDLY_TO_PLUGIN.items()}
+84 -60
pkgs/applications/editors/jetbrains/versions.json
··· 19 "dataspell": { 20 "update-channel": "DataSpell RELEASE", 21 "url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz", 22 - "version": "2023.2.1", 23 - "sha256": "0faf17adf9a071ef8813c1b43e8321728990ba8e4a2c284915cb3ce9451fca80", 24 - "url": "https://download.jetbrains.com/python/dataspell-2023.2.1.tar.gz", 25 - "build_number": "232.9559.63" 26 }, 27 "gateway": { 28 "update-channel": "Gateway RELEASE", 29 "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", 30 - "version": "2023.2.1", 31 - "sha256": "05cfcaaebfa171297eff94ca44fa58500bd7d33db3dc6fa55f5f8501c449c9df", 32 - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.1.tar.gz", 33 - "build_number": "232.9559.62" 34 }, 35 "goland": { 36 "update-channel": "GoLand RELEASE", 37 "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", 38 - "version": "2023.2.1", 39 - "sha256": "7d5c83cb43286d57b045d1d837185633be13673a5e0e443773778e0d4936647a", 40 - "url": "https://download.jetbrains.com/go/goland-2023.2.1.tar.gz", 41 - "build_number": "232.9559.64" 42 }, 43 "idea-community": { 44 "update-channel": "IntelliJ IDEA RELEASE", ··· 100 "ruby-mine": { 101 "update-channel": "RubyMine RELEASE", 102 "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", 103 - "version": "2023.2.1", 104 - "sha256": "13e56acc36e52e52e91eb23d5166144be47511ee466601efea82dc891bad3bfe", 105 - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.1.tar.gz", 106 - "build_number": "232.9559.58" 107 }, 108 "webstorm": { 109 "update-channel": "WebStorm RELEASE", 110 "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", 111 - "version": "2023.2.1", 112 - "sha256": "0487d1e80b3d538c968ab6437d950a504166b0c266346d52969bfb828820a642", 113 - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.1.tar.gz", 114 - "build_number": "232.9559.58" 115 } 116 }, 117 "x86_64-darwin": { ··· 134 "dataspell": { 135 "update-channel": "DataSpell RELEASE", 136 "url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg", 137 - "version": "2023.2.1", 138 - "sha256": "447ed7d593ea225af53ef54023cb29cfb906109961011d485eefbf0f0879451b", 139 - "url": "https://download.jetbrains.com/python/dataspell-2023.2.1.dmg", 140 - "build_number": "232.9559.63" 141 }, 142 "gateway": { 143 "update-channel": "Gateway RELEASE", 144 "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", 145 - "version": "2023.2.1", 146 - "sha256": "a0d4a889bc0688bfb03add22f45d878b99e5d85faf24f628345121b8689704e0", 147 - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.1.dmg", 148 - "build_number": "232.9559.62" 149 }, 150 "goland": { 151 "update-channel": "GoLand RELEASE", 152 "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", 153 - "version": "2023.2.1", 154 - "sha256": "63f26b3a2a8aa7fb93b5a0a61ca9f4e4f75688ee9451631b875829dee013e561", 155 - "url": "https://download.jetbrains.com/go/goland-2023.2.1.dmg", 156 - "build_number": "232.9559.64" 157 }, 158 "idea-community": { 159 "update-channel": "IntelliJ IDEA RELEASE", ··· 215 "ruby-mine": { 216 "update-channel": "RubyMine RELEASE", 217 "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", 218 - "version": "2023.2.1", 219 - "sha256": "1ae42d9f0af0e293406a7ab6042299cc29a3ae4f6d023656bebc0b1d78ad0a4b", 220 - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.1.dmg", 221 - "build_number": "232.9559.58" 222 }, 223 "webstorm": { 224 "update-channel": "WebStorm RELEASE", 225 "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", 226 - "version": "2023.2.1", 227 - "sha256": "c42ba4e262a91bed368168ef8498058ccaef560bce3f72d86fc80e5492cad6f1", 228 - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.1.dmg", 229 - "build_number": "232.9559.58" 230 } 231 }, 232 "aarch64-darwin": { ··· 249 "dataspell": { 250 "update-channel": "DataSpell RELEASE", 251 "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg", 252 - "version": "2023.2.1", 253 - "sha256": "a17d036b2d425619941d90ab7ae6597c8d5aad4a2e1446d6ccbc3ad1f844852d", 254 - "url": "https://download.jetbrains.com/python/dataspell-2023.2.1-aarch64.dmg", 255 - "build_number": "232.9559.63" 256 }, 257 "gateway": { 258 "update-channel": "Gateway RELEASE", 259 "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", 260 - "version": "2023.2.1", 261 - "sha256": "4e227b78bcb33f2bdbc3f3749a373413e785180b34fce03de863479c1f892bd2", 262 - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.1-aarch64.dmg", 263 - "build_number": "232.9559.62" 264 }, 265 "goland": { 266 "update-channel": "GoLand RELEASE", 267 "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", 268 - "version": "2023.2.1", 269 - "sha256": "08310be67b03a0f36cebf28fddfe0886d96f7446f04d25fec69beaaf222daf9e", 270 - "url": "https://download.jetbrains.com/go/goland-2023.2.1-aarch64.dmg", 271 - "build_number": "232.9559.64" 272 }, 273 "idea-community": { 274 "update-channel": "IntelliJ IDEA RELEASE", ··· 330 "ruby-mine": { 331 "update-channel": "RubyMine RELEASE", 332 "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", 333 - "version": "2023.2.1", 334 - "sha256": "422462636fc4036a2a28037519decef70f38505826b34f167020b1ffeea3a8aa", 335 - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.1-aarch64.dmg", 336 - "build_number": "232.9559.58" 337 }, 338 "webstorm": { 339 "update-channel": "WebStorm RELEASE", 340 "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", 341 - "version": "2023.2.1", 342 - "sha256": "fb75c5d9164776353262cde6d8589826975868804a32f27007cb8a71c0e2d87b", 343 - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.1-aarch64.dmg", 344 - "build_number": "232.9559.58" 345 } 346 } 347 }
··· 19 "dataspell": { 20 "update-channel": "DataSpell RELEASE", 21 "url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz", 22 + "version": "2023.2.2", 23 + "sha256": "30a7b848d004c12e8a5ce668dea6939f49b2aaf0bcce443f02987b4ea38179ab", 24 + "url": "https://download.jetbrains.com/python/dataspell-2023.2.2.tar.gz", 25 + "build_number": "232.9921.48" 26 }, 27 "gateway": { 28 "update-channel": "Gateway RELEASE", 29 "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", 30 + "version": "2023.2.2", 31 + "sha256": "685b3eb786134137be41beaca80a0edb9aaed9e24b98cef8006fe840972b990f", 32 + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.2.tar.gz", 33 + "build_number": "232.9921.47" 34 }, 35 "goland": { 36 "update-channel": "GoLand RELEASE", 37 "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", 38 + "version": "2023.2.2", 39 + "sha256": "e2951dfcd80556f29378d55c8d4ebfbc6e599e14ada17a06386729221d71353b", 40 + "url": "https://download.jetbrains.com/go/goland-2023.2.2.tar.gz", 41 + "build_number": "232.9921.53" 42 }, 43 "idea-community": { 44 "update-channel": "IntelliJ IDEA RELEASE", ··· 100 "ruby-mine": { 101 "update-channel": "RubyMine RELEASE", 102 "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", 103 + "version": "2023.2.2", 104 + "sha256": "9f14f95ef1952d6b85e13a596d00e8b57ab35a4d07a96ee33d4ceebbd113a827", 105 + "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.2.tar.gz", 106 + "build_number": "232.9921.48" 107 + }, 108 + "rust-rover": { 109 + "update-channel": "RustRover EAP", 110 + "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz", 111 + "version": "2023.2", 112 + "sha256": "5a51bcae179467e9c6440bc0c31bffd27c6fc58d593a0cbecd5aeb51508d27b6", 113 + "url": "https://download.jetbrains.com/rustrover/RustRover-232.9921.46.tar.gz", 114 + "build_number": "232.9921.46" 115 }, 116 "webstorm": { 117 "update-channel": "WebStorm RELEASE", 118 "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", 119 + "version": "2023.2.2", 120 + "sha256": "10c1203620258bf4b0c952d809f50ea954f80d1ed60098917a4c64fb2718b931", 121 + "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.2.tar.gz", 122 + "build_number": "232.9921.42" 123 } 124 }, 125 "x86_64-darwin": { ··· 142 "dataspell": { 143 "update-channel": "DataSpell RELEASE", 144 "url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg", 145 + "version": "2023.2.2", 146 + "sha256": "24fb47966c891bf3a2a827df38885d48509c6e2e68a7cc03145ad28493adb76b", 147 + "url": "https://download.jetbrains.com/python/dataspell-2023.2.2.dmg", 148 + "build_number": "232.9921.48" 149 }, 150 "gateway": { 151 "update-channel": "Gateway RELEASE", 152 "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", 153 + "version": "2023.2.2", 154 + "sha256": "cfa68c2b1290f1d51aa37a918a79342e42b6a50b2563524757ec8bd700008fba", 155 + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.2.dmg", 156 + "build_number": "232.9921.47" 157 }, 158 "goland": { 159 "update-channel": "GoLand RELEASE", 160 "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", 161 + "version": "2023.2.2", 162 + "sha256": "d60e55ecd6208d2af871c154320f988622cd52ca4b202cd9a90c2de7750e8e23", 163 + "url": "https://download.jetbrains.com/go/goland-2023.2.2.dmg", 164 + "build_number": "232.9921.53" 165 }, 166 "idea-community": { 167 "update-channel": "IntelliJ IDEA RELEASE", ··· 223 "ruby-mine": { 224 "update-channel": "RubyMine RELEASE", 225 "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", 226 + "version": "2023.2.2", 227 + "sha256": "2b77f24770813c0cf55892effde8c0a6a5af1c9f4b08c1c8ae9163e503afc5d3", 228 + "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.2.dmg", 229 + "build_number": "232.9921.48" 230 + }, 231 + "rust-rover": { 232 + "update-channel": "RustRover EAP", 233 + "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg", 234 + "version": "2023.2", 235 + "sha256": "4c7193acf07f44b91512d8b4c04c88068b8599e76150a81dfd728046910a0929", 236 + "url": "https://download.jetbrains.com/rustrover/RustRover-232.9921.46.dmg", 237 + "build_number": "232.9921.46" 238 }, 239 "webstorm": { 240 "update-channel": "WebStorm RELEASE", 241 "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", 242 + "version": "2023.2.2", 243 + "sha256": "3733f1968925681a693a09053e62ba4a800b51a062f5e9772658a5fba82d2fa8", 244 + "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.2.dmg", 245 + "build_number": "232.9921.42" 246 } 247 }, 248 "aarch64-darwin": { ··· 265 "dataspell": { 266 "update-channel": "DataSpell RELEASE", 267 "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg", 268 + "version": "2023.2.2", 269 + "sha256": "0baeeba5f8a2dd02304b42a54d633719df3242bfaedc5b62bec4dacd403eabf2", 270 + "url": "https://download.jetbrains.com/python/dataspell-2023.2.2-aarch64.dmg", 271 + "build_number": "232.9921.48" 272 }, 273 "gateway": { 274 "update-channel": "Gateway RELEASE", 275 "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", 276 + "version": "2023.2.2", 277 + "sha256": "b6ae26eaa6f7f4b77d1bf3d75658eb8ae70bccce4b7e8e62d18dada0810b382c", 278 + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.2-aarch64.dmg", 279 + "build_number": "232.9921.47" 280 }, 281 "goland": { 282 "update-channel": "GoLand RELEASE", 283 "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", 284 + "version": "2023.2.2", 285 + "sha256": "b8343e424f1c954ef2c8db7dabc4aaad63d055aa7a4b572773dbeeab43463007", 286 + "url": "https://download.jetbrains.com/go/goland-2023.2.2-aarch64.dmg", 287 + "build_number": "232.9921.53" 288 }, 289 "idea-community": { 290 "update-channel": "IntelliJ IDEA RELEASE", ··· 346 "ruby-mine": { 347 "update-channel": "RubyMine RELEASE", 348 "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", 349 + "version": "2023.2.2", 350 + "sha256": "53e551897d42d0986b2e01f171bd7b96fe790516fdf1578feabec0a44cf441e5", 351 + "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.2-aarch64.dmg", 352 + "build_number": "232.9921.48" 353 + }, 354 + "rust-rover": { 355 + "update-channel": "RustRover EAP", 356 + "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg", 357 + "version": "2023.2", 358 + "sha256": "7f01fef11d89c6c6c870a79007607babde40f7a958b7103d1028aa760ed713b7", 359 + "url": "https://download.jetbrains.com/rustrover/RustRover-232.9921.46-aarch64.dmg", 360 + "build_number": "232.9921.46" 361 }, 362 "webstorm": { 363 "update-channel": "WebStorm RELEASE", 364 "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", 365 + "version": "2023.2.2", 366 + "sha256": "27ae504b6ee24df28d29f59602c893c2b9af9357e4cc1e20dab22753177508db", 367 + "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.2-aarch64.dmg", 368 + "build_number": "232.9921.42" 369 } 370 } 371 }
+8 -8
pkgs/applications/editors/vscode/vscode.nix
··· 30 archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; 31 32 sha256 = { 33 - x86_64-linux = "0ycn0madcc70yidhp3vazxlrl9pskpaiji5xg1c3hqgc8snbhwfc"; 34 - x86_64-darwin = "1vgrgsp6jrkll1ai0l8pbdmn7lx9hvg0f44g9rcx80yff80xa18a"; 35 - aarch64-linux = "1id8ajlak4vkzmr2lj1wwbgdizsz44b74w4d620fa51nx9zd1wmi"; 36 - aarch64-darwin = "0xzkzzx9yjf1wmk7x26x3b0nq1l7wbnrqcb86zdpbqr8zh386y41"; 37 - armv7l-linux = "0cw55k7f1dhna4hv394dl638bas0w2p6009xn99lm9p9lqybz618"; 38 }.${system} or throwSystem; 39 in 40 callPackage ./generic.nix rec { 41 # Please backport all compatible updates to the stable release. 42 # This is important for the extension ecosystem. 43 - version = "1.82.1"; 44 pname = "vscode" + lib.optionalString isInsiders "-insiders"; 45 46 # This is used for VS Code - Remote SSH test 47 - rev = "6509174151d557a81c9d0b5f8a5a1e9274db5585"; 48 49 executableName = "code" + lib.optionalString isInsiders "-insiders"; 50 longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; ··· 68 src = fetchurl { 69 name = "vscode-server-${rev}.tar.gz"; 70 url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; 71 - sha256 = "00in41ps77nl3z2mpl57l7ng0pyg9k3c16gaprzv13g9bqisqd7b"; 72 }; 73 }; 74
··· 30 archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; 31 32 sha256 = { 33 + x86_64-linux = "0i6zk4zkwcw5lnzhg7vvnsw17nar97bbq3iishag9cpjqs9jpq4z"; 34 + x86_64-darwin = "1sy0ir4mhw9j5ifiv6d2928gcs8wfksxlsp312r9nsmc2h0i11g6"; 35 + aarch64-linux = "13lsycmia9yj6s7zf441vg8c0pipxpxdrnrj7v4rhjlvixjb8f8k"; 36 + aarch64-darwin = "1qwmwx0q05lzhsb8810kjk1lcw4wm7cr0zn7pkyjlsda0vkcc5g8"; 37 + armv7l-linux = "1hlnd9w141phrd3mzkhgiskbcnxqb05396frrv38pns007xhj103"; 38 }.${system} or throwSystem; 39 in 40 callPackage ./generic.nix rec { 41 # Please backport all compatible updates to the stable release. 42 # This is important for the extension ecosystem. 43 + version = "1.82.2"; 44 pname = "vscode" + lib.optionalString isInsiders "-insiders"; 45 46 # This is used for VS Code - Remote SSH test 47 + rev = "abd2f3db4bdb28f9e95536dfa84d8479f1eb312d"; 48 49 executableName = "code" + lib.optionalString isInsiders "-insiders"; 50 longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; ··· 68 src = fetchurl { 69 name = "vscode-server-${rev}.tar.gz"; 70 url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; 71 + sha256 = "1d1ypmasr7zj4csinb5nj531ckj7a1pgn36469fdzwn0xjrgkg16"; 72 }; 73 }; 74
+139 -75
pkgs/applications/graphics/oculante/Cargo.lock
··· 95 checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" 96 97 [[package]] 98 name = "any_ascii" 99 version = "0.1.7" 100 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 161 dependencies = [ 162 "proc-macro2", 163 "quote", 164 - "syn 2.0.33", 165 ] 166 167 [[package]] ··· 281 dependencies = [ 282 "proc-macro2", 283 "quote", 284 - "syn 2.0.33", 285 ] 286 287 [[package]] ··· 298 dependencies = [ 299 "proc-macro2", 300 "quote", 301 - "syn 2.0.33", 302 ] 303 304 [[package]] 305 name = "atk-sys" 306 - version = "0.16.0" 307 source = "registry+https://github.com/rust-lang/crates.io-index" 308 - checksum = "11ad703eb64dc058024f0e57ccfa069e15a413b98dbd50a1a950e743b7f11148" 309 dependencies = [ 310 "glib-sys", 311 "gobject-sys", ··· 550 dependencies = [ 551 "proc-macro2", 552 "quote", 553 - "syn 2.0.33", 554 ] 555 556 [[package]] ··· 567 568 [[package]] 569 name = "cairo-sys-rs" 570 - version = "0.16.3" 571 source = "registry+https://github.com/rust-lang/crates.io-index" 572 - checksum = "7c48f4af05fabdcfa9658178e1326efa061853f040ce7d72e33af6885196f421" 573 dependencies = [ 574 "libc", 575 "system-deps", ··· 655 ] 656 657 [[package]] 658 name = "clap" 659 version = "3.2.25" 660 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1057 source = "registry+https://github.com/rust-lang/crates.io-index" 1058 checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" 1059 dependencies = [ 1060 - "libloading 0.8.0", 1061 ] 1062 1063 [[package]] ··· 1140 dependencies = [ 1141 "proc-macro2", 1142 "quote", 1143 - "syn 2.0.33", 1144 ] 1145 1146 [[package]] ··· 1508 dependencies = [ 1509 "proc-macro2", 1510 "quote", 1511 - "syn 2.0.33", 1512 ] 1513 1514 [[package]] ··· 1543 1544 [[package]] 1545 name = "gdk-pixbuf-sys" 1546 - version = "0.16.3" 1547 source = "registry+https://github.com/rust-lang/crates.io-index" 1548 - checksum = "3092cf797a5f1210479ea38070d9ae8a5b8e9f8f1be9f32f4643c529c7d70016" 1549 dependencies = [ 1550 "gio-sys", 1551 "glib-sys", ··· 1556 1557 [[package]] 1558 name = "gdk-sys" 1559 - version = "0.16.0" 1560 source = "registry+https://github.com/rust-lang/crates.io-index" 1561 - checksum = "d76354f97a913e55b984759a997b693aa7dc71068c9e98bcce51aa167a0a5c5a" 1562 dependencies = [ 1563 "cairo-sys-rs", 1564 "gdk-pixbuf-sys", ··· 1642 1643 [[package]] 1644 name = "gio-sys" 1645 - version = "0.16.3" 1646 source = "registry+https://github.com/rust-lang/crates.io-index" 1647 - checksum = "e9b693b8e39d042a95547fc258a7b07349b1f0b48f4b2fa3108ba3c51c0b5229" 1648 dependencies = [ 1649 "glib-sys", 1650 "gobject-sys", ··· 1676 1677 [[package]] 1678 name = "glib-sys" 1679 - version = "0.16.3" 1680 source = "registry+https://github.com/rust-lang/crates.io-index" 1681 - checksum = "c61a4f46316d06bfa33a7ac22df6f0524c8be58e3db2d9ca99ccb1f357b62a65" 1682 dependencies = [ 1683 "libc", 1684 "system-deps", ··· 1727 "glutin_egl_sys", 1728 "glutin_glx_sys", 1729 "glutin_wgl_sys", 1730 - "libloading 0.7.4", 1731 "objc2", 1732 "once_cell", 1733 "raw-window-handle", ··· 1817 1818 [[package]] 1819 name = "gobject-sys" 1820 - version = "0.16.3" 1821 source = "registry+https://github.com/rust-lang/crates.io-index" 1822 - checksum = "3520bb9c07ae2a12c7f2fbb24d4efc11231c8146a86956413fb1a79bb760a0f1" 1823 dependencies = [ 1824 "glib-sys", 1825 "libc", ··· 1828 1829 [[package]] 1830 name = "gtk-sys" 1831 - version = "0.16.0" 1832 source = "registry+https://github.com/rust-lang/crates.io-index" 1833 - checksum = "89b5f8946685d5fe44497007786600c2f368ff6b1e61a16251c89f72a97520a3" 1834 dependencies = [ 1835 "atk-sys", 1836 "cairo-sys-rs", ··· 2015 ] 2016 2017 [[package]] 2018 name = "idna" 2019 version = "0.4.0" 2020 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 2119 dependencies = [ 2120 "proc-macro2", 2121 "quote", 2122 - "syn 2.0.33", 2123 ] 2124 2125 [[package]] ··· 2245 2246 [[package]] 2247 name = "jxl-frame" 2248 - version = "0.4.0" 2249 source = "registry+https://github.com/rust-lang/crates.io-index" 2250 - checksum = "e2c4e276ea56d8bc4961f13501d565cc6b665f0da76e0e5f90aa44a1475eb409" 2251 dependencies = [ 2252 "jxl-bitstream", 2253 "jxl-coding", ··· 2266 2267 [[package]] 2268 name = "jxl-image" 2269 - version = "0.4.1" 2270 source = "registry+https://github.com/rust-lang/crates.io-index" 2271 - checksum = "28d10c717baa0dd19c25b37b6baebb5f07d7efdaa6225a65aa98dcaf1d40a3e5" 2272 dependencies = [ 2273 "jxl-bitstream", 2274 "jxl-color", ··· 2278 2279 [[package]] 2280 name = "jxl-modular" 2281 - version = "0.2.2" 2282 source = "registry+https://github.com/rust-lang/crates.io-index" 2283 - checksum = "a4fea731da48d358a60d6185c58ac897f22895ea0e3380df04c106c87e192a7d" 2284 dependencies = [ 2285 "jxl-bitstream", 2286 "jxl-coding", ··· 2290 2291 [[package]] 2292 name = "jxl-oxide" 2293 - version = "0.3.0" 2294 source = "registry+https://github.com/rust-lang/crates.io-index" 2295 - checksum = "7d90d7ccb9a843e69563abdab2cd362702668f23e39e7fa3dcdf2594b1d29042" 2296 dependencies = [ 2297 "jxl-bitstream", 2298 "jxl-color", ··· 2305 2306 [[package]] 2307 name = "jxl-render" 2308 - version = "0.3.0" 2309 source = "registry+https://github.com/rust-lang/crates.io-index" 2310 - checksum = "774684715db3b6e60a13059ad746829c9f9b39b7865ba0dc7ea9fd93469d9297" 2311 dependencies = [ 2312 "jxl-bitstream", 2313 "jxl-coding", ··· 2322 2323 [[package]] 2324 name = "jxl-vardct" 2325 - version = "0.2.1" 2326 source = "registry+https://github.com/rust-lang/crates.io-index" 2327 - checksum = "1abaffccbc217e48cb45b9aca639c18a873b66200fc5a3695fb98333e0b1fead" 2328 dependencies = [ 2329 "jxl-bitstream", 2330 "jxl-coding", ··· 2448 dependencies = [ 2449 "cfg-if 1.0.0", 2450 "winapi", 2451 - ] 2452 - 2453 - [[package]] 2454 - name = "libloading" 2455 - version = "0.8.0" 2456 - source = "registry+https://github.com/rust-lang/crates.io-index" 2457 - checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" 2458 - dependencies = [ 2459 - "cfg-if 1.0.0", 2460 - "windows-sys 0.48.0", 2461 ] 2462 2463 [[package]] ··· 3025 "proc-macro2", 3026 "quote", 3027 "spirv_cross", 3028 - "syn 2.0.33", 3029 ] 3030 3031 [[package]] ··· 3153 dependencies = [ 3154 "proc-macro2", 3155 "quote", 3156 - "syn 2.0.33", 3157 ] 3158 3159 [[package]] ··· 3257 "proc-macro-crate", 3258 "proc-macro2", 3259 "quote", 3260 - "syn 2.0.33", 3261 ] 3262 3263 [[package]] ··· 3342 3343 [[package]] 3344 name = "oculante" 3345 - version = "0.7.5" 3346 dependencies = [ 3347 "anyhow", 3348 "arboard", ··· 3385 "strum_macros", 3386 "tiff", 3387 "tiny-skia 0.9.1", 3388 "turbojpeg", 3389 "usvg", 3390 "webbrowser", ··· 3497 dependencies = [ 3498 "proc-macro2", 3499 "quote", 3500 - "syn 2.0.33", 3501 ] 3502 3503 [[package]] 3504 name = "pango-sys" 3505 - version = "0.16.3" 3506 source = "registry+https://github.com/rust-lang/crates.io-index" 3507 - checksum = "9e134909a9a293e04d2cc31928aa95679c5e4df954d0b85483159bd20d8f047f" 3508 dependencies = [ 3509 "glib-sys", 3510 "gobject-sys", ··· 3618 "phf_shared 0.11.2", 3619 "proc-macro2", 3620 "quote", 3621 - "syn 2.0.33", 3622 ] 3623 3624 [[package]] ··· 3662 dependencies = [ 3663 "proc-macro2", 3664 "quote", 3665 - "syn 2.0.33", 3666 ] 3667 3668 [[package]] ··· 4074 4075 [[package]] 4076 name = "rfd" 4077 - version = "0.11.4" 4078 source = "registry+https://github.com/rust-lang/crates.io-index" 4079 - checksum = "4fe664af397d2b6a13a8ba1d172a2b5c87c6c5149039edbf8fa122b98c9ed96f" 4080 dependencies = [ 4081 - "async-io", 4082 "block", 4083 "dispatch", 4084 - "futures-util", 4085 "glib-sys", 4086 "gobject-sys", 4087 "gtk-sys", ··· 4094 "wasm-bindgen", 4095 "wasm-bindgen-futures", 4096 "web-sys", 4097 - "windows", 4098 ] 4099 4100 [[package]] ··· 4385 dependencies = [ 4386 "proc-macro2", 4387 "quote", 4388 - "syn 2.0.33", 4389 ] 4390 4391 [[package]] ··· 4407 dependencies = [ 4408 "proc-macro2", 4409 "quote", 4410 - "syn 2.0.33", 4411 ] 4412 4413 [[package]] ··· 4542 4543 [[package]] 4544 name = "smithay-client-toolkit" 4545 - version = "0.16.0" 4546 source = "registry+https://github.com/rust-lang/crates.io-index" 4547 - checksum = "f307c47d32d2715eb2e0ece5589057820e0e5e70d07c247d1063e844e107f454" 4548 dependencies = [ 4549 "bitflags 1.3.2", 4550 "calloop", ··· 4657 "proc-macro2", 4658 "quote", 4659 "rustversion", 4660 - "syn 2.0.33", 4661 ] 4662 4663 [[package]] ··· 4693 4694 [[package]] 4695 name = "syn" 4696 - version = "2.0.33" 4697 source = "registry+https://github.com/rust-lang/crates.io-index" 4698 - checksum = "9caece70c63bfba29ec2fed841a09851b14a235c60010fa4de58089b6c025668" 4699 dependencies = [ 4700 "proc-macro2", 4701 "quote", ··· 4766 dependencies = [ 4767 "proc-macro2", 4768 "quote", 4769 - "syn 2.0.33", 4770 ] 4771 4772 [[package]] ··· 4966 dependencies = [ 4967 "proc-macro2", 4968 "quote", 4969 - "syn 2.0.33", 4970 ] 4971 4972 [[package]] ··· 4979 ] 4980 4981 [[package]] 4982 name = "try-lock" 4983 version = "0.2.4" 4984 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 5026 source = "registry+https://github.com/rust-lang/crates.io-index" 5027 checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" 5028 dependencies = [ 5029 - "cfg-if 1.0.0", 5030 "rand", 5031 "static_assertions", 5032 ] 5033 5034 [[package]] 5035 name = "typenum" 5036 - version = "1.16.0" 5037 source = "registry+https://github.com/rust-lang/crates.io-index" 5038 - checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" 5039 5040 [[package]] 5041 name = "uds_windows" ··· 5285 "once_cell", 5286 "proc-macro2", 5287 "quote", 5288 - "syn 2.0.33", 5289 "wasm-bindgen-shared", 5290 ] 5291 ··· 5319 dependencies = [ 5320 "proc-macro2", 5321 "quote", 5322 - "syn 2.0.33", 5323 "wasm-bindgen-backend", 5324 "wasm-bindgen-shared", 5325 ] ··· 5511 checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" 5512 dependencies = [ 5513 "windows-targets 0.42.2", 5514 ] 5515 5516 [[package]]
··· 95 checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" 96 97 [[package]] 98 + name = "android-tzdata" 99 + version = "0.1.1" 100 + source = "registry+https://github.com/rust-lang/crates.io-index" 101 + checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" 102 + 103 + [[package]] 104 + name = "android_system_properties" 105 + version = "0.1.5" 106 + source = "registry+https://github.com/rust-lang/crates.io-index" 107 + checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" 108 + dependencies = [ 109 + "libc", 110 + ] 111 + 112 + [[package]] 113 name = "any_ascii" 114 version = "0.1.7" 115 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 176 dependencies = [ 177 "proc-macro2", 178 "quote", 179 + "syn 2.0.35", 180 ] 181 182 [[package]] ··· 296 dependencies = [ 297 "proc-macro2", 298 "quote", 299 + "syn 2.0.35", 300 ] 301 302 [[package]] ··· 313 dependencies = [ 314 "proc-macro2", 315 "quote", 316 + "syn 2.0.35", 317 ] 318 319 [[package]] 320 name = "atk-sys" 321 + version = "0.18.0" 322 source = "registry+https://github.com/rust-lang/crates.io-index" 323 + checksum = "251e0b7d90e33e0ba930891a505a9a35ece37b2dd37a14f3ffc306c13b980009" 324 dependencies = [ 325 "glib-sys", 326 "gobject-sys", ··· 565 dependencies = [ 566 "proc-macro2", 567 "quote", 568 + "syn 2.0.35", 569 ] 570 571 [[package]] ··· 582 583 [[package]] 584 name = "cairo-sys-rs" 585 + version = "0.18.2" 586 source = "registry+https://github.com/rust-lang/crates.io-index" 587 + checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" 588 dependencies = [ 589 "libc", 590 "system-deps", ··· 670 ] 671 672 [[package]] 673 + name = "chrono" 674 + version = "0.4.31" 675 + source = "registry+https://github.com/rust-lang/crates.io-index" 676 + checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" 677 + dependencies = [ 678 + "android-tzdata", 679 + "iana-time-zone", 680 + "num-traits 0.2.16", 681 + "windows-targets 0.48.5", 682 + ] 683 + 684 + [[package]] 685 name = "clap" 686 version = "3.2.25" 687 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1084 source = "registry+https://github.com/rust-lang/crates.io-index" 1085 checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" 1086 dependencies = [ 1087 + "libloading", 1088 ] 1089 1090 [[package]] ··· 1167 dependencies = [ 1168 "proc-macro2", 1169 "quote", 1170 + "syn 2.0.35", 1171 ] 1172 1173 [[package]] ··· 1535 dependencies = [ 1536 "proc-macro2", 1537 "quote", 1538 + "syn 2.0.35", 1539 ] 1540 1541 [[package]] ··· 1570 1571 [[package]] 1572 name = "gdk-pixbuf-sys" 1573 + version = "0.18.0" 1574 source = "registry+https://github.com/rust-lang/crates.io-index" 1575 + checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" 1576 dependencies = [ 1577 "gio-sys", 1578 "glib-sys", ··· 1583 1584 [[package]] 1585 name = "gdk-sys" 1586 + version = "0.18.0" 1587 source = "registry+https://github.com/rust-lang/crates.io-index" 1588 + checksum = "31ff856cb3386dae1703a920f803abafcc580e9b5f711ca62ed1620c25b51ff2" 1589 dependencies = [ 1590 "cairo-sys-rs", 1591 "gdk-pixbuf-sys", ··· 1669 1670 [[package]] 1671 name = "gio-sys" 1672 + version = "0.18.1" 1673 source = "registry+https://github.com/rust-lang/crates.io-index" 1674 + checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" 1675 dependencies = [ 1676 "glib-sys", 1677 "gobject-sys", ··· 1703 1704 [[package]] 1705 name = "glib-sys" 1706 + version = "0.18.1" 1707 source = "registry+https://github.com/rust-lang/crates.io-index" 1708 + checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" 1709 dependencies = [ 1710 "libc", 1711 "system-deps", ··· 1754 "glutin_egl_sys", 1755 "glutin_glx_sys", 1756 "glutin_wgl_sys", 1757 + "libloading", 1758 "objc2", 1759 "once_cell", 1760 "raw-window-handle", ··· 1844 1845 [[package]] 1846 name = "gobject-sys" 1847 + version = "0.18.0" 1848 source = "registry+https://github.com/rust-lang/crates.io-index" 1849 + checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" 1850 dependencies = [ 1851 "glib-sys", 1852 "libc", ··· 1855 1856 [[package]] 1857 name = "gtk-sys" 1858 + version = "0.18.0" 1859 source = "registry+https://github.com/rust-lang/crates.io-index" 1860 + checksum = "771437bf1de2c1c0b496c11505bdf748e26066bbe942dfc8f614c9460f6d7722" 1861 dependencies = [ 1862 "atk-sys", 1863 "cairo-sys-rs", ··· 2042 ] 2043 2044 [[package]] 2045 + name = "iana-time-zone" 2046 + version = "0.1.57" 2047 + source = "registry+https://github.com/rust-lang/crates.io-index" 2048 + checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" 2049 + dependencies = [ 2050 + "android_system_properties", 2051 + "core-foundation-sys", 2052 + "iana-time-zone-haiku", 2053 + "js-sys", 2054 + "wasm-bindgen", 2055 + "windows 0.48.0", 2056 + ] 2057 + 2058 + [[package]] 2059 + name = "iana-time-zone-haiku" 2060 + version = "0.1.2" 2061 + source = "registry+https://github.com/rust-lang/crates.io-index" 2062 + checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" 2063 + dependencies = [ 2064 + "cc", 2065 + ] 2066 + 2067 + [[package]] 2068 name = "idna" 2069 version = "0.4.0" 2070 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 2169 dependencies = [ 2170 "proc-macro2", 2171 "quote", 2172 + "syn 2.0.35", 2173 ] 2174 2175 [[package]] ··· 2295 2296 [[package]] 2297 name = "jxl-frame" 2298 + version = "0.5.0" 2299 source = "registry+https://github.com/rust-lang/crates.io-index" 2300 + checksum = "8d63bdd104e3746669a123de86f940aa5d59fdc9c5a65f16a4f867dde75e45e1" 2301 dependencies = [ 2302 "jxl-bitstream", 2303 "jxl-coding", ··· 2316 2317 [[package]] 2318 name = "jxl-image" 2319 + version = "0.5.0" 2320 source = "registry+https://github.com/rust-lang/crates.io-index" 2321 + checksum = "ef86f7f74acc9c9e66604c8d030e00cdef5a0c455ea3d7d26bd9ddbb9160be59" 2322 dependencies = [ 2323 "jxl-bitstream", 2324 "jxl-color", ··· 2328 2329 [[package]] 2330 name = "jxl-modular" 2331 + version = "0.3.0" 2332 source = "registry+https://github.com/rust-lang/crates.io-index" 2333 + checksum = "504e6b55db362568592be81993c772fc6786c56fb67ae769ff62dc514c3e6748" 2334 dependencies = [ 2335 "jxl-bitstream", 2336 "jxl-coding", ··· 2340 2341 [[package]] 2342 name = "jxl-oxide" 2343 + version = "0.4.0" 2344 source = "registry+https://github.com/rust-lang/crates.io-index" 2345 + checksum = "57e3b7e459d823979c4ca0c9584f391581db154437f34596ea443b082e9b6064" 2346 dependencies = [ 2347 "jxl-bitstream", 2348 "jxl-color", ··· 2355 2356 [[package]] 2357 name = "jxl-render" 2358 + version = "0.4.0" 2359 source = "registry+https://github.com/rust-lang/crates.io-index" 2360 + checksum = "7157d1c6c4896ddc800cb0cc8ba545ba7417ab9afc51f39e69484e6607c8707e" 2361 dependencies = [ 2362 "jxl-bitstream", 2363 "jxl-coding", ··· 2372 2373 [[package]] 2374 name = "jxl-vardct" 2375 + version = "0.3.0" 2376 source = "registry+https://github.com/rust-lang/crates.io-index" 2377 + checksum = "eb4a2d9ba8c48a52f6143ba01c38aac67d1309c9b939a9f84cd60f650d15053e" 2378 dependencies = [ 2379 "jxl-bitstream", 2380 "jxl-coding", ··· 2498 dependencies = [ 2499 "cfg-if 1.0.0", 2500 "winapi", 2501 ] 2502 2503 [[package]] ··· 3065 "proc-macro2", 3066 "quote", 3067 "spirv_cross", 3068 + "syn 2.0.35", 3069 ] 3070 3071 [[package]] ··· 3193 dependencies = [ 3194 "proc-macro2", 3195 "quote", 3196 + "syn 2.0.35", 3197 ] 3198 3199 [[package]] ··· 3297 "proc-macro-crate", 3298 "proc-macro2", 3299 "quote", 3300 + "syn 2.0.35", 3301 ] 3302 3303 [[package]] ··· 3382 3383 [[package]] 3384 name = "oculante" 3385 + version = "0.7.6" 3386 dependencies = [ 3387 "anyhow", 3388 "arboard", ··· 3425 "strum_macros", 3426 "tiff", 3427 "tiny-skia 0.9.1", 3428 + "trash", 3429 "turbojpeg", 3430 "usvg", 3431 "webbrowser", ··· 3538 dependencies = [ 3539 "proc-macro2", 3540 "quote", 3541 + "syn 2.0.35", 3542 ] 3543 3544 [[package]] 3545 name = "pango-sys" 3546 + version = "0.18.0" 3547 source = "registry+https://github.com/rust-lang/crates.io-index" 3548 + checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" 3549 dependencies = [ 3550 "glib-sys", 3551 "gobject-sys", ··· 3659 "phf_shared 0.11.2", 3660 "proc-macro2", 3661 "quote", 3662 + "syn 2.0.35", 3663 ] 3664 3665 [[package]] ··· 3703 dependencies = [ 3704 "proc-macro2", 3705 "quote", 3706 + "syn 2.0.35", 3707 ] 3708 3709 [[package]] ··· 4115 4116 [[package]] 4117 name = "rfd" 4118 + version = "0.12.0" 4119 source = "registry+https://github.com/rust-lang/crates.io-index" 4120 + checksum = "241a0deb168c88050d872294f7b3106c1dfa8740942bcc97bc91b98e97b5c501" 4121 dependencies = [ 4122 "block", 4123 "dispatch", 4124 "glib-sys", 4125 "gobject-sys", 4126 "gtk-sys", ··· 4133 "wasm-bindgen", 4134 "wasm-bindgen-futures", 4135 "web-sys", 4136 + "windows-sys 0.48.0", 4137 ] 4138 4139 [[package]] ··· 4424 dependencies = [ 4425 "proc-macro2", 4426 "quote", 4427 + "syn 2.0.35", 4428 ] 4429 4430 [[package]] ··· 4446 dependencies = [ 4447 "proc-macro2", 4448 "quote", 4449 + "syn 2.0.35", 4450 ] 4451 4452 [[package]] ··· 4581 4582 [[package]] 4583 name = "smithay-client-toolkit" 4584 + version = "0.16.1" 4585 source = "registry+https://github.com/rust-lang/crates.io-index" 4586 + checksum = "870427e30b8f2cbe64bf43ec4b86e88fe39b0a84b3f15efd9c9c2d020bc86eb9" 4587 dependencies = [ 4588 "bitflags 1.3.2", 4589 "calloop", ··· 4696 "proc-macro2", 4697 "quote", 4698 "rustversion", 4699 + "syn 2.0.35", 4700 ] 4701 4702 [[package]] ··· 4732 4733 [[package]] 4734 name = "syn" 4735 + version = "2.0.35" 4736 source = "registry+https://github.com/rust-lang/crates.io-index" 4737 + checksum = "59bf04c28bee9043ed9ea1e41afc0552288d3aba9c6efdd78903b802926f4879" 4738 dependencies = [ 4739 "proc-macro2", 4740 "quote", ··· 4805 dependencies = [ 4806 "proc-macro2", 4807 "quote", 4808 + "syn 2.0.35", 4809 ] 4810 4811 [[package]] ··· 5005 dependencies = [ 5006 "proc-macro2", 5007 "quote", 5008 + "syn 2.0.35", 5009 ] 5010 5011 [[package]] ··· 5018 ] 5019 5020 [[package]] 5021 + name = "trash" 5022 + version = "3.0.6" 5023 + source = "registry+https://github.com/rust-lang/crates.io-index" 5024 + checksum = "af3663fb8f476d674b9c61d1d2796acec725bef6bec4b41402a904252a25971e" 5025 + dependencies = [ 5026 + "chrono", 5027 + "libc", 5028 + "log", 5029 + "objc", 5030 + "once_cell", 5031 + "scopeguard", 5032 + "url", 5033 + "windows 0.44.0", 5034 + ] 5035 + 5036 + [[package]] 5037 name = "try-lock" 5038 version = "0.2.4" 5039 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 5081 source = "registry+https://github.com/rust-lang/crates.io-index" 5082 checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" 5083 dependencies = [ 5084 + "cfg-if 0.1.10", 5085 "rand", 5086 "static_assertions", 5087 ] 5088 5089 [[package]] 5090 name = "typenum" 5091 + version = "1.17.0" 5092 source = "registry+https://github.com/rust-lang/crates.io-index" 5093 + checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" 5094 5095 [[package]] 5096 name = "uds_windows" ··· 5340 "once_cell", 5341 "proc-macro2", 5342 "quote", 5343 + "syn 2.0.35", 5344 "wasm-bindgen-shared", 5345 ] 5346 ··· 5374 dependencies = [ 5375 "proc-macro2", 5376 "quote", 5377 + "syn 2.0.35", 5378 "wasm-bindgen-backend", 5379 "wasm-bindgen-shared", 5380 ] ··· 5566 checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" 5567 dependencies = [ 5568 "windows-targets 0.42.2", 5569 + ] 5570 + 5571 + [[package]] 5572 + name = "windows" 5573 + version = "0.48.0" 5574 + source = "registry+https://github.com/rust-lang/crates.io-index" 5575 + checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" 5576 + dependencies = [ 5577 + "windows-targets 0.48.5", 5578 ] 5579 5580 [[package]]
+2 -2
pkgs/applications/graphics/oculante/default.nix
··· 21 22 rustPlatform.buildRustPackage rec { 23 pname = "oculante"; 24 - version = "0.7.5"; 25 26 src = fetchFromGitHub { 27 owner = "woelper"; 28 repo = pname; 29 rev = version; 30 - hash = "sha256-8l6wOWvwPm18aqoTzt5+ZH7CDgeuxBvwO6w9Nor1Eig="; 31 }; 32 33 cargoLock = {
··· 21 22 rustPlatform.buildRustPackage rec { 23 pname = "oculante"; 24 + version = "0.7.6"; 25 26 src = fetchFromGitHub { 27 owner = "woelper"; 28 repo = pname; 29 rev = version; 30 + hash = "sha256-nUq/Fwftfg7H+HlMZO2JMfGBeCOs6nEAcsbrbowPC4A="; 31 }; 32 33 cargoLock = {
+2 -2
pkgs/applications/misc/keepass/default.nix
··· 4 inherit (builtins) add length readFile replaceStrings unsafeDiscardStringContext toString map; 5 in buildDotnetPackage rec { 6 pname = "keepass"; 7 - version = "2.53.1"; 8 9 src = fetchurl { 10 url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; 11 - hash = "sha256-R7KWxlxrhl55nOaDNYwA/cJJl+kd5ZYy6eZVqyrxxnM="; 12 }; 13 14 sourceRoot = ".";
··· 4 inherit (builtins) add length readFile replaceStrings unsafeDiscardStringContext toString map; 5 in buildDotnetPackage rec { 6 pname = "keepass"; 7 + version = "2.54"; 8 9 src = fetchurl { 10 url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; 11 + hash = "sha256-fDXT4XxoJfPV8tU8uL94bnL//zKlvXGS9EzNls52kJg="; 12 }; 13 14 sourceRoot = ".";
+30 -31
pkgs/applications/misc/keepass/fix-paths.patch
··· 53 54 int iSep = str.IndexOf(':'); 55 diff --git a/KeePass/Util/ClipboardUtil.Unix.cs b/KeePass/Util/ClipboardUtil.Unix.cs 56 - index ab49ee2..7f6c50f 100644 57 --- a/KeePass/Util/ClipboardUtil.Unix.cs 58 +++ b/KeePass/Util/ClipboardUtil.Unix.cs 59 - @@ -62,7 +62,7 @@ namespace KeePass.Util 60 - // "-out -selection clipboard"); 61 - // if(str != null) return str; 62 63 - - string str = NativeLib.RunConsoleApp("xsel", 64 - + string str = NativeLib.RunConsoleApp("@xsel@", 65 - "--output --clipboard", null, XSelFlags); 66 - if(str != null) return str; 67 68 - @@ -83,10 +83,10 @@ namespace KeePass.Util 69 - if(string.IsNullOrEmpty(str)) 70 - { 71 - // xsel with an empty input can hang, thus use --clear 72 - - if(NativeLib.RunConsoleApp("xsel", "--clear --primary", 73 - + if(NativeLib.RunConsoleApp("@xsel@", "--clear --primary", 74 - null, XSelFlags) != null) 75 { 76 - - NativeLib.RunConsoleApp("xsel", "--clear --clipboard", 77 - + NativeLib.RunConsoleApp("@xsel@", "--clear --clipboard", 78 - null, XSelFlags); 79 return; 80 } 81 - @@ -97,10 +97,10 @@ namespace KeePass.Util 82 - } 83 - 84 - // xsel does not support --primary and --clipboard together 85 - - if(NativeLib.RunConsoleApp("xsel", "--input --primary", 86 - + if(NativeLib.RunConsoleApp("@xsel@", "--input --primary", 87 - str, XSelFlags) != null) 88 - { 89 - - NativeLib.RunConsoleApp("xsel", "--input --clipboard", 90 - + NativeLib.RunConsoleApp("@xsel@", "--input --clipboard", 91 - str, XSelFlags); 92 - return; 93 - } 94 diff --git a/KeePassLib/Native/ClipboardU.cs b/KeePassLib/Native/ClipboardU.cs 95 index 291c51d..3c76380 100644 96 --- a/KeePassLib/Native/ClipboardU.cs
··· 53 54 int iSep = str.IndexOf(':'); 55 diff --git a/KeePass/Util/ClipboardUtil.Unix.cs b/KeePass/Util/ClipboardUtil.Unix.cs 56 --- a/KeePass/Util/ClipboardUtil.Unix.cs 57 +++ b/KeePass/Util/ClipboardUtil.Unix.cs 58 + @@ -65,7 +65,7 @@ 59 + // "-out -selection clipboard"); 60 + // if(str != null) return str; 61 62 + - string str = NativeLib.RunConsoleApp("xsel", 63 + + string str = NativeLib.RunConsoleApp("@xsel@", 64 + "--output --clipboard", null, XSelFlags); 65 + if(str != null) return str; 66 + } 67 + @@ -93,10 +93,10 @@ 68 + if(string.IsNullOrEmpty(str)) 69 + { 70 + // xsel with an empty input can hang, thus use --clear 71 + - if(NativeLib.RunConsoleApp("xsel", "--clear --primary", 72 + + if(NativeLib.RunConsoleApp("@xsel@", "--clear --primary", 73 + null, XSelFlags) != null) 74 + { 75 + - NativeLib.RunConsoleApp("xsel", "--clear --clipboard", 76 + + NativeLib.RunConsoleApp("@xsel@", "--clear --clipboard", 77 + null, XSelFlags); 78 + return; 79 + } 80 + @@ -107,10 +107,10 @@ 81 + } 82 83 + // xsel does not support --primary and --clipboard together 84 + - if(NativeLib.RunConsoleApp("xsel", "--input --primary", 85 + + if(NativeLib.RunConsoleApp("@xsel@", "--input --primary", 86 + str, XSelFlags) != null) 87 { 88 + - NativeLib.RunConsoleApp("xsel", "--input --clipboard", 89 + + NativeLib.RunConsoleApp("@xsel@", "--input --clipboard", 90 + str, XSelFlags); 91 return; 92 } 93 diff --git a/KeePassLib/Native/ClipboardU.cs b/KeePassLib/Native/ClipboardU.cs 94 index 291c51d..3c76380 100644 95 --- a/KeePassLib/Native/ClipboardU.cs
+5 -4
pkgs/applications/networking/cluster/nomad/default.nix
··· 1 { lib 2 , buildGoModule 3 , buildGo120Module 4 , fetchFromGitHub 5 , nixosTests 6 , installShellFiles ··· 73 }; 74 75 nomad_1_6 = generic { 76 - buildGoModule = buildGo120Module; 77 - version = "1.6.1"; 78 - sha256 = "sha256-RsyGUaLteGiNf0PTkKLcjHTevhKb/mNx2JORpXhHJMw="; 79 - vendorHash = "sha256-Y3O7ADzZPlLWFbXSYBcI6b5MAhMD0UnkhQxO9VJMpOY="; 80 passthru.tests.nomad = nixosTests.nomad; 81 preCheck = '' 82 export PATH="$PATH:$NIX_BUILD_TOP/go/bin"
··· 1 { lib 2 , buildGoModule 3 , buildGo120Module 4 + , buildGo121Module 5 , fetchFromGitHub 6 , nixosTests 7 , installShellFiles ··· 74 }; 75 76 nomad_1_6 = generic { 77 + buildGoModule = buildGo121Module; 78 + version = "1.6.2"; 79 + sha256 = "sha256-Q0RyO9FZWGxWgVmTU07/pw5P4Ebcwcednq8TDmshuAk="; 80 + vendorHash = "sha256-XCuWhKuBtSPTK8fXwgjMKMjwLnl1KWZKSJ4Ih9XDIDc="; 81 passthru.tests.nomad = nixosTests.nomad; 82 preCheck = '' 83 export PATH="$PATH:$NIX_BUILD_TOP/go/bin"
+7
pkgs/build-support/flutter/default.nix
··· 3 , stdenvNoCC 4 , runCommand 5 , makeWrapper 6 , llvmPackages_13 7 , cacert 8 , flutter 9 , jq 10 }: ··· 68 deps 69 flutter 70 jq 71 ] ++ nativeBuildInputs; 72 73 preUnpack = '' 74 ${lib.optionalString (!autoDepsList) '' ··· 144 for f in "$out"/bin/*; do 145 wrapProgram "$f" \ 146 --suffix LD_LIBRARY_PATH : '${lib.makeLibraryPath finalAttrs.runtimeDependencies}' \ 147 ${extraWrapProgramArgs} 148 done 149
··· 3 , stdenvNoCC 4 , runCommand 5 , makeWrapper 6 + , wrapGAppsHook 7 , llvmPackages_13 8 , cacert 9 + , glib 10 , flutter 11 , jq 12 }: ··· 70 deps 71 flutter 72 jq 73 + glib 74 + wrapGAppsHook 75 ] ++ nativeBuildInputs; 76 + 77 + dontWrapGApps = true; 78 79 preUnpack = '' 80 ${lib.optionalString (!autoDepsList) '' ··· 150 for f in "$out"/bin/*; do 151 wrapProgram "$f" \ 152 --suffix LD_LIBRARY_PATH : '${lib.makeLibraryPath finalAttrs.runtimeDependencies}' \ 153 + ''${gappsWrapperArgs[@]} \ 154 ${extraWrapProgramArgs} 155 done 156
+10 -10
pkgs/development/compilers/flutter/default.nix
··· 74 { 75 inherit wrapFlutter; 76 stable = mkFlutter { 77 - version = "3.13.0"; 78 - engineVersion = "1ac611c64eadbd93c5f5aba5494b8fc3b35ee952"; 79 - dartVersion = "3.1.0"; 80 dartHash = { 81 - x86_64-linux = "sha256-sGpRyuUTkZ0cpG/O21NCHaOsQRjNklsl9G6Ia1tZxAw="; 82 - aarch64-linux = "sha256-wcDtL/Lh0NFC01QlnKwx8ovTHZ5ww+rb1sELn92R1uU="; 83 - x86_64-darwin = "sha256-h+e7ABlLWCxc6wrbjiy5lgp6O/DnNKdXFNJtgnXBZNA="; 84 - aarch64-darwin = "sha256-sAWnd09mbcRLP0WjSjjWF7+WQ7LP3tWsq5Kqw8e4APg="; 85 }; 86 flutterHash = rec { 87 - x86_64-linux = "sha256-gXNQ9RuHVC/3puHNygWPRdezx8iiKmiOnxQmoX6XUFo="; 88 aarch64-linux = x86_64-linux; 89 - x86_64-darwin = "sha256-vI8TsXIfTg4PYf5dzxDaJt+PIdmVFBmd2slKK7c1By0="; 90 - aarch64-darwin = "sha256-VhGJlp+HG8QLZx8u0xK+cgbneoDM7zhNvm3Oco4nBms="; 91 }; 92 patches = flutter3Patches; 93 };
··· 74 { 75 inherit wrapFlutter; 76 stable = mkFlutter { 77 + version = "3.13.4"; 78 + engineVersion = "9064459a8b0dcd32877107f6002cc429a71659d1"; 79 + dartVersion = "3.1.2"; 80 dartHash = { 81 + x86_64-linux = "sha256-kriMqIvS/ZPhCR+hDTZReW4MMBYCVzSO9xTuPrJ1cPg="; 82 + aarch64-linux = "sha256-Fvg9Rr9Z7LYz8MjyzVCZwCzDiWPLDvH8vgD0oDZTksw="; 83 + x86_64-darwin = "sha256-WL42AYjT2iriVP05Pm7288um+oFwS8o8gU5tCwSOvUM="; 84 + aarch64-darwin = "sha256-BMbjSNJuh3RC+ObbJf2l6dacv2Hsn2/uygKDrP5EiuU="; 85 }; 86 flutterHash = rec { 87 + x86_64-linux = "sha256-BPEmO4c3H2bOa+sBAVDz5/qvajobK3YMnBfQWhJUydw="; 88 aarch64-linux = x86_64-linux; 89 + x86_64-darwin = "sha256-BpxeCE9vTnmlIp6OS7BTPkOFptidjXbf2qVOVUAqstY="; 90 + aarch64-darwin = "sha256-rccuxrE9nzC86uKGL96Etxxs4qMbVXJ1jCn/wjp9WlQ="; 91 }; 92 patches = flutter3Patches; 93 };
+57 -56
pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
··· 1 { 2 - "1ac611c64eadbd93c5f5aba5494b8fc3b35ee952" = { 3 skyNotice = "sha256-bJMktK26wC9fVzdhLNcTHqOg5sHRZ535LB5u5dgwjlY="; 4 flutterNotice = "sha256-pZjblLYpD/vhC17PkRBXtqlDNRxyf92p5fKJHWhwCiA="; 5 android-arm = { 6 - "artifacts.zip" = "sha256-rAWcm/vjJ7P9q69z0bZNhBv/NO+sGhFJe+r/BHPR1To="; 7 }; 8 android-arm-profile = { 9 - "artifacts.zip" = "sha256-08+LDA7qNcMFH4xk+WfAXYqIDueCSHNmD/i/XaDeTrA="; 10 - "linux-x64.zip" = "sha256-LWdrWdSGDAfX0gGtqQ2mSschBW3EAgaBldL/Cw99ft8="; 11 - "darwin-x64.zip" = "sha256-FeBLBp3U2BPun/iPpTmHvaj3ZO8l7DQhwArqKN+D1m0="; 12 }; 13 android-arm-release = { 14 - "artifacts.zip" = "sha256-VCWSWfL74PJ6F6N18mOHjOkN8oTkL8coDfemV0Pc/Fw="; 15 - "linux-x64.zip" = "sha256-xtQJ9merALKe20LZai+5ApJNOXR3uweIYQFWSyjmBEE="; 16 - "darwin-x64.zip" = "sha256-YuEY7ZQAqpo0wbvI/iK3YYUSguZGi/wSl/DLPzmlNj8="; 17 }; 18 android-arm64 = { 19 - "artifacts.zip" = "sha256-z4gvkNofQaFv8tFAXcLepsge9CV1T7cBe3EZRdBT7Ms="; 20 }; 21 android-arm64-profile = { 22 - "artifacts.zip" = "sha256-7DHKcgwdaG6+MH7uVqSk2UGxLM4VsHVk5vUtYMn11kQ="; 23 - "linux-x64.zip" = "sha256-3ZahRPzDVBff2pGUjjoIABH1lmwyrx05GnaJNyF4OiY="; 24 - "darwin-x64.zip" = "sha256-Pmil9S314EoWJhfo0nrtBh1VLUeiavKvp/LIPZJoy6U="; 25 }; 26 android-arm64-release = { 27 - "artifacts.zip" = "sha256-GI+ADau8sbD9+ctXrciraeXNPGMto2+bBDyJcKt9YTE="; 28 - "linux-x64.zip" = "sha256-riHs2bbOFNH7VqD3snEu5RuKrMqbsuFnDBZ9Apxq/+g="; 29 - "darwin-x64.zip" = "sha256-DwTskXkcNqNsU3I+t9UMvKjxG4O2mN4cUGLB4dSWBHM="; 30 }; 31 android-x64 = { 32 - "artifacts.zip" = "sha256-0dkDhr/TJi4ROcN1BV1OsUwWSnZuEHzgM0DKSeUIrnA="; 33 }; 34 android-x64-profile = { 35 - "artifacts.zip" = "sha256-2g+GaZHO17/rLa6Y1DHfDEq0Q05NRxQ5ese2Eo5rvNA="; 36 - "linux-x64.zip" = "sha256-O3bHS/UHz8ymXq8ZEutLIj7K8wVTdt7vTo3OLGAkkh8="; 37 - "darwin-x64.zip" = "sha256-vEzg6vxm1CbvVBSAoWwZhAS/bsuDlesmo30zWwK2a7g="; 38 }; 39 android-x64-release = { 40 - "artifacts.zip" = "sha256-nlYI2ffULiDrehOSFEZkZoav/RJ0VykwREQkUwNX2/I="; 41 - "linux-x64.zip" = "sha256-iUy8tjpkFd3V/RIVRPbNNEsa/GAXhtLsNAkEOvdKhks="; 42 - "darwin-x64.zip" = "sha256-xZf2f4L/hSJEN63hQqtP0rbXkB2iw/Co4vLXYe/oeI4="; 43 }; 44 android-x86 = { 45 - "artifacts.zip" = "sha256-OIB7VnhCasOflVtGFOe1DgCLP4Os82R6H7ucp0Wrez0="; 46 }; 47 android-x86-jit-release = { 48 - "artifacts.zip" = "sha256-dyjGkQJu73sOaxKvmIlbS5j0zO78RXHZrJQVi7qpBAU="; 49 }; 50 darwin-arm64 = { 51 - "artifacts.zip" = "sha256-Ro+N5e5RhXgfqVDSEvqCKPdXRK1QnYCvIqmtlEW4s8c="; 52 - "font-subset.zip" = "sha256-yCboANBEarWZDtoTwDFbtnlsPW2kPwZ5Jp31V2hbga4="; 53 }; 54 darwin-arm64-profile = { 55 - "artifacts.zip" = "sha256-Lf3LLkRhtGNA9cWZwv4Q9MncXzOoVCgmp+6osWRUCE0="; 56 }; 57 darwin-arm64-release = { 58 - "artifacts.zip" = "sha256-6BSQ2zodrQmZKkHeaGVVT4D7jNekhwNOul5C6qwLbO8="; 59 }; 60 darwin-x64 = { 61 - "FlutterEmbedder.framework.zip" = "sha256-4jYk+aYjOS/CZajS1oVBexg2+C9fy0OmfaI6i3rrhXo="; 62 - "FlutterMacOS.framework.zip" = "sha256-Im7DTFf1zXrG6n1OtM4Jixd992mS2r47GRnAa7/urNc="; 63 - "artifacts.zip" = "sha256-SdnPPnx4NOfOlJU1234977/cVRCa/5KTI/1kqCtTxG0="; 64 - "font-subset.zip" = "sha256-F7qt7X0FNXODb3rvTkXacK3wG/aEVn+ny8DHFL3gEkI="; 65 - "gen_snapshot.zip" = "sha256-czdCi1cPdD/nu0LJIsgUj42O6D5x5xTKfM8l/UiKZqw="; 66 }; 67 darwin-x64-profile = { 68 - "FlutterMacOS.framework.zip" = "sha256-gdfoq6jdHFDb2JXCf45qJ2ekTildUptLb/k0XuHYuh8="; 69 - "artifacts.zip" = "sha256-aEoenQh0Q8xuLU6OeFND3GBbOvhMNsovbbFQwQfudm0="; 70 - "gen_snapshot.zip" = "sha256-tY3qmpdF7MP4iEfqgouzLehr901H3QTLxeV28RoLPDY="; 71 }; 72 darwin-x64-release = { 73 - "FlutterMacOS.dSYM.zip" = "sha256-dNlx9PsXeJeV6FMPOliRyuc5p58DeEmXus2zP1dOqPs="; 74 - "FlutterMacOS.framework.zip" = "sha256-ibmcuVjd3kswmUvXzZi8vl5uNEbnWvMAwzWYxs8i1zw="; 75 - "artifacts.zip" = "sha256-KCXwR/ZZK1jyLQaIAsb+wAz4awVU1QozydIQt10M30A="; 76 - "gen_snapshot.zip" = "sha256-hZT+IMHbvSTjk2WcNvfPl+vdXZ2vbB/MjiYP1Q+cKD8="; 77 }; 78 - "flutter_patched_sdk.zip" = "sha256-vm9Zt+obBuYHQchQlqlinGYg9mwmoo41HwqYzy8QXP0="; 79 - "flutter_patched_sdk_product.zip" = "sha256-JjMQ2zEGXKIcyYqYfCxDYlRbwglVMQ8H1zs5h6To1es=" 80 ; 81 ios = { 82 - "artifacts.zip" = "sha256-9/GWCsOvwEXVWYMYn48sZTe44GhB2JBJtPDRFUqgTek="; 83 }; 84 ios-profile = { 85 - "artifacts.zip" = "sha256-XZ4AFdG60gUx2xv3qZdk8Hh/0ZuIeJXeBxBoWlmhP4I="; 86 }; 87 ios-release = { 88 - "Flutter.dSYM.zip" = "sha256-QWCVU518mUHDXDdUm58XfS1TWYNkXI8LnfOIZ0PYLjs="; 89 - "artifacts.zip" = "sha256-tFmIpEogaqCcx4ftVRah3Bw3CeB0dTku0xUMvUVfR00="; 90 }; 91 linux-arm64 = { 92 - "artifacts.zip" = "sha256-MFsYOUIYLRINLNOjsDLFX4WPwcW3FTQ7P55/i8xQqcI="; 93 - "font-subset.zip" = "sha256-nIWE1Mep1R1EMS3vS31qdTybhFOCyr7/agPEjlAodOQ="; 94 }; 95 linux-arm64-debug = { 96 - "linux-arm64-flutter-gtk.zip" = "sha256-2zYHns8gycYy7VNjXfJdf/yl71VJSDFSIMb6lQ0JuKI="; 97 }; 98 linux-arm64-profile = { 99 - "linux-arm64-flutter-gtk.zip" = "sha256-doGUIbTinn5kfw20NZRyph96ZkSa77Vm+y1Z/jBUi/E="; 100 }; 101 linux-arm64-release = { 102 - "linux-arm64-flutter-gtk.zip" = "sha256-3zeRvhTZ3nFhOuiacJLTTlPBkyP1u3lh00j3e4jJpXU="; 103 }; 104 linux-x64 = { 105 - "artifacts.zip" = "sha256-L8DrlHTLYneYo5yMdgXVZw3YikF0qBKijGVLJZJLTEA="; 106 - "font-subset.zip" = "sha256-KC733fwlRIK6DhjAJopnKdzjaC1JhvJ8nK74x+5DtIE="; 107 }; 108 linux-x64-debug = { 109 - "linux-x64-flutter-gtk.zip" = "sha256-5hu5uRB4gOnZyH4zWBj/b2Flz6+5DUK2ytTHWGVfp4A="; 110 }; 111 linux-x64-profile = { 112 - "linux-x64-flutter-gtk.zip" = "sha256-gYGBrExyYlIl+nYnCvlGBq13bP0E5bzzM089THEqHBM="; 113 }; 114 linux-x64-release = { 115 - "linux-x64-flutter-gtk.zip" = "sha256-Hw/hAMohLko1AMu3sr4Dq5OwvmrBP2PPJcJRVMgy6B4="; 116 }; 117 }; 118 }
··· 1 { 2 + "9064459a8b0dcd32877107f6002cc429a71659d1" = { 3 skyNotice = "sha256-bJMktK26wC9fVzdhLNcTHqOg5sHRZ535LB5u5dgwjlY="; 4 flutterNotice = "sha256-pZjblLYpD/vhC17PkRBXtqlDNRxyf92p5fKJHWhwCiA="; 5 android-arm = { 6 + "artifacts.zip" = "sha256-AABHJH/EOOQzEcD0O/XftA1AAV8tNFX3dj0OsJJ3/9A="; 7 }; 8 android-arm-profile = { 9 + "artifacts.zip" = "sha256-MLlQFtjrGDQc3mH2T7CUlR/wDOPS7HRfgUuoLXjtd+E="; 10 + "linux-x64.zip" = "sha256-S2/5ZFhNkDxUqsUZCFrwTERTUZIZpOiFijhcLZnozLI="; 11 + "darwin-x64.zip" = "sha256-IwtYSpcg+5JmnkHuj6LGVp7GWiuUzETOPgKYRQczWzc="; 12 }; 13 android-arm-release = { 14 + "artifacts.zip" = "sha256-NLvwaB4UkYBRzg4cxzNZkileDFQk6GT/8nRugHU98Is="; 15 + "linux-x64.zip" = "sha256-dua4xvVqsJY1d/eyA8j6NPnpAbotigPIs8SRj28F87w="; 16 + "darwin-x64.zip" = "sha256-2B1+s6sngbN0+sPP1qKVpeMF6RIZZToF88baiqcNQT4="; 17 }; 18 android-arm64 = { 19 + "artifacts.zip" = "sha256-Hf+S8XuAzD9HCU4FVmjN0jvTTxPtzEm+k++8IgaXOyM="; 20 }; 21 android-arm64-profile = { 22 + "artifacts.zip" = "sha256-k4miTzdDL+gg9LxzjBVRtAuwhKELBiVDsvQ+aVeWTeI="; 23 + "linux-x64.zip" = "sha256-2ErIxNdX1NfHrjiqZzNwISKybeS9SGOlqFh7G8KCAcE="; 24 + "darwin-x64.zip" = "sha256-1FdvI6llPjAeSc7+e97rvG7SvvFHqZH+4MREuRyF1DA="; 25 }; 26 android-arm64-release = { 27 + "artifacts.zip" = "sha256-y64Xhi5QFirZadU+fW8MOpkEarq/KPoEmmo0XRYf3/E="; 28 + "linux-x64.zip" = "sha256-8dKrP9wQ9hDHNNrz1ZiYLV6zeGB60ikyrRFS6xdu+4Q="; 29 + "darwin-x64.zip" = "sha256-2/eyFFAAUnuDtDoVh6L5emRXaQ03kwNRf6yIceWX3eU="; 30 }; 31 android-x64 = { 32 + "artifacts.zip" = "sha256-b3AtOxad05vaXQzeCBtSf3G8ZiM0tOG0JRu4vbNtfgI="; 33 }; 34 android-x64-profile = { 35 + "artifacts.zip" = "sha256-TVOtSjKc8WkvYsY+aK7OH9eTA/q7tmtnSdQArPWS2vM="; 36 + "linux-x64.zip" = "sha256-IHv3TGI1Yvhoq1ehVyVUn3JtPTCFyEtxdysvr/SWFxY="; 37 + "darwin-x64.zip" = "sha256-B4XooSrLRJh3XADfIAv/YBDCT/Mpg2di0oE4SZlU8I8="; 38 }; 39 android-x64-release = { 40 + "artifacts.zip" = "sha256-EaImhQlUnG/zYHDROkdgQdGHD9AfDJULowS785aVoCM="; 41 + "linux-x64.zip" = "sha256-ZBvtCVUNf0D1P1lz4vmIrhsn9hZmJZ5Tn65v9Wot6bk="; 42 + "darwin-x64.zip" = "sha256-IbMANAKyz7uFG5oqOKMj0KTVhaCBryBKdobvgS9bOgI="; 43 }; 44 android-x86 = { 45 + "artifacts.zip" = "sha256-ElFkaxlyLVbexdocyQ1AIKgfr93ol1EDyf+aFDt4I10="; 46 }; 47 android-x86-jit-release = { 48 + "artifacts.zip" = "sha256-ptrhyXrx8xGuRQYs8nBryzyDuCiIMsgMmqxi3kHXQ4s="; 49 }; 50 darwin-arm64 = { 51 + "artifacts.zip" = "sha256-nG23DmYeKoMJnuTPMnvouPHzK3XNKBrEIZ5zijiCoAg="; 52 + "font-subset.zip" = "sha256-Kx3G5FmN2bVgIvYiQP9og8kgl28ZCXThpcmByAv+f6U="; 53 }; 54 darwin-arm64-profile = { 55 + "artifacts.zip" = "sha256-Uzg5F2NPlVN/cui4ixJ3JxBttn0KQMEyKEVLmecssuU="; 56 }; 57 darwin-arm64-release = { 58 + "artifacts.zip" = "sha256-qZ1jYvvkBcaIHqZszFTOcuCDWnEmm/vsJt2aSZvgO+s="; 59 }; 60 darwin-x64 = { 61 + "FlutterEmbedder.framework.zip" = "sha256-6ApkTiLh++bwgfYOGRoqnXglboqCWxc0VpNcYitjLLk="; 62 + "FlutterMacOS.framework.zip" = "sha256-PP2E+PY1HB2OkX8a8/E/HpUBPRoDJyo/2BNUKd1Xd2s="; 63 + "artifacts.zip" = "sha256-aZf99m1KlIpEuwwMMWAksp9d/SQQXt8jOTs/6GJUhcw="; 64 + "font-subset.zip" = "sha256-ZfdDnRPDOqNsj3dCHStLWXWCMOzodmR4ojQrMQt6hQY="; 65 + "gen_snapshot.zip" = "sha256-1xi4EJsiOIJSaBSIhl7p4L0aWtLYR1vGz4yYzNdVuQw="; 66 }; 67 darwin-x64-profile = { 68 + "FlutterMacOS.framework.zip" = "sha256-zDTey1dN4TYfi2/tDlxHPZhW3szZuGTMSaObNNH4zZo="; 69 + "artifacts.zip" = "sha256-kZ6io/+ohx5jKhu1i/l0UZbTB1gk6BSn1VryZJxPcjU="; 70 + "gen_snapshot.zip" = "sha256-5AUul5CQ6A8YGb6/PAfbPH7G/c+9rElDftmL3WIi4ZQ="; 71 }; 72 darwin-x64-release = { 73 + "FlutterMacOS.dSYM.zip" = "sha256-DN5R/U+pcCgFyR6wLcp11Bjvov4sS0J3crMWOx0dNBI="; 74 + "FlutterMacOS.framework.zip" = "sha256-9rEkGe0iz51aVXtCXK+KolJqjNUOEMwjeRHdF6kBjPs="; 75 + "artifacts.zip" = "sha256-Lpz0WLAdspPybLhTnS2fsReTAZ0qkJmMvY+u8iCe53s="; 76 + "gen_snapshot.zip" = "sha256-RLO5V6B/xzI5ljbIY7Yj4m1aFYYJ0PeO6nAyAN/ufnM="; 77 }; 78 + "flutter_patched_sdk.zip" = "sha256-d1KBJex2XgFbM0GgtcMFGDG2MN00zPd5HyAP54vBIaw="; 79 + "flutter_patched_sdk_product.zip" = "sha256-TG0OfcYQHy7Um1nl7xHXGl0oGGkna1tKSWhtnLTo2Ic=" 80 ; 81 ios = { 82 + "artifacts.zip" = "sha256-bTtAJ4mrJZmT9IcDppfvm1ih3lNqJqywgatN3k48hoI="; 83 }; 84 ios-profile = { 85 + "artifacts.zip" = "sha256-4bqMbZ0ASURIRp6Zfs25Nww+5FasRqdXcppX2KSWK0g="; 86 }; 87 ios-release = { 88 + "Flutter.dSYM.zip" = "sha256-LsYX9BTj9FXaW4f+7q6S/raZNx97FmGdJvegYrFiCAc="; 89 + "artifacts.zip" = "sha256-KZBpNSeXCqfRydOdFzcaYdde3OCw7oI7x9/1l/4WlSk="; 90 }; 91 linux-arm64 = { 92 + "artifacts.zip" = "sha256-YBXe02wlxxpWT2pDUSILK/GXpKGx2vQo55E8zDOd4IQ="; 93 + "font-subset.zip" = "sha256-02PHMUCPn6VBaQazfjEqVCGDPeGRXVTMXW8eAOuQRhY="; 94 }; 95 linux-arm64-debug = { 96 + "linux-arm64-flutter-gtk.zip" = "sha256-ZTWenA3msfvFjoPA5ByX1/kXTDtd6H0H6i8AP2K9Zt8="; 97 }; 98 linux-arm64-profile = { 99 + "linux-arm64-flutter-gtk.zip" = "sha256-CDXfWkg/WHT9A8EAzo78KiUI3uN1rZyvrPSDH5fyiQU="; 100 }; 101 linux-arm64-release = { 102 + "linux-arm64-flutter-gtk.zip" = "sha256-62dlbrqCj5mbIQXxMPzXTXHSJdJH4nao1a1c1WOSB1Y="; 103 }; 104 linux-x64 = { 105 + "artifacts.zip" = "sha256-YVKajJeP6hFkLJk0HPIrEg/ig0tzkGj34z3ZA3VB8fE="; 106 + "font-subset.zip" = "sha256-OFWcMnVi6AQoXKYcyMU8JN4/XM3OgSes0hzz8odTc8w="; 107 }; 108 linux-x64-debug = { 109 + "linux-x64-flutter-gtk.zip" = "sha256-Z8xCDor+sBwXg63r0o7RudzoWj5AsAUkc53F6dvEsLY="; 110 }; 111 linux-x64-profile = { 112 + "linux-x64-flutter-gtk.zip" = "sha256-x7n84R4y7/jH/rUbe86Gm0oLM5aLSTB2UjjeIpRJ1zQ="; 113 }; 114 linux-x64-release = { 115 + "linux-x64-flutter-gtk.zip" = "sha256-B/Rtkln/rLS9M1gciXRnKvhPwR6bJrjGhrE9o1waamI="; 116 }; 117 }; 118 } 119 +
+34 -20
pkgs/development/compilers/flutter/wrapper.nix
··· 33 , makeWrapper 34 , runCommandLocal 35 , writeShellScript 36 , git 37 , which 38 , pkg-config ··· 166 includeFlags = map (pkg: "-isystem ${lib.getOutput "dev" pkg}/include") (appStaticBuildDeps ++ extraIncludes); 167 linkerFlags = (map (pkg: "-rpath,${lib.getOutput "lib" pkg}/lib") appRuntimeDeps) ++ extraLinkerFlags; 168 in 169 - (callPackage ./sdk-symlink.nix { }) (runCommandLocal "flutter-wrapped" 170 { 171 - nativeBuildInputs = [ 172 - makeWrapper 173 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ]; 174 175 passthru = flutter.passthru // { 176 - inherit (flutter) version; 177 unwrapped = flutter; 178 }; 179 180 - inherit (flutter) meta; 181 - } '' 182 - for path in ${builtins.concatStringsSep " " (builtins.foldl' (paths: pkg: paths ++ (map (directory: "'${pkg}/${directory}/pkgconfig'") ["lib" "share"])) [ ] pkgConfigPackages)}; do 183 - addToSearchPath FLUTTER_PKG_CONFIG_PATH "$path" 184 - done 185 186 - mkdir -p $out/bin 187 - makeWrapper '${immutableFlutter}' $out/bin/flutter \ 188 - --set-default ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ 189 - --suffix PATH : '${lib.makeBinPath (tools ++ buildTools)}' \ 190 - --suffix PKG_CONFIG_PATH : "$FLUTTER_PKG_CONFIG_PATH" \ 191 - --suffix LIBRARY_PATH : '${lib.makeLibraryPath appStaticBuildDeps}' \ 192 - --prefix CXXFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCxxFlags)}' \ 193 - --prefix CFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCFlags)}' \ 194 - --prefix LDFLAGS "''\t" '${builtins.concatStringsSep " " (map (flag: "-Wl,${flag}") linkerFlags)}' 195 - '')
··· 33 , makeWrapper 34 , runCommandLocal 35 , writeShellScript 36 + , wrapGAppsHook 37 , git 38 , which 39 , pkg-config ··· 167 includeFlags = map (pkg: "-isystem ${lib.getOutput "dev" pkg}/include") (appStaticBuildDeps ++ extraIncludes); 168 linkerFlags = (map (pkg: "-rpath,${lib.getOutput "lib" pkg}/lib") appRuntimeDeps) ++ extraLinkerFlags; 169 in 170 + (callPackage ./sdk-symlink.nix { }) (stdenv.mkDerivation 171 { 172 + pname = "flutter-wrapped"; 173 + inherit (flutter) version; 174 + 175 + nativeBuildInputs = [ makeWrapper ] 176 + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ] 177 + ++ lib.optionals supportsLinuxDesktop [ glib wrapGAppsHook ]; 178 179 passthru = flutter.passthru // { 180 unwrapped = flutter; 181 + inherit engineArtifacts; 182 }; 183 184 + dontUnpack = true; 185 + dontWrapGApps = true; 186 + 187 + installPhase = '' 188 + runHook preInstall 189 + 190 + for path in ${builtins.concatStringsSep " " (builtins.foldl' (paths: pkg: paths ++ (map (directory: "'${pkg}/${directory}/pkgconfig'") ["lib" "share"])) [ ] pkgConfigPackages)}; do 191 + addToSearchPath FLUTTER_PKG_CONFIG_PATH "$path" 192 + done 193 + 194 + mkdir -p $out/bin 195 + makeWrapper '${immutableFlutter}' $out/bin/flutter \ 196 + --set-default ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ 197 + --suffix PATH : '${lib.makeBinPath (tools ++ buildTools)}' \ 198 + --suffix PKG_CONFIG_PATH : "$FLUTTER_PKG_CONFIG_PATH" \ 199 + --suffix LIBRARY_PATH : '${lib.makeLibraryPath appStaticBuildDeps}' \ 200 + --prefix CXXFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCxxFlags)}' \ 201 + --prefix CFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCFlags)}' \ 202 + --prefix LDFLAGS "''\t" '${builtins.concatStringsSep " " (map (flag: "-Wl,${flag}") linkerFlags)}' \ 203 + ''${gappsWrapperArgs[@]} 204 205 + runHook postInstall 206 + ''; 207 + 208 + inherit (flutter) meta; 209 + })
+2 -2
pkgs/development/interpreters/python/default.nix
··· 45 major = "2"; 46 minor = "7"; 47 patch = "18"; 48 - suffix = ".6"; # ActiveState's Python 2 extended support 49 }; 50 - hash = "sha256-+I0QOBkuTHMIQz71lgNn1X1vjPsjJMtFbgC0xcGTwWY="; 51 inherit (darwin) configd; 52 inherit passthruFun; 53 };
··· 45 major = "2"; 46 minor = "7"; 47 patch = "18"; 48 + suffix = ".7"; # ActiveState's Python 2 extended support 49 }; 50 + hash = "sha256-zcjAoSq6491ePiDySBCKrLIyYoO/5fdH6aBTNg/NH8s="; 51 inherit (darwin) configd; 52 inherit passthruFun; 53 };
+10 -4
pkgs/development/node-packages/overrides.nix
··· 29 buildInputs = [ final.node-gyp-build ]; 30 }; 31 32 - "@forge/cli" = prev."@forge/cli".override { 33 nativeBuildInputs = [ pkgs.pkg-config ]; 34 buildInputs = with pkgs; [ 35 libsecret ··· 39 darwin.apple_sdk.frameworks.AppKit 40 darwin.apple_sdk.frameworks.Security 41 ]; 42 - }; 43 44 autoprefixer = prev.autoprefixer.override { 45 nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; ··· 97 }; 98 99 100 - graphite-cli = prev."@withgraphite/graphite-cli".override { 101 name = "graphite-cli"; 102 nativeBuildInputs = with pkgs; [ installShellFiles pkg-config ]; 103 buildInputs = with pkgs; [ cairo pango pixman ]; ··· 108 --bash <($out/bin/gt completion) \ 109 --zsh <(ZSH_NAME=zsh $out/bin/gt completion) 110 ''; 111 - }; 112 113 graphql-language-service-cli = prev.graphql-language-service-cli.override { 114 nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
··· 29 buildInputs = [ final.node-gyp-build ]; 30 }; 31 32 + "@forge/cli" = prev."@forge/cli".override (old: { 33 nativeBuildInputs = [ pkgs.pkg-config ]; 34 buildInputs = with pkgs; [ 35 libsecret ··· 39 darwin.apple_sdk.frameworks.AppKit 40 darwin.apple_sdk.frameworks.Security 41 ]; 42 + meta = old.meta // { 43 + license = lib.licenses.unfree; # unlicensed 44 + }; 45 + }); 46 47 autoprefixer = prev.autoprefixer.override { 48 nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; ··· 100 }; 101 102 103 + graphite-cli = prev."@withgraphite/graphite-cli".override (old: { 104 name = "graphite-cli"; 105 nativeBuildInputs = with pkgs; [ installShellFiles pkg-config ]; 106 buildInputs = with pkgs; [ cairo pango pixman ]; ··· 111 --bash <($out/bin/gt completion) \ 112 --zsh <(ZSH_NAME=zsh $out/bin/gt completion) 113 ''; 114 + meta = old.meta // { 115 + license = lib.licenses.unfree; # no license specified 116 + }; 117 + }); 118 119 graphql-language-service-cli = prev.graphql-language-service-cli.override { 120 nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
+18 -6
pkgs/development/python-modules/flask-compress/default.nix
··· 1 { lib 2 - , fetchPypi 3 , buildPythonPackage 4 , setuptools-scm 5 , flask 6 , brotli 7 , pytestCheckHook 8 }: 9 10 buildPythonPackage rec { 11 - version = "1.13"; 12 pname = "Flask-Compress"; 13 format = "pyproject"; 14 15 - src = fetchPypi { 16 - inherit pname version; 17 - hash = "sha256-7pbxi/mwDy3rTjQGykoFCTqoDi7wV4Ulo7TTLs3/Ep0="; 18 }; 19 20 nativeBuildInputs = [ 21 setuptools-scm 22 ]; 23 24 propagatedBuildInputs = [ 25 flask 26 brotli 27 ]; 28 29 nativeCheckInputs = [ ··· 34 "flask_compress" 35 ]; 36 37 meta = with lib; { 38 - description = "Compress responses in your Flask app with gzip"; 39 homepage = "https://github.com/colour-science/flask-compress"; 40 changelog = "https://github.com/colour-science/flask-compress/blob/v${version}/CHANGELOG.md"; 41 license = licenses.mit; 42 }; 43 }
··· 1 { lib 2 + , fetchFromGitHub 3 , buildPythonPackage 4 + , isPyPy 5 + , setuptools 6 , setuptools-scm 7 , flask 8 , brotli 9 + , brotlicffi 10 , pytestCheckHook 11 }: 12 13 buildPythonPackage rec { 14 + version = "1.14"; 15 pname = "Flask-Compress"; 16 format = "pyproject"; 17 18 + src = fetchFromGitHub { 19 + owner = "colour-science"; 20 + repo = "flask-compress"; 21 + rev = "refs/tags/v${version}"; 22 + hash = "sha256-eP6i4h+O4vkjlhfy3kyB+PY7iHVzOnRBRD8lj5yHehU="; 23 }; 24 25 nativeBuildInputs = [ 26 + setuptools 27 setuptools-scm 28 ]; 29 30 propagatedBuildInputs = [ 31 flask 32 + ] ++ lib.optionals (!isPyPy) [ 33 brotli 34 + ] ++ lib.optionals isPyPy [ 35 + brotlicffi 36 ]; 37 38 nativeCheckInputs = [ ··· 43 "flask_compress" 44 ]; 45 46 + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; 47 + 48 meta = with lib; { 49 + description = "Compress responses in your Flask app with gzip, deflate or brotli"; 50 homepage = "https://github.com/colour-science/flask-compress"; 51 changelog = "https://github.com/colour-science/flask-compress/blob/v${version}/CHANGELOG.md"; 52 license = licenses.mit; 53 + maintainers = with maintainers; [ nickcao ]; 54 }; 55 }
+4 -4
pkgs/servers/audiobookshelf/default.nix
··· 17 nodejs = nodejs_18; 18 19 pname = "audiobookshelf"; 20 - version = "2.3.3"; 21 22 src = fetchFromGitHub { 23 owner = "advplyr"; 24 repo = pname; 25 rev = "v${version}"; 26 - sha256 = "sha256-wSIA2KKDKf3DNgYNNIyYNT8xyPWCZvwLcWuDhWOZpLs="; 27 }; 28 29 client = buildNpmPackage { ··· 37 NODE_OPTIONS = "--openssl-legacy-provider"; 38 39 npmBuildScript = "generate"; 40 - npmDepsHash = "sha256-s3CwGFK87podBJwAqh7JoMA28vnmf77iexrAbbwZlFk="; 41 }; 42 43 wrapper = import ./wrapper.nix { ··· 52 53 dontNpmBuild = true; 54 npmInstallFlags = [ "--only-production" ]; 55 - npmDepsHash = "sha256-gueSlQh4tRTjIWvpNG2cj1np/zUGbjsnv3fA2owtiQY="; 56 57 installPhase = '' 58 mkdir -p $out/opt/client
··· 17 nodejs = nodejs_18; 18 19 pname = "audiobookshelf"; 20 + version = "2.4.3"; 21 22 src = fetchFromGitHub { 23 owner = "advplyr"; 24 repo = pname; 25 rev = "v${version}"; 26 + sha256 = "sha256-Eqi6QVX8ZxX87IJcDNlDEzWYH7FBvYMs/iBAopLGYl4="; 27 }; 28 29 client = buildNpmPackage { ··· 37 NODE_OPTIONS = "--openssl-legacy-provider"; 38 39 npmBuildScript = "generate"; 40 + npmDepsHash = "sha256-j6Q3i3ktvBUMQxCMNIqRjSMly6UMzewaF1EfAmNF8mQ="; 41 }; 42 43 wrapper = import ./wrapper.nix { ··· 52 53 dontNpmBuild = true; 54 npmInstallFlags = [ "--only-production" ]; 55 + npmDepsHash = "sha256-fxXetf6KVK8hEwYZsER/rmt5tDagEOiyh+dJJE8FOXY="; 56 57 installPhase = '' 58 mkdir -p $out/opt/client