Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -54,7 +54,10 @@
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
- [AmneziaVPN](https://amnezia.org/en), an open-source VPN client, with a key feature that enables you to deploy your own VPN server on your server. Available as [programs.amnezia-vpn](#opt-programs.amnezia-vpn.enable).
|
||||
- [AmneziaVPN](https://amnezia.org/en), a self-hostable open-source VPN client, is available in two variants:
|
||||
- [programs.amnezia-vpn](#opt-programs.amnezia-vpn.enable): a GUI client which can also deploy a VPN endpoint to a remote server
|
||||
- {option}`networking.wireguard` adds support for the [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/) variant of the protocol, featuring better masking against Deep Packet Inspection. The variant to be used is set per interface as `networking.wireguard.interfaces.<name>.type`, defaulting to wireguard.
|
||||
|
||||
|
||||
- [Bazecor](https://github.com/Dygmalab/Bazecor), the graphical configurator for Dygma Products.
|
||||
|
||||
@@ -311,6 +314,8 @@
|
||||
After you run ALTER EXTENSION, you must run [this SQL script](https://github.com/timescale/timescaledb-extras/blob/master/utils/2.15.X-fix_hypertable_foreign_keys.sql). For more details, see the following pull requests [#6797](https://github.com/timescale/timescaledb/pull/6797).
|
||||
PostgreSQL 13 is no longer supported in TimescaleDB v2.16.
|
||||
|
||||
- `networking.wireguard.enable = true` does not always add `wireguard-tools` to system packages anymore. Only when wireguard interfaces are configured, the backing implementation packages are added to system PATH.
|
||||
|
||||
- `virtualisation/azure-common.nix`'s filesystem and grub configurations have been moved to `virtualisation/azure-image.nix`. This makes `azure-common.nix` more generic so it could be used for users who generate Azure image using other methods (e.g. nixos-generators and disko). For existing users depending on these configurations, please also import `azure-image.nix`.
|
||||
|
||||
- `zammad` has had its support for MySQL removed, since it was never working correctly and is now deprecated upstream. Check the [migration guide](https://docs.zammad.org/en/latest/appendix/migrate-to-postgresql.html) for how to convert your database to PostgreSQL.
|
||||
|
||||
@@ -174,7 +174,7 @@ in
|
||||
if [[ "$USER" != ${cfg.user} ]]; then
|
||||
sudo="exec /run/wrappers/bin/sudo -u ${cfg.user}"
|
||||
fi
|
||||
$sudo ${lib.getExe cfg.package} ''${1:--help}
|
||||
$sudo ${lib.getExe cfg.package} "''${@:--help}"
|
||||
' > $out/bin/gancio
|
||||
chmod +x $out/bin/gancio
|
||||
'')
|
||||
|
||||
@@ -68,7 +68,6 @@ in
|
||||
ExecStart = "${lib.getExe cfg.package} serve -config ${configFile}";
|
||||
ProtectSystem = "full";
|
||||
SystemCallArchitectures = "native";
|
||||
MemoryDenyWriteExecute = true;
|
||||
NoNewPrivileges = true;
|
||||
PrivateTmp = true;
|
||||
PrivateDevices = true;
|
||||
@@ -89,7 +88,6 @@ in
|
||||
ProtectKernelTunables = true;
|
||||
LockPersonality = true;
|
||||
Restart = "on-failure";
|
||||
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -62,14 +62,14 @@ let
|
||||
codium_running.wait() # type: ignore[union-attr]
|
||||
with codium_running: # type: ignore[union-attr]
|
||||
# Wait until vscodium is visible. "File" is in the menu bar.
|
||||
machine.wait_for_text('Get Started with')
|
||||
machine.wait_for_text('(Get|Started|with|Customize|theme)')
|
||||
machine.screenshot('start_screen')
|
||||
|
||||
test_string = 'testfile'
|
||||
|
||||
# Create a new file
|
||||
machine.send_key('ctrl-n')
|
||||
machine.wait_for_text('Untitled')
|
||||
machine.wait_for_text('(Untitled|Select|language|template|dismiss)')
|
||||
machine.screenshot('empty_editor')
|
||||
|
||||
# Type a string
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{
|
||||
bash,
|
||||
faust,
|
||||
gtk2,
|
||||
jack2,
|
||||
@@ -17,6 +18,10 @@ faust.wrapWithBuildEnv {
|
||||
"faust2jackconsole"
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
bash # required for some scripts
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
gtk2
|
||||
jack2
|
||||
|
||||
@@ -27,11 +27,15 @@ stdenv.mkDerivation rec {
|
||||
|
||||
pitchTracker = puredata-with-plugins plugins;
|
||||
|
||||
buildInputs = [
|
||||
nativeBuildInputs = [
|
||||
faust2jack
|
||||
faust2lv2
|
||||
];
|
||||
|
||||
# ld: crtbegin.o: relocation R_X86_64_32 against hidden symbol `__TMC_END__' can not be used when making a PIE object
|
||||
# ld: failed to set dynamic section sizes: bad value
|
||||
hardeningDisable = [ "pie" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
@@ -11,18 +11,18 @@
|
||||
"clion": {
|
||||
"update-channel": "CLion RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
|
||||
"version": "2025.1",
|
||||
"sha256": "2d1e8d1b8639c29045161567bc3fc8cdfbd9c8fe549d2da92d25e9d9a75c408d",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2025.1.tar.gz",
|
||||
"build_number": "251.23774.442"
|
||||
"version": "2025.1.1",
|
||||
"sha256": "2f747d7240d70b65ed98d736dbcd6ac2b98ac93aff993a63c5f8bd0f65918ac5",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2025.1.1.tar.gz",
|
||||
"build_number": "251.25410.104"
|
||||
},
|
||||
"datagrip": {
|
||||
"update-channel": "DataGrip RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz",
|
||||
"version": "2025.1",
|
||||
"sha256": "d64bb300274f2509dde9a3c73eb66f45d18158bf46c9e61d3dfc602de8f83b5d",
|
||||
"url": "https://download.jetbrains.com/datagrip/datagrip-2025.1.tar.gz",
|
||||
"build_number": "251.23774.426"
|
||||
"version": "2025.1.2",
|
||||
"sha256": "47d1c891a34f12f371aeab2364b9280766e1e99b27933f8d11c3c3832ed865ca",
|
||||
"url": "https://download.jetbrains.com/datagrip/datagrip-2025.1.2.tar.gz",
|
||||
"build_number": "251.25410.123"
|
||||
},
|
||||
"dataspell": {
|
||||
"update-channel": "DataSpell RELEASE",
|
||||
@@ -35,99 +35,99 @@
|
||||
"gateway": {
|
||||
"update-channel": "Gateway RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz",
|
||||
"version": "2025.1",
|
||||
"sha256": "d00276adceee00ea5555013778d3ed25254b60383d43e6d4b7f892b10681c673",
|
||||
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.1.tar.gz",
|
||||
"build_number": "251.23774.441"
|
||||
"version": "2025.1.1",
|
||||
"sha256": "edccd3d877407dfc628d9ba2a8ee767c11a861532dd4e0b1cb2a4d8787476ea8",
|
||||
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.1.1.tar.gz",
|
||||
"build_number": "251.25410.139"
|
||||
},
|
||||
"goland": {
|
||||
"update-channel": "GoLand RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
|
||||
"version": "2025.1",
|
||||
"sha256": "cc22617f9be233a13644d653f20cba29b05295bcb5bb77ac9621ee5447ae349a",
|
||||
"url": "https://download.jetbrains.com/go/goland-2025.1.tar.gz",
|
||||
"build_number": "251.23774.430"
|
||||
"version": "2025.1.1",
|
||||
"sha256": "fb94d5df43942db47a5506b50e511457cf845b986e70168171b9f5324b7d0d77",
|
||||
"url": "https://download.jetbrains.com/go/goland-2025.1.1.tar.gz",
|
||||
"build_number": "251.25410.140"
|
||||
},
|
||||
"idea-community": {
|
||||
"update-channel": "IntelliJ IDEA RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz",
|
||||
"version": "2025.1",
|
||||
"sha256": "d73a0182c9e9660789a6998a5f5743a6c2263e49aabd8ada1108efd575d9ec1e",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIC-2025.1.tar.gz",
|
||||
"build_number": "251.23774.435"
|
||||
"version": "2025.1.1.1",
|
||||
"sha256": "36b72ac85e8e1536dfccb300b5a435461b1e2953585a90a5d8f06e1b263b0b5c",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIC-2025.1.1.1.tar.gz",
|
||||
"build_number": "251.25410.129"
|
||||
},
|
||||
"idea-ultimate": {
|
||||
"update-channel": "IntelliJ IDEA RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz",
|
||||
"version": "2025.1",
|
||||
"sha256": "9946a690072f166607fd7b0d29e9e9c6a24c79fd5d7365a5600366b0b27532ec",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIU-2025.1.tar.gz",
|
||||
"build_number": "251.23774.435"
|
||||
"version": "2025.1.1.1",
|
||||
"sha256": "337d34b20cdaa8da30d71b98e1b36817bdfe2f2245c491ef38f0cee02f0d0316",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIU-2025.1.1.1.tar.gz",
|
||||
"build_number": "251.25410.129"
|
||||
},
|
||||
"mps": {
|
||||
"update-channel": "MPS RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
|
||||
"version": "2024.3.2",
|
||||
"sha256": "54896e4c0a22c2ca27815da40be80f70b40b0d45e86d9bce957e47316f2ad342",
|
||||
"url": "https://download.jetbrains.com/mps/2024.3/MPS-2024.3.2.tar.gz",
|
||||
"build_number": "243.24978.603"
|
||||
"version": "2025.1",
|
||||
"sha256": "0b6d8c0964dc18785437c14bd2ac7e000e07e39865680227d201cd9cad0ff8a8",
|
||||
"url": "https://download.jetbrains.com/mps/2025.1/MPS-2025.1.tar.gz",
|
||||
"build_number": "251.23774.423"
|
||||
},
|
||||
"phpstorm": {
|
||||
"update-channel": "PhpStorm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
|
||||
"version": "2025.1",
|
||||
"sha256": "2ead794b5bc6d31be4ad886788110e9d8e5c708e2e542b20d17a2407b9e58998",
|
||||
"url": "https://download.jetbrains.com/webide/PhpStorm-2025.1.tar.gz",
|
||||
"build_number": "251.23774.436",
|
||||
"version": "2025.1.1",
|
||||
"sha256": "b64722ea715db8566754978af617716016deaa2cda3521cf05e4a049e5bbf6a3",
|
||||
"url": "https://download.jetbrains.com/webide/PhpStorm-2025.1.1.tar.gz",
|
||||
"build_number": "251.25410.148",
|
||||
"version-major-minor": "2022.3"
|
||||
},
|
||||
"pycharm-community": {
|
||||
"update-channel": "PyCharm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz",
|
||||
"version": "2025.1",
|
||||
"sha256": "b0dc6661f2b415677bd61c09fa9197483aa412701ecc527c9237a213e3876247",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-community-2025.1.tar.gz",
|
||||
"build_number": "251.23774.444"
|
||||
"version": "2025.1.1",
|
||||
"sha256": "d2df49f8ec2df88039f535e0d8706d35f608db3e58b9411f5e8e726536788237",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-community-2025.1.1.tar.gz",
|
||||
"build_number": "251.25410.122"
|
||||
},
|
||||
"pycharm-professional": {
|
||||
"update-channel": "PyCharm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz",
|
||||
"version": "2025.1",
|
||||
"sha256": "1282907f134a726e17bb7fe8cb7088e406aa4fbf9d910def03633572f3a62f8c",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-professional-2025.1.tar.gz",
|
||||
"build_number": "251.23774.444"
|
||||
"version": "2025.1.1",
|
||||
"sha256": "b1e8660b1c947f3bb746d0736e1e9c247635fadedb52f230ef5c64862893ad0b",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-professional-2025.1.1.tar.gz",
|
||||
"build_number": "251.25410.122"
|
||||
},
|
||||
"rider": {
|
||||
"update-channel": "Rider RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
|
||||
"version": "2025.1",
|
||||
"sha256": "bd00eb4d43db2386c6219415b098b0fad5abca5796b813d44beeb76c23408260",
|
||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.1.tar.gz",
|
||||
"build_number": "251.23774.437"
|
||||
"version": "2025.1.2",
|
||||
"sha256": "cdf8a824c7daa3247b09d76a29acb31cfa623b90643d3d2a814982cb0a32879d",
|
||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.1.2.tar.gz",
|
||||
"build_number": "251.25410.119"
|
||||
},
|
||||
"ruby-mine": {
|
||||
"update-channel": "RubyMine RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
|
||||
"version": "2025.1",
|
||||
"sha256": "6ad3960cf6a0fa88f3cfb6c166c1080ad7c3fb0f72f50379f9cafbe523813437",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2025.1.tar.gz",
|
||||
"build_number": "251.23774.429"
|
||||
"version": "2025.1.1",
|
||||
"sha256": "f5014b52770be4d1c743c5a60f0e20d0dd1a1c172018180d05c0a22f1ffd1027",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2025.1.1.tar.gz",
|
||||
"build_number": "251.25410.120"
|
||||
},
|
||||
"rust-rover": {
|
||||
"update-channel": "RustRover RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz",
|
||||
"version": "2025.1",
|
||||
"sha256": "6c3e5c2cc45bfbfe631f6f34f87d45fbc3e3f97d12a8ca9e6de77beab230a210",
|
||||
"url": "https://download.jetbrains.com/rustrover/RustRover-2025.1.tar.gz",
|
||||
"build_number": "251.23774.445"
|
||||
"version": "2025.1.2",
|
||||
"sha256": "b2974feb5406153817797b7dc93baaafe35c7b3687d38091d5d1b5d010a03132",
|
||||
"url": "https://download.jetbrains.com/rustrover/RustRover-2025.1.2.tar.gz",
|
||||
"build_number": "251.25410.115"
|
||||
},
|
||||
"webstorm": {
|
||||
"update-channel": "WebStorm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
|
||||
"version": "2025.1",
|
||||
"sha256": "f181eb1348c04a60f860fd9ea9616261c6c012a7916e76380652d129e87503ea",
|
||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2025.1.tar.gz",
|
||||
"build_number": "251.23774.424"
|
||||
"version": "2025.1.1",
|
||||
"sha256": "411b6d93e47d7743aa9189f4a3cab3956c573ce406908da5621f8dee0098ad99",
|
||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2025.1.1.tar.gz",
|
||||
"build_number": "251.25410.117"
|
||||
},
|
||||
"writerside": {
|
||||
"update-channel": "Writerside EAP",
|
||||
@@ -150,18 +150,18 @@
|
||||
"clion": {
|
||||
"update-channel": "CLion RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz",
|
||||
"version": "2025.1",
|
||||
"sha256": "f5bfa7dc9fdcc69558695d0b58fe39e86c75d1b72985845649429c98ba761ff9",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2025.1-aarch64.tar.gz",
|
||||
"build_number": "251.23774.442"
|
||||
"version": "2025.1.1",
|
||||
"sha256": "dcd7373dc9dd941703d18ae602dd384ce6d154a90745c37c3358bf1f6b41ed2e",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2025.1.1-aarch64.tar.gz",
|
||||
"build_number": "251.25410.104"
|
||||
},
|
||||
"datagrip": {
|
||||
"update-channel": "DataGrip RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz",
|
||||
"version": "2025.1",
|
||||
"sha256": "c8bdb2a1d79801889b50ce6de4e859c66a324fb8d3d9211130a7c7803b9f2696",
|
||||
"url": "https://download.jetbrains.com/datagrip/datagrip-2025.1-aarch64.tar.gz",
|
||||
"build_number": "251.23774.426"
|
||||
"version": "2025.1.2",
|
||||
"sha256": "fb34b6469c96a54018b3c728f96787d03da0ec92c88a80f52e8f89a0eecc8d01",
|
||||
"url": "https://download.jetbrains.com/datagrip/datagrip-2025.1.2-aarch64.tar.gz",
|
||||
"build_number": "251.25410.123"
|
||||
},
|
||||
"dataspell": {
|
||||
"update-channel": "DataSpell RELEASE",
|
||||
@@ -174,99 +174,99 @@
|
||||
"gateway": {
|
||||
"update-channel": "Gateway RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz",
|
||||
"version": "2025.1",
|
||||
"sha256": "d2a6f62d639716fd718542e416e4129e03f44768d1495b6399731cbe44f037ea",
|
||||
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.1-aarch64.tar.gz",
|
||||
"build_number": "251.23774.441"
|
||||
"version": "2025.1.1",
|
||||
"sha256": "869882db293640328f5e1ae80c5cf60183ba850f6087ab1b3cf95ec77b3837be",
|
||||
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.1.1-aarch64.tar.gz",
|
||||
"build_number": "251.25410.139"
|
||||
},
|
||||
"goland": {
|
||||
"update-channel": "GoLand RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz",
|
||||
"version": "2025.1",
|
||||
"sha256": "f6b7f36efc9de54c83e49392882075868ba85b418a99cde47031795a79a30426",
|
||||
"url": "https://download.jetbrains.com/go/goland-2025.1-aarch64.tar.gz",
|
||||
"build_number": "251.23774.430"
|
||||
"version": "2025.1.1",
|
||||
"sha256": "949e86c6991e14d90adcaea75c18f679b1ab029ec0c00f00f464a631e999c036",
|
||||
"url": "https://download.jetbrains.com/go/goland-2025.1.1-aarch64.tar.gz",
|
||||
"build_number": "251.25410.140"
|
||||
},
|
||||
"idea-community": {
|
||||
"update-channel": "IntelliJ IDEA RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz",
|
||||
"version": "2025.1",
|
||||
"sha256": "168e2cb680db2ad34633ccea3539151d6fb74989a4b585250814ba65e56dabaa",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIC-2025.1-aarch64.tar.gz",
|
||||
"build_number": "251.23774.435"
|
||||
"version": "2025.1.1.1",
|
||||
"sha256": "7860b836a18b82827fdb54a86cc5601fe8ef28aab4253981f238ef975a982915",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIC-2025.1.1.1-aarch64.tar.gz",
|
||||
"build_number": "251.25410.129"
|
||||
},
|
||||
"idea-ultimate": {
|
||||
"update-channel": "IntelliJ IDEA RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz",
|
||||
"version": "2025.1",
|
||||
"sha256": "b269898937bb0c3309eeae34ca039cff9532867eb7ee787b577b11bb49c87bda",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIU-2025.1-aarch64.tar.gz",
|
||||
"build_number": "251.23774.435"
|
||||
"version": "2025.1.1.1",
|
||||
"sha256": "756baa32d72bd982d9b8c06f86cd42755d2677a9f1ea37bd6ad6a963d17226b2",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIU-2025.1.1.1-aarch64.tar.gz",
|
||||
"build_number": "251.25410.129"
|
||||
},
|
||||
"mps": {
|
||||
"update-channel": "MPS RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
|
||||
"version": "2024.3.2",
|
||||
"sha256": "54896e4c0a22c2ca27815da40be80f70b40b0d45e86d9bce957e47316f2ad342",
|
||||
"url": "https://download.jetbrains.com/mps/2024.3/MPS-2024.3.2.tar.gz",
|
||||
"build_number": "243.24978.603"
|
||||
"version": "2025.1",
|
||||
"sha256": "0b6d8c0964dc18785437c14bd2ac7e000e07e39865680227d201cd9cad0ff8a8",
|
||||
"url": "https://download.jetbrains.com/mps/2025.1/MPS-2025.1.tar.gz",
|
||||
"build_number": "251.23774.423"
|
||||
},
|
||||
"phpstorm": {
|
||||
"update-channel": "PhpStorm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz",
|
||||
"version": "2025.1",
|
||||
"sha256": "a55cbef6886a645e5dfcbead427d1d2b6997eca6b86c9f4e2eed828980bd822b",
|
||||
"url": "https://download.jetbrains.com/webide/PhpStorm-2025.1-aarch64.tar.gz",
|
||||
"build_number": "251.23774.436",
|
||||
"version": "2025.1.1",
|
||||
"sha256": "6e479318f5627ec1d6ccd47610a93aa9e9a56c9badd2be4d8f935008d0e71b9e",
|
||||
"url": "https://download.jetbrains.com/webide/PhpStorm-2025.1.1-aarch64.tar.gz",
|
||||
"build_number": "251.25410.148",
|
||||
"version-major-minor": "2022.3"
|
||||
},
|
||||
"pycharm-community": {
|
||||
"update-channel": "PyCharm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz",
|
||||
"version": "2025.1",
|
||||
"sha256": "49a4738e18129af75f90cd47744f9a46922a74d905f8e4060a531753a0496d6b",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-community-2025.1-aarch64.tar.gz",
|
||||
"build_number": "251.23774.444"
|
||||
"version": "2025.1.1",
|
||||
"sha256": "d717e039a91587e5396c69d056ebd91f640ae03ddf398e575c8f8eb3817d8afb",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-community-2025.1.1-aarch64.tar.gz",
|
||||
"build_number": "251.25410.122"
|
||||
},
|
||||
"pycharm-professional": {
|
||||
"update-channel": "PyCharm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz",
|
||||
"version": "2025.1",
|
||||
"sha256": "4879e9b70aef547fe4a7c846345f496dd1aeaf93be9a62455529409efff97f68",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-professional-2025.1-aarch64.tar.gz",
|
||||
"build_number": "251.23774.444"
|
||||
"version": "2025.1.1",
|
||||
"sha256": "3f8f8a3773652ec99ea7a05b55dff41b5683548838f009e5e3d132ea644384d9",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-professional-2025.1.1-aarch64.tar.gz",
|
||||
"build_number": "251.25410.122"
|
||||
},
|
||||
"rider": {
|
||||
"update-channel": "Rider RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz",
|
||||
"version": "2025.1",
|
||||
"sha256": "9d44cdaf7c344be547908e0a5073b49db7bf66d743b5d19dd2ad01ef7f25a0ed",
|
||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.1-aarch64.tar.gz",
|
||||
"build_number": "251.23774.437"
|
||||
"version": "2025.1.2",
|
||||
"sha256": "c1ad139252fd3158aa86e9ac4532db5d9dd653807fc9f1dc4458170f3f1c3de6",
|
||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.1.2-aarch64.tar.gz",
|
||||
"build_number": "251.25410.119"
|
||||
},
|
||||
"ruby-mine": {
|
||||
"update-channel": "RubyMine RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz",
|
||||
"version": "2025.1",
|
||||
"sha256": "8cf468eae2788a2076be630b1bfc8ac92efc60701617702acbf765346d6ac293",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2025.1-aarch64.tar.gz",
|
||||
"build_number": "251.23774.429"
|
||||
"version": "2025.1.1",
|
||||
"sha256": "00b7526795af4e7eba1c65fc5e10a963e717770e68c5bfd28b10163f9fa37f8c",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2025.1.1-aarch64.tar.gz",
|
||||
"build_number": "251.25410.120"
|
||||
},
|
||||
"rust-rover": {
|
||||
"update-channel": "RustRover RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz",
|
||||
"version": "2025.1",
|
||||
"sha256": "e645f8929095be8ea83da911b55999ff3199daa6ba68ed32cabb1f3824ce301f",
|
||||
"url": "https://download.jetbrains.com/rustrover/RustRover-2025.1-aarch64.tar.gz",
|
||||
"build_number": "251.23774.445"
|
||||
"version": "2025.1.2",
|
||||
"sha256": "4660f8f2fd37b166bae904385b863157ab596fac35869de17a39df999efde8ce",
|
||||
"url": "https://download.jetbrains.com/rustrover/RustRover-2025.1.2-aarch64.tar.gz",
|
||||
"build_number": "251.25410.115"
|
||||
},
|
||||
"webstorm": {
|
||||
"update-channel": "WebStorm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz",
|
||||
"version": "2025.1",
|
||||
"sha256": "51fd7420fb49ff8851d3b4b1079f8d7afebe9631a76e7d1d4fd3e66d42332c6c",
|
||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2025.1-aarch64.tar.gz",
|
||||
"build_number": "251.23774.424"
|
||||
"version": "2025.1.1",
|
||||
"sha256": "0156affae3222afb51cfe8a82e1eabf26f62bd91a74a2822fa821afd1eab9bad",
|
||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2025.1.1-aarch64.tar.gz",
|
||||
"build_number": "251.25410.117"
|
||||
},
|
||||
"writerside": {
|
||||
"update-channel": "Writerside EAP",
|
||||
@@ -289,18 +289,18 @@
|
||||
"clion": {
|
||||
"update-channel": "CLion RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
|
||||
"version": "2025.1",
|
||||
"sha256": "856658b830523f451b511d1c9d098287522fe4d31096093742286340411157e4",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2025.1.dmg",
|
||||
"build_number": "251.23774.442"
|
||||
"version": "2025.1.1",
|
||||
"sha256": "e7558d0196390c18e2c11143aa59f2ad56c020d43ebd05057f997fa117abb484",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2025.1.1.dmg",
|
||||
"build_number": "251.25410.104"
|
||||
},
|
||||
"datagrip": {
|
||||
"update-channel": "DataGrip RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg",
|
||||
"version": "2025.1",
|
||||
"sha256": "15d893fe7dfc8a14bc8ce250b9113fad5c1752cdcad9c4e22cb013fc03a28dda",
|
||||
"url": "https://download.jetbrains.com/datagrip/datagrip-2025.1.dmg",
|
||||
"build_number": "251.23774.426"
|
||||
"version": "2025.1.2",
|
||||
"sha256": "a6b7dadb262813d867281d700456c7bca82b61bea99e52fd54edec05cd07180e",
|
||||
"url": "https://download.jetbrains.com/datagrip/datagrip-2025.1.2.dmg",
|
||||
"build_number": "251.25410.123"
|
||||
},
|
||||
"dataspell": {
|
||||
"update-channel": "DataSpell RELEASE",
|
||||
@@ -313,99 +313,99 @@
|
||||
"gateway": {
|
||||
"update-channel": "Gateway RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg",
|
||||
"version": "2025.1",
|
||||
"sha256": "3201f442143a52f2ad10d6b4cdbd0bb9d67dd7270b3e396919d8c0140196494c",
|
||||
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.1.dmg",
|
||||
"build_number": "251.23774.441"
|
||||
"version": "2025.1.1",
|
||||
"sha256": "c849cd16b77b5268ee2e8279bddf02c21a925a25885549d0b1922a785f18120f",
|
||||
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.1.1.dmg",
|
||||
"build_number": "251.25410.139"
|
||||
},
|
||||
"goland": {
|
||||
"update-channel": "GoLand RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/go/goland-{version}.dmg",
|
||||
"version": "2025.1",
|
||||
"sha256": "587e7a7e56672405b31252567d47eccbc39a5623ec2b8f4f8bf424b038396b86",
|
||||
"url": "https://download.jetbrains.com/go/goland-2025.1.dmg",
|
||||
"build_number": "251.23774.430"
|
||||
"version": "2025.1.1",
|
||||
"sha256": "0b00984d45430b37538bf9c55f8f93f1476f819fba1bdea2588ffd36d7e91cb3",
|
||||
"url": "https://download.jetbrains.com/go/goland-2025.1.1.dmg",
|
||||
"build_number": "251.25410.140"
|
||||
},
|
||||
"idea-community": {
|
||||
"update-channel": "IntelliJ IDEA RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg",
|
||||
"version": "2025.1",
|
||||
"sha256": "9b1fecf56c9d2263f87bced7bb9164669c4e811e958c827480a7144b491e4a52",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIC-2025.1.dmg",
|
||||
"build_number": "251.23774.435"
|
||||
"version": "2025.1.1.1",
|
||||
"sha256": "ee1577a44930b94112819b200acd617cbb3efdfa039df7911094051e9a10e465",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIC-2025.1.1.1.dmg",
|
||||
"build_number": "251.25410.129"
|
||||
},
|
||||
"idea-ultimate": {
|
||||
"update-channel": "IntelliJ IDEA RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg",
|
||||
"version": "2025.1",
|
||||
"sha256": "86c568d302a2a25185fd912d82c6e99e423767ea1442c716f0ee34292736c35d",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIU-2025.1.dmg",
|
||||
"build_number": "251.23774.435"
|
||||
"version": "2025.1.1.1",
|
||||
"sha256": "eccd0ba3f9b1f2f680b946a3658830562fd4369dd11cc618b86671c8e237c375",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIU-2025.1.1.1.dmg",
|
||||
"build_number": "251.25410.129"
|
||||
},
|
||||
"mps": {
|
||||
"update-channel": "MPS RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg",
|
||||
"version": "2024.3.2",
|
||||
"sha256": "09b69187d9feb5e17865fcdec88ce8a95c4933a8176e37a224c251b60d5aed01",
|
||||
"url": "https://download.jetbrains.com/mps/2024.3/MPS-2024.3.2-macos.dmg",
|
||||
"build_number": "243.24978.603"
|
||||
"version": "2025.1",
|
||||
"sha256": "1ddae8569c8a96beeb5e85d20f1eed9115ace532a1154b5624f526cb49ddeaa8",
|
||||
"url": "https://download.jetbrains.com/mps/2025.1/MPS-2025.1-macos.dmg",
|
||||
"build_number": "251.23774.423"
|
||||
},
|
||||
"phpstorm": {
|
||||
"update-channel": "PhpStorm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
|
||||
"version": "2025.1",
|
||||
"sha256": "9c3bcba68beb364f57fa674fc1c33c4ac7fc86d3835de7b33aed8cfd2dbbda33",
|
||||
"url": "https://download.jetbrains.com/webide/PhpStorm-2025.1.dmg",
|
||||
"build_number": "251.23774.436",
|
||||
"version": "2025.1.1",
|
||||
"sha256": "2f7c9b0ec1947c7bb2247fd3a949de9921e82e9a2801e388f6cf9d4421073dbd",
|
||||
"url": "https://download.jetbrains.com/webide/PhpStorm-2025.1.1.dmg",
|
||||
"build_number": "251.25410.148",
|
||||
"version-major-minor": "2022.3"
|
||||
},
|
||||
"pycharm-community": {
|
||||
"update-channel": "PyCharm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg",
|
||||
"version": "2025.1",
|
||||
"sha256": "75e447b1a0e047fe1666bcd840b05ea7a03a0abcab0c1a7775c304d2cdb70c60",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-community-2025.1.dmg",
|
||||
"build_number": "251.23774.444"
|
||||
"version": "2025.1.1",
|
||||
"sha256": "3d439ad29771d8618b03f28497899f09a6eb696c96c789b54aac9ac1bfb4766c",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-community-2025.1.1.dmg",
|
||||
"build_number": "251.25410.122"
|
||||
},
|
||||
"pycharm-professional": {
|
||||
"update-channel": "PyCharm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg",
|
||||
"version": "2025.1",
|
||||
"sha256": "3ee1462eb7fa52593c67a50374a9af9d0ab4d081aa3c7ed72305bcbb1285a16e",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-professional-2025.1.dmg",
|
||||
"build_number": "251.23774.444"
|
||||
"version": "2025.1.1",
|
||||
"sha256": "cd56a7e1072f4562e2d3ef67e70f227606376572634120170f5689d3b970b570",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-professional-2025.1.1.dmg",
|
||||
"build_number": "251.25410.122"
|
||||
},
|
||||
"rider": {
|
||||
"update-channel": "Rider RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
|
||||
"version": "2025.1",
|
||||
"sha256": "e7d2dab3620e597a5f8a96f0611e97a489d7edecc8475f1be3109d3f0ab11327",
|
||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.1.dmg",
|
||||
"build_number": "251.23774.437"
|
||||
"version": "2025.1.2",
|
||||
"sha256": "23f3479d1cff5ee1726726bea866ff755b08930e9da43b7ad250e6cb620c1dcf",
|
||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.1.2.dmg",
|
||||
"build_number": "251.25410.119"
|
||||
},
|
||||
"ruby-mine": {
|
||||
"update-channel": "RubyMine RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg",
|
||||
"version": "2025.1",
|
||||
"sha256": "3908c735f5c8293afa9166e48b6d90d717d5e472a3810f5f721026df51e4b07b",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2025.1.dmg",
|
||||
"build_number": "251.23774.429"
|
||||
"version": "2025.1.1",
|
||||
"sha256": "97b154079ef326c9a3ce229129d7d220faee30f266954288f74bf6f27ee43942",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2025.1.1.dmg",
|
||||
"build_number": "251.25410.120"
|
||||
},
|
||||
"rust-rover": {
|
||||
"update-channel": "RustRover RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg",
|
||||
"version": "2025.1",
|
||||
"sha256": "b0b41fbcb264aec50022800fb2930e3686d2f9dad07acc49621c85dfc3d4a193",
|
||||
"url": "https://download.jetbrains.com/rustrover/RustRover-2025.1.dmg",
|
||||
"build_number": "251.23774.445"
|
||||
"version": "2025.1.2",
|
||||
"sha256": "1419d2aac23965838e16c2bedc31851045f8b9d99ccf93594838a4e329059d92",
|
||||
"url": "https://download.jetbrains.com/rustrover/RustRover-2025.1.2.dmg",
|
||||
"build_number": "251.25410.115"
|
||||
},
|
||||
"webstorm": {
|
||||
"update-channel": "WebStorm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg",
|
||||
"version": "2025.1",
|
||||
"sha256": "6acb3058c55c400d7a8dffd56edfdedf85cd6cf68735728ff02f123eb6804ac5",
|
||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2025.1.dmg",
|
||||
"build_number": "251.23774.424"
|
||||
"version": "2025.1.1",
|
||||
"sha256": "44363b71b4ad461c07c2c0ae8424f6efabe356b347a2974765f88549a8ee183c",
|
||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2025.1.1.dmg",
|
||||
"build_number": "251.25410.117"
|
||||
},
|
||||
"writerside": {
|
||||
"update-channel": "Writerside EAP",
|
||||
@@ -428,18 +428,18 @@
|
||||
"clion": {
|
||||
"update-channel": "CLion RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg",
|
||||
"version": "2025.1",
|
||||
"sha256": "fdc89423f33affb7740ea6785977912e6030e9bccd06361e7b1a00b598e84f7e",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2025.1-aarch64.dmg",
|
||||
"build_number": "251.23774.442"
|
||||
"version": "2025.1.1",
|
||||
"sha256": "475280e277cc94d18de228bf5f81ebd6ff14084c2e1d2b0db5b4612007dc46fe",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2025.1.1-aarch64.dmg",
|
||||
"build_number": "251.25410.104"
|
||||
},
|
||||
"datagrip": {
|
||||
"update-channel": "DataGrip RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg",
|
||||
"version": "2025.1",
|
||||
"sha256": "ae95080c1a8696bb4811dc4e18f195aa8f0c49d546ee7e4dbeaed1fe56d4d2ef",
|
||||
"url": "https://download.jetbrains.com/datagrip/datagrip-2025.1-aarch64.dmg",
|
||||
"build_number": "251.23774.426"
|
||||
"version": "2025.1.2",
|
||||
"sha256": "6d12a59053db3dfa33079ac79b1ea263e5b3ec6fde01d1d803f6d27afea033de",
|
||||
"url": "https://download.jetbrains.com/datagrip/datagrip-2025.1.2-aarch64.dmg",
|
||||
"build_number": "251.25410.123"
|
||||
},
|
||||
"dataspell": {
|
||||
"update-channel": "DataSpell RELEASE",
|
||||
@@ -452,99 +452,99 @@
|
||||
"gateway": {
|
||||
"update-channel": "Gateway RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg",
|
||||
"version": "2025.1",
|
||||
"sha256": "51b25a295182bd916d0b3b2881cf3ebd1ed30577dd7c63253231c80a080df947",
|
||||
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.1-aarch64.dmg",
|
||||
"build_number": "251.23774.441"
|
||||
"version": "2025.1.1",
|
||||
"sha256": "abad0e061896590bea9bd1d4bead2183be3c1e71d6dfcba89ce2408f34af3536",
|
||||
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.1.1-aarch64.dmg",
|
||||
"build_number": "251.25410.139"
|
||||
},
|
||||
"goland": {
|
||||
"update-channel": "GoLand RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg",
|
||||
"version": "2025.1",
|
||||
"sha256": "6c478fc82467dc3f9970bc03b8c035210a0eb73cef9e32b27d6cd0dac9e166b6",
|
||||
"url": "https://download.jetbrains.com/go/goland-2025.1-aarch64.dmg",
|
||||
"build_number": "251.23774.430"
|
||||
"version": "2025.1.1",
|
||||
"sha256": "52e62d5a616b6ab6bf36f0d40d1925e9f477fcf84e187a2a1194d56d5ccae6ec",
|
||||
"url": "https://download.jetbrains.com/go/goland-2025.1.1-aarch64.dmg",
|
||||
"build_number": "251.25410.140"
|
||||
},
|
||||
"idea-community": {
|
||||
"update-channel": "IntelliJ IDEA RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg",
|
||||
"version": "2025.1",
|
||||
"sha256": "051f322384f41dae627f0a2487f47a72e2c696ef38b5c256f4348aad0d47dffb",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIC-2025.1-aarch64.dmg",
|
||||
"build_number": "251.23774.435"
|
||||
"version": "2025.1.1.1",
|
||||
"sha256": "92ea35ebfcd9e34cd9bda0103ca036fe1f9eb900c005ae33a9295050ad636dae",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIC-2025.1.1.1-aarch64.dmg",
|
||||
"build_number": "251.25410.129"
|
||||
},
|
||||
"idea-ultimate": {
|
||||
"update-channel": "IntelliJ IDEA RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg",
|
||||
"version": "2025.1",
|
||||
"sha256": "2877c9ec5cfef9afa09c489083aa4c93f400d35556953ee757a4ee599432c601",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIU-2025.1-aarch64.dmg",
|
||||
"build_number": "251.23774.435"
|
||||
"version": "2025.1.1.1",
|
||||
"sha256": "5207878b28df2a13e4248c1936ee4fff7c89495e3d4ffdaa3b8da3f21548117e",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIU-2025.1.1.1-aarch64.dmg",
|
||||
"build_number": "251.25410.129"
|
||||
},
|
||||
"mps": {
|
||||
"update-channel": "MPS RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg",
|
||||
"version": "2024.3.2",
|
||||
"url": "https://download.jetbrains.com/mps/2024.3/MPS-2024.3.2-macos-aarch64.dmg",
|
||||
"sha256": "9e6b8fb53418cef55bdbc690cc1c817f39b12b81cc3985522c24ee7f6fa5c364",
|
||||
"build_number": "243.24978.603"
|
||||
"version": "2025.1",
|
||||
"url": "https://download.jetbrains.com/mps/2025.1/MPS-2025.1-macos-aarch64.dmg",
|
||||
"sha256": "cb2aaa6311252a655ef55f813d3dff78890c2a10cf0aeff885018c316390486b",
|
||||
"build_number": "251.23774.423"
|
||||
},
|
||||
"phpstorm": {
|
||||
"update-channel": "PhpStorm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg",
|
||||
"version": "2025.1",
|
||||
"sha256": "f963bacc18282e83da5adb85d55d8a6db74b8636c5c88777031fe1f222cb6a07",
|
||||
"url": "https://download.jetbrains.com/webide/PhpStorm-2025.1-aarch64.dmg",
|
||||
"build_number": "251.23774.436",
|
||||
"version": "2025.1.1",
|
||||
"sha256": "8bb7acf16076e4a32b522107bc359197bb2ee0eeebe0ed5feb1d25d9110830c1",
|
||||
"url": "https://download.jetbrains.com/webide/PhpStorm-2025.1.1-aarch64.dmg",
|
||||
"build_number": "251.25410.148",
|
||||
"version-major-minor": "2022.3"
|
||||
},
|
||||
"pycharm-community": {
|
||||
"update-channel": "PyCharm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg",
|
||||
"version": "2025.1",
|
||||
"sha256": "16f53e8200e3c17f1ea99cae469b94110cbc159e2063be0c0ce5e8b2f0214190",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-community-2025.1-aarch64.dmg",
|
||||
"build_number": "251.23774.444"
|
||||
"version": "2025.1.1",
|
||||
"sha256": "4e493ce20dd840402ed040f4447d06cab62e59514b5ab2058e94421877f72270",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-community-2025.1.1-aarch64.dmg",
|
||||
"build_number": "251.25410.122"
|
||||
},
|
||||
"pycharm-professional": {
|
||||
"update-channel": "PyCharm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg",
|
||||
"version": "2025.1",
|
||||
"sha256": "8a0f796981c3df2cf19cdaa5aa75b2c3f45adf2e7b779c40d7043d6d8dbcebe3",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-professional-2025.1-aarch64.dmg",
|
||||
"build_number": "251.23774.444"
|
||||
"version": "2025.1.1",
|
||||
"sha256": "76a97e0d1ca75cbfbcc0acb046154daec1113010c052318077a128ff89fb55a6",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-professional-2025.1.1-aarch64.dmg",
|
||||
"build_number": "251.25410.122"
|
||||
},
|
||||
"rider": {
|
||||
"update-channel": "Rider RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg",
|
||||
"version": "2025.1",
|
||||
"sha256": "8a3b452dd35ed1be8eca579de47f27febdc68271123a0557354ded179f53bce2",
|
||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.1-aarch64.dmg",
|
||||
"build_number": "251.23774.437"
|
||||
"version": "2025.1.2",
|
||||
"sha256": "ab6645bba503f0a9d67b2838d1dd88a81ad81dd34e6015ccaea30400c35659e4",
|
||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.1.2-aarch64.dmg",
|
||||
"build_number": "251.25410.119"
|
||||
},
|
||||
"ruby-mine": {
|
||||
"update-channel": "RubyMine RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg",
|
||||
"version": "2025.1",
|
||||
"sha256": "fe19db995e43fbd2b76a90ef31ef61ae15c2ba5a479d40a539d1f768245683f3",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2025.1-aarch64.dmg",
|
||||
"build_number": "251.23774.429"
|
||||
"version": "2025.1.1",
|
||||
"sha256": "6b8bd9c8ffeec01b0a907604d99cc77ede865aa9abf350e76957d9675ab8a810",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2025.1.1-aarch64.dmg",
|
||||
"build_number": "251.25410.120"
|
||||
},
|
||||
"rust-rover": {
|
||||
"update-channel": "RustRover RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg",
|
||||
"version": "2025.1",
|
||||
"sha256": "4ee23c7ec5a85e8e42d9d74fb86e03ce9cac8e1d0c827df42360375fd912e81b",
|
||||
"url": "https://download.jetbrains.com/rustrover/RustRover-2025.1-aarch64.dmg",
|
||||
"build_number": "251.23774.445"
|
||||
"version": "2025.1.2",
|
||||
"sha256": "3f12ad41285d6b67dcc577526976b5c394b44caa3f243147143968a505144a79",
|
||||
"url": "https://download.jetbrains.com/rustrover/RustRover-2025.1.2-aarch64.dmg",
|
||||
"build_number": "251.25410.115"
|
||||
},
|
||||
"webstorm": {
|
||||
"update-channel": "WebStorm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg",
|
||||
"version": "2025.1",
|
||||
"sha256": "a2de4c845644d51501d7045b33ecb4f88c045cf6aeceb316d95ed115d4945cb6",
|
||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2025.1-aarch64.dmg",
|
||||
"build_number": "251.23774.424"
|
||||
"version": "2025.1.1",
|
||||
"sha256": "7acfa46536b598b576775892ac46bb570dd06bc9461cc58c51b9efd4afd09139",
|
||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2025.1.1-aarch64.dmg",
|
||||
"build_number": "251.25410.117"
|
||||
},
|
||||
"writerside": {
|
||||
"update-channel": "Writerside EAP",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -14,19 +14,19 @@ let
|
||||
{
|
||||
x86_64-linux = {
|
||||
arch = "linux-x64";
|
||||
hash = "sha256-NTmo45hhvVp5atYWt3046Fe7AtHouH6UBF/FPUllIQQ=";
|
||||
hash = "sha256-XHx64V8JJl+/kb+kkTowu7mE7ysBRhUQJqicxjbHM3k=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
arch = "linux-arm64";
|
||||
hash = "sha256-7K7i+4NtoTmwT1a3dIBF7M2oXyqc66Evos8q1B1RWkk=";
|
||||
hash = "sha256-Pm3jUARrH8bksiCpYtUvo0UB3Oq67EjJGYLGLV54rl4=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
arch = "darwin-x64";
|
||||
hash = "sha256-O/bpKFoCqtzwdNjwWA4WfaeFPUdZtfn14opiSXtjD90=";
|
||||
hash = "sha256-hgd7tpRn2WP0PL4IOpZLL6Uzw1V9rSqlOTDfgFxwWGk=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
arch = "darwin-arm64";
|
||||
hash = "sha256-9kNKHg8lpXf94RT1/oYYeSOX0uHqjpg+zW64NNMQs7A=";
|
||||
hash = "sha256-PQPxwwHbLXa5+p/SfH4IFu/OBEa/1CKdfaM+HAegiDA=";
|
||||
};
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")
|
||||
@@ -36,7 +36,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "csdevkit";
|
||||
publisher = "ms-dotnettools";
|
||||
version = "1.18.25";
|
||||
version = "1.19.63";
|
||||
inherit (extInfo) hash arch;
|
||||
};
|
||||
sourceRoot = "extension"; # This has more than one folder.
|
||||
|
||||
@@ -9,8 +9,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "jupyter";
|
||||
publisher = "ms-toolsai";
|
||||
version = "2025.4.0";
|
||||
hash = "sha256-UU2Ar6JNuEaODSqgssuR6E+XHEtjBojxfxEM8WiejMs=";
|
||||
version = "2025.3.0";
|
||||
hash = "sha256-dH74EX5PDq4t/CukjsswtKLVwbE+q0J+fpZ1MA8CDZI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
wayland,
|
||||
libglvnd,
|
||||
libkrb5,
|
||||
openssl,
|
||||
|
||||
# Populate passthru.tests
|
||||
tests,
|
||||
@@ -51,6 +52,7 @@
|
||||
sourceExecutableName ? executableName,
|
||||
useVSCodeRipgrep ? false,
|
||||
ripgrep,
|
||||
hasVsceSign ? false,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (
|
||||
@@ -233,6 +235,11 @@ stdenv.mkDerivation (
|
||||
dontConfigure = true;
|
||||
noDumpEnvVars = true;
|
||||
|
||||
stripExclude = lib.optional hasVsceSign [
|
||||
# vsce-sign is a single executable application built with Node.js, and it becomes non-functional if stripped
|
||||
"lib/vscode/resources/app/node_modules/@vscode/vsce-sign/bin/vsce-sign"
|
||||
];
|
||||
|
||||
installPhase =
|
||||
''
|
||||
runHook preInstall
|
||||
@@ -324,13 +331,20 @@ stdenv.mkDerivation (
|
||||
''
|
||||
);
|
||||
|
||||
postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
patchelf \
|
||||
--add-needed ${libglvnd}/lib/libGLESv2.so.2 \
|
||||
--add-needed ${libglvnd}/lib/libGL.so.1 \
|
||||
--add-needed ${libglvnd}/lib/libEGL.so.1 \
|
||||
$out/lib/${libraryName}/${executableName}
|
||||
'';
|
||||
postFixup = lib.optionalString stdenv.hostPlatform.isLinux (
|
||||
''
|
||||
patchelf \
|
||||
--add-needed ${libglvnd}/lib/libGLESv2.so.2 \
|
||||
--add-needed ${libglvnd}/lib/libGL.so.1 \
|
||||
--add-needed ${libglvnd}/lib/libEGL.so.1 \
|
||||
$out/lib/${libraryName}/${executableName}
|
||||
''
|
||||
+ (lib.optionalString hasVsceSign ''
|
||||
patchelf \
|
||||
--add-needed ${lib.getLib openssl}/lib/libssl.so \
|
||||
$out/lib/vscode/resources/app/node_modules/@vscode/vsce-sign/bin/vsce-sign
|
||||
'')
|
||||
);
|
||||
|
||||
inherit meta;
|
||||
}
|
||||
|
||||
@@ -36,22 +36,22 @@ let
|
||||
|
||||
sha256 =
|
||||
{
|
||||
x86_64-linux = "0d9qfifxslwkyv9v42y2h7nbqndq5w16z08qar4vly1hnjnmzzxl";
|
||||
x86_64-darwin = "1yyfkgif0nyhgb28wn1wmdq9wyzxybgdfp8j9nknh0nmvmf1r9w6";
|
||||
aarch64-linux = "05xj9fswgf24l9mx98hcapzq90820dwwp9mskbbzai3kxy915yqx";
|
||||
aarch64-darwin = "0a41szz9gljf31pq5czqwiyrxms5cf1x1058rsacaihvx8vn38ya";
|
||||
armv7l-linux = "0iq3y8vj4gm20bxkcrsrnb3g0nf5lg5mpb1bxrg2cy4dgaxjl170";
|
||||
x86_64-linux = "07q8vym10qz91wxn8g7ysksqraj6dr2csyxiclc514k2ifvjh7rx";
|
||||
x86_64-darwin = "068ylhrx4sf7ypynmd17kxrgnjiza7qp5bz63m75vz61vqy655f7";
|
||||
aarch64-linux = "1pl30h3vxsms1xdqvcgsqcl7isc5fz4sxvdy3iml45mg78809hj5";
|
||||
aarch64-darwin = "05das18ks3m4kjq612vwn50sl7sb1mgfjdvzshh662z2spqs6ncb";
|
||||
armv7l-linux = "1xbhkak6gipras6mngsyxnq7k6702dccmqp8az5nig45l54rxfm9";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.99.3";
|
||||
version = "1.100.1";
|
||||
pname = "vscode" + lib.optionalString isInsiders "-insiders";
|
||||
|
||||
# This is used for VS Code - Remote SSH test
|
||||
rev = "17baf841131aa23349f217ca7c570c76ee87b957";
|
||||
rev = "91fa95bccb027ece6a968589bb1d662fa9c8e170";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
|
||||
@@ -75,7 +75,7 @@ callPackage ./generic.nix rec {
|
||||
src = fetchurl {
|
||||
name = "vscode-server-${rev}.tar.gz";
|
||||
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
|
||||
sha256 = "02b2hbdhambi4viyxsxsdayj294g45i49n5yj828nwigw71asysv";
|
||||
sha256 = "1jwy61nypha77iq8mwp2c8jmfxic61m9rkq3p3sjh2i442n0lnwq";
|
||||
};
|
||||
stdenv = stdenvNoCC;
|
||||
};
|
||||
@@ -89,6 +89,8 @@ callPackage ./generic.nix rec {
|
||||
# See https://eclecticlight.co/2022/06/17/app-security-changes-coming-in-ventura/ for more information.
|
||||
dontFixup = stdenv.hostPlatform.isDarwin;
|
||||
|
||||
hasVsceSign = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = ''
|
||||
Open source source code editor developed by Microsoft for Windows,
|
||||
|
||||
@@ -26,11 +26,11 @@ let
|
||||
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-BueYe1tl1IRQdXLkPNCmTzF/BYX+i7j3XK2JufsJ/gk=";
|
||||
x86_64-darwin = "sha256-l0eiuq2SoNj14pDtF4myFySTXHEvXKLN/cO0fEa1nko=";
|
||||
aarch64-linux = "sha256-jE10O+HmdF092XTAhVGc3pwfmXzwB5XpyogDyf1oyos=";
|
||||
aarch64-darwin = "sha256-EDFcyeraRGjGylTOdahmkgUvKwzOhAr+iCIC2QLvPqU=";
|
||||
armv7l-linux = "sha256-2YYTPxLaRSNvS6iFPxWfILvH14jmBgKa94C+jDw7SSI=";
|
||||
x86_64-linux = "sha256-5BRsYaOgavJzMECFHW25r2itiESZWBPmHskfTnH/uLs=";
|
||||
x86_64-darwin = "sha256-bAg+THOBUmrMSGiNs/vxJSbIxq4icx4o1SaFAWOJ3D4=";
|
||||
aarch64-linux = "sha256-pefdxOq/qhKYY6YSM35T+vqGEl3kZc8VqBA5j1IZkEo=";
|
||||
aarch64-darwin = "sha256-sEID3N+Pe7iXJmGxp8Bo6u2AgBVwhBqziEDRAMeAV4w=";
|
||||
armv7l-linux = "sha256-BKUYQs3XqgMWDUFLFEzptPxGK3yP1zmDwN1ElYuALEo=";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
|
||||
@@ -41,7 +41,7 @@ callPackage ./generic.nix rec {
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.100.03093";
|
||||
version = "1.100.13210";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
||||
@@ -26,13 +26,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ovito";
|
||||
version = "3.11.1";
|
||||
version = "3.12.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "stuko";
|
||||
repo = "ovito";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ulzcsFAiZDg8nABQXNB2/MS7lZdK3czGHLKgKDWS15E=";
|
||||
hash = "sha256-qpKQAO2f1TfspqjbCLA/3ERWdMeknKe0a54yd9PZbsA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
patches = [ ./zstd.patch ];
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
mkDerivation,
|
||||
fetchFromGitHub,
|
||||
bash,
|
||||
cmake,
|
||||
boost,
|
||||
xercesc,
|
||||
xalanc,
|
||||
qtbase,
|
||||
qttools,
|
||||
qtmultimedia,
|
||||
qtsvg,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "brewtarget";
|
||||
version = "3.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Brewtarget";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PqaiZ2eLH8+qRRkIolnQClTL9O9EgHMqFH/nUffosV8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
boost
|
||||
xercesc
|
||||
xalanc
|
||||
];
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qttools
|
||||
qtmultimedia
|
||||
qtsvg
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
chmod +x configure
|
||||
substituteInPlace configure --replace /bin/bash "${bash}/bin/bash"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open source beer recipe creation tool";
|
||||
mainProgram = "brewtarget";
|
||||
homepage = "http://www.brewtarget.org/";
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.mmahut ];
|
||||
};
|
||||
}
|
||||
@@ -79,13 +79,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
./fix-ambiguous-constructors.patch
|
||||
];
|
||||
|
||||
# required for GCC 14
|
||||
# Patch required for GCC 14.
|
||||
# (not applicable to super-slicer fork)
|
||||
# Make Gcode viewer open newer bgcode files.
|
||||
postPatch = lib.optionalString (finalAttrs.pname == "prusa-slicer") ''
|
||||
substituteInPlace src/slic3r-arrange/include/arrange/DataStoreTraits.hpp \
|
||||
--replace-fail \
|
||||
"WritableDataStoreTraits<ArrItem>::template set" \
|
||||
"WritableDataStoreTraits<ArrItem>::set"
|
||||
substituteInPlace src/platform/unix/PrusaGcodeviewer.desktop \
|
||||
--replace-fail 'MimeType=text/x.gcode;' 'MimeType=application/x-bgcode;text/x.gcode;'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -186,6 +189,17 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mkdir -p "$out/share/pixmaps/"
|
||||
ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer.png" "$out/share/pixmaps/PrusaSlicer.png"
|
||||
ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer-gcodeviewer_192px.png" "$out/share/pixmaps/PrusaSlicer-gcodeviewer.png"
|
||||
|
||||
mkdir -p "$out"/share/mime/packages
|
||||
cat << EOF > "$out"/share/mime/packages/prusa-gcode-viewer.xml
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
|
||||
<mime-type type="application/x-bgcode">
|
||||
<comment xml:lang="en">Binary G-code file</comment>
|
||||
<glob pattern="*.bgcode"/>
|
||||
</mime-type>
|
||||
</mime-info>
|
||||
EOF
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
@@ -211,6 +225,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
maintainers = with maintainers; [
|
||||
tweber
|
||||
tmarkus
|
||||
fliegendewurst
|
||||
];
|
||||
platforms = platforms.unix;
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
(
|
||||
(buildMozillaMach rec {
|
||||
pname = "floorp";
|
||||
packageVersion = "11.26.0";
|
||||
packageVersion = "11.26.1";
|
||||
applicationName = "Floorp";
|
||||
binaryName = "floorp";
|
||||
branding = "browser/branding/official";
|
||||
@@ -24,7 +24,7 @@
|
||||
repo = "Floorp";
|
||||
fetchSubmodules = true;
|
||||
rev = "v${packageVersion}";
|
||||
hash = "sha256-gv6wEaESFoL4RvZ+alhwUOfPQbSpyQr1yTQedP2RSwE=";
|
||||
hash = "sha256-WX7I81Rjv/6+L+HCN6j/HvLOPJk0vyiLpUmxoK+FDn8=";
|
||||
};
|
||||
|
||||
extraConfigureFlags = [
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
|
||||
# runtime deps
|
||||
adns,
|
||||
bashNonInteractive,
|
||||
curl,
|
||||
gettext,
|
||||
gmp,
|
||||
@@ -48,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
libtool
|
||||
gettext # msgfmt
|
||||
makeWrapper
|
||||
meson
|
||||
ninja
|
||||
@@ -57,8 +58,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
adns
|
||||
bashNonInteractive
|
||||
curl
|
||||
gettext
|
||||
gmp
|
||||
gnutls
|
||||
jansson
|
||||
@@ -71,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libopus
|
||||
libpulseaudio
|
||||
libsodium
|
||||
libtool
|
||||
libunistring
|
||||
libxml2
|
||||
ncurses
|
||||
@@ -78,6 +80,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
zlib
|
||||
] ++ lib.optional postgresqlSupport libpq;
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
preConfigure = ''
|
||||
# Brute force: since nix-worker chroots don't provide
|
||||
# /etc/{resolv.conf,hosts}, replace all references to `localhost'
|
||||
@@ -122,5 +126,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [ pstn ];
|
||||
platforms = lib.platforms.unix;
|
||||
changelog = "https://git.gnunet.org/gnunet.git/tree/ChangeLog?h=v${finalAttrs.version}";
|
||||
# meson: "Can not run test applications in this cross environment." (for dane_verify_crt_raw)
|
||||
broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
{
|
||||
"stable": {
|
||||
"x86_64-linux": {
|
||||
"url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.10.75.x64.tar.gz",
|
||||
"hash": "sha256-HCVTOWRRCyQK0ZoLyxa2QmDE13ZBkK0rgyNGkBjqJlk="
|
||||
"url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.10.76.x64.tar.gz",
|
||||
"hash": "sha256-vEbmZP0WQ0Ha92V/owFKtxavahWMpV73vRiflZ1dpzQ="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.10.75.arm64.tar.gz",
|
||||
"hash": "sha256-2Ro04Ky6rs5NBmcdmVpat0dZsHux2YYQFHqW50AMk8s="
|
||||
"url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.10.76.arm64.tar.gz",
|
||||
"hash": "sha256-4GHFLlpThIJ5oAVgwXUAy4Gb0569RLXK1kdLErOr6j8="
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.10.75-x86_64.zip",
|
||||
"hash": "sha256-ymYDF/4o4MKbqPumIv0+CJAHQH/JL1j+1FYMT8ddQJs="
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.10.76-x86_64.zip",
|
||||
"hash": "sha256-hAIVQ7QVpZzQqW5ikCjp6HsskQWH5bbzM85DNyY0hFQ="
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.10.75-aarch64.zip",
|
||||
"hash": "sha256-3YRsZPgHzNVkoc41q+RWwrO9Yz8v8Owhcvpn0aQk5Gg="
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.10.76-aarch64.zip",
|
||||
"hash": "sha256-jfdtLBsd1IvntJHZOJ0pxIrwjIUOcG3thfyjTMNIMK4="
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"stable-linux": "8.10.75",
|
||||
"stable-darwin": "8.10.75",
|
||||
"stable-linux": "8.10.76",
|
||||
"stable-darwin": "8.10.76",
|
||||
"beta-linux":"8.10.76-32.BETA",
|
||||
"beta-darwin": "8.10.76-32.BETA"
|
||||
}
|
||||
|
||||
@@ -24,16 +24,16 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "age-plugin-fido2-hmac";
|
||||
version = "0.2.4";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "olastor";
|
||||
repo = "age-plugin-fido2-hmac";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-q77j+b0GDJhkCDLJYfIH2ZXqiwTC+ZM8CqXFv11UFaE=";
|
||||
hash = "sha256-DQVNUvKUyx1MUpWy5TeL1FYM5s8eeoNnNjKYozVgAxE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-wNJnpCg5fmzGe45r7LDpr9OBujTzenFhFlxvSj/URbY=";
|
||||
vendorHash = "sha256-/H4zHfaRw2EqV8p57Y1Lgb2N1VXBucetvl7mJ6Jdu/8=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "amazon-ec2-net-utils";
|
||||
version = "2.5.4";
|
||||
version = "2.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amazonlinux";
|
||||
repo = "amazon-ec2-net-utils";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-uHYEavdBggdXBYUSDFvajRVLxcRge/kiu60c1a4SPRw=";
|
||||
hash = "sha256-FHPJeyXrnf0+aeh1YqFXWz7qreLs6FHpZuPArt/nkIo=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
meson,
|
||||
ninja,
|
||||
boost,
|
||||
pandoc,
|
||||
pkg-config,
|
||||
xercesc,
|
||||
xalanc,
|
||||
qt6Packages,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "brewtarget";
|
||||
version = "4.0.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Brewtarget";
|
||||
repo = "brewtarget";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-bJMKmOSoL7mzV7G87O2w1WFWmwRetXa8fUkfLIM5Qwk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# 3 sed statements from below derived from AUR
|
||||
# Disable boost-stacktrace_backtrace, requires an optional boost lib that's only built in Debianland
|
||||
sed -i "/boostModules += 'stacktrace_backtrace'/ {N;N;d}" meson.build
|
||||
# Make libbacktrace not required, we're not running the bt script
|
||||
sed -i "/compiler\.find_library('backtrace'/ {n;s/true/false/}" meson.build
|
||||
# Disable static linking
|
||||
sed -i 's/static : true/static : false/g' meson.build
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
cmake
|
||||
ninja
|
||||
pkg-config
|
||||
qt6Packages.wrapQtAppsHook
|
||||
pandoc
|
||||
];
|
||||
buildInputs = [
|
||||
boost
|
||||
qt6Packages.qtbase
|
||||
qt6Packages.qttools
|
||||
qt6Packages.qtmultimedia
|
||||
qt6Packages.qtsvg
|
||||
xercesc
|
||||
xalanc
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Open source beer recipe creation tool";
|
||||
mainProgram = "brewtarget";
|
||||
homepage = "http://www.brewtarget.org/";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [
|
||||
avnik
|
||||
mmahut
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -33,6 +33,8 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
|
||||
postPatch = ''
|
||||
substituteInPlace git_hash.cmake \
|
||||
--replace-fail "\''${GIT_HASH}" "${rev}"
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "-Werror" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -28,13 +28,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cagebreak";
|
||||
version = "2.4.0";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "project-repo";
|
||||
repo = "cagebreak";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-eJLYv9CalBTOQEOMRg/5ctHByrkA44pfS7K3H4XTdSc=";
|
||||
hash = "sha256-vXRIZqFyywRettzriOArl1FGdzWdaeVOfYFZCiPLQZg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
glow,
|
||||
imagemagick,
|
||||
jq,
|
||||
poppler-utils,
|
||||
ueberzug,
|
||||
}:
|
||||
|
||||
@@ -52,11 +53,15 @@ stdenv.mkDerivation rec {
|
||||
glow # for markdown files
|
||||
imagemagick
|
||||
jq # for json files
|
||||
poppler-utils # for pdf files
|
||||
ueberzug # for image files on X11
|
||||
]
|
||||
}";
|
||||
'';
|
||||
|
||||
# Until https://github.com/NikitaIvanovV/ctpv/pull/90 is merged
|
||||
patches = [ ./use-polite-flag.patch ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "File previewer for a terminal";
|
||||
homepage = "https://github.com/NikitaIvanovV/ctpv";
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/sh/helpers.sh b/sh/helpers.sh
|
||||
index fef8691..229d38f 100644
|
||||
--- a/sh/helpers.sh
|
||||
+++ b/sh/helpers.sh
|
||||
@@ -73,7 +73,7 @@ is_anim_image() {
|
||||
chafa_run() {
|
||||
format='-f symbols'
|
||||
autochafa && format=
|
||||
- chafasixel && format='-f sixels'
|
||||
+ chafasixel && format='-f sixels --polite on'
|
||||
chafa -s "${w}x${h}" $format "$1" | sed 's/#/\n#/g'
|
||||
}
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dissent";
|
||||
version = "0.0.32";
|
||||
version = "0.0.34";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "diamondburned";
|
||||
repo = "dissent";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-6ZUJp4pW+rbV+2TJ9H69kThc5zzDFG5KjGRHVwFS76Q=";
|
||||
hash = "sha256-65UsXSxcEQhQM3N4wUoEehJmF9pJPcGCG7fF/DWe+zU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -56,7 +56,7 @@ buildGoModule rec {
|
||||
install -D -m 444 -t $out/share/dbus-1/services nix/so.libdb.dissent.service
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-cA+rD7mbTYE+LqdLFFV8Li65wL2B5cUFwxWsMwNMRQg=";
|
||||
vendorHash = "sha256-unb/x7bzWWkr2zKioOarY2VdrGBiJq/mORsWifuulqQ=";
|
||||
|
||||
meta = {
|
||||
description = "Third-party Discord client designed for a smooth, native experience (formerly gtkcord4)";
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "egl-wayland";
|
||||
version = "1.1.18";
|
||||
version = "1.1.19";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "Nvidia";
|
||||
repo = "egl-wayland";
|
||||
rev = version;
|
||||
hash = "sha256-Vu0XPcFKQJ+nypNMX1tw17whVWceZ0YlqvEEmEbTQaU=";
|
||||
hash = "sha256-xQZTmZQqFY7oXHx+g+PKbwCYCPdpUrFnyMZyL2Q/faE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -59,13 +59,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fastfetch";
|
||||
version = "2.42.0";
|
||||
version = "2.43.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastfetch-cli";
|
||||
repo = "fastfetch";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-nlhW3ftBOjb2BHz1qjOI4VGiSn1+VAUcaA9n0nPikCU=";
|
||||
hash = "sha256-gUqNiiPipoxLKwGVsi42PyOnmPbfvUs7UwfqOdmFn/E=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
let
|
||||
pname = "fiddler-everywhere";
|
||||
version = "6.4.0";
|
||||
version = "6.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.getfiddler.com/linux/fiddler-everywhere-${version}.AppImage";
|
||||
hash = "sha256-b90O45IOF1F39fKOxyUk8ONTWhH7A367jJpzeKukj04=";
|
||||
hash = "sha256-XEmQeEXqQpVASJ5NJEhZZOkIPbSbj/DOUbfbdAJXSRk=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
{
|
||||
lib,
|
||||
esbuild,
|
||||
buildNpmPackage,
|
||||
|
||||
pname,
|
||||
@@ -13,8 +11,6 @@ buildNpmPackage {
|
||||
inherit version src npmDepsHash;
|
||||
pname = "${pname}-frontend";
|
||||
|
||||
nativeBuildInputs = [ esbuild ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
@@ -37,6 +33,5 @@ buildNpmPackage {
|
||||
|
||||
env = {
|
||||
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = 1;
|
||||
ESBUILD_BINARY_PATH = lib.getExe esbuild;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -3,21 +3,19 @@
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
callPackage,
|
||||
esbuild,
|
||||
buildGoModule,
|
||||
nixosTests,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "fider";
|
||||
version = "0.24.0";
|
||||
version = "0.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getfider";
|
||||
repo = "fider";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-nzOplwsE0ppmxbTrNAgePnIQIAD/5Uu4gXlebFKWGfc=";
|
||||
hash = "sha256-uABRIR/3D+//qYu/396qqVizP0kLmAA8auYd83rABhE=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
@@ -32,8 +30,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
# vendorHash = "...";
|
||||
# npmDepsHash = "...";
|
||||
# })
|
||||
vendorHash = "sha256-CfopU72fpXiTaBtdf9A57Wb+flDu2XEtTISxImeJLL0=";
|
||||
npmDepsHash = "sha256-gnboT5WQzftOCZ2Ouuza7bqpxJf+Zs7OWC8OHMZNHvw=";
|
||||
vendorHash = "sha256-4ilOdUblpwteY0ZInitSuzuB8mU1ltYgRJjla6LiziU=";
|
||||
npmDepsHash = "sha256-c8CFMMmFcLZkJL50bfLlk2HP9B/rexNZ2WWJkV0x4Rk=";
|
||||
|
||||
server = callPackage ./server.nix {
|
||||
inherit (finalAttrs)
|
||||
@@ -50,31 +48,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
src
|
||||
npmDepsHash
|
||||
;
|
||||
# We specify the esbuild override here instead of in frontend.nix so end users can
|
||||
# again easily override it if necessary, for example when changing to an unreleased
|
||||
# version of fider requiring a newer esbuild than specified here:
|
||||
# pkgs.fider.overrideAttrs (prev: {
|
||||
# frontend = prev.frontend.override {
|
||||
# esbuild = ...;
|
||||
# };
|
||||
# })
|
||||
esbuild = esbuild.override {
|
||||
buildGoModule =
|
||||
args:
|
||||
buildGoModule (
|
||||
args
|
||||
// rec {
|
||||
version = "0.14.38";
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-rvMi1oC7qGidvi4zrm9KCMMntu6LJGVOGN6VmU2ivQE=";
|
||||
};
|
||||
vendorHash = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs=";
|
||||
}
|
||||
);
|
||||
};
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -116,7 +116,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
);
|
||||
|
||||
doCheck = true;
|
||||
# https://github.com/facebook/folly/blob/main/folly/DiscriminatedPtr.h
|
||||
# error: #error "DiscriminatedPtr is x64, arm64, ppc64 and riscv64 specific code."
|
||||
doCheck =
|
||||
stdenv.hostPlatform.isx86_64
|
||||
|| stdenv.hostPlatform.isAarch64
|
||||
|| stdenv.hostPlatform.isPower64
|
||||
|| stdenv.hostPlatform.isRiscV64;
|
||||
|
||||
patches = [
|
||||
# The base template for std::char_traits has been removed in LLVM 19
|
||||
|
||||
@@ -7,18 +7,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "harper";
|
||||
version = "0.32.1";
|
||||
version = "0.34.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Automattic";
|
||||
repo = "harper";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6W1NFZ5wRL3RxNYbgRH4qCSDNwOc3uQFeFujffusjGo=";
|
||||
hash = "sha256-fBAPJhB+x8cIFs6rp1nDvrtVkAKx2wuFCO7FwHOwLRM=";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "harper-ls";
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-PKqLf7UrtQp8pLIJbFgZ53iW+So6Yq7cpETARsnMFvI=";
|
||||
cargoHash = "sha256-XVC2xgUwazYXVp5sx6kA+aopd9m38XlbgsLnb0D92kg=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "home-manager";
|
||||
version = "0-unstable-2025-04-28";
|
||||
version = "0-unstable-2025-05-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "home-manager-source";
|
||||
owner = "nix-community";
|
||||
repo = "home-manager";
|
||||
rev = "d0d9d0a1454d5a0200693570618084d80a8b336c";
|
||||
hash = "sha256-B1FQwPCFLL3cbHc2nxT3/UI1uprHp2h1EA6M2JVe0oQ=";
|
||||
rev = "8d832ddfda9facf538f3dda9b6985fb0234f151c";
|
||||
hash = "sha256-NnPzzXEqfYjfrimLzK0JOBItfdEJdP/i6SNTuunCGgw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import ./generic.nix {
|
||||
version = "1.6.2";
|
||||
hash = "sha256-rfQNx6yAj1mDW7UL8mz01TqMAET9D5fL02JhHeN5zV4=";
|
||||
cargoHash = "sha256-3XUAwuRKtdnMNhH92lgwgeN2rMmzgqir1+OZNaTGmks=";
|
||||
version = "1.6.3";
|
||||
hash = "sha256-oZU7XgGpkPAwuUVVjpiKApOiQN692CRFjmWzE9hcqPY=";
|
||||
cargoHash = "sha256-cgTCLTcPXjGdvremw1afyRGHwnBvqNGXr1D8Xgxv4uA=";
|
||||
patchDir = ./patches/1_6;
|
||||
}
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "kickoff";
|
||||
version = "0.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "j0ru";
|
||||
repo = "kickoff";
|
||||
rev = "v${version}";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-V4MkVjg5Q8eAJ80V/4SvEIwjVy35/HVewaR1caYLguw=";
|
||||
};
|
||||
|
||||
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/kickoff" --prefix LD_LIBRARY_PATH : "${libPath}"
|
||||
wrapProgram "$out/bin/kickoff" --prefix LD_LIBRARY_PATH : "${finalAttrs.libPath}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
@@ -49,4 +49,4 @@ rustPlatform.buildRustPackage rec {
|
||||
maintainers = with maintainers; [ pyxels ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,24 +1,23 @@
|
||||
{
|
||||
lib,
|
||||
# broken with go 1.24 for some reason
|
||||
buildGo123Module,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
gitMinimal,
|
||||
installShellFiles,
|
||||
}:
|
||||
|
||||
buildGo123Module rec {
|
||||
buildGoModule rec {
|
||||
pname = "ko";
|
||||
version = "0.17.1";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ko-build";
|
||||
repo = pname;
|
||||
tag = "v${version}";
|
||||
hash = "sha256-OQtYyokARrjaf0MWQ0sMqJPb+C5pRkKFumAmtxS4SBo=";
|
||||
hash = "sha256-fAdogzNCuz8vHWF1UOFmDKSRXbNvY5knKIhfJzXNGzw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-YQggwX6fUsfZMM+GdgeNAIHkfX84FMF84xHsP/SNiS4=";
|
||||
vendorHash = "sha256-R+vGG2u/unXffD/9Aq065zR7Xq9KEWZl4llYFxR0HLU=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdeltachat";
|
||||
version = "1.159.3";
|
||||
version = "1.159.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chatmail";
|
||||
repo = "core";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ghUPbHwOEND/ab8PELCJn3ADBWBe2v8u5xMrp9wiwjY=";
|
||||
hash = "sha256-OLE3BoQNgpOHYuMUFBmk+raXimJGOsXySkfP+UTDk/8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
pname = "deltachat-core-rust";
|
||||
inherit version src;
|
||||
hash = "sha256-S46y3By/81qEOY54JqMJtnb6zXvd+e7PG4THmxPRQcY=";
|
||||
hash = "sha256-+h93tSiKxnnNXPGk7elMQrcIuw3G/j2/gugqSbqOrDw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "livepeer";
|
||||
version = "0.8.4";
|
||||
version = "0.8.5";
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-9BxLyl8lZTKx/2Qw0NR4+1GdmD9FQPfnVU+x/RWEIvA=";
|
||||
@@ -19,7 +19,7 @@ buildGoModule rec {
|
||||
owner = "livepeer";
|
||||
repo = "go-livepeer";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-slM3StvePwCyKXFmbxyZAZ4tTtLea4SMBXCojK8zrdM=";
|
||||
hash = "sha256-GT/YMY3U17pfhAL5uiEBjSlM79dhwgkwan0xlzGbR5g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mamba-cpp";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mamba-org";
|
||||
repo = "mamba";
|
||||
tag = version;
|
||||
hash = "sha256-7YR3ToPz80I9d1pRNiEaoIacVyaz2mqzdm0h5WGSb2g=";
|
||||
hash = "sha256-JBwdfYM7J5R7HZyw5kVXwu4FlZUd2QPrsTaGuXnyAJI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "n8n";
|
||||
version = "1.91.0";
|
||||
version = "1.91.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "n8n-io";
|
||||
repo = "n8n";
|
||||
tag = "n8n@${finalAttrs.version}";
|
||||
hash = "sha256-YbN1i1c/AhLczpX5Zp3x+4mX0R6pwre47Pr5/YzzhYw=";
|
||||
hash = "sha256-FkjYe+OSSzEHGx2NW1I3ZAsg4FbEP1VS2hA4Li3JvXc=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm_10.fetchDeps {
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nelm";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "nelm";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-voSGwr4wpei9U5L/6uAcapjNZ5CVn49mwngfsXMcxB0=";
|
||||
hash = "sha256-yIBgNgWqWxEHlrngNe47iSqVcPIoqet3V/nCnqftk1Q=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-kLFQtRAsxA7fdQIgpa0eV3hSpX5pAGT1DTGeGkawvVk=";
|
||||
vendorHash = "sha256-osFfjZcvNVNkX2YAcgWS0AYD2b0DzN3RUvZU1P7epbU=";
|
||||
|
||||
subPackages = [ "cmd/nelm" ];
|
||||
|
||||
|
||||
@@ -1,38 +1,20 @@
|
||||
{
|
||||
lib,
|
||||
python3Packages,
|
||||
fetchFromSourcehut,
|
||||
file,
|
||||
installShellFiles,
|
||||
less,
|
||||
lib,
|
||||
offpunk,
|
||||
python3Packages,
|
||||
testers,
|
||||
timg,
|
||||
xdg-utils,
|
||||
xsel,
|
||||
}:
|
||||
|
||||
let
|
||||
pythonDependencies = with python3Packages; [
|
||||
beautifulsoup4
|
||||
chardet
|
||||
cryptography
|
||||
feedparser
|
||||
readability-lxml
|
||||
requests
|
||||
setproctitle
|
||||
];
|
||||
otherDependencies = [
|
||||
file
|
||||
less
|
||||
timg
|
||||
xdg-utils
|
||||
xsel
|
||||
];
|
||||
in
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "offpunk";
|
||||
version = "2.6";
|
||||
version = "2.7.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = python3Packages.pythonOlder "3.7";
|
||||
@@ -41,14 +23,30 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "~lioploum";
|
||||
repo = "offpunk";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bVWPmCs8vspW0leaNajEYy+c3WRRMzIB8b9nXDDB8tw=";
|
||||
hash = "sha256-+Mbe1VLeF8Adf7bgVnbzvcWdPB4PXakCD9gO35jAYBY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3Packages.hatchling
|
||||
installShellFiles
|
||||
];
|
||||
propagatedBuildInputs = otherDependencies ++ pythonDependencies;
|
||||
build-system = with python3Packages; [ hatchling ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
dependencies =
|
||||
[
|
||||
file
|
||||
less
|
||||
timg
|
||||
xdg-utils
|
||||
xsel
|
||||
]
|
||||
++ (with python3Packages; [
|
||||
beautifulsoup4
|
||||
chardet
|
||||
cryptography
|
||||
feedparser
|
||||
readability-lxml
|
||||
requests
|
||||
setproctitle
|
||||
]);
|
||||
|
||||
postInstall = ''
|
||||
installManPage man/*.1
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2025-04-19";
|
||||
version = "2025-04-29";
|
||||
pname = "oh-my-zsh";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ohmyzsh";
|
||||
repo = "ohmyzsh";
|
||||
rev = "de1ca65dcaebd19f5ca6626616bb79b529362458";
|
||||
sha256 = "sha256-ag/hVeCvrGHYSchdeTQKOtqFvmtn12vJZJM+EIpyYpE=";
|
||||
rev = "f6a7bbf81a18d30f75bad72de3398d0f55c8792b";
|
||||
sha256 = "sha256-2SoiItbJ/WQ+Kv8gM+nBjco0BiX+CYoJ4d+yj71XckE=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -14,17 +14,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rattler-build";
|
||||
version = "0.40.0";
|
||||
version = "0.41.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prefix-dev";
|
||||
repo = "rattler-build";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-NwsNCd6ueCtvJp04fJTsfoXtfUlgZou+zwDHrXeUlhk=";
|
||||
hash = "sha256-6N4YHrwzFTBShitAW7BMjEMzigB37Om5lICb94wEvlQ=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-O0nTxgftGv70c8yv4qEG+fEZEXZ+H6fhUzd/p8CQMQ4=";
|
||||
cargoHash = "sha256-fslC+e3d2tVFOWag7NZ1mTnjG3iMMezodpNQ+2LVRxU=";
|
||||
|
||||
doCheck = false; # test requires network access
|
||||
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitea,
|
||||
fetchNpmDeps,
|
||||
buildGoModule,
|
||||
nodejs,
|
||||
npmHooks,
|
||||
lib,
|
||||
python3,
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
file-compose = buildGoModule {
|
||||
pname = "file-compose";
|
||||
version = "unstable-2023-10-21";
|
||||
@@ -27,19 +27,20 @@ in
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "readeck";
|
||||
version = "0.17.1";
|
||||
version = "0.18.2";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "readeck";
|
||||
repo = "readeck";
|
||||
tag = version;
|
||||
hash = "sha256-+GgjR1mxD93bFNaLeDuEefPlQEV9jNgFIo8jTAxphyo=";
|
||||
hash = "sha256-geKhug1sQ51i+6qw2LVzW8lXyvre6AlVHWvGlEXWki8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
npmHooks.npmConfigHook
|
||||
(python3.withPackages (ps: with ps; [ babel ]))
|
||||
];
|
||||
|
||||
npmRoot = "web";
|
||||
@@ -48,10 +49,13 @@ buildGoModule rec {
|
||||
|
||||
preBuild = ''
|
||||
make web-build
|
||||
python3 locales/messages.py compile
|
||||
${file-compose}/bin/file-compose -format json docs/api/api.yaml docs/assets/api.json
|
||||
go run ./tools/docs docs/src docs/assets
|
||||
'';
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
tags = [
|
||||
"netgo"
|
||||
"osusergo"
|
||||
@@ -66,6 +70,7 @@ buildGoModule rec {
|
||||
"-X"
|
||||
"codeberg.org/readeck/readeck/configs.version=${version}"
|
||||
];
|
||||
|
||||
overrideModAttrs = oldAttrs: {
|
||||
# Do not add `npmConfigHook` to `goModules`
|
||||
nativeBuildInputs = lib.remove npmHooks.npmConfigHook oldAttrs.nativeBuildInputs;
|
||||
@@ -75,18 +80,17 @@ buildGoModule rec {
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
src = "${src}/web";
|
||||
hash = "sha256-7fRSkXKAMEC7rFmSF50DM66SVhV68g93PMBjrtkd9/E=";
|
||||
hash = "sha256-3MVrzpilJKptT0iRBQx2Cl0iKVoOJu5cBT987U1/C1k=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-O/ZrpT6wTtPwBDUCAmR0XHRgQmd46/MPvWNE0EvD3bg=";
|
||||
vendorHash = "sha256-RjU3PW7GeMkQE0oHkI4EmFNr4HT3vRyFITUzYX9AHpw=";
|
||||
|
||||
meta = {
|
||||
description = "Web application that lets you save the readable content of web pages you want to keep forever.";
|
||||
mainProgram = "readeck";
|
||||
homepage = "https://readeck.org/";
|
||||
changelog = "https://github.com/readeck/readeck/releases/tag/${version}";
|
||||
changelog = "https://codeberg.org/readeck/readeck/releases/tag/${version}";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [ julienmalka ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
{
|
||||
SDL2_mixer_2_0,
|
||||
SDL2_classic_mixer,
|
||||
}:
|
||||
|
||||
SDL2_mixer_2_0.override {
|
||||
SDL2_mixer = SDL2_classic_mixer;
|
||||
}
|
||||
-26
@@ -1,26 +0,0 @@
|
||||
--- a/music_mpg123.c 2018-10-31 10:59:00.000000000 -0400
|
||||
+++ b/music_mpg123.c 2023-09-05 21:31:51.529191521 -0400
|
||||
@@ -48,7 +48,11 @@
|
||||
int (*mpg123_open_handle)(mpg123_handle *mh, void *iohandle);
|
||||
const char* (*mpg123_plain_strerror)(int errcode);
|
||||
void (*mpg123_rates)(const long **list, size_t *number);
|
||||
+#if (MPG123_API_VERSION >= 45) /* api (but not abi) change as of mpg123-1.26.0 */
|
||||
+ int (*mpg123_read)(mpg123_handle *mh, void *outmemory, size_t outmemsize, size_t *done );
|
||||
+#else
|
||||
int (*mpg123_read)(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done );
|
||||
+#endif
|
||||
int (*mpg123_replace_reader_handle)( mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) );
|
||||
off_t (*mpg123_seek)( mpg123_handle *mh, off_t sampleoff, int whence );
|
||||
const char* (*mpg123_strerror)(mpg123_handle *mh);
|
||||
@@ -95,7 +99,11 @@
|
||||
FUNCTION_LOADER(mpg123_open_handle, int (*)(mpg123_handle *mh, void *iohandle))
|
||||
FUNCTION_LOADER(mpg123_plain_strerror, const char* (*)(int errcode))
|
||||
FUNCTION_LOADER(mpg123_rates, void (*)(const long **list, size_t *number));
|
||||
+#if (MPG123_API_VERSION >= 45) /* api (but not abi) change as of mpg123-1.26.0 */
|
||||
+ FUNCTION_LOADER(mpg123_read, int (*)(mpg123_handle *mh, void *outmemory, size_t outmemsize, size_t *done ))
|
||||
+#else
|
||||
FUNCTION_LOADER(mpg123_read, int (*)(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done ))
|
||||
+#endif
|
||||
FUNCTION_LOADER(mpg123_replace_reader_handle, int (*)( mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) ))
|
||||
FUNCTION_LOADER(mpg123_seek, off_t (*)( mpg123_handle *mh, off_t sampleoff, int whence ))
|
||||
FUNCTION_LOADER(mpg123_strerror, const char* (*)(mpg123_handle *mh))
|
||||
@@ -1,37 +0,0 @@
|
||||
{
|
||||
SDL2_mixer,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
timidity,
|
||||
}:
|
||||
|
||||
let
|
||||
attrset = {
|
||||
version = "2.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libsdl-org";
|
||||
repo = "SDL_mixer";
|
||||
rev = "release-${attrset.version}";
|
||||
hash = "sha256-vo9twUGeK2emDiGd9kSGuA/X8TxVmQrRFFm71zawWYM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# These patches fix incompatible function pointer conversion errors with clang 16.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/libsdl-org/SDL_mixer/commit/4119ec3fe838d38d2433f4432cd18926bda5d093.patch";
|
||||
stripLen = 2;
|
||||
hash = "sha256-Ug1EEZIRcV8+e1MeMsGHuTW7Zn6j4szqujP8IkIq2VM=";
|
||||
})
|
||||
# Based on https://github.com/libsdl-org/SDL_mixer/commit/64ab759111ddb1b033bcce64e1a04e0cba6e498f
|
||||
./SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch
|
||||
];
|
||||
|
||||
# fix default path to timidity.cfg so MIDI files could be played
|
||||
postPatch = ''
|
||||
substituteInPlace timidity/options.h \
|
||||
--replace "/usr/share/timidity" "${timidity}/share/timidity"
|
||||
'';
|
||||
};
|
||||
in
|
||||
SDL2_mixer.overrideAttrs (_: attrset)
|
||||
@@ -16,7 +16,6 @@
|
||||
testers,
|
||||
libX11,
|
||||
libGL,
|
||||
testSupport ? true,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -60,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# skip timing-based tests as those are flaky
|
||||
env.SDL_TESTS_QUICK = 1;
|
||||
|
||||
doCheck = testSupport && stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
doCheck = true;
|
||||
|
||||
patches = [ ./find-headers.patch ];
|
||||
setupHook = ./setup-hook.sh;
|
||||
@@ -73,20 +72,20 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
passthru = {
|
||||
tests =
|
||||
let
|
||||
replaceSDL2 = drv: drv.override { SDL2 = finalAttrs.finalPackage; };
|
||||
in
|
||||
{
|
||||
pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
|
||||
SDL2_ttf = replaceSDL2 SDL2_ttf;
|
||||
SDL2_net = replaceSDL2 SDL2_net;
|
||||
SDL2_gfx = replaceSDL2 SDL2_gfx;
|
||||
SDL2_sound = replaceSDL2 SDL2_sound;
|
||||
SDL2_mixer = replaceSDL2 SDL2_mixer;
|
||||
SDL2_image = replaceSDL2 SDL2_image;
|
||||
pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
|
||||
inherit
|
||||
SDL2_ttf
|
||||
SDL2_net
|
||||
SDL2_gfx
|
||||
SDL2_sound
|
||||
SDL2_mixer
|
||||
SDL2_image
|
||||
;
|
||||
}
|
||||
// lib.optionalAttrs stdenv.hostPlatform.isLinux {
|
||||
monado = replaceSDL2 monado;
|
||||
inherit monado;
|
||||
};
|
||||
|
||||
updateScript = nix-update-script {
|
||||
@@ -108,6 +107,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
marcin-serwin
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
pkgConfigModules = [ "sdl2-compat" ];
|
||||
pkgConfigModules = [
|
||||
"sdl2-compat"
|
||||
"sdl2"
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -24,23 +24,23 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "libsignal-node";
|
||||
version = "0.68.0";
|
||||
version = "0.70.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "signalapp";
|
||||
repo = "libsignal";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Bc9wsi+Y6PzNSt4+I8ULMUsrKDFLKaxZ/HqldlYOtoM=";
|
||||
hash = "sha256-6CBhLvD0UflLzJHAMB21wSH8MWTUNx0uPdqOUo/Eq44=";
|
||||
};
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-NmC/htksyrkaudVq3EuQ5gepmFZNQ7t/FVazfdxg8ds=";
|
||||
cargoHash = "sha256-4bSPPf16nUQTl6INa3mLhPIe8iiFfpPw1E5fpNvnKqs=";
|
||||
|
||||
npmRoot = "node";
|
||||
npmDeps = fetchNpmDeps {
|
||||
name = "${finalAttrs.pname}-npm-deps";
|
||||
inherit (finalAttrs) version src;
|
||||
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
|
||||
hash = "sha256-hn7bfULZJTIJVU51Cuvj+9AAudSC/C3wBzkIEzlO3VQ=";
|
||||
hash = "sha256-djk+YGZ/eUq6MXjUEE47bgKnQlUSuaoUPx8hUMtjvyQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -21,23 +21,6 @@ let
|
||||
pnpm = pnpm_10.override { inherit nodejs; };
|
||||
electron = electron_35;
|
||||
|
||||
nodeOS =
|
||||
{
|
||||
"linux" = "linux";
|
||||
"darwin" = "darwin";
|
||||
}
|
||||
.${stdenv.hostPlatform.parsed.kernel.name}
|
||||
or (throw "unsupported platform ${stdenv.hostPlatform.parsed.kernel.name}");
|
||||
|
||||
nodeArch =
|
||||
{
|
||||
# https://nodejs.org/api/os.html#osarch
|
||||
"x86_64" = "x64";
|
||||
"aarch64" = "arm64";
|
||||
}
|
||||
.${stdenv.hostPlatform.parsed.cpu.name}
|
||||
or (throw "unsupported platform ${stdenv.hostPlatform.parsed.cpu.name}");
|
||||
|
||||
libsignal-node = callPackage ./libsignal-node.nix { inherit nodejs; };
|
||||
signal-sqlcipher = callPackage ./signal-sqlcipher.nix { inherit pnpm nodejs; };
|
||||
|
||||
@@ -65,13 +48,13 @@ let
|
||||
'';
|
||||
});
|
||||
|
||||
version = "7.52.0";
|
||||
version = "7.54.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "signalapp";
|
||||
repo = "Signal-Desktop";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-dV99PUcXhFwdI6VmS3tuvLYNkPMJOFhxg+lbDqIV7Ms=";
|
||||
hash = "sha256-dv1Yi7gSd7kY3MSrsPjcaf2hAEq6Y+XoWtlBfvd86ac=";
|
||||
};
|
||||
|
||||
sticker-creator = stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -84,6 +67,7 @@ let
|
||||
hash = "sha256-TuPyRVNFIlR0A4YHMpQsQ6m+lm2fsp79FzQ1P5qqjIc=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
pnpm.configHook
|
||||
@@ -106,6 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "signal-desktop";
|
||||
inherit src version;
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
pnpm.configHook
|
||||
@@ -131,24 +116,24 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
;
|
||||
hash =
|
||||
if withAppleEmojis then
|
||||
"sha256-fCA1tBpj0l3Ur9z1o1IAz+HtfDlC5DzPa3m1/8NsFkY="
|
||||
"sha256-Kdg0+kLEDFobWEEhJgKuaou/pYwn1dTugye7OcMYfEQ="
|
||||
else
|
||||
"sha256-XQzjctXrpIy1zCWshJY2bA1BvKJ2o2cBA8/ikNYKXok=";
|
||||
"sha256-cit/Hn7L6qmfIJCDF2wlx/4aKygRYy+zvBQGX6Mg+og=";
|
||||
};
|
||||
|
||||
env = {
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
SIGNAL_ENV = "production";
|
||||
SOURCE_DATE_EPOCH = 1745425141;
|
||||
SOURCE_DATE_EPOCH = 1747170390;
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
if [ "`jq -r '.engines.node' < package.json | head -c 2`" != `head -c 2 <<< "${nodejs.version}"` ]
|
||||
if [ "`jq -r '.engines.node' < package.json | cut -d. -f1`" != "${lib.versions.major nodejs.version}" ]
|
||||
then
|
||||
die "nodejs version mismatch"
|
||||
fi
|
||||
|
||||
if [ "`jq -r '.devDependencies.electron' < package.json | head -c 2`" != `head -c 2 <<< "${electron.version}"` ]
|
||||
if [ "`jq -r '.devDependencies.electron' < package.json | cut -d. -f1`" != "${lib.versions.major electron.version}" ]
|
||||
then
|
||||
die "electron version mismatch"
|
||||
fi
|
||||
@@ -168,14 +153,21 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
die "ringrtc version mismatch"
|
||||
fi
|
||||
|
||||
mkdir -p node_modules/@signalapp/ringrtc/build
|
||||
install -D ${ringrtc}/lib/libringrtc${stdenv.hostPlatform.extensions.library} \
|
||||
node_modules/@signalapp/ringrtc/build/${nodeOS}/libringrtc-${nodeArch}.node
|
||||
node_modules/@signalapp/ringrtc/build/libringrtc.node
|
||||
|
||||
rm -fr node_modules/@signalapp/libsignal-client/prebuilds
|
||||
substituteInPlace package.json \
|
||||
--replace-fail '"node_modules/@signalapp/ringrtc/build/''${platform}/*''${arch}*.node",' \
|
||||
'"node_modules/@signalapp/ringrtc/build/libringrtc.node",'
|
||||
|
||||
substituteInPlace node_modules/@signalapp/ringrtc/dist/ringrtc/Native.js \
|
||||
--replace-fail 'exports.default = require(`../../build/''${os.platform()}/libringrtc-''${process.arch}.node`);' \
|
||||
'exports.default = require(`../../build/libringrtc.node`);'
|
||||
|
||||
rm -r node_modules/@signalapp/libsignal-client/prebuilds
|
||||
cp -r ${libsignal-node}/lib node_modules/@signalapp/libsignal-client/prebuilds
|
||||
|
||||
rm -fr node_modules/@signalapp/sqlcipher
|
||||
rm -r node_modules/@signalapp/sqlcipher
|
||||
cp -r ${signal-sqlcipher} node_modules/@signalapp/sqlcipher
|
||||
'';
|
||||
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ringrtc";
|
||||
version = "2.50.5";
|
||||
version = "2.51.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "signalapp";
|
||||
repo = "ringrtc";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-qBIm5gMwnTHR0PjO4xjyka0ebR6JAOcCJ/JqcyhPP6Q=";
|
||||
hash = "sha256-PLrGLW6pDoCNpbWASxAqockAJRoeBrkBdxNOHYrQu4s=";
|
||||
};
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-VLefmYCotBwppcKUrVfi1ikfompQsaYZ9cYbHU93iwA=";
|
||||
cargoHash = "sha256-u38VOV2xdNG1WFox+SWT9ejJD1TjK0yAI6lCB9r75iY=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"-p"
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "node-sqlcipher";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "signalapp";
|
||||
repo = "node-sqlcipher";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-piHgAcUdmJo09UG/840GOim3TrlM1Wbzh2wceC1xb9k=";
|
||||
hash = "sha256-15t2HuEYdCxShK703/z3bb1VCgSNpziaK5+wM3TqSHg=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
@@ -32,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-qT4HM/FRL8qugKKNlMYM/0zgUsC6cDOa9fgd1d4VIrc=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
pnpm.configHook
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
"hash": "sha256-yomovlwRmrzsN+dvmUgOM6pzBTH41QuHQXnEJBhQglY=",
|
||||
"owner": "signalapp",
|
||||
"repo": "webrtc",
|
||||
"rev": "6998a"
|
||||
"rev": "6998b"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
|
||||
@@ -38,6 +38,12 @@ let
|
||||
'';
|
||||
distPhase = "true";
|
||||
dontInstall = true;
|
||||
|
||||
patches = [
|
||||
# Update field names to work with pdu versions >=0.10.0
|
||||
# https://github.com/adileo/squirreldisk/pull/47
|
||||
./update-pdu-json-format.patch
|
||||
];
|
||||
};
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
diff --git a/src/components/FileLine.tsx b/src/components/FileLine.tsx
|
||||
index e55f3bd..bd722d7 100644
|
||||
--- a/src/components/FileLine.tsx
|
||||
+++ b/src/components/FileLine.tsx
|
||||
@@ -65,7 +65,7 @@ export const FileLine = ({
|
||||
{/* {JSON.stringify(item.data)} */}
|
||||
{item &&
|
||||
item.data &&
|
||||
- (item.data.data / mul / mul / mul).toFixed(2)}{" "}
|
||||
+ (item.data.size / mul / mul / mul).toFixed(2)}{" "}
|
||||
GB
|
||||
</div>
|
||||
</div>
|
||||
diff --git a/src/d3chart.ts b/src/d3chart.ts
|
||||
index 855886b..d85c682 100644
|
||||
--- a/src/d3chart.ts
|
||||
+++ b/src/d3chart.ts
|
||||
@@ -191,7 +191,7 @@ const updateData = (
|
||||
isDirectory: false,
|
||||
name: "Smaller Items",
|
||||
value: item.value || 0,
|
||||
- data: item.value || 0,
|
||||
+ size: item.value || 0,
|
||||
children: [],
|
||||
};
|
||||
accumulator = d3.hierarchy(v) as D3HierarchyDiskItem;
|
||||
@@ -248,7 +248,7 @@ const updateData = (
|
||||
.ancestors()
|
||||
.map((d) => d.data.name)
|
||||
.reverse()
|
||||
- .join("/")}\n${((d.data.data || 0) / mul / mul / mul).toFixed(
|
||||
+ .join("/")}\n${((d.data.size || 0) / mul / mul / mul).toFixed(
|
||||
2
|
||||
)} GB`
|
||||
);
|
||||
diff --git a/src/index.d.ts b/src/index.d.ts
|
||||
index daa7233..81b5243 100644
|
||||
--- a/src/index.d.ts
|
||||
+++ b/src/index.d.ts
|
||||
@@ -5,7 +5,7 @@ interface DiskItem {
|
||||
id: string;
|
||||
name: string;
|
||||
value: number;
|
||||
- data: number;
|
||||
+ size: number;
|
||||
isDirectory: boolean;
|
||||
children: Array<DiskItem>;
|
||||
}
|
||||
diff --git a/src/pruneData.ts b/src/pruneData.ts
|
||||
index 37e70d8..040e227 100644
|
||||
--- a/src/pruneData.ts
|
||||
+++ b/src/pruneData.ts
|
||||
@@ -18,7 +18,7 @@ export const itemMap = (obj: any, parent: any = null) => {
|
||||
//recursive call to scan property
|
||||
if (obj["children"].length > 0) {
|
||||
obj.isDirectory = true;
|
||||
- obj.value = obj.data;
|
||||
+ obj.value = obj.size;
|
||||
obj["children"].forEach((element: any) => {
|
||||
itemMap(element, obj);
|
||||
});
|
||||
@@ -31,13 +31,13 @@ const partition = (data: DiskItem) => {
|
||||
const hierarchy = d3
|
||||
.hierarchy(data)
|
||||
.sum(function (d) {
|
||||
- return !d.children || d.children.length === 0 ? d.data : 0;
|
||||
+ return !d.children || d.children.length === 0 ? d.size : 0;
|
||||
})
|
||||
|
||||
// .sum(d => d.value)
|
||||
// .sum((d: DiskItem) => (d.children ? d.data : d.data))
|
||||
// .sum(d => d.data ? 0 : d.value)
|
||||
- .sort((a: any, b: any) => (b.data || 0) - (a.data || 0));
|
||||
+ .sort((a: any, b: any) => (b.size || 0) - (a.size || 0));
|
||||
// debugger;
|
||||
const partition = d3
|
||||
.partition<DiskItem>()
|
||||
@@ -22,6 +22,7 @@
|
||||
perl,
|
||||
makeWrapper,
|
||||
nixosTests,
|
||||
ffmpeg,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -138,6 +139,7 @@ stdenv.mkDerivation rec {
|
||||
libjpeg_turbo
|
||||
pixman
|
||||
gawk
|
||||
ffmpeg
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux (
|
||||
with xorg;
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
cmake,
|
||||
pkg-config,
|
||||
arpa2cm,
|
||||
arpa2common,
|
||||
db,
|
||||
gnutls,
|
||||
ldns,
|
||||
libkrb5,
|
||||
libtasn1,
|
||||
openldap,
|
||||
p11-kit,
|
||||
quickder,
|
||||
unbound,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tlspool";
|
||||
version = "0.9.7";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "arpa2";
|
||||
repo = "tlspool";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-nODnRoFlgCTtBjPief9SkVlLgD3g+2zbwM0V9pt3Crk=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
libkrb5
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
arpa2cm
|
||||
arpa2common
|
||||
db
|
||||
gnutls
|
||||
ldns
|
||||
libkrb5
|
||||
libtasn1
|
||||
openldap
|
||||
p11-kit
|
||||
quickder
|
||||
unbound
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "TLS daemon with PKCS #11 backend";
|
||||
homepage = "https://gitlab.com/arpa2/tlspool";
|
||||
changelog = "https://gitlab.com/arpa2/tlspool/-/blob/v${finalAttrs.version}/CHANGES";
|
||||
license = with lib.licenses; [
|
||||
gpl3Plus # daemon
|
||||
cc-by-sa-40 # docs
|
||||
bsd2 # userspace
|
||||
];
|
||||
teams = with lib.teams; [ ngi ];
|
||||
maintainers = with lib.maintainers; [ ethancedwards8 ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "tlsserver";
|
||||
};
|
||||
})
|
||||
@@ -4,21 +4,26 @@
|
||||
fetchFromGitHub,
|
||||
curl,
|
||||
python3,
|
||||
perl,
|
||||
trurl,
|
||||
testers,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "trurl";
|
||||
version = "0.16";
|
||||
version = "0.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "curl";
|
||||
repo = "trurl";
|
||||
rev = "trurl-${version}";
|
||||
hash = "sha256-Og7+FVCBWohVd58GVxFN3KChcG0Kts1MokiOQXZ1OTc=";
|
||||
hash = "sha256-VCMT4WgZ6LG7yiKaRy7KTgTkbACVXb4rw62lWnVAuP0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs scripts/*
|
||||
'';
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
@@ -28,17 +33,22 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ curl ];
|
||||
nativeBuildInputs = [
|
||||
curl
|
||||
perl
|
||||
];
|
||||
buildInputs = [ curl ];
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
doCheck = true;
|
||||
nativeCheckInputs = [ python3 ];
|
||||
checkTarget = "test";
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = trurl;
|
||||
};
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command line tool for URL parsing and manipulation";
|
||||
|
||||
@@ -0,0 +1,235 @@
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index e29ff77..6d94916 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -1,6 +1,6 @@
|
||||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
-version = 3
|
||||
+version = 4
|
||||
|
||||
[[package]]
|
||||
name = "adler32"
|
||||
@@ -89,7 +89,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
- "syn 2.0.18",
|
||||
+ "syn 2.0.43",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -435,7 +435,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24"
|
||||
dependencies = [
|
||||
"percent-encoding",
|
||||
- "time 0.3.21",
|
||||
+ "time 0.3.41",
|
||||
"version_check",
|
||||
]
|
||||
|
||||
@@ -627,6 +627,15 @@ dependencies = [
|
||||
"syn 1.0.67",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "deranged"
|
||||
+version = "0.4.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
|
||||
+dependencies = [
|
||||
+ "powerfmt",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "devise"
|
||||
version = "0.4.1"
|
||||
@@ -657,7 +666,7 @@ dependencies = [
|
||||
"proc-macro2",
|
||||
"proc-macro2-diagnostics",
|
||||
"quote",
|
||||
- "syn 2.0.18",
|
||||
+ "syn 2.0.43",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1716,6 +1725,12 @@ dependencies = [
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "num-conv"
|
||||
+version = "0.1.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
|
||||
+
|
||||
[[package]]
|
||||
name = "num-integer"
|
||||
version = "0.1.44"
|
||||
@@ -1895,7 +1910,7 @@ dependencies = [
|
||||
"proc-macro2",
|
||||
"proc-macro2-diagnostics",
|
||||
"quote",
|
||||
- "syn 2.0.18",
|
||||
+ "syn 2.0.43",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1948,6 +1963,12 @@ version = "1.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794"
|
||||
|
||||
+[[package]]
|
||||
+name = "powerfmt"
|
||||
+version = "0.2.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
|
||||
+
|
||||
[[package]]
|
||||
name = "ppv-lite86"
|
||||
version = "0.2.10"
|
||||
@@ -1992,9 +2013,9 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
-version = "1.0.59"
|
||||
+version = "1.0.95"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
|
||||
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
@@ -2007,7 +2028,7 @@ checksum = "606c4ba35817e2922a308af55ad51bab3645b59eae5c570d4a6cf07e36bd493b"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
- "syn 2.0.18",
|
||||
+ "syn 2.0.43",
|
||||
"version_check",
|
||||
"yansi",
|
||||
]
|
||||
@@ -2349,7 +2370,7 @@ dependencies = [
|
||||
"serde_json",
|
||||
"state",
|
||||
"tempfile",
|
||||
- "time 0.3.21",
|
||||
+ "time 0.3.41",
|
||||
"tokio",
|
||||
"tokio-stream",
|
||||
"tokio-util",
|
||||
@@ -2369,7 +2390,7 @@ dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"rocket_http",
|
||||
- "syn 2.0.18",
|
||||
+ "syn 2.0.43",
|
||||
"unicode-xid",
|
||||
]
|
||||
|
||||
@@ -2394,7 +2415,7 @@ dependencies = [
|
||||
"smallvec",
|
||||
"stable-pattern",
|
||||
"state",
|
||||
- "time 0.3.21",
|
||||
+ "time 0.3.41",
|
||||
"tokio",
|
||||
"uncased",
|
||||
]
|
||||
@@ -2682,22 +2703,22 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
-version = "1.0.163"
|
||||
+version = "1.0.193"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
|
||||
+checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
-version = "1.0.163"
|
||||
+version = "1.0.193"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
|
||||
+checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
- "syn 2.0.18",
|
||||
+ "syn 2.0.43",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2977,9 +2998,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
-version = "2.0.18"
|
||||
+version = "2.0.43"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
|
||||
+checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -3160,11 +3181,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "time"
|
||||
-version = "0.3.21"
|
||||
+version = "0.3.41"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc"
|
||||
+checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
|
||||
dependencies = [
|
||||
+ "deranged",
|
||||
"itoa 1.0.6",
|
||||
+ "num-conv",
|
||||
+ "powerfmt",
|
||||
"serde",
|
||||
"time-core",
|
||||
"time-macros",
|
||||
@@ -3172,16 +3196,17 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "time-core"
|
||||
-version = "0.1.1"
|
||||
+version = "0.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
|
||||
+checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
|
||||
|
||||
[[package]]
|
||||
name = "time-macros"
|
||||
-version = "0.2.9"
|
||||
+version = "0.2.22"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b"
|
||||
+checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
|
||||
dependencies = [
|
||||
+ "num-conv",
|
||||
"time-core",
|
||||
]
|
||||
|
||||
@@ -3226,7 +3251,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
- "syn 2.0.18",
|
||||
+ "syn 2.0.43",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -3354,7 +3379,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
- "syn 2.0.18",
|
||||
+ "syn 2.0.43",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -0,0 +1,44 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
openssl,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "wally";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "UpliftGames";
|
||||
repo = "wally";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-lbEUj6iWwm3KtfUwNkJf8cSjXMQ4Mki/jAqQavDajUA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
# https://github.com/UpliftGames/wally/issues/223
|
||||
cargoPatches = [ ./Cargo.lock.patch ];
|
||||
cargoHash = "sha256-5Lfs5GlOPxvltFpbgPBhStWxPGqv8nYpY/WC2ABtea0=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Modern package manager for Roblox projects inspired by Cargo";
|
||||
homepage = "https://github.com/UpliftGames/wally";
|
||||
downloadPage = "https://github.com/UpliftGames/wally/releases/tag/v${finalAttrs.version}";
|
||||
changelog = "https://github.com/UpliftGames/wally/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.mpl20;
|
||||
maintainers = with lib.maintainers; [ anninzy ];
|
||||
mainProgram = "wally";
|
||||
badPlatforms = lib.platforms.darwin;
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,48 @@
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 22427fb..75a924a 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -12162,43 +12162,6 @@ dependencies = [
|
||||
"winreg 0.50.0",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "reqwest"
|
||||
-version = "0.12.15"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb"
|
||||
-dependencies = [
|
||||
- "base64 0.22.1",
|
||||
- "bytes 1.10.1",
|
||||
- "futures-channel",
|
||||
- "futures-core",
|
||||
- "futures-util",
|
||||
- "http 1.3.1",
|
||||
- "http-body 1.0.1",
|
||||
- "http-body-util",
|
||||
- "hyper 1.6.0",
|
||||
- "hyper-util",
|
||||
- "ipnet",
|
||||
- "js-sys",
|
||||
- "log",
|
||||
- "mime",
|
||||
- "once_cell",
|
||||
- "percent-encoding",
|
||||
- "pin-project-lite",
|
||||
- "serde",
|
||||
- "serde_json",
|
||||
- "serde_urlencoded",
|
||||
- "sync_wrapper 1.0.2",
|
||||
- "tokio",
|
||||
- "tower 0.5.2",
|
||||
- "tower-service",
|
||||
- "url",
|
||||
- "wasm-bindgen",
|
||||
- "wasm-bindgen-futures",
|
||||
- "web-sys",
|
||||
- "windows-registry 0.4.0",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "reqwest"
|
||||
version = "0.12.15"
|
||||
@@ -99,7 +99,7 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zed-editor";
|
||||
version = "0.184.10";
|
||||
version = "0.186.8";
|
||||
|
||||
outputs =
|
||||
[ "out" ]
|
||||
@@ -111,7 +111,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "zed-industries";
|
||||
repo = "zed";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-AtccwZueh4kJZNWR+wUkPx5pe4izyTrm4LJYe99OyaM=";
|
||||
hash = "sha256-oSmwEtF8VWSKcBlL11MMThBAJFisXwWQjZAzcNIptt0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -121,15 +121,24 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
./0001-linux-linker.patch
|
||||
];
|
||||
|
||||
cargoPatches = [
|
||||
./0002-fix-duplicate-reqwest.patch
|
||||
];
|
||||
|
||||
postPatch =
|
||||
# Dynamically link WebRTC instead of static
|
||||
''
|
||||
substituteInPlace $cargoDepsCopy/webrtc-sys-*/build.rs \
|
||||
--replace-fail "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=dylib=webrtc"
|
||||
|
||||
# Zed team renamed the function but forgot to update its usage in this file
|
||||
# We rename it ourselves for now, until upstream fixes the issue
|
||||
substituteInPlace $cargoDepsCopy/reqwest-0.12*/src/blocking/client.rs \
|
||||
--replace-fail "inner.redirect(policy)" "inner.redirect_policy(policy)"
|
||||
'';
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-Kd6z3oUuiqLpOC6J2GZTTQd+1bKCnJNtfBgaWJkN0ho=";
|
||||
cargoHash = "sha256-WH6cQa6DChkUtqh+irIz2hJd5/RW/oln+TZPHunEmNk=";
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
|
||||
@@ -33,7 +33,8 @@ let
|
||||
|
||||
environment = {
|
||||
NEXT_TELEMETRY_DISABLED = "1";
|
||||
FFMPEG_BIN = lib.getExe ffmpeg;
|
||||
FFMPEG_PATH = lib.getExe ffmpeg;
|
||||
FFPROBE_PATH = lib.getExe' ffmpeg "ffprobe";
|
||||
PRISMA_SCHEMA_ENGINE_BINARY = lib.getExe' prisma-engines "schema-engine";
|
||||
PRISMA_QUERY_ENGINE_BINARY = lib.getExe' prisma-engines "query-engine";
|
||||
PRISMA_QUERY_ENGINE_LIBRARY = "${prisma-engines}/lib/libquery_engine.node";
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rakudo";
|
||||
version = "2025.03";
|
||||
version = "2025.04";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "rakudo";
|
||||
repo = "rakudo";
|
||||
rev = version;
|
||||
hash = "sha256-7gqBjhPtD4gm3D3uNlzOFftETvgbdQn7TKlKaEke/hg=";
|
||||
hash = "sha256-gVW1CB2LbgXV4uApmcl0/uxkcl9/PKk8sxj2R5dgowI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -42,14 +42,15 @@ stdenv.mkDerivation rec {
|
||||
remove-references-to -t ${stdenv.cc.cc} "$(readlink -f $out/share/perl6/runtime/dynext/libperl6_ops_moar${stdenv.hostPlatform.extensions.sharedLibrary})"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Raku implementation on top of Moar virtual machine";
|
||||
homepage = "https://rakudo.org";
|
||||
license = licenses.artistic2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [
|
||||
license = lib.licenses.artistic2;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [
|
||||
thoughtpolice
|
||||
sgo
|
||||
prince213
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "moarvm";
|
||||
version = "2025.03";
|
||||
version = "2025.04";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "moarvm";
|
||||
repo = "moarvm";
|
||||
rev = version;
|
||||
hash = "sha256-8uvO4GcediL0ysYWApEo6C583nw5QcrjN+0EmO2NKWo=";
|
||||
hash = "sha256-g2L7pEFU/ECNRYcNORH66qYKIAO7Uqtk3pFxyvxgKT4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -36,15 +36,16 @@ stdenv.mkDerivation rec {
|
||||
|
||||
configureScript = "${perl}/bin/perl ./Configure.pl";
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "VM with adaptive optimization and JIT compilation, built for Rakudo";
|
||||
homepage = "https://moarvm.org";
|
||||
license = licenses.artistic2;
|
||||
maintainers = with maintainers; [
|
||||
license = lib.licenses.artistic2;
|
||||
maintainers = with lib.maintainers; [
|
||||
thoughtpolice
|
||||
sgo
|
||||
prince213
|
||||
];
|
||||
mainProgram = "moar";
|
||||
platforms = platforms.unix;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nqp";
|
||||
version = "2025.03";
|
||||
version = "2025.04";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "raku";
|
||||
repo = "nqp";
|
||||
rev = version;
|
||||
hash = "sha256-/+MfjR7J2fwwMu8oRaBqjKi1dI0+6WZENzpymXEYN/Q=";
|
||||
hash = "sha256-X/xPtsGhGSV3QkD4pvuhJYueH9nksbmf+CLqORUdtJc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -39,14 +39,15 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Not Quite Perl -- a lightweight Raku-like environment for virtual machines";
|
||||
meta = {
|
||||
description = "Lightweight Raku-like environment for virtual machines";
|
||||
homepage = "https://github.com/Raku/nqp";
|
||||
license = licenses.artistic2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [
|
||||
license = lib.licenses.artistic2;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [
|
||||
thoughtpolice
|
||||
sgo
|
||||
prince213
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -75,10 +75,12 @@ let
|
||||
];
|
||||
|
||||
buildTargets =
|
||||
[ "cli" ]
|
||||
++ lib.optionals finalAttrs.finalPackage.doCheck [ "tests" ]
|
||||
lib.optionals finalAttrs.finalPackage.doCheck [ "tests" ]
|
||||
++ lib.optionals static [ "static" ]
|
||||
++ lib.optionals (!static) [ "shared" ];
|
||||
++ lib.optionals (!static) [
|
||||
"cli"
|
||||
"shared"
|
||||
];
|
||||
|
||||
botanConfigureFlags =
|
||||
[
|
||||
@@ -131,7 +133,7 @@ let
|
||||
ln -s botan-*.pc botan.pc || true
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
doCheck = !static;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cryptographic algorithms library";
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
pythonAtLeast,
|
||||
buildPythonPackage,
|
||||
fetchurl,
|
||||
libguestfs,
|
||||
@@ -8,12 +9,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "guestfs";
|
||||
version = "1.40.1";
|
||||
version = "1.40.2";
|
||||
format = "setuptools";
|
||||
|
||||
# FIXME: "error: implicit declaration of function 'PyEval_ThreadsInitialized'"
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2343777
|
||||
disabled = pythonAtLeast "3.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.libguestfs.org/python/guestfs-${version}.tar.gz";
|
||||
sha256 = "06a4b5xf1rkhnzfvck91n0z9mlkrgy90s9na5a8da2g4p776lhkf";
|
||||
hash = "sha256-GCKwkhrIXPz0hPrwe3YrhlEr6TuDYQivDzpMlZ+CAzI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -30,14 +30,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "guidata";
|
||||
version = "3.8.0";
|
||||
version = "3.9.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PlotPyStack";
|
||||
repo = "guidata";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ljS2FJmLPPRHQesEwO4dTWr+OZRjviGjkuTYusB9O48=";
|
||||
hash = "sha256-W3d7LGfQJ9DVngZxhnuQpoTHvXyHenaXzm7qeqi/zGQ=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -82,7 +82,6 @@ buildPythonPackage rec {
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
# Should be compatible with all of these Qt implementations
|
||||
withPyQt6 = guidata.override {
|
||||
pyqt6 = pyqt6;
|
||||
qt6 = qt6;
|
||||
@@ -95,6 +94,11 @@ buildPythonPackage rec {
|
||||
pyqt6 = pyqt5;
|
||||
qt6 = qt5;
|
||||
};
|
||||
};
|
||||
# Upstream doesn't officially supports all of them, although they use qtpy,
|
||||
# see: https://github.com/PlotPyStack/PlotPy/issues/20 . See also the
|
||||
# comment near this attribute at plotpy
|
||||
knownFailingTests = {
|
||||
withPySide2 = guidata.override {
|
||||
pyqt6 = pyside2;
|
||||
qt6 = qt5;
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
aiohttp,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "huisbaasje-client";
|
||||
version = "0.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dennisschroer";
|
||||
repo = "huisbaasje-client";
|
||||
rev = "v${version}";
|
||||
sha256 = "113aymffyz1nki3a43j5cyj87qa0762j38qlz0wd5px7diwjxsfl";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ aiohttp ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "huisbaasje.huisbaasje" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Client for Huisbaasje";
|
||||
homepage = "https://github.com/dennisschroer/huisbaasje-client";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
@@ -1,47 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
aiohttp,
|
||||
python-slugify,
|
||||
pytz,
|
||||
aresponses,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "logi-circle";
|
||||
version = "0.2.3";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanjd";
|
||||
repo = "python-logi-circle";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Q+uoaimJjn6MiO3jXGYyZ6cS0tqI06Azkq1QbNq2FN8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
python-slugify
|
||||
pytz
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
aresponses
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "logi_circle" ];
|
||||
|
||||
meta = {
|
||||
description = "Python library to communicate with Logi Circle cameras";
|
||||
homepage = "https://github.com/evanjd/python-logi-circle";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
@@ -20,7 +20,7 @@
|
||||
portmidi,
|
||||
SDL2_classic,
|
||||
SDL2_classic_image,
|
||||
SDL2_classic_mixer_2_0,
|
||||
SDL2_classic_mixer,
|
||||
SDL2_classic_ttf,
|
||||
numpy,
|
||||
|
||||
@@ -100,7 +100,7 @@ buildPythonPackage rec {
|
||||
portmidi
|
||||
SDL2_classic
|
||||
(SDL2_classic_image.override { enableSTB = false; })
|
||||
SDL2_classic_mixer_2_0
|
||||
SDL2_classic_mixer
|
||||
SDL2_classic_ttf
|
||||
];
|
||||
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
hatchling,
|
||||
pythonOlder,
|
||||
pytest,
|
||||
tappy,
|
||||
@@ -10,29 +12,35 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-tap";
|
||||
version = "3.3";
|
||||
format = "setuptools";
|
||||
version = "3.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-tap";
|
||||
repo = "pytest-tap";
|
||||
rev = "v${version}";
|
||||
sha256 = "R0RSdKTyJYGq+x0+ut4pJEywTGNgGp/ps36ZaH5dyY4=";
|
||||
hash = "sha256-IuVtH1hrynbFDmz7IZ6vef9bAwl8L1eqR9WYQVL6CCA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# see https://github.com/python-tap/pytest-tap/pull/105
|
||||
name = "missing-package-in-wheel.patch";
|
||||
url = "https://github.com/python-tap/pytest-tap/commit/056a44a632b1af19d9ba4b5044768bde3dd6a764.patch";
|
||||
hash = "sha256-P52NqgXtnO2SthDwVbT+NVPeBNhjGS/8Vsbe/WLCc3A=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
buildInputs = [ pytest ];
|
||||
|
||||
propagatedBuildInputs = [ tappy ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
disabledTests = [
|
||||
# Fixed in 4ed0138bf659c348b6dfb8bb701ae1989625d3d8 and hopefully in next release
|
||||
"test_unittest_expected_failure"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pytest_tap" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
fetchFromGitHub,
|
||||
pythonAtLeast,
|
||||
|
||||
# build-system
|
||||
@@ -20,12 +20,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "qrcode";
|
||||
version = "8.0";
|
||||
version = "8.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-AlzisVD3/kKW0Rbum61FWmZDq09ufc5UFhOkdYy840c=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lincolnloop";
|
||||
repo = "python-qrcode";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-qLIYUFnBJQGidnfC0bQAkO/aUmT94uXFMeMhnUgUnfQ=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
@@ -56,12 +58,12 @@ buildPythonPackage rec {
|
||||
"test_piped"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Python QR Code image generator";
|
||||
mainProgram = "qr";
|
||||
homepage = "https://github.com/lincolnloop/python-qrcode";
|
||||
changelog = "https://github.com/lincolnloop/python-qrcode/blob/v${version}/CHANGES.rst";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ ];
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ attila ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -31,14 +31,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "safety";
|
||||
version = "3.5.0";
|
||||
version = "3.5.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyupio";
|
||||
repo = "safety";
|
||||
tag = version;
|
||||
hash = "sha256-F/tFfLDD2e+M5hHepaqhu5uqwqp2IHD7zxTYNMa+YCQ=";
|
||||
hash = "sha256-ZUtx0pOBYPWJDy/xM4A71w+7OzFEkmKxgXtudu2oaUo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -27,6 +27,7 @@
|
||||
rustc-demangle,
|
||||
elfutils,
|
||||
perf,
|
||||
gtk3,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -85,6 +86,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--set-default PERFPROFILER_PARSER_FILEPATH ${lib.getBin perf}/bin"
|
||||
"--suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -8,27 +8,27 @@
|
||||
zip,
|
||||
wxGTK,
|
||||
gtk3,
|
||||
sfml,
|
||||
sfml_2,
|
||||
fluidsynth,
|
||||
curl,
|
||||
freeimage,
|
||||
ftgl,
|
||||
glew,
|
||||
lua,
|
||||
mpg123,
|
||||
wrapGAppsHook3,
|
||||
unstableGitUpdater,
|
||||
libwebp,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "slade";
|
||||
version = "3.2.6-unstable-2024-11-26";
|
||||
version = "3.2.7-unstable-2025-04-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sirjuddington";
|
||||
repo = "SLADE";
|
||||
rev = "f8ca52edf98e649c6455f6cc32f7aa361e41babe";
|
||||
hash = "sha256-h43kYVLDxr1Z3vKJ+IZaDmvkerUdGJFLzJrPj0b2VUI=";
|
||||
rev = "f8584231353845148c7623990dd90291fcb70f33";
|
||||
hash = "sha256-tP84FfSjfOxFh8S7GuyHB0M13Svx6SLbloo8xt9oORU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -42,18 +42,19 @@ stdenv.mkDerivation {
|
||||
buildInputs = [
|
||||
wxGTK
|
||||
gtk3
|
||||
sfml
|
||||
sfml_2
|
||||
fluidsynth
|
||||
curl
|
||||
freeimage
|
||||
ftgl
|
||||
glew
|
||||
lua
|
||||
mpg123
|
||||
libwebp
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DwxWidgets_LIBRARIES=${wxGTK}/lib"
|
||||
(lib.cmakeFeature "CL_WX_CONFIG" (lib.getExe' (lib.getDev wxGTK) "wx-config"))
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-narrowing";
|
||||
@@ -68,11 +69,11 @@ stdenv.mkDerivation {
|
||||
url = "https://github.com/sirjuddington/SLADE.git";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Doom editor";
|
||||
homepage = "http://slade.mancubus.net/";
|
||||
license = licenses.gpl2Only; # https://github.com/sirjuddington/SLADE/issues/1754
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ertes ];
|
||||
license = lib.licenses.gpl2Only; # https://github.com/sirjuddington/SLADE/issues/1754
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ ertes ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1655,6 +1655,8 @@ mapAliases {
|
||||
SDL1 = throw "'SDL1' has been removed as development ended long ago with SDL 2.0 replacing it, use SDL_compat instead"; # Added 2025-03-27
|
||||
SDL_gpu = throw "'SDL_gpu' has been removed due to lack of upstream maintenance and known users"; # Added 2025-03-15
|
||||
SDL_image_2_0 = throw "'SDL_image_2_0' has been removed in favor of the latest version"; # Added 2025-04-20
|
||||
SDL2_mixer_2_0 = throw "'SDL2_mixer_2_0' has been removed in favor of the latest version"; # Added 2025-04-27
|
||||
SDL2_classic_mixer_2_0 = throw "'SDL2_classic_mixer_2_0' has been removed in favor of the latest version"; # Added 2025-04-27
|
||||
s2n = throw "'s2n' has been renamed to/replaced by 's2n-tls'"; # Converted to throw 2024-10-17
|
||||
sandboxfs = throw "'sandboxfs' has been removed due to being unmaintained, consider using linux namespaces for sandboxing instead"; # Added 2024-06-06
|
||||
sane-backends-git = throw "'sane-backends-git' has been renamed to/replaced by 'sane-backends'"; # Converted to throw 2024-10-17
|
||||
|
||||
@@ -1671,8 +1671,6 @@ with pkgs;
|
||||
|
||||
brakeman = callPackage ../development/tools/analysis/brakeman { };
|
||||
|
||||
brewtarget = libsForQt5.callPackage ../applications/misc/brewtarget { };
|
||||
|
||||
# Derivation's result is not used by nixpkgs. Useful for validation for
|
||||
# regressions of bootstrapTools on hydra and on ofborg. Example:
|
||||
# pkgsCross.aarch64-multiplatform.freshBootstrapTools.build
|
||||
|
||||
@@ -322,6 +322,7 @@ mapAliases ({
|
||||
htmllaundry = throw "htmllaundry has been removed because it is abandoned"; # added 2024-06-04
|
||||
HTSeq = htseq; # added 2023-02-19
|
||||
hug = throw "hug was marked broken since 2021 and has not established compatibility with newer dependency versions. It has therefore been removed."; # added 2024-11-15
|
||||
huisbaasje-client = throw "huisbaasje-client has been removed because it was replaced with energyflip-client"; # added 2025-05-12
|
||||
hyperkitty = throw "Please use pkgs.mailmanPackages.hyperkitty"; # added 2022-04-29
|
||||
hydra-check = throw "The Python package hydra-check was removed in favor of the top-level rust based pkgs.hydra-check"; # added 2022-04-29
|
||||
ihatemoney = throw "ihatemoney was removed because it is no longer maintained downstream"; # added 2023-04-08
|
||||
@@ -385,6 +386,7 @@ mapAliases ({
|
||||
livestreamer-curses = throw "'livestreamer-curses' has been removed as it, and livestreamer itself are unmaintained."; # added 2023-11-14
|
||||
lmcloud = pylamarzocco; # added 2024-11-26
|
||||
localstack = throw "localstack was promoted to a top-level attribute"; # added 2025-02-21
|
||||
logi-circle = throw "logi-circle has been removed because the logi_circle integration was removed from Home Assistant"; # added 2025-05-13
|
||||
logilab_astng = throw "logilab-astng has not been released since 2013 and is unmaintained"; # added 2022-11-29
|
||||
logilab_common = logilab-common; # added 2022-11-21
|
||||
loo-py = loopy; # added 2022-05-03
|
||||
|
||||
@@ -6496,8 +6496,6 @@ self: super: with self; {
|
||||
|
||||
huggingface-hub = callPackage ../development/python-modules/huggingface-hub { };
|
||||
|
||||
huisbaasje-client = callPackage ../development/python-modules/huisbaasje-client { };
|
||||
|
||||
human-readable = callPackage ../development/python-modules/human-readable { };
|
||||
|
||||
humanfriendly = callPackage ../development/python-modules/humanfriendly { };
|
||||
@@ -8289,8 +8287,6 @@ self: super: with self; {
|
||||
|
||||
logging-journald = callPackage ../development/python-modules/logging-journald { };
|
||||
|
||||
logi-circle = callPackage ../development/python-modules/logi-circle { };
|
||||
|
||||
logical-unification = callPackage ../development/python-modules/logical-unification { };
|
||||
|
||||
logilab-common = callPackage ../development/python-modules/logilab/common.nix {
|
||||
|
||||
Reference in New Issue
Block a user