diff --git a/pkgs/applications/editors/jetbrains/versions.json b/pkgs/applications/editors/jetbrains/versions.json index de8f51bc2cec..9b7c7e7cc425 100644 --- a/pkgs/applications/editors/jetbrains/versions.json +++ b/pkgs/applications/editors/jetbrains/versions.json @@ -3,18 +3,18 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2022.3.3", - "sha256": "1b46ff0791bcb38ecb39c5f4a99941f99ed73d4f6d924a2042fdb55afc5fc03d", - "url": "https://download.jetbrains.com/cpp/CLion-2022.3.3.tar.gz", - "build_number": "223.8836.42" + "version": "2023.1", + "sha256": "4b7f431dec981601f4c4e217612f582ffd6c8aa53d03604f518eb1f35357ec6a", + "url": "https://download.jetbrains.com/cpp/CLion-2023.1.tar.gz", + "build_number": "231.8109.174" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2022.3.3", - "sha256": "a5575ff7e80dd4e9390eb64fc54ed4a924403950da0c38da548de3c4bd97b34b", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.3.tar.gz", - "build_number": "223.8617.3" + "version": "2023.1", + "sha256": "0512cef755d7a465a8a525fc88b443a5f8ace062f5aa0598e51e38d2ad34f341", + "url": "https://download.jetbrains.com/datagrip/datagrip-2023.1.tar.gz", + "build_number": "231.8109.163" }, "gateway": { "update-channel": "Gateway RELEASE", @@ -27,26 +27,26 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2022.3.3", - "sha256": "8c85b56b4e226739a0e36549f5f80fed4cbf2b2798eff442499f5779396a6917", - "url": "https://download.jetbrains.com/go/goland-2022.3.3.tar.gz", - "build_number": "223.8836.34" + "version": "2022.3.4", + "sha256": "f8ff96336c416ab56abea03819cb3637a1d46b80a88e8544f1e9e98746b781ac", + "url": "https://download.jetbrains.com/go/goland-2022.3.4.tar.gz", + "build_number": "223.8836.56" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2022.3.3", - "sha256": "699492fb5a9de750250fdaadca5fc9212114ee445a50875b59bbc99f0187c2e4", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.3.tar.gz", - "build_number": "223.8836.41" + "version": "2023.1", + "sha256": "e6fe45c9df8e763ee3278444b5fb1003910c436752e83221e0303a62c5e81eaa", + "url": "https://download.jetbrains.com/idea/ideaIC-2023.1.tar.gz", + "build_number": "231.8109.175" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", - "version": "2022.3.3", - "sha256": "c302bd84b48a56ef1b0f033e8e93a0da5590f80482eae172db6130da035314a6", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.3.tar.gz", - "build_number": "223.8836.41" + "version": "2023.1", + "sha256": "3029c751c36d86fef0021feceb8f3010d37aebd42aef6d6aed9e3b9207c2d2ac", + "url": "https://download.jetbrains.com/idea/ideaIU-2023.1.tar.gz", + "build_number": "231.8109.175" }, "mps": { "update-channel": "MPS RELEASE", @@ -68,18 +68,18 @@ "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2022.3.3", - "sha256": "fe84e586ce8da916abf481e02959742a20bab6ba3cdf447370ac8b2d5115211c", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.3.tar.gz", - "build_number": "223.8836.43" + "version": "2023.1", + "sha256": "e8e9ed964ef8a397ad920ccaad41b30c3f29a2e125e7a5c4be50db791099e068", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.1.tar.gz", + "build_number": "231.8109.197" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2022.3.3", - "sha256": "50c37aafd9fbe3a78d97cccf4f7abd80266c548d1c7ea4751b08c52810f16f2d", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.3.tar.gz", - "build_number": "223.8836.43" + "version": "2023.1", + "sha256": "26c3f49ad899178105943eb63e1abae85c40f2f44362a2b20629a6263a4f8da6", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.tar.gz", + "build_number": "231.8109.197" }, "rider": { "update-channel": "Rider RELEASE", @@ -92,36 +92,36 @@ "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2022.3.3", - "sha256": "18dec5191b07a455d3c3dcb0bcc146fbe83ebb411addaf89e895d373728d932e", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.3.tar.gz", - "build_number": "223.8836.42" + "version": "2023.1", + "sha256": "f9eabc980d82a9c9b27bc84daa7f1e786f41b17bbbfeca282985c6ed87e768ec", + "url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.tar.gz", + "build_number": "231.8109.174" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2022.3.4", - "sha256": "c33f72b5e26f347983b7bae92608d9b4343dcbb400736addb0793407aedc3260", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.4.tar.gz", - "build_number": "223.8836.50" + "version": "2023.1", + "sha256": "bd074c7bafdcfcce4db001a4356040d0badd7cd2f65418a35b4156b00a07e94b", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.tar.gz", + "build_number": "231.8109.174" } }, "x86_64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2022.3.3", - "sha256": "d07ecaf7e3950cbbc445b59049a40b018a07e0f7031169b28acb185d74b1b20c", - "url": "https://download.jetbrains.com/cpp/CLion-2022.3.3.dmg", - "build_number": "223.8836.42" + "version": "2023.1", + "sha256": "f3e30a41c183d3ed929324dc2531c07374e59fa12185ced97b9b6800896e4f1e", + "url": "https://download.jetbrains.com/cpp/CLion-2023.1.dmg", + "build_number": "231.8109.174" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2022.3.3", - "sha256": "e9da8036c7d268368b3f82034389481730cb663b809659b1fa1ab91fd9bdc8cd", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.3.dmg", - "build_number": "223.8617.3" + "version": "2023.1", + "sha256": "5de7f381f20c52bd0c96977f9d000033f0decd3912eaf0776eff540ec06c0881", + "url": "https://download.jetbrains.com/datagrip/datagrip-2023.1.dmg", + "build_number": "231.8109.163" }, "gateway": { "update-channel": "Gateway RELEASE", @@ -134,26 +134,26 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2022.3.3", - "sha256": "70d98ed21d52f7cabd4a1f8a1153388e8675220118eed9c767a82172b2dc2453", - "url": "https://download.jetbrains.com/go/goland-2022.3.3.dmg", - "build_number": "223.8836.34" + "version": "2022.3.4", + "sha256": "c42568393732fd8c25f81167a9e984c79c84095a9d394138c014814738ad5628", + "url": "https://download.jetbrains.com/go/goland-2022.3.4.dmg", + "build_number": "223.8836.56" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2022.3.3", - "sha256": "7837002f5998d683ab547e2548e1ac863b359d20a935c11ff0a27d858e64a522", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.3.dmg", - "build_number": "223.8836.41" + "version": "2023.1", + "sha256": "233cc0253921bb002bd20eff0e493864b5b7ad951cd806d29a702cf1a6934f0f", + "url": "https://download.jetbrains.com/idea/ideaIC-2023.1.dmg", + "build_number": "231.8109.175" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2022.3.3", - "sha256": "500b38341a13f2365b0052fadc91f83431db27c223036458171298a3bdd4b8b9", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.3.dmg", - "build_number": "223.8836.41" + "version": "2023.1", + "sha256": "1e8498336a5c4d90518f47d687a167adbe0e634d1f7d10530164c84542b91677", + "url": "https://download.jetbrains.com/idea/ideaIU-2023.1.dmg", + "build_number": "231.8109.175" }, "mps": { "update-channel": "MPS RELEASE", @@ -175,18 +175,18 @@ "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2022.3.3", - "sha256": "2681947868b6f64a9b528fb2083347cd15f1094f1e880a25eaa1c96eb7a1406f", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.3.dmg", - "build_number": "223.8836.43" + "version": "2023.1", + "sha256": "01ef3582e4b0617649e4c0784a9a5be952688796766c34e025bc0cad5ba18a0f", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.1.dmg", + "build_number": "231.8109.197" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2022.3.3", - "sha256": "290ab690c193563e0b2afc88e9d01feca319e2bc366a3677c8870ac8ba8d7e6f", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.3.dmg", - "build_number": "223.8836.43" + "version": "2023.1", + "sha256": "1b4b171d48ba046679de94985f20f3574af53e6d5fad9aab7bed0d820e504c4a", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.dmg", + "build_number": "231.8109.197" }, "rider": { "update-channel": "Rider RELEASE", @@ -199,36 +199,36 @@ "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2022.3.3", - "sha256": "f6583f4c9b9cb3fb1079968565c3f65f6a05329724e1dbb5c29ac348fc86cd9d", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.3.dmg", - "build_number": "223.8836.42" + "version": "2023.1", + "sha256": "fba60e34520c807ba0a9124802e5782e2b4c8e63c27e07968b9cb642f0fc0a77", + "url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.dmg", + "build_number": "231.8109.174" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2022.3.4", - "sha256": "9146df417dcddaab5a58e1b9495c0b3d1e6c81ad9d61d354e54cbd24ba254351", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.4.dmg", - "build_number": "223.8836.50" + "version": "2023.1", + "sha256": "35f110baf5a37232175a367c524a4cb04216bc2c0b0767506449648df6a12032", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.dmg", + "build_number": "231.8109.174" } }, "aarch64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2022.3.3", - "sha256": "c271f9c704626a14381e6fd8f99b2cd5a370545c660e059b8afd677c8558dd7b", - "url": "https://download.jetbrains.com/cpp/CLion-2022.3.3-aarch64.dmg", - "build_number": "223.8836.42" + "version": "2023.1", + "sha256": "83c9fffa1f8890a36db5fed21a49133989cb59bd98f8011ea0a6fdae7e2a7eb3", + "url": "https://download.jetbrains.com/cpp/CLion-2023.1-aarch64.dmg", + "build_number": "231.8109.174" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2022.3.3", - "sha256": "ef76c7d61c64f7f0f831ef2774bd908e68d651a20648fc4e63618e24a81be6dd", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.3-aarch64.dmg", - "build_number": "223.8617.3" + "version": "2023.1", + "sha256": "17a74498378758bd2963e775dea7b77744a7072778a07a5685375b07acbd537b", + "url": "https://download.jetbrains.com/datagrip/datagrip-2023.1-aarch64.dmg", + "build_number": "231.8109.163" }, "gateway": { "update-channel": "Gateway RELEASE", @@ -241,26 +241,26 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2022.3.3", - "sha256": "6414ffacecbdc5f02c5ad30a4ba710c8a9b59753eb27376b0df9856696d7ee5f", - "url": "https://download.jetbrains.com/go/goland-2022.3.3-aarch64.dmg", - "build_number": "223.8836.34" + "version": "2022.3.4", + "sha256": "279b522a7ee3c22dd0b5eec20b116921209008d4d50d0d5a7a08a13fb98914c9", + "url": "https://download.jetbrains.com/go/goland-2022.3.4-aarch64.dmg", + "build_number": "223.8836.56" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2022.3.3", - "sha256": "f7c98311b8520050f15f8ffb169a8a0f511958f4e4d39eff3891bc62c5d16920", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.3-aarch64.dmg", - "build_number": "223.8836.41" + "version": "2023.1", + "sha256": "33964525cb28ac199e39e3c8eac4128874963f3292d5074257ae54fe1df9f986", + "url": "https://download.jetbrains.com/idea/ideaIC-2023.1-aarch64.dmg", + "build_number": "231.8109.175" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2022.3.3", - "sha256": "627fdf0818f829ffa3c63275d51128ca23f27bca9945508e4743716856329043", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.3-aarch64.dmg", - "build_number": "223.8836.41" + "version": "2023.1", + "sha256": "6e2ca530fe082f79724fb89849e06fa91b8c17089430f9633a7e9a813204151f", + "url": "https://download.jetbrains.com/idea/ideaIU-2023.1-aarch64.dmg", + "build_number": "231.8109.175" }, "mps": { "update-channel": "MPS RELEASE", @@ -282,18 +282,18 @@ "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2022.3.3", - "sha256": "270388941ad525c5a96e885b3450a345e34ec82c2360c82554aa1d3537bc0fd9", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.3-aarch64.dmg", - "build_number": "223.8836.43" + "version": "2023.1", + "sha256": "59ed747fa81718bee0714da08ad9041c828fe7ca459ac3a004277eef71b463bd", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.1-aarch64.dmg", + "build_number": "231.8109.197" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2022.3.3", - "sha256": "d53b7ea764cd89cea81ebefe630a151627d4d71657868bd35296fd994524105a", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.3-aarch64.dmg", - "build_number": "223.8836.43" + "version": "2023.1", + "sha256": "8caa44cef3c83bf8d059b7582951d411a854083aa34b3c3e72bc47daa3bd65a8", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.1-aarch64.dmg", + "build_number": "231.8109.197" }, "rider": { "update-channel": "Rider RELEASE", @@ -306,18 +306,18 @@ "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2022.3.3", - "sha256": "317c9bd172cf7484d57781fafe8d317f6e1478141bbe30ac364aaa48a0cdc692", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.3-aarch64.dmg", - "build_number": "223.8836.42" + "version": "2023.1", + "sha256": "56d0202ea1261eb8ac5bd24f1cb044282cda5bd6c8306d3ec606109a3fe28fba", + "url": "https://download.jetbrains.com/ruby/RubyMine-2023.1-aarch64.dmg", + "build_number": "231.8109.174" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2022.3.4", - "sha256": "66020aa7607eb31c2b1f278f7999078d2bfe74bac0f84f86ad8f51cf4c1e4415", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.4-aarch64.dmg", - "build_number": "223.8836.50" + "version": "2023.1", + "sha256": "91f4a8f63c36407e9431a97a1ecc33762f67afd488046796cf4cca3a6709518c", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1-aarch64.dmg", + "build_number": "231.8109.174" } } } diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index 22b0bd26f3a4..6d62db43949e 100644 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -9,10 +9,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "14824-ad3e740c0"; - rpcs3Version = "0.0.27-14824-ad3e740c0"; - rpcs3Revision = "ad3e740c0921c18a832fd4b0401f965a28a58c97"; - rpcs3Sha256 = "0j9zi45z4xiam8frqs3b9xcjdw2gmqj34p8cv5w7sizr6sj09srp"; + rpcs3GitVersion = "14840-842edbcbe"; + rpcs3Version = "0.0.27-14840-842edbcbe"; + rpcs3Revision = "842edbcbe795941981993c667c2d8a866126b5b0"; + rpcs3Sha256 = "1al4dx93f02k56k62dxjqqb46cwg0nkpjax1xnjc8v3bx4gsp6f6"; ittapi = fetchFromGitHub { owner = "intel"; diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index f973cf591593..2a7ff5940b4f 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, perl, makeWrapper -, makeDesktopItem, which, perlPackages, boost +, makeDesktopItem, which, perlPackages, boost, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-cf0QTOzhLyTcbJryCQoTVzU8kfrPV6SLpqi4s36X5N0="; }; - nativeBuildInputs = [ makeWrapper which ]; + nativeBuildInputs = [ makeWrapper which wrapGAppsHook ]; buildInputs = [boost] ++ (with perlPackages; [ perl diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 0184424a0643..003e17aba24b 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,9 +32,9 @@ } }, "dev": { - "version": "113.0.5668.0", - "sha256": "0rp43m8n26rs2hiysavr0w65x27i6n94jghx81w92fxbfjkc0qp3", - "sha256bin64": "1xnx8pg0xhbw2va8bm97x092andzzvqxcm9ydi7d6qadhwqam1br", + "version": "113.0.5672.12", + "sha256": "1h0mll8xq096jzqg4hhwcaxg12j5pinjjyicm276f7r5m12l1c1x", + "sha256bin64": "1ffyhigs4x3c1cr4r8pv5jjg6qx9pxwy0hmyp9a1196jxkh65kpy", "deps": { "gn": { "version": "2023-03-18", diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index f2b946792afc..66ec78fb4eb9 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -274,13 +274,13 @@ "vendorHash": "sha256-v1RHxXYTvpyWzyph6qg3GW75OPYc5qYQ/yyDI8WkbNc=" }, "ct": { - "hash": "sha256-poEyXP6VfKYKuTCxQxkiWBuc7/1S2J7RolrrPb6nvUI=", + "hash": "sha256-NuspY7hvnEo7IAUa1ixv8CzdWo39vEDh3HOvy+A0XjY=", "homepage": "https://registry.terraform.io/providers/poseidon/ct", "owner": "poseidon", "repo": "terraform-provider-ct", - "rev": "v0.11.0", + "rev": "v0.12.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-QlmVrcC1ctjAHOd7qsqc9gpqttKplEy4hlT++cFUZfM=" + "vendorHash": "sha256-cDt7eC1GjGnvFLelAi3sF6XjP0QQi9eWW6iHroYZ4pA=" }, "datadog": { "hash": "sha256-rbBLyCxGB1W7VCPs1f/7PQnyvdWo+uhze6p4cucdEG0=", @@ -382,11 +382,11 @@ "vendorHash": "sha256-E1gzdES/YVxQq2J47E2zosvud2C/ViBeQ8+RfNHMBAg=" }, "fastly": { - "hash": "sha256-hJHErQ8vDY9c1uaqiLYdxBns3U3XvAGKsobH8fit4HI=", + "hash": "sha256-YKF4aW+K5JffPd5b3Kh540ml0uc9q5WSvcNgj9g6/Bk=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v4.1.2", + "rev": "v4.2.0", "spdx": "MPL-2.0", "vendorHash": null }, diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index 57cf5e20bcd5..eb306ff2c99e 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rssguard"; - version = "4.3.2"; + version = "4.3.3"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = version; - sha256 = "sha256-2h9fVah0WZ8X0GsCLtiUWRan1Gkl4WBxuEQ3gx4FFBo="; + sha256 = "sha256-dSnPQbCPXREMOeqyn17BEi29soeVfrThnDBqdti5BiA="; }; buildInputs = [ qtwebengine qttools ]; diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index a7fa809de1fa..3bab193e8adf 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.1.1"; + version = "0.1.2"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy_x86_64-unknown-linux-gnu_ubuntu-20.04.tar.gz"; - sha256 = "sha256-H4xVUXC7cRCgC1fHMXPucGRTBlGRcyzskhNBaNVGAns="; + sha256 = "sha256-fOPODq938ejJY4QDJawN/WFv6Ynr9pGgJPWnjWD/rQk="; stripRoot = false; }; diff --git a/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix index 2826035685a8..cb32ce21e94e 100644 --- a/pkgs/applications/radio/freedv/default.nix +++ b/pkgs/applications/radio/freedv/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "freedv"; - version = "1.8.8"; + version = "1.8.8.1"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; rev = "v${version}"; - hash = "sha256-rXiNhk+6eeYF5w/8jSJaEaLEgRYngqTV/wLkMvg6qOQ="; + hash = "sha256-zFfPXI15XnzHSG1hrMQz82aAVOc/Qqr1FHUrmaTLOk0="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index 07008fac336b..019c86d2bd8d 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "discord.py"; - version = "2.1.0"; + version = "2.2.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Rapptz"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-243w3J3nb/6GV5ogS/Ev9X3r0GrgUokMq14r5rjOdrA="; + hash = "sha256-1XK9HRSdIhlunSno3FpvD3dIgZ4zbpSTS9kxj+8+S3g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fastai/default.nix b/pkgs/development/python-modules/fastai/default.nix index 4a4d9a16d107..9f58d0434329 100644 --- a/pkgs/development/python-modules/fastai/default.nix +++ b/pkgs/development/python-modules/fastai/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "fastai"; - version = "2.7.11"; + version = "2.7.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xrOhdmrCWvsPtCFDsnUxiSd7ox+Pgpmte5LyNPCHRYU="; + hash = "sha256-5ayA/0bdgHDGcKNI8xpkyF6hqR3DIMIQZIjzQzMoKRY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index af5bc6855b53..a73c04c3e004 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.9.0"; + version = "1.9.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-LRSAJoqdqMbNlQhoH7YQ9cZ3g7Iq4pkItaxTQTGZw1E="; + hash = "sha256-XomRFXDBStCFPh7vYyUXeToWfm+u21WwqzvDs0zIPrE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 0110d038e64b..714a91e177cc 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.21"; + version = "0.21.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -46,3 +46,4 @@ buildPythonPackage rec { maintainers = with maintainers; [ jluttine ]; }; } + diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index fd40463f2f71..c257ab92db77 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.26.99"; + version = "1.26.104"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iImkxirshZBr218nJ1YLvUxBy1h0ugZ+JQ8k4J4NmyQ="; + hash = "sha256-pY00LXLVj++i7NJNkm28kq6LlyBcWcMUTRhoV9XzCBQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 67e0947b5c14..f2452683d6ed 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.6.0"; + version = "5.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-OjGLV7xHyF8kB++juXTM40aUl4OK+xwhnFaLSyxHMo4="; + hash = "sha256-LVdzbmNhCSsDpb0inmgIqHugyu9ncrjpucEwV2l+cAM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index dcafb119be30..07934dde7654 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -75,7 +75,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://www.prisma.io/"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ pamplemousse pimeys tomhoule ivan ]; + maintainers = with maintainers; [ pimeys tomhoule ivan ]; }; } diff --git a/pkgs/development/tools/ddosify/default.nix b/pkgs/development/tools/ddosify/default.nix index e2af4178117d..78bd50ad7d41 100644 --- a/pkgs/development/tools/ddosify/default.nix +++ b/pkgs/development/tools/ddosify/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ddosify"; - version = "0.15.3"; + version = "0.15.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-xTalStFym/8l2YDuk2F0ydHnT46sxRj/KmOdIbYAMsQ="; + sha256 = "sha256-83/NZ/DcB7+jHFm1i3ru/vdUOhCP68xAkhrX4ekL8Uo="; }; - vendorHash = "sha256-3y5ppTtvGqwWhgnVBpP4gf26DHKPnSNYK4jfhBiYDwY="; + vendorHash = "sha256-/kxHK3dX1RXB3Z5suSKsTHF7xaklCoyzUTbU1lcYwwg="; ldflags = [ "-s" "-w" diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 1dac904d315a..0e343e1c9eaa 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.498"; + version = "0.0.500"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-8rkG5OiyK7+HaUZjbTEr6KbK9cl4AFPepav76DS7LoU="; + hash = "sha256-ESWGSRE/XY2EXe/j5M8UKuHGGDhl9kVWjTUxU8Ws7n4="; }; - vendorHash = "sha256-ZLENEilEH+GgSyCYbptdNkz6eveCbVr9f/09szyM8pw="; + vendorHash = "sha256-YYumFyLDIU1JdkoNGQksSWg3OiZGAwP21HvloiCyn9A="; subPackages = [ "." ]; diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix index 1eabfe77a7ae..d2880913db1a 100644 --- a/pkgs/games/hyperrogue/default.nix +++ b/pkgs/games/hyperrogue/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hyperrogue"; - version = "12.1i"; + version = "12.1l"; src = fetchFromGitHub { owner = "zenorogue"; repo = "hyperrogue"; rev = "v${version}"; - sha256 = "sha256-TMPumyTEzDbV/31UgwXJwr7zt7ufENX3ESxlcBEnaSc="; + sha256 = "sha256-816F7+zsVRLM0h6N0g7tU4D2qi0braftN9cxi0Kwtog="; }; CXXFLAGS = [ diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 51f217f03b27..3f2d77729abc 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -68,7 +68,7 @@ armv6l-linux = import ./bootstrap-files/armv6l.nix; armv7l-linux = import ./bootstrap-files/armv7l.nix; aarch64-linux = import ./bootstrap-files/aarch64.nix; - mipsel-linux = import ./bootstrap-files/loongson2f.nix; + mipsel-linux = import ./bootstrap-files/mipsel.nix; mips64el-linux = import (if localSystem.isMips64n32 then ./bootstrap-files/mips64el-n32.nix diff --git a/pkgs/tools/admin/copilot-cli/default.nix b/pkgs/tools/admin/copilot-cli/default.nix index 7460139a4bc0..0eb19679bdc4 100644 --- a/pkgs/tools/admin/copilot-cli/default.nix +++ b/pkgs/tools/admin/copilot-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "copilot-cli"; - version = "1.26.0"; + version = "1.27.0"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pmP1PqkLq5rkod896oRsSY3UX6q7F4kVREw8R+mLf2Y="; + sha256 = "sha256-Py45QkivjwVNQqKX5/j4YUO+gpVYfXI7elD9YSlrmak="; }; - vendorHash = "sha256-jvK4xI0Pvv0ed6uSmfXltUkVmG4RqId4zEI9JFDzoBQ="; + vendorHash = "sha256-ali7zvLLLB5kQCU9r2o/dO0g5CQxv/kVVz3iJ56fqYY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/cf-terraforming/default.nix b/pkgs/tools/misc/cf-terraforming/default.nix index cc28ddb12a6e..7774d0513f55 100644 --- a/pkgs/tools/misc/cf-terraforming/default.nix +++ b/pkgs/tools/misc/cf-terraforming/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cf-terraforming"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cf-terraforming"; rev = "v${version}"; - sha256 = "sha256-kdY/3D/GiAlOfj3pT9DECOsD9wqb7GZN7yzZrhec8hI="; + sha256 = "sha256-HCJYLU3eo1C06qp8sb2MsDoLrD0bDeu5WEeGCrOucn4="; }; vendorHash = "sha256-HLKk64PcJUjKfY4pIwI2OXnjqFF1EkYlWOi0aWOVSbk="; diff --git a/pkgs/tools/misc/dooit/default.nix b/pkgs/tools/misc/dooit/default.nix new file mode 100644 index 000000000000..6610c13b6a74 --- /dev/null +++ b/pkgs/tools/misc/dooit/default.nix @@ -0,0 +1,48 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "dooit"; + version = "1.0.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "kraanzu"; + repo = pname; + rev = "v${version}"; + hash = "sha256-7a6xoqbAmnGVUVppQTSo4hH44XFCqBnF7xO7sOVySY0="; + }; + + # Required versions not available + pythonRelaxDeps = [ + "textual" + "tzlocal" + ]; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = with python3.pkgs; [ + textual + pyperclip + pyyaml + dateparser + tzlocal + appdirs + ]; + + # No tests available + doCheck = false; + + meta = with lib; { + description = "A TUI todo manager"; + homepage = "https://github.com/kraanzu/dooit"; + changelog = "https://github.com/kraanzu/dooit/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ wesleyjrz ]; + }; +} diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 53b50f01c1e8..94758156e392 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -118,9 +118,9 @@ rustPlatform.buildRustPackage { }; meta = with lib; { - description = "A high-performance logs, metrics, and events router"; - homepage = "https://github.com/timberio/vector"; - license = with licenses; [ asl20 ]; + description = "A high-performance observability data pipeline"; + homepage = "https://github.com/vectordotdev/vector"; + license = licenses.mpl20; maintainers = with maintainers; [ thoughtpolice happysalada ]; platforms = with platforms; all; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fdf5872ea8c4..0c927419f42e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1,5 +1,22 @@ lib: self: super: +### Deprecated aliases - for backward compatibility +### Please maintain this list in ASCIIbetical ordering. +### Hint: the "sections" are delimited by ### ### + +# These aliases should not be used within nixpkgs, but exist to improve +# backward compatibility in projects outside of nixpkgs. See the +# documentation for the `allowAliases` option for more background. + +# A script to convert old aliases to throws and remove old +# throws can be found in './maintainers/scripts/remove-old-aliases.py'. + +# Add 'preserve, reason: reason why' after the date if the alias should not be removed. +# Try to keep them to a minimum. +# valid examples of what to preserve: +# distro aliases such as: +# debian-package-name -> nixos-package-name + with self; let @@ -31,19 +48,6 @@ let aliases; in -### Deprecated aliases - for backward compatibility -### Please maintain this list in ASCIIbetical ordering. -### Hint: the "sections" are delimited by ### ### - -# A script to convert old aliases to throws and remove old -# throws can be found in './maintainers/scripts/remove-old-aliases.py'. - -# Add 'preserve, reason: reason why' after the date if the alias should not be removed. -# Try to keep them to a minimum. -# valid examples of what to preserve: -# distro aliases such as: -# debian-package-name -> nixos-package-name - mapAliases ({ # Added 2018-07-16 preserve, reason: forceSystem should not be used directly in Nixpkgs. forceSystem = system: _: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 424a6e4ab8fc..95f8c441483a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3230,6 +3230,8 @@ with pkgs; dpt-rp1-py = callPackage ../tools/misc/dpt-rp1-py { }; + dooit = callPackage ../tools/misc/dooit { }; + doona = callPackage ../tools/security/doona { }; dotter = callPackage ../tools/misc/dotter { diff --git a/pkgs/top-level/haxe-packages.nix b/pkgs/top-level/haxe-packages.nix index 82ad280380c4..e3221412aaa1 100644 --- a/pkgs/top-level/haxe-packages.nix +++ b/pkgs/top-level/haxe-packages.nix @@ -1,133 +1,133 @@ { stdenv, lib, fetchzip, fetchFromGitHub, haxe, neko, jdk, mono }: let - self = haxePackages; - haxePackages = with self; { + withCommas = lib.replaceStrings [ "." ] [ "," ]; - withCommas = lib.replaceStrings ["."] [","]; + # simulate "haxelib dev $libname ." + simulateHaxelibDev = libname: '' + devrepo=$(mktemp -d) + mkdir -p "$devrepo/${withCommas libname}" + echo $(pwd) > "$devrepo/${withCommas libname}/.dev" + export HAXELIB_PATH="$HAXELIB_PATH:$devrepo" + ''; - # simulate "haxelib dev $libname ." - simulateHaxelibDev = libname: '' - devrepo=$(mktemp -d) - mkdir -p "$devrepo/${withCommas libname}" - echo $(pwd) > "$devrepo/${withCommas libname}/.dev" - export HAXELIB_PATH="$HAXELIB_PATH:$devrepo" - ''; + installLibHaxe = { libname, version, files ? "*" }: '' + mkdir -p "$out/lib/haxe/${withCommas libname}/${withCommas version}" + echo -n "${version}" > $out/lib/haxe/${withCommas libname}/.current + cp -dpR ${files} "$out/lib/haxe/${withCommas libname}/${withCommas version}/" + ''; - installLibHaxe = { libname, version, files ? "*" }: '' - mkdir -p "$out/lib/haxe/${withCommas libname}/${withCommas version}" - echo -n "${version}" > $out/lib/haxe/${withCommas libname}/.current - cp -dpR ${files} "$out/lib/haxe/${withCommas libname}/${withCommas version}/" - ''; - - buildHaxeLib = { - libname, - version, - sha256, - meta, - ... + buildHaxeLib = + { libname + , version + , sha256 + , meta + , ... } @ attrs: - stdenv.mkDerivation (attrs // { + stdenv.mkDerivation (attrs // { + name = "${libname}-${version}"; + + buildInputs = (attrs.buildInputs or [ ]) ++ [ haxe neko ]; # for setup-hook.sh to work + src = fetchzip rec { name = "${libname}-${version}"; + url = "http://lib.haxe.org/files/3.0/${withCommas name}.zip"; + inherit sha256; + stripRoot = false; + }; - buildInputs = (attrs.buildInputs or []) ++ [ haxe neko ]; # for setup-hook.sh to work - src = fetchzip rec { - name = "${libname}-${version}"; - url = "http://lib.haxe.org/files/3.0/${withCommas name}.zip"; - inherit sha256; - stripRoot = false; - }; - - installPhase = attrs.installPhase or '' - runHook preInstall - ( - if [ $(ls $src | wc -l) == 1 ]; then - cd $src/* || cd $src - else - cd $src - fi - ${installLibHaxe { inherit libname version; }} - ) - runHook postInstall - ''; - - meta = { - homepage = "http://lib.haxe.org/p/${libname}"; - license = lib.licenses.bsd2; - platforms = lib.platforms.all; - description = throw "please write meta.description"; - } // attrs.meta; - }); - - format = buildHaxeLib { - libname = "format"; - version = "3.5.0"; - sha256 = "sha256-5vZ7b+P74uGx0Gb7X/+jbsx5048dO/jv5nqCDtw5y/A="; - meta.description = "A Haxe Library for supporting different file formats"; - }; - - heaps = buildHaxeLib { - libname = "heaps"; - version = "1.9.1"; - sha256 = "sha256-i5EIKnph80eEEHvGXDXhIL4t4+RW7OcUV5zb2f3ItlI="; - meta.description = "The GPU Game Framework"; - }; - - hlopenal = buildHaxeLib { - libname = "hlopenal"; - version = "1.5.0"; - sha256 = "sha256-mJWFGBJPPAhVwsB2HzMfk4szSyjMT4aw543YhVqIan4="; - meta.description = "OpenAL support for Haxe/HL"; - }; - - hlsdl = buildHaxeLib { - libname = "hlsdl"; - version = "1.10.0"; - sha256 = "sha256-kmC2EMDy1mv0jFjwDj+m0CUvKal3V7uIGnMxJBRYGms="; - meta.description = "SDL/GL support for Haxe/HL"; - }; - - hxcpp = buildHaxeLib rec { - libname = "hxcpp"; - version = "4.1.15"; - sha256 = "1ybxcvwi4655563fjjgy6xv5c78grjxzadmi3l1ghds48k1rh50p"; - postFixup = '' - for f in $out/lib/haxe/${withCommas libname}/${withCommas version}/{,project/libs/nekoapi/}bin/Linux{,64}/*; do - chmod +w "$f" - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${ lib.makeLibraryPath [ stdenv.cc.cc ] } "$f" || true - done + installPhase = attrs.installPhase or '' + runHook preInstall + ( + if [ $(ls $src | wc -l) == 1 ]; then + cd $src/* || cd $src + else + cd $src + fi + ${installLibHaxe { inherit libname version; }} + ) + runHook postInstall ''; - meta.description = "Runtime support library for the Haxe C++ backend"; - }; - hxjava = buildHaxeLib { - libname = "hxjava"; - version = "3.2.0"; - sha256 = "1vgd7qvsdxlscl3wmrrfi5ipldmr4xlsiwnj46jz7n6izff5261z"; - meta.description = "Support library for the Java backend of the Haxe compiler"; - propagatedBuildInputs = [ jdk ]; - }; + meta = { + homepage = "http://lib.haxe.org/p/${libname}"; + license = lib.licenses.bsd2; + platforms = lib.platforms.all; + description = throw "please write meta.description"; + } // attrs.meta; + }); +in +{ + format = buildHaxeLib { + libname = "format"; + version = "3.5.0"; + sha256 = "sha256-5vZ7b+P74uGx0Gb7X/+jbsx5048dO/jv5nqCDtw5y/A="; + meta.description = "A Haxe Library for supporting different file formats"; + }; - hxcs = buildHaxeLib { - libname = "hxcs"; - version = "3.4.0"; - sha256 = "0f5vgp2kqnpsbbkn2wdxmjf7xkl0qhk9lgl9kb8d5wdy89nac6q6"; - meta.description = "Support library for the C# backend of the Haxe compiler"; - propagatedBuildInputs = [ mono ]; - }; + heaps = buildHaxeLib { + libname = "heaps"; + version = "1.9.1"; + sha256 = "sha256-i5EIKnph80eEEHvGXDXhIL4t4+RW7OcUV5zb2f3ItlI="; + meta.description = "The GPU Game Framework"; + }; - hxnodejs_4 = buildHaxeLib { - libname = "hxnodejs"; - version = "4.0.9"; - sha256 = "0b7ck48nsxs88sy4fhhr0x1bc8h2ja732zzgdaqzxnh3nir0bajm"; - meta.description = "Extern definitions for node.js 4.x"; - }; + hlopenal = buildHaxeLib { + libname = "hlopenal"; + version = "1.5.0"; + sha256 = "sha256-mJWFGBJPPAhVwsB2HzMfk4szSyjMT4aw543YhVqIan4="; + meta.description = "OpenAL support for Haxe/HL"; + }; - hxnodejs_6 = let + hlsdl = buildHaxeLib { + libname = "hlsdl"; + version = "1.10.0"; + sha256 = "sha256-kmC2EMDy1mv0jFjwDj+m0CUvKal3V7uIGnMxJBRYGms="; + meta.description = "SDL/GL support for Haxe/HL"; + }; + + hxcpp = buildHaxeLib rec { + libname = "hxcpp"; + version = "4.1.15"; + sha256 = "1ybxcvwi4655563fjjgy6xv5c78grjxzadmi3l1ghds48k1rh50p"; + postFixup = '' + for f in $out/lib/haxe/${withCommas libname}/${withCommas version}/{,project/libs/nekoapi/}bin/Linux{,64}/*; do + chmod +w "$f" + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) "$f" || true + patchelf --set-rpath ${ lib.makeLibraryPath [ stdenv.cc.cc ] } "$f" || true + done + ''; + meta.description = "Runtime support library for the Haxe C++ backend"; + }; + + hxjava = buildHaxeLib { + libname = "hxjava"; + version = "3.2.0"; + sha256 = "1vgd7qvsdxlscl3wmrrfi5ipldmr4xlsiwnj46jz7n6izff5261z"; + meta.description = "Support library for the Java backend of the Haxe compiler"; + propagatedBuildInputs = [ jdk ]; + }; + + hxcs = buildHaxeLib { + libname = "hxcs"; + version = "3.4.0"; + sha256 = "0f5vgp2kqnpsbbkn2wdxmjf7xkl0qhk9lgl9kb8d5wdy89nac6q6"; + meta.description = "Support library for the C# backend of the Haxe compiler"; + propagatedBuildInputs = [ mono ]; + }; + + hxnodejs_4 = buildHaxeLib { + libname = "hxnodejs"; + version = "4.0.9"; + sha256 = "0b7ck48nsxs88sy4fhhr0x1bc8h2ja732zzgdaqzxnh3nir0bajm"; + meta.description = "Extern definitions for node.js 4.x"; + }; + + hxnodejs_6 = + let libname = "hxnodejs"; version = "6.9.0"; - in stdenv.mkDerivation { + in + stdenv.mkDerivation { name = "${libname}-${version}"; src = fetchFromGitHub { owner = "HaxeFoundation"; @@ -143,5 +143,4 @@ let description = "Extern definitions for node.js 6.9"; }; }; - }; -in self +}