diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1c5635765bb..22e04af4e1f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15161,6 +15161,12 @@ githubId = 1391883; name = "Tom Hall"; }; + thubrecht = { + email = "tom@hubrecht.ovh"; + github = "Tom-Hubrecht"; + githubId = 26650391; + name = "Tom Hubrecht"; + }; Thunderbottom = { email = "chinmaydpai@gmail.com"; github = "Thunderbottom"; diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 74a84e2a8dc..4ee3aab2a79 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -26,13 +26,13 @@ assert withQt -> wrapQtAppsHook != null; stdenv.mkDerivation rec { pname = "carla"; - version = "2.5.3"; + version = "2.5.4"; src = fetchFromGitHub { owner = "falkTX"; repo = pname; rev = "v${version}"; - hash = "sha256-J0C3GLdlLMkm3LHl6l3OI2rA73A6z5MMcNJ1I1T0pbI="; + hash = "sha256-St0+avF9/UzQj8T1eZq5HSmxnaK9+BXSuufyX0NJYbU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/mmlgui/default.nix b/pkgs/applications/audio/mmlgui/default.nix index 90a86b0dfec..23f59270376 100644 --- a/pkgs/applications/audio/mmlgui/default.nix +++ b/pkgs/applications/audio/mmlgui/default.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "mmlgui"; - version = "unstable-2022-10-13"; + version = "unstable-2023-03-19"; src = fetchFromGitHub { owner = "superctr"; repo = "mmlgui"; - rev = "6b2687504644b481db403f032f463e38bbbb1dca"; + rev = "59ac28c0008e227c03799cce85b77f96241159b1"; fetchSubmodules = true; - sha256 = "OkYVjdvi8ls01DaIiDEPFXFCUh6g9AEeSlbDFfdPKeo="; + sha256 = "0CHRUizhg/WOWhDOsFqRiGu/m/U7xt5du8Uvnl7kxpU="; }; postPatch = '' diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix index 8a672948634..f8e5f4abcc1 100644 --- a/pkgs/applications/audio/nova-filters/default.nix +++ b/pkgs/applications/audio/nova-filters/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation { sed -i -e '4d' SConstruct sed -i 's@Options@Variables@g' SConstruct sed -i "s@-fomit-frame-pointer -ffast-math -mfpmath=sse@-I ${boost.dev}/include@g" SConstruct + sed -i "s@env.has_key('cxx')@'cxx' in env@g" SConstruct sed -i "s@ladspa.h@${ladspaH}/include/ladspa.h@g" filters.cpp sed -i "s@LADSPA_HINT_SAMPLE_RATE, 0, 0.5@LADSPA_HINT_SAMPLE_RATE, 0.0001, 0.5@g" filters.cpp sed -i "s/= check/= detail::filter_base::check/" nova/source/dsp/filter.hpp diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index c75aba9d261..7a8f16ef1b1 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -32,6 +32,12 @@ in mkDerivation { url = "https://github.com/sddm/sddm/commit/e93bf95c54ad8c2a1604f8d7be05339164b19308.patch"; sha256 = "sha256:1rh6sdvzivjcl5b05fczarvxhgpjhi7019hvf2gadnwgwdg104r4"; }) + # Fix fails to start while starting X server + # See: https://github.com/sddm/sddm/pull/1324 + (fetchpatch { + url = "https://github.com/sddm/sddm/commit/adfaa222fdfa6115ea2b320b0bbc2126db9270a5.patch"; + sha256 = "sha256-q/YLlAjxluzHMKUUQglLo3RyyhERQGPHXGr56+4R9VU="; + }) ]; postPatch = diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 1081ed1b10c..be9bb651e2a 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.187.1"; + version = "1.188.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-OdeiJ+g2woNjjQI5z3TDSi9Tt8kOheUrd/Gak+fmXX0="; + hash = "sha256-h5lbZ7H9a24OQvisBcmHe5RfaXTz2/LX3b4x6ArraYQ="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 33ba30821cb..711496c5441 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -11,13 +11,13 @@ }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2023.03.10", - "hash": "sha256-RHNWJN+P3w67UupeikHn6GrWZCOSoGCrP7BYG7myx+A=" + "rev": "2023.03.22", + "hash": "sha256-cUuoB9hPA04MmurtCbzkMuozc79Dj0rRnqE0ms2jJGs=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2023.03.14", - "hash": "sha256-mrjMG0t10lOd9hOEGBt9iGlpGdHcgbEVRcezyuUOqPQ=" + "rev": "2023.03.22", + "hash": "sha256-IoucMftNzDSOU3R6vyWTjfM9UVJrUSiHe5Kt1Ax05fg=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", @@ -26,8 +26,8 @@ }, "EControl": { "owner": "Alexey-T", - "rev": "2023.02.25", - "hash": "sha256-09jTp0pFbiQ268xB/eDUj98t8WYjzGaTiHdFvWlmoR0=" + "rev": "2023.03.06", + "hash": "sha256-JQURgyFfzKL8RC2wJmubFrXmpCeGWDkz1jXl4wBwhJ8=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", diff --git a/pkgs/applications/editors/jetbrains/versions.json b/pkgs/applications/editors/jetbrains/versions.json index 0dc6e8297c6..de8f51bc2ce 100644 --- a/pkgs/applications/editors/jetbrains/versions.json +++ b/pkgs/applications/editors/jetbrains/versions.json @@ -3,10 +3,10 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2022.3.2", - "sha256": "896e9cc5b908aa51e091201c320f6f08033f9064382e44b107fccc554ed94895", - "url": "https://download.jetbrains.com/cpp/CLion-2022.3.2.tar.gz", - "build_number": "223.8617.54" + "version": "2022.3.3", + "sha256": "1b46ff0791bcb38ecb39c5f4a99941f99ed73d4f6d924a2042fdb55afc5fc03d", + "url": "https://download.jetbrains.com/cpp/CLion-2022.3.3.tar.gz", + "build_number": "223.8836.42" }, "datagrip": { "update-channel": "DataGrip RELEASE", @@ -27,26 +27,26 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2022.3.2", - "sha256": "f130d0e4c2c89dcd291e05cca33484eb08e247e9ec29c13deaf67176afbf6a36", - "url": "https://download.jetbrains.com/go/goland-2022.3.2.tar.gz", - "build_number": "223.8617.58" + "version": "2022.3.3", + "sha256": "8c85b56b4e226739a0e36549f5f80fed4cbf2b2798eff442499f5779396a6917", + "url": "https://download.jetbrains.com/go/goland-2022.3.3.tar.gz", + "build_number": "223.8836.34" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2022.3.2", - "sha256": "02bc35281eb4e1285eeb9d797ec2b31ec7370e320ad0e89f6f1fa704d78ec4bf", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.2.tar.gz", - "build_number": "223.8617.56" + "version": "2022.3.3", + "sha256": "699492fb5a9de750250fdaadca5fc9212114ee445a50875b59bbc99f0187c2e4", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.3.tar.gz", + "build_number": "223.8836.41" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", - "version": "2022.3.2", - "sha256": "6fa3aff1c730bb79bf3e2e29edcce6d4cdbccfa631524c6253de518be6b6f3d2", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.2.tar.gz", - "build_number": "223.8617.56" + "version": "2022.3.3", + "sha256": "c302bd84b48a56ef1b0f033e8e93a0da5590f80482eae172db6130da035314a6", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.3.tar.gz", + "build_number": "223.8836.41" }, "mps": { "update-channel": "MPS RELEASE", @@ -59,61 +59,61 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2022.3.2", - "sha256": "7592d18fa1e199087cfd661b64c2fad717840f8ff3e3faf4d88db58bdb397e03", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.2.tar.gz", - "build_number": "223.8617.59", + "version": "2022.3.3", + "sha256": "d79a66032dfb85b16cef4ff308eb0161e06a831cee1fa93f2b7ca46fb1dc2ea9", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.3.tar.gz", + "build_number": "223.8836.42", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2022.3.2", - "sha256": "0ae72d1931a6effbeb2329f6e5c35859d933798a494479f066ef0a7b2be6b553", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.2.tar.gz", - "build_number": "223.8617.48" + "version": "2022.3.3", + "sha256": "fe84e586ce8da916abf481e02959742a20bab6ba3cdf447370ac8b2d5115211c", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.3.tar.gz", + "build_number": "223.8836.43" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2022.3.2", - "sha256": "56430090dd471e106fdc48463027d89de624759f8757248ced9776978854e4f6", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.2.tar.gz", - "build_number": "223.8617.48" + "version": "2022.3.3", + "sha256": "50c37aafd9fbe3a78d97cccf4f7abd80266c548d1c7ea4751b08c52810f16f2d", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.3.tar.gz", + "build_number": "223.8836.43" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2022.3.2", - "sha256": "ad853b75bc1e1379593bece3a5fbecec21d1de30263d0d5fef067a352b7d27ef", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.2.tar.gz", - "build_number": "223.8617.53" + "version": "2022.3.3", + "sha256": "e4607ae70bd0acf827535aa329e3da73ddf3a3fa78b54b5c8d18eae6ef52919c", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.3.tar.gz", + "build_number": "223.8836.53" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2022.3.2", - "sha256": "8c803914c55a3c1801ff9b619870d81597fabedbfb08a7c1aecf24f5d0884aea", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.2.tar.gz", - "build_number": "223.8617.48" + "version": "2022.3.3", + "sha256": "18dec5191b07a455d3c3dcb0bcc146fbe83ebb411addaf89e895d373728d932e", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.3.tar.gz", + "build_number": "223.8836.42" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2022.3.2", - "sha256": "2b612177c99ff0c6c542abe005846c3aa6cf170faa0202daafeb4ab1627c3794", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.2.tar.gz", - "build_number": "223.8617.44" + "version": "2022.3.4", + "sha256": "c33f72b5e26f347983b7bae92608d9b4343dcbb400736addb0793407aedc3260", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.4.tar.gz", + "build_number": "223.8836.50" } }, "x86_64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2022.3.2", - "sha256": "482461646f61f355c7fd976e655bf77dadfa545483c6ab47352ff22eb1193e33", - "url": "https://download.jetbrains.com/cpp/CLion-2022.3.2.dmg", - "build_number": "223.8617.54" + "version": "2022.3.3", + "sha256": "d07ecaf7e3950cbbc445b59049a40b018a07e0f7031169b28acb185d74b1b20c", + "url": "https://download.jetbrains.com/cpp/CLion-2022.3.3.dmg", + "build_number": "223.8836.42" }, "datagrip": { "update-channel": "DataGrip RELEASE", @@ -134,26 +134,26 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2022.3.2", - "sha256": "8e12ae0ee0d88cd716ac76a8a49392a51236287984d84c19324a19758fe8fc03", - "url": "https://download.jetbrains.com/go/goland-2022.3.2.dmg", - "build_number": "223.8617.58" + "version": "2022.3.3", + "sha256": "70d98ed21d52f7cabd4a1f8a1153388e8675220118eed9c767a82172b2dc2453", + "url": "https://download.jetbrains.com/go/goland-2022.3.3.dmg", + "build_number": "223.8836.34" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2022.3.2", - "sha256": "14b3f587e868adfb132791e17e3b1978a2fb5fd55447eae589c4d95d70c9ace7", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.2.dmg", - "build_number": "223.8617.56" + "version": "2022.3.3", + "sha256": "7837002f5998d683ab547e2548e1ac863b359d20a935c11ff0a27d858e64a522", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.3.dmg", + "build_number": "223.8836.41" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2022.3.2", - "sha256": "54d51ba7b65f84545faa7f8fc001b2bce48ef3ddb76006a44de9e95c6b395b8c", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.2.dmg", - "build_number": "223.8617.56" + "version": "2022.3.3", + "sha256": "500b38341a13f2365b0052fadc91f83431db27c223036458171298a3bdd4b8b9", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.3.dmg", + "build_number": "223.8836.41" }, "mps": { "update-channel": "MPS RELEASE", @@ -166,61 +166,61 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2022.3.2", - "sha256": "a2833c575cfa17c8d30a5f2e0d4ff06167372e7d8190ff08fc2f14e57a21396c", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.2.dmg", - "build_number": "223.8617.59", + "version": "2022.3.3", + "sha256": "79f5857f95452a6f66ba4ddbfd4445290449f21b90e6fd37e6118ac17cc052ed", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.3.dmg", + "build_number": "223.8836.42", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2022.3.2", - "sha256": "0a5a396b71533ab7ec77b2f10e08a20a970ac5712cfeb3378728020ec84be416", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.2.dmg", - "build_number": "223.8617.48" + "version": "2022.3.3", + "sha256": "2681947868b6f64a9b528fb2083347cd15f1094f1e880a25eaa1c96eb7a1406f", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.3.dmg", + "build_number": "223.8836.43" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2022.3.2", - "sha256": "6537fe033c13fb9b06da7583c875b0dc5f20660e5b349edc39bd8fdddffaf0f3", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.2.dmg", - "build_number": "223.8617.48" + "version": "2022.3.3", + "sha256": "290ab690c193563e0b2afc88e9d01feca319e2bc366a3677c8870ac8ba8d7e6f", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.3.dmg", + "build_number": "223.8836.43" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2022.3.2", - "sha256": "896dadb76b44bacef79b31619719107f8cf0e729331bda2d6b9f80e8be6dea92", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.2.dmg", - "build_number": "223.8617.53" + "version": "2022.3.3", + "sha256": "e06189d3170b7005540de82ad4288111007c1231f15598ee9baa392004d31dae", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.3.dmg", + "build_number": "223.8836.53" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2022.3.2", - "sha256": "bea0a86a4ca00c08d78ccca7568ad5170798544c4a64b21bbfede126bdff0a99", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.2.dmg", - "build_number": "223.8617.48" + "version": "2022.3.3", + "sha256": "f6583f4c9b9cb3fb1079968565c3f65f6a05329724e1dbb5c29ac348fc86cd9d", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.3.dmg", + "build_number": "223.8836.42" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2022.3.2", - "sha256": "87e716107156d15aa68230369b6eab2d25c5f6134cfe38cdb01e5b10f2a24418", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.2.dmg", - "build_number": "223.8617.44" + "version": "2022.3.4", + "sha256": "9146df417dcddaab5a58e1b9495c0b3d1e6c81ad9d61d354e54cbd24ba254351", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.4.dmg", + "build_number": "223.8836.50" } }, "aarch64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2022.3.2", - "sha256": "0d3d8ccce520a26781a2d126b887d5a829e97987b728104203528510ff9a4423", - "url": "https://download.jetbrains.com/cpp/CLion-2022.3.2-aarch64.dmg", - "build_number": "223.8617.54" + "version": "2022.3.3", + "sha256": "c271f9c704626a14381e6fd8f99b2cd5a370545c660e059b8afd677c8558dd7b", + "url": "https://download.jetbrains.com/cpp/CLion-2022.3.3-aarch64.dmg", + "build_number": "223.8836.42" }, "datagrip": { "update-channel": "DataGrip RELEASE", @@ -241,26 +241,26 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2022.3.2", - "sha256": "1df4707686f88e284e15a7fd63945b476dabf8e5a041894c281aba4838c603d9", - "url": "https://download.jetbrains.com/go/goland-2022.3.2-aarch64.dmg", - "build_number": "223.8617.58" + "version": "2022.3.3", + "sha256": "6414ffacecbdc5f02c5ad30a4ba710c8a9b59753eb27376b0df9856696d7ee5f", + "url": "https://download.jetbrains.com/go/goland-2022.3.3-aarch64.dmg", + "build_number": "223.8836.34" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2022.3.2", - "sha256": "808fa52e8dceacb8beb6b84705ac44ded04b67d07c1310449d7cd5c7afbdea46", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.2-aarch64.dmg", - "build_number": "223.8617.56" + "version": "2022.3.3", + "sha256": "f7c98311b8520050f15f8ffb169a8a0f511958f4e4d39eff3891bc62c5d16920", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.3-aarch64.dmg", + "build_number": "223.8836.41" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2022.3.2", - "sha256": "ea6da172fc8f27b7bad5475f0e1fc3359c492885bba8b6de59be727cb7b65284", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.2-aarch64.dmg", - "build_number": "223.8617.56" + "version": "2022.3.3", + "sha256": "627fdf0818f829ffa3c63275d51128ca23f27bca9945508e4743716856329043", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.3-aarch64.dmg", + "build_number": "223.8836.41" }, "mps": { "update-channel": "MPS RELEASE", @@ -273,51 +273,51 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2022.3.2", - "sha256": "4e1244d7fa459a7f07ec43725ed4271e2c669c3202cc04cc074f11fb07bbb25e", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.2-aarch64.dmg", - "build_number": "223.8617.59", + "version": "2022.3.3", + "sha256": "23ba3a7ff84216b945327241be759429040bd09bc4269a01b77a2e3745c66132", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.3-aarch64.dmg", + "build_number": "223.8836.42", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2022.3.2", - "sha256": "5a0fcb9fdc94896cd5651d9d60fa708596aebe374bc35944b3ff6133f4eb5aae", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.2-aarch64.dmg", - "build_number": "223.8617.48" + "version": "2022.3.3", + "sha256": "270388941ad525c5a96e885b3450a345e34ec82c2360c82554aa1d3537bc0fd9", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.3-aarch64.dmg", + "build_number": "223.8836.43" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2022.3.2", - "sha256": "3237e19f920880a92712d7a61df5eadd6b8e1652cf97115078289468e17332a4", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.2-aarch64.dmg", - "build_number": "223.8617.48" + "version": "2022.3.3", + "sha256": "d53b7ea764cd89cea81ebefe630a151627d4d71657868bd35296fd994524105a", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.3-aarch64.dmg", + "build_number": "223.8836.43" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2022.3.2", - "sha256": "a680b91d6c909f913317c91b1912b1b822c121d14d78962f7f44f7473e54b5a2", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.2-aarch64.dmg", - "build_number": "223.8617.53" + "version": "2022.3.3", + "sha256": "5284412be4fc781047dda6d0af7bf6bebbc051e6c67bd2cf228ffee83d2d4ccb", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.3-aarch64.dmg", + "build_number": "223.8836.53" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2022.3.2", - "sha256": "346b990c412f272acc2fc7e87448f456d8d6a1978b7a94eb645f9cea806b083c", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.2-aarch64.dmg", - "build_number": "223.8617.48" + "version": "2022.3.3", + "sha256": "317c9bd172cf7484d57781fafe8d317f6e1478141bbe30ac364aaa48a0cdc692", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.3-aarch64.dmg", + "build_number": "223.8836.42" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2022.3.2", - "sha256": "a869cd1c1c7b01bbd98f9a1cfd08b1b18ebe77f1c4422ee7e11ddc2c3cb250ce", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.2-aarch64.dmg", - "build_number": "223.8617.44" + "version": "2022.3.4", + "sha256": "66020aa7607eb31c2b1f278f7999078d2bfe74bac0f84f86ad8f51cf4c1e4415", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.4-aarch64.dmg", + "build_number": "223.8836.50" } } } diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index dff834d9b68..e6c70d60a0e 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -597,6 +597,17 @@ self: super: { rev = "5d916c39c1852e09fcd39eab174b8e5bbdb25f8f"; sha256 = "10d6dh0czdpgfpzqs5vzxfffkm0460qjzi2mfkacgghqf3iwkbja"; }; + passthru.python3Dependencies = ps: with ps; [ + pynvim + jupyter-client + ueberzug + pillow + cairosvg + plotly + ipykernel + pyperclip + pnglatex + ]; meta.homepage = "https://github.com/WhiteBlackGoose/magma-nvim-goose/"; }; diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index 655fa862376..22b0bd26f3a 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 = "14812-cf5346c26"; - rpcs3Version = "0.0.27-14812-cf5346c26"; - rpcs3Revision = "cf5346c263111760752cabb94767c07c501207c4"; - rpcs3Sha256 = "1dkik6r6khmpcbh27n1bzg7y1ws7ljrkn81a7qn21wmh709sscc8"; + rpcs3GitVersion = "14824-ad3e740c0"; + rpcs3Version = "0.0.27-14824-ad3e740c0"; + rpcs3Revision = "ad3e740c0921c18a832fd4b0401f965a28a58c97"; + rpcs3Sha256 = "0j9zi45z4xiam8frqs3b9xcjdw2gmqj34p8cv5w7sizr6sj09srp"; ittapi = fetchFromGitHub { owner = "intel"; diff --git a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix index 93040240a1e..a137fd5c70b 100644 --- a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix +++ b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix @@ -6,7 +6,7 @@ buildGo120Package rec { pname = "ssm-session-manager-plugin"; - version = "1.2.398.0"; + version = "1.2.463.0"; goPackagePath = "github.com/aws/session-manager-plugin"; @@ -14,7 +14,7 @@ buildGo120Package rec { owner = "aws"; repo = "session-manager-plugin"; rev = version; - sha256 = "ufNnr/sxOHUDUsGXwxp1yloVAI6DMtuEdjcQZ2XaHRg="; + sha256 = "sha256-0n7/3CAPf+ioSE041Zik9xeHt5qtrdHotJjBWhizExo="; }; postPatch = '' diff --git a/pkgs/applications/networking/freefilesync/default.nix b/pkgs/applications/networking/freefilesync/default.nix index 4d1310335ec..82cecfb91f9 100644 --- a/pkgs/applications/networking/freefilesync/default.nix +++ b/pkgs/applications/networking/freefilesync/default.nix @@ -1,8 +1,11 @@ { lib -, gcc12Stdenv +, stdenv , fetchFromGitHub , fetchpatch +, copyDesktopItems , pkg-config +, wrapGAppsHook +, unzip , curl , glib , gtk3 @@ -10,10 +13,10 @@ , openssl , wxGTK32 , gitUpdater -, wrapGAppsHook +, makeDesktopItem }: -gcc12Stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "freefilesync"; version = "12.1"; @@ -24,30 +27,26 @@ gcc12Stdenv.mkDerivation rec { hash = "sha256-KA3Bn8skJ2gMmihmwlUmN6jXZmfoYY/f4vqbKwvxwgw="; }; - # Patches from ROSA Linux + # Patches from Debian patches = [ # Disable loading of the missing Animal.dat (fetchpatch { - url = "https://abf.io/import/freefilesync/raw/rosa2021.1-11.25-1/ffs_devuan.patch"; - sha256 = "sha256-o8T/tBinlhM1I82yXxm0ogZcZf+uri95vTJrca5mcqs="; + url = "https://sources.debian.org/data/main/f/freefilesync/12.0-2/debian/patches/ffs_devuan.patch"; excludes = [ "FreeFileSync/Source/ffs_paths.cpp" ]; - postFetch = '' - substituteInPlace $out --replace " for Rosa" "" - ''; + hash = "sha256-6pHr5txabMTpGMKP7I5oe1lGAmgb0cPW8ZkPv/WXN74="; }) # Fix build with GTK 3 (fetchpatch { - url = "https://abf.io/import/freefilesync/raw/rosa2021.1-11.25-1/ffs_devuan_gtk3.patch"; - sha256 = "sha256-NXt/+BRTcMk8bnjR9Hipv1NzV9YqRJqy0e3RMInoWsA="; - postFetch = '' - substituteInPlace $out --replace "-isystem/usr/include/gtk-3.0" "" - ''; + url = "https://sources.debian.org/data/main/f/freefilesync/12.0-2/debian/patches/ffs_devuan_gtk3.patch"; + hash = "sha256-0n58Np4JI3hYK/CRBytkPHl9Jp4xK+IRjgUvoYti/f4="; }) ]; nativeBuildInputs = [ - wrapGAppsHook + copyDesktopItems pkg-config + wrapGAppsHook + unzip ]; buildInputs = [ @@ -88,9 +87,31 @@ gcc12Stdenv.mkDerivation rec { cp -R FreeFileSync/Build/* $out mv $out/{Bin,bin} + mkdir -p $out/share/pixmaps + unzip -j $out/Resources/Icons.zip '*Sync.png' -d $out/share/pixmaps + runHook postInstall ''; + desktopItems = [ + (makeDesktopItem rec { + name = "FreeFileSync"; + desktopName = name; + genericName = "Folder Comparison and Synchronization"; + icon = name; + exec = name; + categories = [ "Utility" "FileTools" ]; + }) + (makeDesktopItem rec { + name = "RealTimeSync"; + desktopName = name; + genericName = "Automated Synchronization"; + icon = name; + exec = name; + categories = [ "Utility" "FileTools" ]; + }) + ]; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index d6833bcfae8..eb6746af752 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2023-03-07"; + version = "unstable-2023-03-18"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "6672b90aa6310f2a02d9527f500645dd525a8fe3"; - sha256 = "uf4fSkMGVS1/H5HwKTo0Fp69CjI3C9Bmw07oP9PYvlQ="; + rev = "fd73698ba15b36cfd1f1726e51558405a56c6cd2"; + sha256 = "kGpze5aBbBjhLTU9jV2xX44iO82skgbxVKc0lHndezw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/math/gretl/default.nix b/pkgs/applications/science/math/gretl/default.nix index 026be6fa1a4..64e2b9f9131 100644 --- a/pkgs/applications/science/math/gretl/default.nix +++ b/pkgs/applications/science/math/gretl/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gretl"; - version = "2022c"; + version = "2023a"; src = fetchurl { url = "mirror://sourceforge/gretl/${pname}-${version}.tar.xz"; - sha256 = "sha256-4QAQTNqbfIX6K3CdtKcVONtCWrkTRvGl2ZXGR1eyQdA="; + sha256 = "sha256-T1UwQhw/Tr/juYqVJBkst2LRBCIXPLvVd0N+QCJcVtM="; }; buildInputs = [ diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 805704e9c61..c83e0fbbc87 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "21.1.0"; + version = "21.1.1"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index b859d17cf93..ad54127eb00 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "0kw1jynkl3dfvs8pm54sr1rlg1zd0g57jqnnfnlm1jrpwh28b1ba"; - iosevka-aile = "1jsp3nhkf9a5vgnxq57p7fqqj352r7kvqvdmzvw8y3snppxk3czf"; - iosevka-curly = "1bdwgadvwksyrq5m209jliwr3ywfkn090j5q07hm9zzpygnwgw8m"; - iosevka-curly-slab = "059yv1b1h8ksglaly20mf5jyhsbfi3y2lvr8jhg5fhmcp6mginqj"; - iosevka-etoile = "11l29xc4s9yb56f6n2q7hh6bvzq9pjfc3j9zpd15y11cm382a70s"; - iosevka-slab = "1vzansf0a8zfif7i2g5znwgdzkcjj16qga19y1386fci0z1vm9ib"; - iosevka-ss01 = "0179zprfy8l27jyk4hjb0da2z5qq4pgkvnbmnxvlrf5mqbrmph6v"; - iosevka-ss02 = "0kmfyp3hgacgdrbh6rkyig9m95j33nxx1xlmcsi7rq7i6rxj9ixs"; - iosevka-ss03 = "0irlr2r1lnlb56zmq3blq84r5sy4gsmr50chw5g6b01ygx6263hk"; - iosevka-ss04 = "0dyw52i73msayy76w77r79pgali1rjas8zgpfq2l2q9z2d7m945i"; - iosevka-ss05 = "0ynm24xdhsl9jkdhjadc7ks4rrrl8ri2fj1vndw7ymrp95mh8kia"; - iosevka-ss06 = "1md6zgvj30fw6hbsx6vx5n56lxavlr5wzsmyw0a4y37lb9q5ch61"; - iosevka-ss07 = "09qyxicbq7kalxxll5mcs5vgd9g80lxzw8zin6yrclm5hghz9x8x"; - iosevka-ss08 = "14mvfpc17n5lzn3amp3s27c3r513jlbffcw084wsppjbvaqyv063"; - iosevka-ss09 = "1h06sp9s6dqn0inki37h3qv350a6jaf82xjad8wlx3kbgbs5vr7d"; - iosevka-ss10 = "0j0ryw12c21z7qijplws7fhhvd3p0xvfvx17b38i9yf1m3i9lswv"; - iosevka-ss11 = "0kknvqqxhp9qdjg172s75j8mhm49204528xsylabifpf9225qxm7"; - iosevka-ss12 = "1skvr7vp9p0ndbic5l2j3zp5rq1mnfjv91s15msi96pqdsg3acr4"; - iosevka-ss13 = "185b0zyg0gz3560fpr7crzan3jdymvhap2hw789yzygswl6mqz8b"; - iosevka-ss14 = "1sdzi8ncm6mypqza7yl2c3f25jf9596d8a0z6d6ppad9x00jrx32"; - iosevka-ss15 = "1jkjcag0zx5rnh2hv847q6fvh0v2vypc6l981kkrql3qbqd4lk9q"; - iosevka-ss16 = "1dbkc950lw5iv3rh0x1zxlr52iwsvvxpr1cilr54hqiq8qjv6rc9"; - iosevka-ss17 = "0iyfis5mfmf7s1k45a8pbmdz5wj2q444vgqj1a4ndk0r1aphvrnp"; - iosevka-ss18 = "0jdi9vgq07sf9s1fs1syd6acj37s1cymrm0i9id2g2yjnr1vm947"; - sgr-iosevka = "0cihnnf51a3kwjmpd7iblwjanj0x9w69l7yx2isn3fs9y7r6dzbm"; - sgr-iosevka-aile = "0bgcbm900j20yh6jkmqx1aji87410j2nfz84p96rdzcq8zyicf6i"; - sgr-iosevka-curly = "0hf8hbn61pb5b9p0dnx5vzhx0ivb8x8x9abf91dlr5n20qs8gyzg"; - sgr-iosevka-curly-slab = "0kc19qapsqq9l6g59k3kjbz4x6c4fl3xyg6wirp5p2nfiyhb8ww1"; - sgr-iosevka-etoile = "1w9znis6f59x2l0i2x94qmvawxx3jzwz4d06b4sw066329fazbbx"; - sgr-iosevka-fixed = "0xymjy1i2472p741iv5gr6366s6g9llmvkdkpx579dyk3shpabnl"; - sgr-iosevka-fixed-curly = "14sgb2j66hv64nslhy5cq0zdv0yr4x3175w8dkyzvhagvlx3ra5h"; - sgr-iosevka-fixed-curly-slab = "096b9jykaf2l9mqyji462ga4hy8s25qb5j0c000lsja8674f1mip"; - sgr-iosevka-fixed-slab = "12cim6i3wydx6adzvcdg8knfajjzxvgxq021m65k7icw5yi47rpk"; - sgr-iosevka-fixed-ss01 = "1gjl7swgg5vkrzq7fsr80bpnw68a0gsq2dhm3mfcjv24rqdhprxf"; - sgr-iosevka-fixed-ss02 = "1cih7cp5lp1456d4q7nk6zk0yk6iybhrhixx926yc04vjl3iaali"; - sgr-iosevka-fixed-ss03 = "02i8wipf12dxkkh92g2yqdh3cy6nvcl77q67pzl5746zgy48h987"; - sgr-iosevka-fixed-ss04 = "01cl31s26lzfdrf5k8r4rgbwp69gczg0m107psda903x95hiyd6a"; - sgr-iosevka-fixed-ss05 = "10cd8hvjzflkcv929radp9hj08hdr1a6da01fvr3gg59m1jg7hkp"; - sgr-iosevka-fixed-ss06 = "01mpq5qsiws9ag4izq34mj15cilxkp529in29v2zc0vsi68a3n1s"; - sgr-iosevka-fixed-ss07 = "00wd0valk2jhw82hlv9zdcdp97ysc361bm665rsncplnd97nx2jj"; - sgr-iosevka-fixed-ss08 = "0ihgx6arv585k8p1rk5byhqm2f6ypbq26rnzihm2r11lg8hxyvqj"; - sgr-iosevka-fixed-ss09 = "05zl4wz61sfjfa68zpjbvq7awibkxfkdnpimf5mikivhb13rmjjn"; - sgr-iosevka-fixed-ss10 = "0k8p1ld2i9xiagahxhfabb7fhr9sq7cv7dpcyrja20hmwnm28qrl"; - sgr-iosevka-fixed-ss11 = "159zaybnlrxd4q5iwhq7dsp09skvh13g734zk2l89xwsk5h2w4ns"; - sgr-iosevka-fixed-ss12 = "0d2hzhlpl6rb9nqyygifbd09ylfvj4a9wlpmzpibbx06mrqcinri"; - sgr-iosevka-fixed-ss13 = "0p99i58cwj39h1r2qhdrs3fasr75nw50m47iqjijn9mvgd01k82z"; - sgr-iosevka-fixed-ss14 = "1m2s9wclk6xjxf4kjw0w0nffzx41s16www2nhm1v0lx1ikyj5pvl"; - sgr-iosevka-fixed-ss15 = "04ykxwxibl1k3zxr9swywrg9v78hbf8vm4cbgscv78nm88srwykw"; - sgr-iosevka-fixed-ss16 = "1kzj8b3356mh0ls2w5mv5hbqv3fwxk3izlw7xxd8q65cvrfs3gzq"; - sgr-iosevka-fixed-ss17 = "1hnbni2f3lhr15j3y80rwihwjc4vvvnidjswan3ahwhh2qc8krlf"; - sgr-iosevka-fixed-ss18 = "1cd5lhpkjcqlv0cr7nzh24xlc9912pnjfcppkcvmg7p0slg0zlkn"; - sgr-iosevka-slab = "1zpmn157j5jpc9xmjqv0jga1hh8bc4b86f1xq651633ckf6ly6cq"; - sgr-iosevka-ss01 = "0nacmqlh8rzkzhlzrsnpgrsznr8grd9kyxz77sfxyvn4d2i6lnwy"; - sgr-iosevka-ss02 = "07hpwpbxj8z0zzya0zs1c5i4yssjmgv05w7q1xr64zsjffpd7m9k"; - sgr-iosevka-ss03 = "19pcnyspbyq0bc33l9jsnmc808d9q20aglxnwv2jx97rwg2sv2mh"; - sgr-iosevka-ss04 = "0wg8hi2465agxvx3yyflff5mbwfgvgayx2zvvjwakiy4sq0ymib6"; - sgr-iosevka-ss05 = "1lr9brpkhb28ziw56idyk2k5vx5bw4zwbg6d1p4iwrirmwrxrjgi"; - sgr-iosevka-ss06 = "1bwgmsdirfhqnri6lnrmwjiwm4xy0qscbkx3j6rx68j9x4fk4991"; - sgr-iosevka-ss07 = "00p8slkgzivkikc9nxlhsda50vxm7bdj1gh95p7kvmnkxksckx7f"; - sgr-iosevka-ss08 = "0yas5iq36dckl0zzgkz8qbqz4zlzapg4cgq89676n64wmhxpifci"; - sgr-iosevka-ss09 = "1ds6gkm9rpxwg5vafm0vaadv6ww9hrh51q30n1f7vblk3mvj6wz4"; - sgr-iosevka-ss10 = "01qldfwld13n1j340a3kl4b9ixd0y4kjws9ym4cp8l84p4ylk9h5"; - sgr-iosevka-ss11 = "0z57jq0l5f7nqi04i9hr22hxwx350pkkhcis7lzh799gc9av2rp5"; - sgr-iosevka-ss12 = "1zvns2g30918hcgwbhswp2645mqkkq3b07i8z6w7vg61y1zylgqp"; - sgr-iosevka-ss13 = "1gydqrscy94v6iidhz7vak5xr5aln5127b3f3m1bb3x6gz5154wz"; - sgr-iosevka-ss14 = "1g91lbmkw1r7prs7wbfdqhkrixil71zgnsd2zrr9v68g75r3gwyl"; - sgr-iosevka-ss15 = "0zpb2jk7r6kfmjgirkyxcilxw92hya8v10xd7ad28cvr9p4jngwj"; - sgr-iosevka-ss16 = "056rnnnzqc5wwfk92wik8sndyj7mlwmzvz0vd4imx5pa0x7cgznk"; - sgr-iosevka-ss17 = "0qg7rm664anvsjbnrh3r039md3a68b5pxvgkpq9ls9mard4jd2zr"; - sgr-iosevka-ss18 = "19hgnj7afpsy2n8ydqrkyl97s10893qxyaqg898xs2552prazcx5"; - sgr-iosevka-term = "0qd1dx0q4x8km3222g9znimvzw9nzhhj4g3d4n2dq3hir0biwvkw"; - sgr-iosevka-term-curly = "111lriaizsg80c4qljxsflm7p9la68kkh7ssqykkjs91a6qfsfs0"; - sgr-iosevka-term-curly-slab = "08qbpwzzmnql92vwisb4bmsa9ajnffa50qy4kan34qpanrkgnps7"; - sgr-iosevka-term-slab = "1gkfvp97vv3p2llxzk1zpvfr5lm0npg56gac083wy8jds837wzl9"; - sgr-iosevka-term-ss01 = "123r80pciasa1gvyri4gn7706zf0f7shv5w0jyn88cgpklrbpjgx"; - sgr-iosevka-term-ss02 = "0l4fzq1g93bmv24r7r9fjkkyzyyp8sgzq7501ayrzdc9yxj3hcs4"; - sgr-iosevka-term-ss03 = "1jq9xm7qfx3jf603njfm9y1dbhj3dv2gbsyx1plch8q5x2kfpn49"; - sgr-iosevka-term-ss04 = "07mv1pxy0smk7p549iz7jn030h3f6c2k5km62v54xhd47zmkmcqz"; - sgr-iosevka-term-ss05 = "1n0szq4h32qbmrsyn942gn2w3rwbv2wa9l3nrrpdqn6bn33dhisl"; - sgr-iosevka-term-ss06 = "1rhhk2cbmd3yr6pry8v1hl1kw84dgv84mbs9qi4lvfjfj5pknai9"; - sgr-iosevka-term-ss07 = "1fnhld17m9ggfvjajm3cygx9n07w0bazdxz5jv6d2whczhbqgiqs"; - sgr-iosevka-term-ss08 = "0w4fmznj9i7qg2ygzcnia1l0wg5sm85vqlij22g55ycw87fxi1l2"; - sgr-iosevka-term-ss09 = "19z86rbdmszd5qzxlfsacdvg4dmcsm6fl17yna8sgkxhh562x7kj"; - sgr-iosevka-term-ss10 = "19mhyqqbs7jfnlpx5dl5p7gp2i0kslmb9wzvkm4i3fs7cy06hzc7"; - sgr-iosevka-term-ss11 = "1kg67yhc3adw0ahm940bsabnsr46k0z8m2d8q7jmml1w45llfxsf"; - sgr-iosevka-term-ss12 = "1jc8d0hm0hh7p6wixr37qg36nb3jr5vfkwwc9qfvjv3snq38z139"; - sgr-iosevka-term-ss13 = "1ksyzlafcph69a2mqajdavd2r5f88dfq3hbglwm3b14ijifgzj92"; - sgr-iosevka-term-ss14 = "11ay1smy18qbn3qh6nbxyr58ldzc7x7aib51hvbnjrgx666f4lhp"; - sgr-iosevka-term-ss15 = "0dnspjglxshn9qrc5ib5ygma03djj2n3kvkqss6sxl7lp27b9nz0"; - sgr-iosevka-term-ss16 = "17hvq2x0zmpr93dym2i1izy3nnkplpszwjlwq35r07k7nikcs4ir"; - sgr-iosevka-term-ss17 = "1jdk38a1q0s4my3n7kjrpas010j85yxxy1qylz48h0makw4vfmfy"; - sgr-iosevka-term-ss18 = "1n57dzf7ks5plk6zprk8yyjvsj87l6jfkhsh4xmmzvwk78rkn4w4"; + iosevka = "0nlc16faywn7jzc9zsa6f4ccd9r1b5ncmm4342j1fvj4850yicc1"; + iosevka-aile = "0p9y4z2zgdb3hqyrn0pqxip8b2q7xwjnwf392ni9gkgzvsvmy1dv"; + iosevka-curly = "1hhi2xhsahvbj285ia66w3mnb6c1axp5jlfknqki9z95i69mzmfp"; + iosevka-curly-slab = "0k3cz39f9dmb58xawllzqczwhd23x75xklwvadc2rsi3m3r19070"; + iosevka-etoile = "1hyavl45w7ia9w33bnhfcl3w4hb18qhf50al4mmzyw4cl4pwdxdk"; + iosevka-slab = "1w7c7f3q2pj4rnvwywndr4a4b8nd7q3ray9fmkhisn479c87z8sr"; + iosevka-ss01 = "0b19gn6shv4bd4zy0ay1wcx46avz1dahaw350mhiq5f807l7ilzi"; + iosevka-ss02 = "0yzwlp7zccfyfby8lvx45rmrnd9dnmd4hzgbvrynw476byjaa78d"; + iosevka-ss03 = "1ndpx5j70yxmszr4q6c8di8rxak1792gyjbl9914rzd0fhs3mfcn"; + iosevka-ss04 = "0blhdf8grq7z28s7f6vfirfyil5vxazmk1597dxd8j54wi7zxzx4"; + iosevka-ss05 = "0w07frh2z4xcmzm95a3g4d50jv9b1l3wnqj6rd2jqbm1n9rsab2a"; + iosevka-ss06 = "0vrkkd98yv7wz23bbylfpk1kf01svvsmnfz3ac36vz6x0bzcy2qd"; + iosevka-ss07 = "0mg5is3hv16wgk6sc394a36nfwfy1ki3qy41wf0qh9nrcmhk6hxy"; + iosevka-ss08 = "1vbzv6hdiwj6qy50vjkyikh2b99cqsf8a25a6d2mgs790qna514k"; + iosevka-ss09 = "0v7w6q6qgc72v8ylqnc94c384aiqball51a4wcxcbndqhskmisfj"; + iosevka-ss10 = "10s3i7w6zg9arh554vc03bd8lv7lfkfdnhq65rzfmx3prh9l6d85"; + iosevka-ss11 = "1rfbs3k576922mwyw9x5pzz8yawvpzznpvib0v78all0a0a7ycv9"; + iosevka-ss12 = "18nz0x5fn5v826sfxxc78gq2l5q6fkr1xgb7m1h6y9zf49cb5qdi"; + iosevka-ss13 = "0f6lgkxxwf9xcjacgq9a1wwlns827w5xh2djwq9rxnwfd4p629n9"; + iosevka-ss14 = "02vcn31xnzbkh18yphrbshyg9zpdrhal2iqbcvwqdy9pj0hvqy1s"; + iosevka-ss15 = "1w0p84dfmr04f5xw0xdyjd064dnv8603w1sf60132ln0m5zdw5nl"; + iosevka-ss16 = "0h7my2b3vrf11z1rxvppk9zw1qrj0r311yyb3ca2k6pclpdv1776"; + iosevka-ss17 = "13qwrfrrjkxdny40gsf4xpdk5291fkmz5yc6qhmb7s8kl3jxrrdc"; + iosevka-ss18 = "09kfnjyq47dcf2ynqh6rki63057vy4sf5d86w4k35qs7xjrvk0rn"; + sgr-iosevka = "1wqcpi7645485glh6fcjsj3way3ssswm6fdks8l2did9xm3213d0"; + sgr-iosevka-aile = "1vax6a7w3mphbb4yvwyxvgblxpxsbng5p4ahsm52hm7wchi2x37q"; + sgr-iosevka-curly = "0yxjvjy9k1ng0fsyxp83yg8wdadj8d1jyziy2p3k4x7dhbnp7iqn"; + sgr-iosevka-curly-slab = "14xi01qjk8kinqqibqcgmrg09xgm1d7bf8dd2gjs0c9fjd8hxjwl"; + sgr-iosevka-etoile = "1b6n9ph1rq94hw0crmb7ahnfc9bp5wyinrn3kjwlxdn53qk2zkq7"; + sgr-iosevka-fixed = "1dmkpj5i4gjh3fv8sipkbi798fw7yhhnla16c68jldnc7sdshd59"; + sgr-iosevka-fixed-curly = "1cdp11xjh5i14bwj3jsx7vbladh5j9rgqy9r18bbxs3z2xg3q3y6"; + sgr-iosevka-fixed-curly-slab = "0yka45rja8wdng1k2l6smbf1azfs25byxfvq8rvjbfakm7ykva7l"; + sgr-iosevka-fixed-slab = "1xz40hp07cvmyfsr7vgbyyphvg982xvc3arssbiqw7b57bpzfmvz"; + sgr-iosevka-fixed-ss01 = "0j1wfwq2z42bazgambwpcy45g742wy7h9ls5c546vjm9i3dbg035"; + sgr-iosevka-fixed-ss02 = "0dw2810wbpmcp04lp3hvh1s44k0a6fw1sgg9arhmvkvmxrjxkhhw"; + sgr-iosevka-fixed-ss03 = "107iw60i3z9jslq8a66vf3c6p7f2wkmg5d8pdw14k0jdrc2fg9rq"; + sgr-iosevka-fixed-ss04 = "18slm69psavwg2nnpcxzr09lc4aya192sf3mrgpvw0qw8j3p3adp"; + sgr-iosevka-fixed-ss05 = "1676xxf2wbqsr726s0066xiv91ki4ckhbz7cs4qnggh01mrraqcq"; + sgr-iosevka-fixed-ss06 = "03w821f78z090qzpqzzr26r4rcmp4jxy4lwgz6q71cg5b6xpfv8n"; + sgr-iosevka-fixed-ss07 = "10xklsb1s53yj0bjf8q0ii6s8zddkhx1yyh5x86rsdapkk6rhwp6"; + sgr-iosevka-fixed-ss08 = "0s6hkc7pnx73byc33wcqglqhd273rl3z9c2g4qy5a9qlfcyhgdsz"; + sgr-iosevka-fixed-ss09 = "0gify4mz7fnkakpf3blnqh43w44azgyld4vkxrzxmnlblc22fazn"; + sgr-iosevka-fixed-ss10 = "0f3351ddpq5kl3199jm96gpji0c11hy68wgk0b3vccdhbffyzbjr"; + sgr-iosevka-fixed-ss11 = "1jkyzrj37clp93dsvs9d8278q2vblxdwhbqp69nk1pqcxdplx70h"; + sgr-iosevka-fixed-ss12 = "1gh6pxq4fisnka4b64qx2ayffqlhqkk4625lcx6c8q60a73rim0s"; + sgr-iosevka-fixed-ss13 = "1gg1pfi3l1g2gw1mwds52j8j6wxvv52nx1zhn96937gmw80b4vk8"; + sgr-iosevka-fixed-ss14 = "1rnkw69lv7krs3fwv099hqnd7acnazizla3595x4cr220d2dbn2l"; + sgr-iosevka-fixed-ss15 = "1icrs42jfijw5jwvkcqad5ln9n1pkmdg6nm4wy7p0q936xr6y00k"; + sgr-iosevka-fixed-ss16 = "1y0p624187hjb85j78y25784473x7j82xj3g3g17w4g5p8n63mar"; + sgr-iosevka-fixed-ss17 = "13kzwf0x1cqri5z3x5pq922mvqm0ji1vh0g3adf2gvz8dk10wwy6"; + sgr-iosevka-fixed-ss18 = "1r9x62jdsrb9k88af4h0azk60z4yjdk39sdffw2liypfx4zlbmnv"; + sgr-iosevka-slab = "15kl87w79kyb1sg76s69vj338ms8q3yq207l25k1sh59qzl0r5v7"; + sgr-iosevka-ss01 = "161xggjrnrnr8bah8hslc5jsilp3qf505pr9nl2ly1amda8kpp9l"; + sgr-iosevka-ss02 = "17cm9jy9wv0zyfs6r5fm2kd8h64j2qlxzny0q482a05frk21fx4p"; + sgr-iosevka-ss03 = "0i1b851sklhx6vl6ckj6rfzjxh4y75pkjwwk2v5q3sskw35lfdml"; + sgr-iosevka-ss04 = "0i4rx4bwvqd45b14d46k123m1wf7cd3gfpxhha4i5g8fmab5jyll"; + sgr-iosevka-ss05 = "14dzvvaznf3j3dj3pis5h592vrjlgjiqcjf94gnalkfg83frrvfg"; + sgr-iosevka-ss06 = "0gni839pida0ii43bfjydhnfsp8gjvnz0cjqb3cf046dgr12ynx5"; + sgr-iosevka-ss07 = "1was57vafdmv9qgazd5kxd0glqbahi2cjkw1av30870nx05zyxmv"; + sgr-iosevka-ss08 = "1f4gs5kk3b1x6vw49127pm8h5nbn0b81nnmfnd72gc0ml2jm1d8m"; + sgr-iosevka-ss09 = "14kpzkv0xcy5v6x9x8rrcww9lrs8z9dmydzbxi0zwpazsl8fmkvn"; + sgr-iosevka-ss10 = "1zg170qn0qyqqf2f8ascysnmry7xapp7c1hn7l53vabdb9x2dw26"; + sgr-iosevka-ss11 = "0wxqwqna2bxzcfdxcq7sdl3rw14lch4kpdy641s6frxvvb1ki0pc"; + sgr-iosevka-ss12 = "1p50mqxykb9q3cszlswjsgdaml9wagnkq111lbl6v1bjpn72cmd6"; + sgr-iosevka-ss13 = "1rj81w0ljgi34sx0hzg2np62wlhv628msk92sknqy7nb29ddz56z"; + sgr-iosevka-ss14 = "0lgvh4njc8zhl7b7ybzcn4h7n89da4cjyfzi80jqnvsrchwfbsr1"; + sgr-iosevka-ss15 = "15ngz09ax90mf02pf9j6cmr2aqic0kdg5fgsqxdwfhhzczb70j0f"; + sgr-iosevka-ss16 = "1d6wkhkfivyzn806lk359yj8brcip69a2r02vlzr0h5k6zphfaxb"; + sgr-iosevka-ss17 = "18vb87rxm40snwagfdgqff1gnlgdq0w921kan0flnrq6cy8h2v5m"; + sgr-iosevka-ss18 = "0h76169821d4qxkh49p8f1cd8zm3bx0xmnspwf18a38n1f6jk2hi"; + sgr-iosevka-term = "1qg4c95gf2flacc4zplglb3ygcl2gbzwgd49yivz0l0riq816hws"; + sgr-iosevka-term-curly = "099lj37032fly1h9spk45f41gmjny8nyrhmxkni3cjmxsldxqphc"; + sgr-iosevka-term-curly-slab = "11grvy0ff9hn0hazjldzkd1dvzphs53snlvx2fgg8xjrr2b8l6fw"; + sgr-iosevka-term-slab = "011h29r8h5fjxv4yf99pja2lapdn546mqgpf0535iv8kck830451"; + sgr-iosevka-term-ss01 = "1049089mzw33czjk36clhvmb5lv53iw9qvs192a3jhizxa2gj17y"; + sgr-iosevka-term-ss02 = "1vzh14l64spqwm4wznnmlr1p01d9xspk0wsp2nd3kqn3ydrzwxc2"; + sgr-iosevka-term-ss03 = "1w63jckv0s60lx036rl1k4pmxvnphfasid5mng1g0fm1mac8qn49"; + sgr-iosevka-term-ss04 = "03xg9f4pxf5xbdlirmw6fwig84ir2p2cc2nh41s8gg9yv5z4xhqv"; + sgr-iosevka-term-ss05 = "08cq9k25wzkqdxjzjhxgpi6qk0awwcj7f0vz7ykkklkmd1qjjaqc"; + sgr-iosevka-term-ss06 = "0gba1mpxy3wyzbmgfrrgb2cpzlwrhixgy4475q81anp810v49jha"; + sgr-iosevka-term-ss07 = "0frhjqhl32ny95i5nkhwil543l1bk0rb912qigzg1gv9ji7ngmpk"; + sgr-iosevka-term-ss08 = "0kb4vbl36saylvm53i09zkzz2vkipqsyn8kv2aly3yz8i2vxx9sg"; + sgr-iosevka-term-ss09 = "1jxdwpp0g2c13hc68i2nnmpd84ci5sg71dm1dnwfs44xf2zspn1y"; + sgr-iosevka-term-ss10 = "0mjy40hhrbb1s5bg70yxzyqppyl50lps3l6gjjjb7c6h3hzs0hyk"; + sgr-iosevka-term-ss11 = "19wkwpws6hbwvwhbbj4jxs51026qmv5iikfaqhzp6hq4gdhafarb"; + sgr-iosevka-term-ss12 = "1sz9937n6h896c2nvhnkwchjylw3kn0ywq97n4ksfiw5ziamz6d0"; + sgr-iosevka-term-ss13 = "13fk86078ljwz3prb1rj43g4mgc8j3mf5ccl4ghaa2dgik7sln27"; + sgr-iosevka-term-ss14 = "1jc4nmmv2dwp04ihfq9y97kbgnishrn81183ar4wqn9076qifjvi"; + sgr-iosevka-term-ss15 = "1kl8am9874zi3r2f1hkxx63dq60922cq982c5r9a07fr44cpmapm"; + sgr-iosevka-term-ss16 = "072ak17fx1gpd3mz1bg7rhgp4bb32i3p71jrmnpf1h0v6xmnbgwa"; + sgr-iosevka-term-ss17 = "13fbvmjjicv7s54x7q7kmccs10mangrply1257d58cc0jhmgqnyg"; + sgr-iosevka-term-ss18 = "0dspz5d0jm7d3iqxkx5hc5lf53i84iv6iajvaxdbsiwvvdv1fh8s"; } diff --git a/pkgs/data/icons/kora-icon-theme/default.nix b/pkgs/data/icons/kora-icon-theme/default.nix index 1cf5992b35a..880568fe4ff 100644 --- a/pkgs/data/icons/kora-icon-theme/default.nix +++ b/pkgs/data/icons/kora-icon-theme/default.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation rec { pname = "kora-icon-theme"; - version = "1.5.4"; + version = "1.5.6"; src = fetchFromGitHub { owner = "bikass"; repo = "kora"; rev = "v${version}"; - sha256 = "sha256-LYlrLkMArF3rRVrvQNNfMdOgW6bJOjK9fE9obXEJK4w="; + sha256 = "sha256-vAeml+upESUVlJ95Rm0+vlZ+NQZWEZl00scDkb3W7Yo="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnustep/make/builder.sh b/pkgs/desktops/gnustep/make/builder.sh index e5c277e796a..736635ab502 100644 --- a/pkgs/desktops/gnustep/make/builder.sh +++ b/pkgs/desktops/gnustep/make/builder.sh @@ -1,7 +1,11 @@ if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup +providedPreConfigure="$preConfigure"; + preConfigure() { + eval "$providedPreConfigure" + . $GNUSTEP_MAKEFILES/GNUstep.sh } diff --git a/pkgs/desktops/gnustep/projectcenter/default.nix b/pkgs/desktops/gnustep/projectcenter/default.nix index afe47c6cef7..b535365b25d 100644 --- a/pkgs/desktops/gnustep/projectcenter/default.nix +++ b/pkgs/desktops/gnustep/projectcenter/default.nix @@ -1,15 +1,19 @@ -{ fetchurl +{ lib, fetchFromGitHub , base, back, gsmakeDerivation, gui, gorm , gnumake, gdb }: let - version = "0.6.2"; + version = "0.7.0"; in gsmakeDerivation { - name = "projectcenter-${version}"; - src = fetchurl { - url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/ProjectCenter-${version}.tar.gz"; - sha256 = "0wwlbpqf541apw192jb633d634zkpjhcrrkd1j80y9hihphll465"; + pname = "projectcenter"; + inherit version; + + src = fetchFromGitHub { + owner = "gnustep"; + repo = "apps-projectcenter"; + rev = "projectcenter-${lib.replaceStrings [ "." ] [ "_" ] version}"; + hash = "sha256-uXT2UUvMZNc6Fqi2BUXQimbZk8b3IqXzB+A2btBOmms="; }; # NOTE: need a patch for ProjectCenter to help it locate some necessary tools: diff --git a/pkgs/development/compilers/llvm/rocm/llvm.nix b/pkgs/development/compilers/llvm/rocm/llvm.nix index 272a1209b49..1f1add5cf67 100644 --- a/pkgs/development/compilers/llvm/rocm/llvm.nix +++ b/pkgs/development/compilers/llvm/rocm/llvm.nix @@ -48,7 +48,7 @@ let else throw "Unsupported ROCm LLVM platform"; in stdenv.mkDerivation (finalAttrs: { pname = "rocm-llvm-${targetName}"; - version = "5.4.3"; + version = "5.4.4"; outputs = [ "out" diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix index 31492620cb9..baa679b6e00 100644 --- a/pkgs/development/interpreters/gauche/default.nix +++ b/pkgs/development/interpreters/gauche/default.nix @@ -45,6 +45,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ mnacamura ]; license = licenses.bsd3; platforms = platforms.unix; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/libraries/libcutl/default.nix b/pkgs/development/libraries/libcutl/default.nix index e87dc064402..db04b5f59b5 100644 --- a/pkgs/development/libraries/libcutl/default.nix +++ b/pkgs/development/libraries/libcutl/default.nix @@ -1,5 +1,8 @@ -{ lib, stdenv, fetchurl, xercesc }: +{ lib, gccStdenv, fetchurl, xercesc }: +let + stdenv = gccStdenv; +in stdenv.mkDerivation rec { pname = "libcutl"; version = "1.10.0"; @@ -14,7 +17,6 @@ stdenv.mkDerivation rec { homepage = "https://codesynthesis.com/projects/libcutl/"; changelog = "https://git.codesynthesis.com/cgit/libcutl/libcutl/plain/NEWS?h=${version}"; platforms = platforms.all; - broken = stdenv.isDarwin; maintainers = with maintainers; [ ]; license = licenses.mit; }; diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/development/libraries/libffcall/default.nix index 07de21a4120..ebeb520a769 100644 --- a/pkgs/development/libraries/libffcall/default.nix +++ b/pkgs/development/libraries/libffcall/default.nix @@ -24,7 +24,5 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/libffcall/"; license = licenses.gpl2Plus; platforms = platforms.unix; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 59bfabefce7..63e0dae08a3 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -38,7 +38,6 @@ in stdenv.mkDerivation rec { # https://github.com/TokTok/c-toxcore/issues/2334 meta = with lib; { - broken = stdenv.isDarwin; description = "P2P FOSS instant messaging application aimed to replace Skype"; homepage = "https://tox.chat"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/muparserx/default.nix b/pkgs/development/libraries/muparserx/default.nix index c6b6c75c22d..2b3d2853d13 100644 --- a/pkgs/development/libraries/muparserx/default.nix +++ b/pkgs/development/libraries/muparserx/default.nix @@ -38,7 +38,5 @@ stdenv.mkDerivation rec { homepage = "https://beltoforion.de/en/muparserx/"; license = licenses.bsd2; maintainers = with maintainers; [ drewrisinger ]; - # selftest fails - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index fa60a4d3f9e..92e84fe1419 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -14,7 +14,7 @@ let else throw "Unsupported ROCm LLVM platform"; in stdenv.mkDerivation (finalAttrs: { pname = "rocm-device-libs"; - version = "5.4.3"; + version = "5.4.4"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/ocaml-modules/digestif/default.nix b/pkgs/development/ocaml-modules/digestif/default.nix index 75ecb7fc58f..4bdc9f2e5ca 100644 --- a/pkgs/development/ocaml-modules/digestif/default.nix +++ b/pkgs/development/ocaml-modules/digestif/default.nix @@ -1,22 +1,20 @@ { lib, ocaml, fetchurl, buildDunePackage -, pkg-config, which , eqaf , alcotest, astring, bos, findlib, fpath }: buildDunePackage rec { pname = "digestif"; - version = "1.1.2"; + version = "1.1.4"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/digestif/releases/download/v${version}/digestif-${version}.tbz"; - sha256 = "sha256-edNM5ROxFIV+OAqr328UcyGPGwXdflHQOJB3ntAbRmY="; + hash = "sha256-w3k+cg8NqAVPYobFRcghp/6+iC5/TlSX7ImxWjU1EeE="; }; - nativeBuildInputs = [ findlib which ocaml pkg-config ]; - propagatedBuildInputs = [ eqaf ]; checkInputs = [ alcotest astring bos fpath ]; diff --git a/pkgs/development/ocaml-modules/tezos-base58/default.nix b/pkgs/development/ocaml-modules/tezos-base58/default.nix index 9a3079fc0e7..1ed04a082d5 100644 --- a/pkgs/development/ocaml-modules/tezos-base58/default.nix +++ b/pkgs/development/ocaml-modules/tezos-base58/default.nix @@ -12,6 +12,7 @@ buildDunePackage rec { }; minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ zarith digestif fmt diff --git a/pkgs/development/python-modules/aioopenexchangerates/default.nix b/pkgs/development/python-modules/aioopenexchangerates/default.nix index 43a2fbe365e..3ca5f710882 100644 --- a/pkgs/development/python-modules/aioopenexchangerates/default.nix +++ b/pkgs/development/python-modules/aioopenexchangerates/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioopenexchangerates"; - version = "0.4.1"; + version = "0.4.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-JS134qjK2pT6KLD+91EmrA3HCNmF8DWcq71E/k9ULSA="; + hash = "sha256-Ykbw/s932XXX3qWutWUOLV1O9MMgBWPJNveKG8SDhWY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix index 942881583d3..c4e0d9c5aa4 100644 --- a/pkgs/development/python-modules/aiortm/default.nix +++ b/pkgs/development/python-modules/aiortm/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiortm"; - version = "0.6.2"; + version = "0.6.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = pname; rev = "v${version}"; - hash = "sha256-pfBJ5LWsG3HUGQF2IPMbVKv99xg+dqt17B8unmuv/Ww="; + hash = "sha256-9Ny1Xby2e1lyrDTZLd6UVASx8/kwjsq4ogMTSKryQqg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/asyncstdlib/default.nix b/pkgs/development/python-modules/asyncstdlib/default.nix index 608af2ac902..72c7293a117 100644 --- a/pkgs/development/python-modules/asyncstdlib/default.nix +++ b/pkgs/development/python-modules/asyncstdlib/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "asyncstdlib"; - version = "3.10.5"; + version = "3.10.6"; format = "flit"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "maxfischer2781"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ILb+iWg2xYWBEQY1a4jPITm4QCPO8qfVCPgO3YWIVAQ="; + hash = "sha256-JfKcmmusFmMckYc2+EBItt5V6o4Dk+foIv5hb7wMsHs="; }; propagatedBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library that extends the Python asyncio standard library"; homepage = "https://asyncstdlib.readthedocs.io/"; + changelog = "https://github.com/maxfischer2781/asyncstdlib/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 4968c5b28f8..613b825beba 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "dash"; - version = "2.8.1"; + version = "2.9.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "plotly"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6FsLvLsqnkSt/i27q/JJGfNh2zxKeA0t6VYNPCzhR0w="; + hash = "sha256-bxWSYDKKnsWs/bTRkIsNJ2hOIoHS2xhl4IIW+uEnbMU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/laspy/default.nix b/pkgs/development/python-modules/laspy/default.nix new file mode 100644 index 00000000000..2907e61b9d8 --- /dev/null +++ b/pkgs/development/python-modules/laspy/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, laszip +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "laspy"; + version = "2.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-Wdbp6kjuZkJh+pp9OVczdsRNgn41/Tdt7nGFvewcQ1w="; + }; + + propagatedBuildInputs = [ + numpy + laszip + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "laspy" "laszip" ]; + + meta = with lib; { + description = "Interface for reading/modifying/creating .LAS LIDAR files"; + homepage = "https://github.com/laspy/laspy"; + license = licenses.bsd2; + maintainers = with maintainers; [ matthewcroughan ]; + }; +} diff --git a/pkgs/development/python-modules/laszip/default.nix b/pkgs/development/python-modules/laszip/default.nix new file mode 100644 index 00000000000..cefd2d5f6e1 --- /dev/null +++ b/pkgs/development/python-modules/laszip/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, scikit-build-core +, distlib +, pytestCheckHook +, pyproject-metadata +, pathspec +, pybind11 +, cmake +, LASzip +}: + +buildPythonPackage rec { + pname = "laszip-python"; + version = "0.2.1"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "tmontaigu"; + repo = pname; + rev = version; + sha256 = "sha256-ujKoUm2Btu25T7ZrSGqjRc3NR1qqsQU8OwHQDSx8grY="; + }; + + nativeBuildInputs = [ + scikit-build-core + scikit-build-core.optional-dependencies.pyproject + cmake + ]; + + buildInputs = [ + pybind11 + LASzip + ]; + + checkInputs = [ + pytestCheckHook + ]; + + preBuild = '' + cd .. + ''; + + # There are no tests + doCheck = false; + + pythonImportsCheck = [ "laszip" ]; + + meta = with lib; { + description = "Unofficial bindings between Python and LASzip made using pybind11"; + homepage = "https://github.com/tmontaigu/laszip-python"; + license = licenses.mit; + maintainers = with maintainers; [ matthewcroughan ]; + }; +} + diff --git a/pkgs/development/python-modules/pygments/default.nix b/pkgs/development/python-modules/pygments/default.nix index 5015acb03f3..f3bcafff799 100644 --- a/pkgs/development/python-modules/pygments/default.nix +++ b/pkgs/development/python-modules/pygments/default.nix @@ -44,6 +44,7 @@ let pygments = buildPythonPackage meta = with lib; { homepage = "https://pygments.org/"; description = "A generic syntax highlighter"; + mainProgram = "pygmentize"; license = licenses.bsd2; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/sendgrid/default.nix b/pkgs/development/python-modules/sendgrid/default.nix index 37e7ea9d985..6f3e9914243 100644 --- a/pkgs/development/python-modules/sendgrid/default.nix +++ b/pkgs/development/python-modules/sendgrid/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "sendgrid"; - version = "6.9.7"; + version = "6.10.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = "sendgrid-python"; - rev = version; - hash = "sha256-Lx84jmgJz/J5MJtJyqDTVIbN6H63gD2rkJrdNeojd08="; + rev = "refs/tags/${version}"; + hash = "sha256-/un/m4Br0Ylk00fS/U+QKeXwM1Ix5TFedaPhCyScWvs="; }; propagatedBuildInputs = [ @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for SendGrid"; homepage = "https://github.com/sendgrid/sendgrid-python"; + changelog = "https://github.com/sendgrid/sendgrid-python/blob/${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix index eceeb7d929a..e0675662ece 100644 --- a/pkgs/development/python-modules/timezonefinder/default.nix +++ b/pkgs/development/python-modules/timezonefinder/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "timezonefinder"; - version = "6.1.9"; + version = "6.1.10"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "jannikmi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-A5s1npvgJGp6SvIqoXGRmFN3iE0pqMUl1ZTi07ix5b0="; + hash = "sha256-mmHSN78Gzt2nKX8ypsSzNqvYwM3uu6o72vMrqqdhXwk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 7459a398145..7b0e1f01f84 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "7.16.5"; + version = "7.17.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-Z/A+NcB/LpzF3JtdDA7+h0scjGWOiYx5fwAZTuyfdug="; + hash = "sha256-14agJq7+fuQXqFDS8qfCj45XW/v3CekKmC5TA/5+eTk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/twitterapi/default.nix b/pkgs/development/python-modules/twitterapi/default.nix index 7b9f82cd6c5..72185f243be 100644 --- a/pkgs/development/python-modules/twitterapi/default.nix +++ b/pkgs/development/python-modules/twitterapi/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "twitterapi"; - version = "2.8.1"; + version = "2.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "geduldig"; repo = "TwitterAPI"; - rev = "v${version}"; - hash = "sha256-aBL7k10kZNQG/wNIxO37TbDSlbhrVjTfv2aXcrS2Ibo="; + rev = "refs/tags/v${version}"; + hash = "sha256-4Z8XfgRhQXawCvaXM+kyMO3fejvXIF2LgVdmfXDDqIA="; }; propagatedBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for Twitter's REST and Streaming APIs"; homepage = "https://github.com/geduldig/TwitterAPI"; + changelog = "https://github.com/geduldig/TwitterAPI/blob/v${version}/CHANGE.log"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/vehicle/default.nix b/pkgs/development/python-modules/vehicle/default.nix index 301675878f5..442b59b6ca7 100644 --- a/pkgs/development/python-modules/vehicle/default.nix +++ b/pkgs/development/python-modules/vehicle/default.nix @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "vehicle"; - version = "0.4.0"; + version = "1.0.0"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "frenck"; repo = "python-vehicle"; - rev = "v${version}"; - hash = "sha256-dvSdYrONUEe+bdZ+9nALrOQ6gJwq9e1dLvuq08xP5tQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-7WW/gEtS4KLcAujQ+pypDpk9VaacMWj/RP7OpLxUrDs="; }; nativeBuildInputs = [ @@ -55,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client providing RDW vehicle information"; homepage = "https://github.com/frenck/python-vehicle"; + changelog = "https://github.com/frenck/python-vehicle/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index 7184a901725..85179feff1a 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "vowpalwabbit"; - version = "9.7.0"; + version = "9.8.0"; src = fetchPypi{ inherit pname version; - hash = "sha256-O3WnG3JQ7CEHMPYTmE9pgnS8YZs717P6wBKBnXIvvFI="; + hash = "sha256-s2q9K2tuILQATSjUKXe/hYdQW84bSIHwh/gfWM0/NTM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/build-managers/scons/common.nix b/pkgs/development/tools/build-managers/scons/common.nix index da276be7287..5b0aff8072c 100644 --- a/pkgs/development/tools/build-managers/scons/common.nix +++ b/pkgs/development/tools/build-managers/scons/common.nix @@ -7,12 +7,20 @@ python.pkgs.buildPythonApplication rec { inherit version; src = fetchurl { - url = "mirror://sourceforge/scons/${pname}-${version}.tar.gz"; + url = + if lib.versionAtLeast version "4.3.0" then + "mirror://sourceforge/project/scons/scons/${version}/SCons-${version}.tar.gz" + else + "mirror://sourceforge/scons/scons-${version}.tar.gz"; inherit sha256; }; setupHook = ./setup-hook.sh; + patches = lib.optionals (lib.versionAtLeast version "4.3.0") [ + ./env.patch + ]; + postPatch = lib.optionalString (lib.versionAtLeast version "4.0.0") '' substituteInPlace setup.cfg \ --replace "build/dist" "dist" diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index b0d6085250d..f338d346a70 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -9,8 +9,12 @@ in { version = "3.1.2"; sha256 = "1yzq2gg9zwz9rvfn42v5jzl3g4qf1khhny6zfbi2hib55zvg60bq"; }); - scons_latest = mkScons { + scons_4_1_0 = mkScons { version = "4.1.0"; sha256 = "11axk03142ziax6i3wwy9qpqp7r3i7h5jg9y2xzph9i15rv8vlkj"; }; + scons_latest = mkScons { + version = "4.5.2"; + sha256 = "sha256-ziaqyV01CnmkGSGWsL6sPLJPTMq84BI+so0zcPV28HI="; + }; } diff --git a/pkgs/development/tools/build-managers/scons/env.patch b/pkgs/development/tools/build-managers/scons/env.patch new file mode 100644 index 00000000000..95615016aed --- /dev/null +++ b/pkgs/development/tools/build-managers/scons/env.patch @@ -0,0 +1,9 @@ +diff --git a/SCons/Platform/posix.py b/SCons/Platform/posix.py +index 4c9f8f9ba..d68da1b08 100644 +--- a/SCons/Platform/posix.py ++++ b/SCons/Platform/posix.py +@@ -30,0 +31 @@ selection method. ++import os +@@ -87 +88 @@ def generate(env): +- env['ENV']['PATH'] = '/usr/local/bin:/opt/bin:/bin:/usr/bin:/snap/bin' ++ env['ENV']['PATH'] = os.environ["PATH"] diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 777c9c1689c..0bdca8889e8 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "2.0.1"; + version = "2.0.2"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-aEM+kQoqF2p9oSqh/qqwyw8BDSM2qvcDjGc6qD2e0Bg="; + hash = "sha256-iutlsB+qZ9/ix/UUnHspppsbiXclolXNcbiTChz3tQk="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/djhtml/default.nix b/pkgs/development/tools/djhtml/default.nix new file mode 100644 index 00000000000..a014c9722f2 --- /dev/null +++ b/pkgs/development/tools/djhtml/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, pythonOlder +}: +buildPythonApplication rec { + pname = "djhtml"; + version = "3.0.5"; + + format = "setuptools"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "rtts"; + repo = pname; + rev = version; + hash = "sha256-m13lw1x+URAYuDc0gXRIxfRnd6kQxeAuLDqYXeOgQE0="; + }; + + pythonImportsCheck = [ "djhtml" ]; + + meta = with lib; { + homepage = "https://github.com/rtts/djhtml"; + description = "Django/Jinja template indenter"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ thubrecht ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-insta/default.nix b/pkgs/development/tools/rust/cargo-insta/default.nix index 8c1b6d4a651..7c74eef89b7 100644 --- a/pkgs/development/tools/rust/cargo-insta/default.nix +++ b/pkgs/development/tools/rust/cargo-insta/default.nix @@ -1,34 +1,28 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub -, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-insta"; - version = "1.28.0"; + version = "1.29.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "insta"; rev = "refs/tags/${version}"; - hash = "sha256-GqM3b2evjACNkTOyfA6N6TInuGo9f/1retkXVTgbJ3A="; + hash = "sha256-3fN7otTIAdn7Bs96IaboxY0DG381AjCV/KsDzv8xng8="; }; sourceRoot = "source/cargo-insta"; - cargoHash = "sha256-ZIS3O19N7w+sL+2IdoCw4/Hx9Jtjx7MYE7JcEu+PFRA="; - - buildInputs = lib.optionals stdenv.isDarwin [ - libiconv - ]; + cargoHash = "sha256-zxf70F3x8eydQuUrrdoQljvmmTzS6ytxVlbHOCepxFg="; meta = with lib; { description = "A Cargo subcommand for snapshot testing"; homepage = "https://github.com/mitsuhiko/insta"; changelog = "https://github.com/mitsuhiko/insta/blob/${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with lib.maintainers; [ oxalica ]; + maintainers = with lib.maintainers; [ figsoda oxalica ]; }; } diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index d0a6665dcbd..f37475d454e 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2023-03-13"; - cargoSha256 = "sha256-dyQpgh+htNQDa8voj6NormTw2TmnlId6iS6cQ2LEB/U="; + version = "2023-03-20"; + cargoSha256 = "sha256-2r9Z3nzHENonhR3CmQ8ofm5Qa7g7FqLy5pTbhNCSaZE="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-3DHDfYCLn0clUXoUPqU5FjJFDkiqff7zMhIRHh3QU2M="; + sha256 = "sha256-TnMPQPXDXLGLJu5PvEMglPidrtxH89P9dj/YmWc5JiQ="; }; auditable = true; # TODO: remove when this is the default diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index 1e7fb07131b..ae15331db1f 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "atlassian-jira"; - version = "9.4.0"; + version = "9.6.0"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "sha256-PParjwX7/7kMd8nMn50Shpur8+f0TTEgeSn85B3BrsI="; + sha256 = "sha256-J4AT8fmSFVR45wyxDKZ3QgDyc5yz5TiJbEGFbfJB/Zo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 5bc102caa61..004aa72c7cb 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.3627"; + version = "0.20.3670"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-enyxUGfS7nzy4Ej+raPbhUc+WJJQL5J3i8WhoVsYBDwlcfW0kXjljhipPqkW4bONTRKL3zLI4HbaHEW1t/Ca/g=="; + hash = "sha512-n+dZ5YsluZK45QCHcc2leFwfBEUXHvlAC9LBni5L+lDmNVNkH4Qz+nbJHOiK/WNeTn6aAUADhGk6vUJoaFUqEQ=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/servers/jackett/deps.nix b/pkgs/servers/jackett/deps.nix index 66a88ea2bbd..7926aac57b4 100644 --- a/pkgs/servers/jackett/deps.nix +++ b/pkgs/servers/jackett/deps.nix @@ -11,7 +11,7 @@ (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; }) (fetchNuGet { pname = "coverlet.msbuild"; version = "3.2.0"; sha256 = "0lyw70xgri3jqxzd06s077p8wymislljsyrsyn081pb0xc20vd00"; }) (fetchNuGet { pname = "DotNet4.SocksProxy"; version = "1.4.0.1"; sha256 = "1ig2a9ism041a6qrqkxa9xhvp19yxzcadlap5i1kz97f05a2msvb"; }) - (fetchNuGet { pname = "FlareSolverrSharp"; version = "3.0.4"; sha256 = "01y17xdijgdivzxmk9a4c3h5mzqbimiyrd8knpb0sr4wzbms5m3k"; }) + (fetchNuGet { pname = "FlareSolverrSharp"; version = "3.0.5"; sha256 = "1pv07ka068mfvsx5vix0p4mm4950z94iqqdp1znq03j2zp03ja14"; }) (fetchNuGet { pname = "FluentAssertions"; version = "6.8.0"; sha256 = "102977059vkllkr1pg43kcmgvlf9jm1bpmdkq4hx4ljrn1wflwnb"; }) (fetchNuGet { pname = "Microsoft.AspNetCore"; version = "2.2.0"; sha256 = "0vsv7hcsmnsgqhs67zp207n7m9ix3dbwm1p2ch3dizkcdvz235f9"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Antiforgery"; version = "2.2.0"; sha256 = "026wjdwjx0lgccqv0xi5gxylxzgz5ifgxf25p5pqakgrhkz0a59l"; }) diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 3be8eb51a7e..8cfd5413dd4 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2023-02-20"; + version = "unstable-2023-03-15"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "848a78d1a548cfe28af20d5d0ab021558368cfae"; - sha256 = "sha256-pSuGNBvLBJ64pm4hECign2FhtAPx6xnXlhCa2eFzrwE="; + rev = "c54d83c9f134d47f00da5ecd0d762e01748aaa59"; + sha256 = "sha256-zPK1dzUFLQmno4A7jEStininVcYpUh0WAFjlAqnTLS0="; }; sourceRoot = "source/klippy"; diff --git a/pkgs/tools/admin/daemontools/default.nix b/pkgs/tools/admin/daemontools/default.nix index f827b1c71a0..07830d6fe68 100644 --- a/pkgs/tools/admin/daemontools/default.nix +++ b/pkgs/tools/admin/daemontools/default.nix @@ -46,6 +46,10 @@ stdenv.mkDerivation rec { tar -xz --strip-components=2 -f ${man-pages} installManPage daemontools-man/*.8 install -v -Dm644 daemontools-man/README $man/share/doc/daemontools/README.man + # fix svscanboot + sed -i "s_/command/__" "$out/bin/svscanboot" + sed -i "s_/service_/var/service_g" "$out/bin/svscanboot" + sed -i "s_^PATH=.*_PATH=$out/bin:\$PATH_" "$out/bin/svscanboot" ''; # Keep README.man in the man output (see _multioutDocs()) diff --git a/pkgs/tools/audio/dir2opus/default.nix b/pkgs/tools/audio/dir2opus/default.nix deleted file mode 100644 index c9729fa43d8..00000000000 --- a/pkgs/tools/audio/dir2opus/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, python, mutagen, wrapPython, opusTools, mpg123 }: - -let version = "0.12.2"; in -stdenv.mkDerivation rec { - pname = "dir2opus"; - inherit version; - - pythonPath = [ mutagen ]; - buildInputs = [ wrapPython ]; - propagatedBuildInputs = [ opusTools mpg123 ]; - - src = fetchFromGitHub { - owner = "ehmry"; - repo = "dir2opus"; - rev = version; - hash = "sha256-ZEsXwqxikWxFOz99wTI3rEK/rEYA+BSWGrCwW4q+FFc="; - }; - - postPatch = "sed -i -e 's|#!/usr/bin/python|#!${python}/bin/python|' dir2opus"; - - installPhase = - '' - mkdir -p $out/bin $out/share/man/man1 - cp dir2opus $out/bin - cp dir2opus.1 $out/share/man/man1 - ''; - - postFixup = "wrapPythonPrograms"; - - meta = with lib; { - homepage = "https://github.com/ehmry/dir2opus"; - maintainers = [ maintainers.ehmry ]; - license = licenses.gpl2; - platforms = platforms.unix; - }; -} diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index f21c6d779e6..42d1d1a6126 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.20.2"; + version = "1.21.1"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-TSaHngDLD2Tit4ixFDT2OhoqLGMIXj5rgxLwX06nHNw="; + hash = "sha256-Tlup1A/CI2nb3d/TwgYPx0X0/JTkA27MXVaCMB2ZPoo="; }; - cargoHash = "sha256-66iEMcgd3Tx6134ggqckOf61RMn/w5x2a61Dlfs1GUc="; + cargoHash = "sha256-IAz33uXtJUx/PZ7umGWj5BqdROpujJ2tzkMgrdFOoU4="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/misc/fetch-scm/default.nix b/pkgs/tools/misc/fetch-scm/default.nix index cd8026c1929..3e8a3e63e80 100644 --- a/pkgs/tools/misc/fetch-scm/default.nix +++ b/pkgs/tools/misc/fetch-scm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fetch-scm"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "KikyTokamuro"; repo = "fetch.scm"; rev = "v${version}"; - sha256 = "sha256-H89VCNAYnTwVEqyInATvLHIB7ioe2zvIGTAM2MUo7+g="; + sha256 = "sha256-WdYi8EVxQ6xPtld8JyZlUmgpxroevBehtkRANovMh2E="; }; dontBuild = true; diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index 07db2334d9f..d3436cffe37 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { pname = "ipxe"; - version = "unstable-2023-03-07"; + version = "unstable-2023-03-15"; nativeBuildInputs = [ gnu-efi mtools openssl perl xorriso xz ] ++ lib.optional stdenv.hostPlatform.isx86 syslinux; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ipxe"; repo = "ipxe"; - rev = "9e1f7a3659071004f4b8c76f2593da6287f0d575"; - sha256 = "a9YvF/oGnZ/GuBDfWj/Uh6ozY0sTztlCqEMk//lb5Lo="; + rev = "09e8a154084c57311463408e3f2e412c305a9638"; + sha256 = "pAZs3CyFPH1tiMo3Te2DN3lahzmNTX9kqNvfZLDF6BQ="; }; postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' diff --git a/pkgs/tools/misc/jfrog-cli/default.nix b/pkgs/tools/misc/jfrog-cli/default.nix index d0779138088..96a812986f0 100644 --- a/pkgs/tools/misc/jfrog-cli/default.nix +++ b/pkgs/tools/misc/jfrog-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "jfrog-cli"; - version = "2.34.6"; - vendorHash = "sha256-EhdE94djk/Or5K4BZtJ3NPNPWt5lODV10zgYWfZ/4OI="; + version = "2.35.0"; + vendorHash = "sha256-vOYfm6V1SyfhT7gX/Nk01hD/Txwh5UXCorzi6Jfl9I8="; src = fetchFromGitHub { owner = "jfrog"; repo = "jfrog-cli"; rev = "v${version}"; - sha256 = "sha256-d2kEl2zT0vlcjii5V54oWE1TIKPPEUuCbvrrjPMme3E="; + sha256 = "sha256-kaPGVNS+h+kZjG7+GupRxn6ypUfIU4BefPEl6QNA4cE="; }; postInstall = '' diff --git a/pkgs/tools/networking/proxify/default.nix b/pkgs/tools/networking/proxify/default.nix index b5697da280f..17ba57f3cd7 100644 --- a/pkgs/tools/networking/proxify/default.nix +++ b/pkgs/tools/networking/proxify/default.nix @@ -1,20 +1,20 @@ -{ buildGoModule +{ lib +, buildGoModule , fetchFromGitHub -, lib }: buildGoModule rec { pname = "proxify"; - version = "0.0.8"; + version = "0.0.9"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "proxify"; - rev = "v${version}"; - sha256 = "sha256-0zXWW6U+x9W+fMsvYTfWRdoftsQCp2JXXkfbqS63Svk="; + rev = "refs/tags/v${version}"; + hash = "sha256-InHo5nfgCLDxciwjaB9tamV6MGEM3DlRGU00Ng2SfVY="; }; - vendorSha256 = "sha256-OldZyaPROtnPZPczFjn+kl61TI5zco/gM2MuPn2gYjo="; + vendorHash = "sha256-GPkxUU9HXLWnj+qjee/CuSE683l2V22cH9KBP2ssaXc="; meta = with lib; { description = "Proxy tool for HTTP/HTTPS traffic capture"; @@ -25,6 +25,7 @@ buildGoModule rec { domain name) into other tools by simply setting the upstream proxy to proxify. ''; homepage = "https://github.com/projectdiscovery/proxify"; + changelog = "https://github.com/projectdiscovery/proxify/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/tools/security/govulncheck/default.nix b/pkgs/tools/security/govulncheck/default.nix index d0523a5d58e..bb62c0e1756 100644 --- a/pkgs/tools/security/govulncheck/default.nix +++ b/pkgs/tools/security/govulncheck/default.nix @@ -1,17 +1,17 @@ { lib, buildGoModule, fetchFromGitHub }: -buildGoModule rec { +buildGoModule { pname = "govulncheck"; - version = "unstable-2023-02-17"; + version = "unstable-2023-03-22"; src = fetchFromGitHub { owner = "golang"; repo = "vuln"; - rev = "b91abcc5ae3c412965b4c8131c4373040c69e1b7"; - sha256 = "sha256-DYeG7SbjoH7rLD+Q0/5VC85bT2x7YxB4tAj1wmHkI4A="; + rev = "f2d9b5a6e023e7cd80347eb7ebca02ae19b28903"; + sha256 = "sha256-zaeCEgFlv3Oxm4dIT/Evevww05JYEecekXO9UtIKLkU="; }; - vendorSha256 = "sha256-+luU71QHNs7xxXQOLtd+Ka8+ETv5sA+gv+4g7Ogm5TI="; + vendorSha256 = "sha256-RxdiZ3NN+EWVCiBPI0VIDuRI1/h4rnU4KCNn2WwZL7Q="; subPackages = [ "cmd/govulncheck" ]; @@ -27,9 +27,9 @@ buildGoModule rec { # - tries to builds govulncheck again rm cmd/govulncheck/main_command_118_test.go # - does go builds of example go files - rm vulncheck/binary_test.go + rm internal/vulncheck/binary_test.go # - just have resolution issues - rm vulncheck/{source,vulncheck}_test.go + rm internal/vulncheck/{source,vulncheck}_test.go rm internal/govulncheck/callstacks_test.go ''; @@ -61,6 +61,6 @@ buildGoModule rec { reported for a Linux build. ''; license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ jk ]; + maintainers = with maintainers; [ jk SuperSandro2000 ]; }; } diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/tools/text/link-grammar/default.nix index 28cd894393e..0406c41d1a8 100644 --- a/pkgs/tools/text/link-grammar/default.nix +++ b/pkgs/tools/text/link-grammar/default.nix @@ -54,7 +54,6 @@ link-grammar = stdenv.mkDerivation rec { }; meta = with lib; { - broken = stdenv.isDarwin; description = "A Grammar Checking library"; homepage = "https://www.abisource.com/projects/link-grammar/"; changelog = "https://github.com/opencog/link-grammar/blob/link-grammar-${version}/ChangeLog"; diff --git a/pkgs/tools/text/mdbook-katex/default.nix b/pkgs/tools/text/mdbook-katex/default.nix index 40999bc71eb..37fa39c5fb2 100644 --- a/pkgs/tools/text/mdbook-katex/default.nix +++ b/pkgs/tools/text/mdbook-katex/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-katex"; - version = "0.3.10"; + version = "0.3.11"; src = fetchCrate { inherit pname version; - hash = "sha256-oGefjf4URmE0i6mOjpZfBcSh280O+IvrAhu3vFAyntQ="; + hash = "sha256-TeMB0+XjFSVg0kEV+uN7o0gc3PapkOAe+AI5AfcwczE="; }; - cargoHash = "sha256-tkMdxkJcvmDSH2ree1nol1JlKKhI5G4x9x5Hs0peKI8="; + cargoHash = "sha256-eu2B+YtSTwehU0bIRI1favDyLdth845xfi+y+jP40Hc="; OPENSSL_DIR = "${lib.getDev openssl}"; OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b21efbb40b..8b728f0c4f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -494,6 +494,8 @@ with pkgs; dinghy = with python3Packages; toPythonApplication dinghy; + djhtml = callPackage ../development/tools/djhtml { }; + deadcode = callPackage ../development/tools/deadcode { }; deadnix = callPackage ../development/tools/deadnix { }; @@ -6701,10 +6703,6 @@ with pkgs; diffutils = callPackage ../tools/text/diffutils { }; - dir2opus = callPackage ../tools/audio/dir2opus { - inherit (python2Packages) mutagen python wrapPython; - }; - dsp = callPackage ../tools/audio/dsp { }; dirdiff = callPackage ../tools/text/dirdiff { @@ -18795,7 +18793,7 @@ with pkgs; semantik = libsForQt5.callPackage ../applications/office/semantik { }; sconsPackages = dontRecurseIntoAttrs (callPackage ../development/tools/build-managers/scons { }); - scons = sconsPackages.scons_latest; + scons = sconsPackages.scons_4_1_0; mill = callPackage ../development/tools/build-managers/mill { }; @@ -29801,9 +29799,9 @@ with pkgs; ganttproject-bin = callPackage ../applications/misc/ganttproject-bin { }; - gaucheBootstrap = callPackage ../development/interpreters/gauche/boot.nix { }; + gaucheBootstrap = darwin.apple_sdk_11_0.callPackage ../development/interpreters/gauche/boot.nix { }; - gauche = callPackage ../development/interpreters/gauche { }; + gauche = darwin.apple_sdk_11_0.callPackage ../development/interpreters/gauche { }; gazelle-origin = python3Packages.callPackage ../tools/misc/gazelle-origin { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7ed831a95ad..1085080f0cb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5309,6 +5309,10 @@ self: super: with self; { larynx-train = callPackage ../development/python-modules/larynx-train { }; + laspy = callPackage ../development/python-modules/laspy { }; + + laszip = callPackage ../development/python-modules/laszip { }; + latexcodec = callPackage ../development/python-modules/latexcodec { }; latexify-py = callPackage ../development/python-modules/latexify-py { };