diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2e2689ad3641..f12546d56d0e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2742,6 +2742,16 @@ githubId = 16895361; name = "Deniz Alp Durmaz"; }; + DAlperin = { + email = "git@dov.dev"; + github = "DAlperin"; + githubId = 16063713; + name = "Dov Alperin"; + keys = [{ + longkeyid = "rsa3072/0x7F2C07B91B52BB61"; + fingerprint = "4EED 5096 B925 86FA 1101 6673 7F2C 07B9 1B52 BB61"; + }]; + }; DamienCassou = { email = "damien@cassou.me"; github = "DamienCassou"; diff --git a/nixos/modules/config/xdg/icons.nix b/nixos/modules/config/xdg/icons.nix index c83fdc251ef0..1e91670cf03b 100644 --- a/nixos/modules/config/xdg/icons.nix +++ b/nixos/modules/config/xdg/icons.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, lib, pkgs, ... }: with lib; { @@ -23,6 +23,12 @@ with lib; "/share/pixmaps" ]; + environment.systemPackages = [ + # Empty icon theme that contains index.theme file describing directories + # where toolkits should look for icons installed by apps. + pkgs.hicolor-icon-theme + ]; + # libXcursor looks for cursors in XCURSOR_PATH # it mostly follows the spec for icons # See: https://www.x.org/releases/current/doc/man/man3/Xcursor.3.xhtml Themes diff --git a/nixos/modules/services/security/privacyidea.nix b/nixos/modules/services/security/privacyidea.nix index b8e2d9a8b0df..c1617348fb01 100644 --- a/nixos/modules/services/security/privacyidea.nix +++ b/nixos/modules/services/security/privacyidea.nix @@ -6,7 +6,7 @@ let cfg = config.services.privacyidea; opt = options.services.privacyidea; - uwsgi = pkgs.uwsgi.override { plugins = [ "python3" ]; }; + uwsgi = pkgs.uwsgi.override { plugins = [ "python3" ]; python3 = pkgs.python39; }; python = uwsgi.python3; penv = python.withPackages (const [ pkgs.privacyidea ]); logCfg = pkgs.writeText "privacyidea-log.cfg" '' diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index e7e626c66f02..ff9d08ea9970 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -189,7 +189,6 @@ in Note that this should be a last resort; patching the package is preferred (see GPaste). ''; - apply = list: list ++ [ pkgs.gnome.gnome-shell pkgs.gnome.gnome-shell-extensions ]; }; favoriteAppsOverride = mkOption { @@ -367,6 +366,10 @@ in services.upower.enable = config.powerManagement.enable; services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center + # Explicitly enabled since GNOME will be severely broken without these. + xdg.mime.enable = true; + xdg.icons.enable = true; + xdg.portal.enable = true; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gnome @@ -400,6 +403,18 @@ in }) (mkIf serviceCfg.core-shell.enable { + services.xserver.desktopManager.gnome.sessionPath = + let + mandatoryPackages = [ + pkgs.gnome.gnome-shell + ]; + optionalPackages = [ + pkgs.gnome.gnome-shell-extensions + ]; + in + mandatoryPackages + ++ utils.removePackagesByName optionalPackages config.environment.gnome.excludePackages; + services.colord.enable = mkDefault true; services.gnome.chrome-gnome-shell.enable = mkDefault true; services.gnome.glib-networking.enable = true; @@ -452,26 +467,31 @@ in ]; # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-shell.bst - environment.systemPackages = with pkgs.gnome; [ - adwaita-icon-theme - nixos-background-info - gnome-backgrounds - gnome-bluetooth - gnome-color-manager - gnome-control-center - gnome-shell - gnome-shell-extensions - gnome-themes-extra - pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in. - pkgs.gnome-user-docs - pkgs.orca - pkgs.glib # for gsettings - pkgs.gnome-menus - pkgs.gtk3.out # for gtk-launch - pkgs.hicolor-icon-theme - pkgs.shared-mime-info # for update-mime-database - pkgs.xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ - ]; + environment.systemPackages = + let + mandatoryPackages = with pkgs.gnome; [ + gnome-shell + ]; + optionalPackages = with pkgs.gnome; [ + adwaita-icon-theme + nixos-background-info + gnome-backgrounds + gnome-bluetooth + gnome-color-manager + gnome-control-center + gnome-shell-extensions + gnome-themes-extra + pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in. + pkgs.gnome-user-docs + pkgs.orca + pkgs.glib # for gsettings program + pkgs.gnome-menus + pkgs.gtk3.out # for gtk-launch program + pkgs.xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ + ]; + in + mandatoryPackages + ++ utils.removePackagesByName optionalPackages config.environment.gnome.excludePackages; }) # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-utilities.bst diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index d89364280795..84312cf4c917 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -82,13 +82,13 @@ let in python3'.pkgs.buildPythonPackage rec { pname = "privacyIDEA"; - version = "3.7.1"; + version = "3.7.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-c5pWbBaOFQd7z3BvtYgrnZBiknLBDCE6So76Q68AptA="; + sha256 = "sha256-bjMw69nKecv87nwsLfb4+h677WjZlkVcIpVe53AI9WU="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index f661e64bac7f..82a76eb00760 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "103.0.5060.53", - "sha256": "00di0nw6h3kb0qp2wp3ny3zsar1ayn1lyx5zr28dl1h5cwaaxjqf", - "sha256bin64": "19wxd4jl6fyjpcpy2331ckz6dgzrfj52wvdkp0kb18n0sym17fyn", + "version": "103.0.5060.114", + "sha256": "0rarcd2q1ggl10cw3vwjk7j9aka7i129a0qv8qr7751vy083as3p", + "sha256bin64": "1qxbnnnq0miizazprwynvxxvgaaw9dd9y7bssybvmga3g2c00fk9", "deps": { "gn": { "version": "2022-05-11", @@ -12,10 +12,10 @@ } }, "chromedriver": { - "version": "103.0.5060.24", - "sha256_linux": "0snsv9n9db314adrr7hhcf49mgrkak6bvq84q9l5yvpl8ihvd0xr", - "sha256_darwin": "1rdai2vvnj7156lbbg0zambcz638hq7a3i9npbmlsl826l61m8wm", - "sha256_darwin_aarch64": "15f5q9fdqa63mb9yjm4dql69fh6w85f0xj428sv4grfhrn8w0bh3" + "version": "103.0.5060.53", + "sha256_linux": "1gpxfrqf2wm2c76701rnw0h5ppmaqzf5ygcrasj1mmwjsfk49v5d", + "sha256_darwin": "03ibi0ybr3mmk02mmn6dp7ygjn7c9wwvahbhm2syh0fhxyyxmf0p", + "sha256_darwin_aarch64": "13bb2ai32b1q4lvyhcgp5315zzxwbi6609xxb67h7h3i3rb2yhcd" } }, "beta": { @@ -45,9 +45,9 @@ } }, "ungoogled-chromium": { - "version": "103.0.5060.53", - "sha256": "00di0nw6h3kb0qp2wp3ny3zsar1ayn1lyx5zr28dl1h5cwaaxjqf", - "sha256bin64": "19wxd4jl6fyjpcpy2331ckz6dgzrfj52wvdkp0kb18n0sym17fyn", + "version": "103.0.5060.114", + "sha256": "0rarcd2q1ggl10cw3vwjk7j9aka7i129a0qv8qr7751vy083as3p", + "sha256bin64": "1qxbnnnq0miizazprwynvxxvgaaw9dd9y7bssybvmga3g2c00fk9", "deps": { "gn": { "version": "2022-05-11", @@ -56,8 +56,8 @@ "sha256": "03dqfrdpf5xxl64dby3qmbwpzdq2gsa8g7xl438py3a629rgxg63" }, "ungoogled-patches": { - "rev": "103.0.5060.53-1", - "sha256": "1g5ciwzrhg9g13gvhrwqf19djk9jhj1d6nx2f6a8d5ch1mhi2z8s" + "rev": "103.0.5060.114-1", + "sha256": "11i7d480q21vcd9p14rc7rb408xwlg2nkj88dq0sfj2rz60lzy0a" } } } diff --git a/pkgs/applications/networking/powerdns-admin/default.nix b/pkgs/applications/networking/powerdns-admin/default.nix index 82d011281fe6..81195c4e212b 100644 --- a/pkgs/applications/networking/powerdns-admin/default.nix +++ b/pkgs/applications/networking/powerdns-admin/default.nix @@ -1,27 +1,16 @@ { lib, stdenv, fetchFromGitHub, mkYarnPackage, nixosTests, writeText, python3 }: let - version = "0.2.4"; + version = "0.3.0"; src = fetchFromGitHub { owner = "ngoduykhanh"; repo = "PowerDNS-Admin"; rev = "v${version}"; - sha256 = "sha256-xJ0NNnDVwGl+t9q1INPhCxcTmQayYBYdjEG0PbPCI9E="; + hash = "sha256-e11u0jdJr+2TDXvBAPlDfnuuDwSfBq+JtvnDUTNKp/c="; }; python = python3.override { packageOverrides = self: super: { - dnspython = super.dnspython.overridePythonAttrs (oldAttrs: rec { - version = "1.16.0"; - src = oldAttrs.src.override { - inherit version; - extension = "zip"; - sha256 = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01"; - }; - # Needs networking for some tests - doCheck = false; - }); - # The bravado-core dependency is incompatible with jschonschema 4.0: # https://github.com/Yelp/bravado-core/pull/385 jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec { @@ -43,8 +32,8 @@ let flask flask_assets flask_login flask_sqlalchemy flask_migrate flask-seasurf flask_mail flask-session flask-sslify mysqlclient psycopg2 sqlalchemy cffi configobj cryptography bcrypt requests ldap pyotp qrcode dnspython - gunicorn python3-saml pyopenssl pytz cssmin jsmin authlib bravado-core - lima pytimeparse pyyaml + gunicorn python3-saml pytz cssmin rjsmin authlib bravado-core + lima pytimeparse pyyaml jinja2 itsdangerous werkzeug ]; assets = mkYarnPackage { diff --git a/pkgs/applications/networking/powerdns-admin/package.json b/pkgs/applications/networking/powerdns-admin/package.json index 84f495920744..21119525d434 100644 --- a/pkgs/applications/networking/powerdns-admin/package.json +++ b/pkgs/applications/networking/powerdns-admin/package.json @@ -2,6 +2,7 @@ "dependencies": { "admin-lte": "2.4.9", "bootstrap": "^3.4.1", + "bootstrap-datepicker": "^1.8.0", "bootstrap-validator": "^0.11.9", "datatables.net-plugins": "^1.10.19", "icheck": "^1.0.2", @@ -12,5 +13,5 @@ "multiselect": "^0.9.12" }, "name": "powerdns-admin-assets", - "version": "0.2.4" + "version": "0.3.0" } diff --git a/pkgs/applications/networking/powerdns-admin/yarndeps.nix b/pkgs/applications/networking/powerdns-admin/yarndeps.nix index 7dcd54b53c21..7181d9e741e5 100644 --- a/pkgs/applications/networking/powerdns-admin/yarndeps.nix +++ b/pkgs/applications/networking/powerdns-admin/yarndeps.nix @@ -38,7 +38,7 @@ path = fetchurl { name = "admin_lte___admin_lte_2.4.9.tgz"; url = "https://registry.yarnpkg.com/admin-lte/-/admin-lte-2.4.9.tgz"; - sha1 = "effc04dbb587ccb7d674d4cf663cc141f925ed73"; + sha512 = "+u3zt5sWPPT8HmBvRg4F8IGZPaE5wD0K10+IjXoynfe/jEUrMMj+4eA1LGH9fMK6QulmFr1NCtc1Tk+mTgC24A=="; }; } { @@ -49,30 +49,6 @@ sha1 = "a0e7c95ac7624d6417b4494b1e68bff693168a20"; }; } - { - name = "array_filter___array_filter_0.0.1.tgz"; - path = fetchurl { - name = "array_filter___array_filter_0.0.1.tgz"; - url = "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz"; - sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec"; - }; - } - { - name = "array_map___array_map_0.0.0.tgz"; - path = fetchurl { - name = "array_map___array_map_0.0.0.tgz"; - url = "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz"; - sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662"; - }; - } - { - name = "array_reduce___array_reduce_0.0.0.tgz"; - path = fetchurl { - name = "array_reduce___array_reduce_0.0.0.tgz"; - url = "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz"; - sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b"; - }; - } { name = "asn1.js___asn1.js_4.10.1.tgz"; path = fetchurl { @@ -118,7 +94,7 @@ path = fetchurl { name = "bn.js___bn.js_4.12.0.tgz"; url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz"; - sha1 = "775b3f278efbb9718eec7361f483fb36fbbfea88"; + sha512 = "c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="; }; } { @@ -126,7 +102,7 @@ path = fetchurl { name = "bootstrap_colorpicker___bootstrap_colorpicker_2.5.3.tgz"; url = "https://registry.yarnpkg.com/bootstrap-colorpicker/-/bootstrap-colorpicker-2.5.3.tgz"; - sha1 = "b50aff8590fbaa6b5aa63a5624e4213f1659a49d"; + sha512 = "xdllX8LSMvKULs3b8JrgRXTvyvjkSMHHHVuHjjN5FNMqr6kRe5NPiMHFmeAFjlgDF73MspikudLuEwR28LbzLw=="; }; } { @@ -134,7 +110,7 @@ path = fetchurl { name = "bootstrap_datepicker___bootstrap_datepicker_1.8.0.tgz"; url = "https://registry.yarnpkg.com/bootstrap-datepicker/-/bootstrap-datepicker-1.8.0.tgz"; - sha1 = "c63513931e6f09f16ae9f11b62f32d950df3958e"; + sha512 = "213St/G8KT3mjs4qu4qwww74KWysMaIeqgq5OhrboZjIjemIpyuxlSo9FNNI5+KzpkkxkRRba+oewiRGV42B1A=="; }; } { @@ -174,7 +150,7 @@ path = fetchurl { name = "bootstrap___bootstrap_3.4.1.tgz"; url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.4.1.tgz"; - sha1 = "c3a347d419e289ad11f4033e3c4132b87c081d72"; + sha512 = "yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA=="; }; } { @@ -190,7 +166,7 @@ path = fetchurl { name = "brorand___brorand_1.1.0.tgz"; url = "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz"; - sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; + sha1 = "EsJe/kCkXjwyPrhnWgoM5XsiNx8="; }; } { @@ -298,11 +274,11 @@ }; } { - name = "cached_path_relative___cached_path_relative_1.0.2.tgz"; + name = "cached_path_relative___cached_path_relative_1.1.0.tgz"; path = fetchurl { - name = "cached_path_relative___cached_path_relative_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.2.tgz"; - sha1 = "a13df4196d26776220cc3356eb147a52dba2c6db"; + name = "cached_path_relative___cached_path_relative_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.1.0.tgz"; + sha512 = "WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA=="; }; } { @@ -334,7 +310,7 @@ path = fetchurl { name = "ckeditor___ckeditor_4.11.3.tgz"; url = "https://registry.yarnpkg.com/ckeditor/-/ckeditor-4.11.3.tgz"; - sha1 = "91f66d7ddb5bff3874514fe539779686874ed655"; + sha512 = "v6G+v16WAcukKuQH6m+trA9RCOQntFM2nxPO/GFiLYsdD/5IbZAZ2n7GwMxQmxDXpx4AixpnMWF+yAE1t9wq6Q=="; }; } { @@ -438,7 +414,7 @@ path = fetchurl { name = "datatables.net_bs___datatables.net_bs_1.10.19.tgz"; url = "https://registry.yarnpkg.com/datatables.net-bs/-/datatables.net-bs-1.10.19.tgz"; - sha1 = "08763b4e4d0cef1a427d019dc15e717c7ed67a4d"; + sha512 = "5gxoI2n+duZP06+4xVC2TtH6zcY369/TRKTZ1DdSgDcDUl4OYQsrXCuaLJmbVzna/5Y5lrMmK7CxgvYgIynICA=="; }; } { @@ -446,7 +422,7 @@ path = fetchurl { name = "datatables.net_plugins___datatables.net_plugins_1.10.20.tgz"; url = "https://registry.yarnpkg.com/datatables.net-plugins/-/datatables.net-plugins-1.10.20.tgz"; - sha1 = "c89f6bed3fa7e6605cbeaa35d60f223659e84c8c"; + sha512 = "rnhNmRHe9UEzvM7gtjBay1QodkWUmxLUhHNbmJMYhhUggjtm+BRSlE0PRilkeUkwckpNWzq+0fPd7/i0fpQgzA=="; }; } { @@ -454,7 +430,7 @@ path = fetchurl { name = "datatables.net___datatables.net_1.10.19.tgz"; url = "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.10.19.tgz"; - sha1 = "97a1ed41c85e62d61040603481b59790a172dd1f"; + sha512 = "+ljXcI6Pj3PTGy5pesp3E5Dr3x3AV45EZe0o1r0gKENN2gafBKXodVnk2ypKwl2tTmivjxbkiqoWnipTefyBTA=="; }; } { @@ -534,7 +510,7 @@ path = fetchurl { name = "elliptic___elliptic_6.5.4.tgz"; url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz"; - sha1 = "da37cebd31e79a1367e941b592ed1fbebd58abbb"; + sha512 = "iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ=="; }; } { @@ -574,7 +550,7 @@ path = fetchurl { name = "flot___flot_0.8.3.tgz"; url = "https://registry.yarnpkg.com/flot/-/flot-0.8.3.tgz"; - sha1 = "6d9b93c7aa2cfb30dfa1af9c1ec4c94070b1217f"; + sha512 = "xg2otcTJDvS+ERK+my4wxG/ASq90QURXtoM4LhacCq0jQW2jbyjdttbRNqU2cPykrpMvJ6b2uSp6SAgYAzj9tQ=="; }; } { @@ -598,7 +574,7 @@ path = fetchurl { name = "fullcalendar___fullcalendar_3.10.0.tgz"; url = "https://registry.yarnpkg.com/fullcalendar/-/fullcalendar-3.10.0.tgz"; - sha1 = "cc5e87d518fd6550e142816a31dd191664847919"; + sha512 = "0OtsHhmdYhtFmQwXzyo8VqHzYgamg+zVOoytv5N13gI+iF6CGjevpCi/yBaQs0O4wY3OAp8I688IxdNYe0iAvw=="; }; } { @@ -638,7 +614,7 @@ path = fetchurl { name = "hash.js___hash.js_1.1.7.tgz"; url = "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz"; - sha1 = "0babca538e8d4ee4a0f8988d68866537a003cf42"; + sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="; }; } { @@ -646,7 +622,7 @@ path = fetchurl { name = "hmac_drbg___hmac_drbg_1.0.1.tgz"; url = "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz"; - sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1"; + sha1 = "0nRXAQJabHdabFRXk+1QL8DGSaE="; }; } { @@ -694,7 +670,7 @@ path = fetchurl { name = "inherits___inherits_2.0.4.tgz"; url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; - sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; } { @@ -742,7 +718,7 @@ path = fetchurl { name = "ion_rangeslider___ion_rangeslider_2.3.0.tgz"; url = "https://registry.yarnpkg.com/ion-rangeslider/-/ion-rangeslider-2.3.0.tgz"; - sha1 = "7957ce2e78acfc956b8c43009373da91f743347e"; + sha512 = "7TtH9/X4Aq/xCzboWxjwlv20gVqR90Ysc3aehMlTuH2/ULaSxpB80hq+yvD1N0FwWbPDtxQpjQrz/iX+LWXKmg=="; }; } { @@ -818,11 +794,11 @@ }; } { - name = "jquery_ui___jquery_ui_1.12.1.tgz"; + name = "jquery_ui___jquery_ui_1.13.0.tgz"; path = fetchurl { - name = "jquery_ui___jquery_ui_1.12.1.tgz"; - url = "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.12.1.tgz"; - sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; + name = "jquery_ui___jquery_ui_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.0.tgz"; + sha512 = "Osf7ECXNTYHtKBkn9xzbIf9kifNrBhfywFEKxOeB/OVctVmLlouV9mfc2qXCp6uyO4Pn72PXKOnj09qXetopCw=="; }; } { @@ -830,15 +806,15 @@ path = fetchurl { name = "jquery.quicksearch___jquery.quicksearch_2.4.0.tgz"; url = "https://registry.yarnpkg.com/jquery.quicksearch/-/jquery.quicksearch-2.4.0.tgz"; - sha1 = "240c9f435e936c63bf8fbba355144ffdddf9ea26"; + sha512 = "20FJSCW3kTawO6Jvy/6MtUCURvgUZFqRUOAGTxH/VaPlwLG4kba82sKaM3ghTi1DsmSZrM2BvrwLUwNWmwDXiw=="; }; } { - name = "jquery___jquery_3.3.1.tgz"; + name = "jquery___jquery_3.6.0.tgz"; path = fetchurl { - name = "jquery___jquery_3.3.1.tgz"; - url = "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz"; - sha1 = "958ce29e81c9790f31be7792df5d4d95fc57fbca"; + name = "jquery___jquery_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz"; + sha512 = "JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="; }; } { @@ -870,7 +846,7 @@ path = fetchurl { name = "jtimeout___jtimeout_3.1.0.tgz"; url = "https://registry.yarnpkg.com/jtimeout/-/jtimeout-3.1.0.tgz"; - sha1 = "4cd65b28eff8b9f8c61d08889a9ac3abdf5d9893"; + sha512 = "xA2TlImMGj4c0yAiM9BUq+8aAFVYVYUX2tkcC8u8das9qoZSs13SxhVcfWqI4cHOsv3huj2D0VRNHeVCLO3mVQ=="; }; } { @@ -926,7 +902,7 @@ path = fetchurl { name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz"; url = "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; - sha1 = "2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"; + sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; }; } { @@ -934,7 +910,7 @@ path = fetchurl { name = "minimalistic_crypto_utils___minimalistic_crypto_utils_1.0.1.tgz"; url = "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; - sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; + sha1 = "9sAMHAsIIkblxNmd+4x8CDsrWCo="; }; } { @@ -978,19 +954,11 @@ }; } { - name = "moment___moment_2.24.0.tgz"; + name = "moment___moment_2.29.2.tgz"; path = fetchurl { - name = "moment___moment_2.24.0.tgz"; - url = "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz"; - sha1 = "0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"; - }; - } - { - name = "moment___moment_2.22.2.tgz"; - path = fetchurl { - name = "moment___moment_2.22.2.tgz"; - url = "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz"; - sha1 = "3c257f9839fc0e93ff53149632239eb90783ff66"; + name = "moment___moment_2.29.2.tgz"; + url = "https://registry.yarnpkg.com/moment/-/moment-2.29.2.tgz"; + sha512 = "UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg=="; }; } { @@ -1074,11 +1042,11 @@ }; } { - name = "path_parse___path_parse_1.0.5.tgz"; + name = "path_parse___path_parse_1.0.7.tgz"; path = fetchurl { - name = "path_parse___path_parse_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz"; - sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"; + name = "path_parse___path_parse_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz"; + sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; }; } { @@ -1250,11 +1218,11 @@ }; } { - name = "shell_quote___shell_quote_1.6.1.tgz"; + name = "shell_quote___shell_quote_1.7.3.tgz"; path = fetchurl { - name = "shell_quote___shell_quote_1.6.1.tgz"; - url = "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz"; - sha1 = "f4781949cce402697127430ea3b3c5476f481767"; + name = "shell_quote___shell_quote_1.7.3.tgz"; + url = "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz"; + sha512 = "Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw=="; }; } { diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 8a7f9a5e1c8a..79cd6187ddb2 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -12,7 +12,6 @@ , pythonOlder , setuptools-scm , typing-extensions -, vim , wcwidth }: @@ -47,7 +46,12 @@ buildPythonPackage rec { pytestCheckHook glibcLocales pytest-mock - vim + ]; + + disabledTests = [ + # don't require vim for tests, it causes lots of rebuilds + "test_find_editor_not_specified" + "test_transcript" ]; postPatch = '' diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix index 3a1b26f1cc8a..ff564916dd3a 100644 --- a/pkgs/development/tools/analysis/coan/default.nix +++ b/pkgs/development/tools/analysis/coan/default.nix @@ -11,9 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl ]; - NIX_CFLAGS_COMPILE = [ - "-std=c++11" - ]; + CXXFLAGS = "-std=c++11"; enableParallelBuilding = true; @@ -22,7 +20,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; description = "The C preprocessor chainsaw"; longDescription = '' A software engineering tool for analysing preprocessor-based diff --git a/pkgs/development/tools/analysis/dotenv-linter/default.nix b/pkgs/development/tools/analysis/dotenv-linter/default.nix index f1cf795d2e78..fdd4d84673b5 100644 --- a/pkgs/development/tools/analysis/dotenv-linter/default.nix +++ b/pkgs/development/tools/analysis/dotenv-linter/default.nix @@ -2,6 +2,7 @@ , lib , rustPlatform , fetchFromGitHub +, Security }: rustPlatform.buildRustPackage rec { @@ -17,8 +18,9 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-q59hpnXc00OzrJk1KOWbIPQYfIE+7ku9XtTDXHgwQBg="; + buildInputs = lib.optional stdenv.isDarwin Security; + meta = with lib; { - broken = stdenv.isDarwin; description = "Lightning-fast linter for .env files. Written in Rust"; homepage = "https://dotenv-linter.github.io"; license = licenses.mit; diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix new file mode 100644 index 000000000000..29cd175392aa --- /dev/null +++ b/pkgs/development/web/bun/default.nix @@ -0,0 +1,60 @@ +{ stdenvNoCC, callPackage, fetchurl, autoPatchelfHook, unzip, openssl, lib }: +let + dists = { + aarch64-darwin = { + arch = "aarch64"; + shortName = "darwin"; + sha256 = "06kf4dyb8y486r2bbpz8znnaxah9y2hwc9km3cigacfchi4dy28j"; + }; + + x86_64-darwin = { + arch = "x64"; + shortName = "darwin"; + sha256 = "06q8cajxra8lgyd1ap6iqzqdw31gkvlc6l2ma0mm22y63msgdn8b"; + }; + + x86_64-linux = { + arch = "x64"; + shortName = "linux"; + sha256 = "038w54yyk94042hg27hfm49w12xsg8wh0skza9l9iybvc9qlvh2i"; + }; + }; + dist = dists.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); +in +stdenvNoCC.mkDerivation rec { + version = "0.1.1"; + pname = "bun"; + + src = fetchurl { + url = "https://github.com/Jarred-Sumner/bun-releases-for-updater/releases/download/bun-v${version}/bun-${dist.shortName}-${dist.arch}.zip"; + sha256 = dist.sha256; + }; + + strictDeps = true; + nativeBuildInputs = [ unzip ] ++ lib.optionals stdenvNoCC.isLinux [ autoPatchelfHook ]; + buildInputs = [ openssl ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + install -Dm 755 ./bun $out/bin/bun + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://bun.sh"; + changelog = "https://github.com/Jarred-Sumner/bun/releases/tag/bun-v${version}"; + description = "Incredibly fast JavaScript runtime, bundler, transpiler and package manager – all in one"; + longDescription = '' + All in one fast & easy-to-use tool. Instead of 1,000 node_modules for development, you only need bun. + ''; + license = with licenses; [ + mit # bun core + lgpl21Only # javascriptcore and webkit + ]; + maintainers = with maintainers; [ DAlperin jk ]; + platforms = builtins.attrNames dists; + }; +} diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 285db86a133c..9376a024eceb 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.5.2"; + version = "1.5.3"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "sha256-8DloOBFW/nkNhYr34GnFVQqFd/uWT5ZiRDSJUnIFODg="; + sha256 = "sha256-S8+sIZ8uAAXJEtrDIndDzB7Q3tacgi90yBpw0EHlo70="; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; diff --git a/pkgs/tools/security/boofuzz/default.nix b/pkgs/tools/security/boofuzz/default.nix index 61ba2136d794..220a372b2e9e 100644 --- a/pkgs/tools/security/boofuzz/default.nix +++ b/pkgs/tools/security/boofuzz/default.nix @@ -37,9 +37,10 @@ python3.pkgs.buildPythonApplication rec { ]; disabledTests = [ - # Tests require socket access - "test_raw_l2" - "test_raw_l3" + "TestNetworkMonitor" + "TestNoResponseFailure" + "TestProcessMonitor" + "TestSocketConnection" ]; pythonImportsCheck = [ @@ -51,7 +52,5 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/jtpereyda/boofuzz"; license = with licenses; [ gpl2Plus ]; maintainers = with maintainers; [ fab ]; - # FAILED unit_tests/test_monitors.py::TestProcessMonitor::test_set_options_persistent - broken = (stdenv.isDarwin && stdenv.isx86_64); }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 822b00d3f800..5601a8fb9844 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3337,7 +3337,9 @@ with pkgs; dosage = callPackage ../applications/graphics/dosage { }; - dotenv-linter = callPackage ../development/tools/analysis/dotenv-linter { }; + dotenv-linter = callPackage ../development/tools/analysis/dotenv-linter { + inherit (darwin.apple_sdk.frameworks) Security; + }; inherit (ocamlPackages) dot-merlin-reader; @@ -12326,6 +12328,8 @@ with pkgs; tex = texlive.combined.scheme-full; }; + bun = callPackage ../development/web/bun { }; + cakelisp = callPackage ../development/compilers/cakelisp { }; ciao = callPackage ../development/compilers/ciao { };