diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix index 79306541b855..9418aff12adb 100644 --- a/nixos/modules/services/web-apps/atlassian/crowd.nix +++ b/nixos/modules/services/web-apps/atlassian/crowd.nix @@ -14,6 +14,21 @@ let proxyUrl = "${cfg.proxy.scheme}://${cfg.proxy.name}:${toString cfg.proxy.port}"; }); + crowdPropertiesFile = pkgs.writeText "crowd.properties" '' + application.name crowd-openid-server + application.password @NIXOS_CROWD_OPENID_PW@ + application.base.url http://localhost:${toString cfg.listenPort}/openidserver + application.login.url http://localhost:${toString cfg.listenPort}/openidserver + application.login.url.template http://localhost:${toString cfg.listenPort}/openidserver?returnToUrl=''${RETURN_TO_URL} + + crowd.server.url http://localhost:${toString cfg.listenPort}/crowd/services/ + + session.isauthenticated session.isauthenticated + session.tokenkey session.tokenkey + session.validationinterval 0 + session.lastvalidation session.lastvalidation + ''; + in { @@ -53,9 +68,16 @@ in openidPassword = mkOption { type = types.str; + default = "WILL_NEVER_BE_SET"; description = "Application password for OpenID server."; }; + openidPasswordFile = mkOption { + type = types.nullOr types.str; + default = null; + description = "Path to the file containing the application password for OpenID server."; + }; + catalinaOptions = mkOption { type = types.listOf types.str; default = []; @@ -140,6 +162,7 @@ in JAVA_HOME = "${cfg.jrePackage}"; CATALINA_OPTS = concatStringsSep " " cfg.catalinaOptions; CATALINA_TMPDIR = "/tmp"; + JAVA_OPTS = mkIf (cfg.openidPasswordFile != null) "-Dcrowd.properties=${cfg.home}/crowd.properties"; }; preStart = '' @@ -151,6 +174,14 @@ in -e 's,compression="on",compression="off" protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${boolToString cfg.proxy.secure}",' \ '') + '' ${pkg}/apache-tomcat/conf/server.xml.dist > ${cfg.home}/server.xml + + ${optionalString (cfg.openidPasswordFile != null) '' + install -m660 ${crowdPropertiesFile} ${cfg.home}/crowd.properties + ${pkgs.replace-secret}/bin/replace-secret \ + '@NIXOS_CROWD_OPENID_PW@' \ + ${cfg.openidPasswordFile} \ + ${cfg.home}/crowd.properties + ''} ''; serviceConfig = { diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 316798712075..29bfaecd0a63 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -230,6 +230,7 @@ let skanlite = callPackage ./skanlite.nix {}; skanpage = callPackage ./skanpage.nix {}; spectacle = callPackage ./spectacle.nix {}; + umbrello = callPackage ./umbrello.nix {}; yakuake = callPackage ./yakuake.nix {}; zanshin = callPackage ./zanshin.nix {}; }; diff --git a/pkgs/applications/kde/umbrello.nix b/pkgs/applications/kde/umbrello.nix new file mode 100644 index 000000000000..4746e1976bf1 --- /dev/null +++ b/pkgs/applications/kde/umbrello.nix @@ -0,0 +1,25 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, cmake +, karchive +, ki18n +, kiconthemes +, kdelibs4support +, ktexteditor +}: + +mkDerivation { + pname = "umbrello"; + meta = { + homepage = "https://umbrello.kde.org/"; + description = "A Unified Modelling Language (UML) diagram program"; + license = [ lib.licenses.gpl2 ]; + }; + nativeBuildInputs = [ + cmake extra-cmake-modules + ]; + propagatedBuildInputs = [ + karchive ki18n kiconthemes kdelibs4support ktexteditor + ]; +} diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index cd332b391056..6ae97e680e38 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -37,14 +37,14 @@ let ]; in with python3'.pkgs; buildPythonApplication rec { - version = "4.6"; + version = "4.7"; pname = "buku"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "sha256-hr9qiP7SbloigDcs+6KVWu0SOlggMaBr7CCfY8zoJG0="; + sha256 = "sha256-7piJK1hz9h6EWiU/q5MAS1PSvHFxnW7rZBKxq+wda1c="; }; checkInputs = [ diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index 24511096f1d4..833b2e4c152c 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "zola"; - version = "0.15.3"; + version = "0.16.0"; src = fetchFromGitHub { owner = "getzola"; repo = "zola"; rev = "v${version}"; - sha256 = "sha256-LK8twqWaS+SQ3oqvMGE7oP/IJNLvQ45Pu92pkbSKzDs="; + sha256 = "sha256-FrCpHavlHf4/g96G7cY0Rymxqi73XUCIAYp4cm//2Ic="; }; - cargoSha256 = "sha256-7W0vjbAWZl/eKBZvUWWWolEOh8aQeKegt823EebcKMQ="; + cargoSha256 = "sha256-c6SbQasgpOyqVninAo104oYo1CXpiECZvsB1gxrD7wM="; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 4990d008c276..1e5e8ab74970 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "cloudflared"; - version = "2022.5.2"; + version = "2022.7.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - hash = "sha256-xE/Bc+6Ob2u4tQQoykoaa8MhFH2czwz5rMABUqfXNMM="; + hash = "sha256-kc6+jn4eTCw37u+kPJdx/kxiaj8MnIddDbUFpPfWdlw="; }; vendorSha256 = null; - ldflags = [ "-X main.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; preCheck = '' # Workaround for: sshgen_test.go:74: mkdir /homeless-shelter/.cloudflared: no such file or directory diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index 2540c777f16d..71df2c1a075f 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ipfs"; - version = "0.13.1"; # When updating, also check if the repo version changed and adjust repoVersion below + version = "0.14.0"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; passthru.repoVersion = "12"; # Also update ipfs-migrator when changing the repo version # go-ipfs makes changes to it's source tarball that don't match the git source. src = fetchurl { - url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz"; - sha256 = "sha256-kGtqFb4Fxx9mxDqX8YSqnY875sU70pzL2BwWBQg5sTU="; + url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz"; + hash = "sha256-93jd0r5nWkGrMnaPXoJMf6dHxMrtiWPgkHYaWH109lg="; }; # tarball contains multiple files/directories diff --git a/pkgs/applications/plasma-mobile/angelfish.nix b/pkgs/applications/plasma-mobile/angelfish.nix index acd3a7a8c84d..35f7b60a45a9 100644 --- a/pkgs/applications/plasma-mobile/angelfish.nix +++ b/pkgs/applications/plasma-mobile/angelfish.nix @@ -20,8 +20,8 @@ , srcs # These must be updated in tandem with package updates. -, cargoShaForVersion ? "22.04" -, cargoSha256 ? "RtdZMBKixC3mdHeFXY9u0pHyDv93Z8p4EVY+lz1aISM=" +, cargoShaForVersion ? "22.06" +, cargoSha256 ? "ckxShWgqGaApYoGQdrRQKCKOsbwUH5QP82x3BNM4Jx8=" }: # Guard against incomplete updates. diff --git a/pkgs/applications/plasma-mobile/fetch.sh b/pkgs/applications/plasma-mobile/fetch.sh index 3a3d5b18a534..41ff6d0f7d6d 100644 --- a/pkgs/applications/plasma-mobile/fetch.sh +++ b/pkgs/applications/plasma-mobile/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/22.04/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/22.06/ -A '*.tar.xz' ) diff --git a/pkgs/applications/plasma-mobile/kasts.nix b/pkgs/applications/plasma-mobile/kasts.nix index 793fd5c9bdab..1903bf259bae 100644 --- a/pkgs/applications/plasma-mobile/kasts.nix +++ b/pkgs/applications/plasma-mobile/kasts.nix @@ -16,6 +16,7 @@ , qtquickcontrols2 , syndication , taglib +, threadweaver }: let @@ -46,6 +47,7 @@ mkDerivation rec { qtquickcontrols2 syndication taglib + threadweaver ]; preFixup = '' diff --git a/pkgs/applications/plasma-mobile/spacebar.nix b/pkgs/applications/plasma-mobile/spacebar.nix index 24e2f6f4715b..0e30c86df981 100644 --- a/pkgs/applications/plasma-mobile/spacebar.nix +++ b/pkgs/applications/plasma-mobile/spacebar.nix @@ -6,6 +6,7 @@ , kcontacts , ki18n +, kio , kirigami2 , knotifications , kpeople @@ -28,6 +29,7 @@ mkDerivation rec { buildInputs = [ kcontacts ki18n + kio kirigami2 knotifications kpeople diff --git a/pkgs/applications/plasma-mobile/srcs.nix b/pkgs/applications/plasma-mobile/srcs.nix index e7da4d7b0f45..849118e5ce65 100644 --- a/pkgs/applications/plasma-mobile/srcs.nix +++ b/pkgs/applications/plasma-mobile/srcs.nix @@ -4,187 +4,195 @@ { alligator = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/alligator-22.04.tar.xz"; - sha256 = "1f2s0ay4qr7ylqnx8d1fawwi4h15gza2d4dsvrww1gm8ar1miqwc"; - name = "alligator-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/alligator-22.06.tar.xz"; + sha256 = "1h4jawzmiikn81iajc62pkgdv0xlc2w9g80l04awfiz2546rcxmf"; + name = "alligator-22.06.tar.xz"; }; }; angelfish = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/angelfish-22.04.tar.xz"; - sha256 = "169bhkymfxcs93injzp86cvcdhv78pl4dfsscjahlh9c1g5lsbqa"; - name = "angelfish-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/angelfish-22.06.tar.xz"; + sha256 = "0s9kzkw0ikb4r4x04nyd568kika7wvi5gj0k6735nwjn5qyp933f"; + name = "angelfish-22.06.tar.xz"; }; }; audiotube = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/audiotube-22.04.tar.xz"; - sha256 = "0x9xmlfz39ac15c4rbg33sl1bbjmglxgz39flmrvrrw9h2m62s2x"; - name = "audiotube-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/audiotube-22.06.tar.xz"; + sha256 = "0680cr90nsa5qc9qm9vpl7993zmz0r1ms0m4f63cds7k8zrwwal0"; + name = "audiotube-22.06.tar.xz"; }; }; calindori = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/calindori-22.04.tar.xz"; - sha256 = "1zinhlflrx230yymlfxvm98dvvq1yig3r49bq61fmyrzq6fdfv60"; - name = "calindori-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/calindori-22.06.tar.xz"; + sha256 = "0fcbkk1yisdd6z1qvac9x6i55wfppqpdma87a0n5smm191lkjg07"; + name = "calindori-22.06.tar.xz"; }; }; kalk = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/kalk-22.04.tar.xz"; - sha256 = "0aaqcb7jkkqypawfkzjnqglzyni17064d0mhch8g7q0qm5izvap8"; - name = "kalk-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/kalk-22.06.tar.xz"; + sha256 = "09c3rfnljjacw55vdrgcpp18vkbbjzq6brcfs6gb0nhfgbjj6ava"; + name = "kalk-22.06.tar.xz"; }; }; kasts = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/kasts-22.04.tar.xz"; - sha256 = "0c60wp0i6l7ji13ap69lh21vpdq09h2nmqpzjlrwlbjqbhhx7lsh"; - name = "kasts-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/kasts-22.06.tar.xz"; + sha256 = "0hznam4gxrhz1sbykl7wr0mqa6r23mskx5qhp0lq3sxaxiy9jlrk"; + name = "kasts-22.06.tar.xz"; }; }; kclock = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/kclock-22.04.tar.xz"; - sha256 = "1ycln85ydd3qmzfadgg80zf7jlwx5yijxs1mbfmx7f1rr427qdk6"; - name = "kclock-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/kclock-22.06.tar.xz"; + sha256 = "1rd2gxbc3p5h1xjwn59vqr5v2xdk8b0m0dx6qsmihx1qnr2k5vrj"; + name = "kclock-22.06.tar.xz"; }; }; keysmith = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/keysmith-22.04.tar.xz"; - sha256 = "0cx14r820mnlh75l3blc0ywxwmlinn2wakdnwl75w6i8l46k48li"; - name = "keysmith-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/keysmith-22.06.tar.xz"; + sha256 = "0qwfvznjp85y93y3dry5pkcqz6y63wpk2h2p5m3qiymk3qckm9yj"; + name = "keysmith-22.06.tar.xz"; }; }; khealthcertificate = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/khealthcertificate-22.04.tar.xz"; - sha256 = "0sr90ki42m3cbjy63rl2ay02wm089wyka0lc4ik7jaic6wb47y5d"; - name = "khealthcertificate-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/khealthcertificate-22.06.tar.xz"; + sha256 = "079j9df21hcfs62ikh2q8sjxq59qiqvinicjvghk708xf0dkl8nh"; + name = "khealthcertificate-22.06.tar.xz"; }; }; koko = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/koko-22.04.tar.xz"; - sha256 = "0i4h2brc5dqwdmj2bs7nywrz7cgqcf7nmm6yl03047vj9aah01cw"; - name = "koko-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/koko-22.06.tar.xz"; + sha256 = "0fcwls7xq0dmb2ghn8x6xq26a4qa9ashnlm8ypcyfmfr4pvxwlml"; + name = "koko-22.06.tar.xz"; }; }; kongress = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/kongress-22.04.tar.xz"; - sha256 = "07yb8hddxl7m1wl0z7rcwdls3k9q89zl1d271n15j1rwrsbwiyxd"; - name = "kongress-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/kongress-22.06.tar.xz"; + sha256 = "1mlyqdv0y112z4c56a9746hc8x0xrcvw0qqafm7vvd7hy5idqsrb"; + name = "kongress-22.06.tar.xz"; }; }; krecorder = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/krecorder-22.04.tar.xz"; - sha256 = "0d7nvq87avw4gj6whjrlmxs361r9cvzfmfsrca5f536jlazp95pg"; - name = "krecorder-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/krecorder-22.06.tar.xz"; + sha256 = "148gqz5xya1pxw0mhs82dns0wmpvl8h48hrb5hly9jwdymb7143g"; + name = "krecorder-22.06.tar.xz"; }; }; ktrip = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/ktrip-22.04.tar.xz"; - sha256 = "1ijy19axc492l4naayr3d8qdjznc286105qnki8vmcaw93p48n9x"; - name = "ktrip-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/ktrip-22.06.tar.xz"; + sha256 = "123770qa8d4xhpgga6gbs7dnnfmka9jshsbkpckvbzl3ndcnlpql"; + name = "ktrip-22.06.tar.xz"; }; }; kweather = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/kweather-22.04.tar.xz"; - sha256 = "0080l00dya34d35sf6z2j3ra6lls0nafr045a9jmxv09763ydb5d"; - name = "kweather-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/kweather-22.06.tar.xz"; + sha256 = "0a47swzvp6z1fdn3vhgfnqz06583x6xsgvf01wsspkz4g2lxj5zk"; + name = "kweather-22.06.tar.xz"; }; }; neochat = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/neochat-22.04.tar.xz"; - sha256 = "04i1kn52w9jjaaw8x53mksw2vzrpsq1xrq13h158c1s3q1g9jdm8"; - name = "neochat-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/neochat-22.06.tar.xz"; + sha256 = "16wxkc3h0bqlnb7jhkk6qh1v5hj06rwaj7khzqxbm9cj8zh29wdn"; + name = "neochat-22.06.tar.xz"; }; }; plasma-dialer = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/plasma-dialer-22.04.tar.xz"; - sha256 = "0hnxasj6psplwykahhisipyvy67hfr820azixw5p820fzy11x2g4"; - name = "plasma-dialer-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/plasma-dialer-22.06.tar.xz"; + sha256 = "07sbjmk9hzf1nhk7jhvavikwkb4nmy0bwccs7qa4nf9g2yzbli87"; + name = "plasma-dialer-22.06.tar.xz"; }; }; plasma-phonebook = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/plasma-phonebook-22.04.tar.xz"; - sha256 = "14nd2yx9cf6gabb10kcaqkdn7kb96n2209qrib7daq2ldva8c9i9"; - name = "plasma-phonebook-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/plasma-phonebook-22.06.tar.xz"; + sha256 = "00h9plfjgr4bmcay56la074pza2hp4l28a566nbqqivagpn1qz8w"; + name = "plasma-phonebook-22.06.tar.xz"; }; }; plasma-settings = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/plasma-settings-22.04.tar.xz"; - sha256 = "1k40mviikpij1srar1hkg732qg14ld0176g1mpza0ysr3yr21vny"; - name = "plasma-settings-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/plasma-settings-22.06.tar.xz"; + sha256 = "096zyzxff0b948wnnmdykp9fm87r8xyn8kkndnjkrmacz2p3822m"; + name = "plasma-settings-22.06.tar.xz"; }; }; plasmatube = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/plasmatube-22.04.tar.xz"; - sha256 = "01bmxdh0aclm184j5s0kddjc7a14225bdnbkr8jlk21g9wlw8cyx"; - name = "plasmatube-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/plasmatube-22.06.tar.xz"; + sha256 = "009kcba9blhyx8xhbsxawjxayq1vrpi2byig1n1ra848kij0hi3q"; + name = "plasmatube-22.06.tar.xz"; }; }; qmlkonsole = { - version = "22.04.1"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/qmlkonsole-22.04.1.tar.xz"; - sha256 = "06zfrqaag9sgihs5k93nssgm4smrs2ymh7q0fx35z7fcphngjpaw"; - name = "qmlkonsole-22.04.1.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/qmlkonsole-22.06.tar.xz"; + sha256 = "1h244bb566sgfgswgdqkljfdd70z4v52gxm0h5bmvmdqjhb6zg7n"; + name = "qmlkonsole-22.06.tar.xz"; }; }; spacebar = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/spacebar-22.04.tar.xz"; - sha256 = "0ga3symavdrq5aim924bd889b9cmv09dyplz9gcspk46w49vx3s5"; - name = "spacebar-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/spacebar-22.06.tar.xz"; + sha256 = "0jl9gvhf8dfg9y8wwxp0c86rlsmj8inrl7syb25pz57z1mvv4kkr"; + name = "spacebar-22.06.tar.xz"; + }; + }; + telly-skout = { + version = "22.06"; + src = fetchurl { + url = "${mirror}/stable/plasma-mobile/22.06/telly-skout-22.06.tar.xz"; + sha256 = "09ibm424x5k1kjbay1cn48car6xacz82dk6qwi8ww3jph32jm4pf"; + name = "telly-skout-22.06.tar.xz"; }; }; tokodon = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/tokodon-22.04.tar.xz"; - sha256 = "0c9q2ax0h047xm3g5r5cn6sxfyv2lb93dahd5z3nw67bfrzwvnw2"; - name = "tokodon-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/tokodon-22.06.tar.xz"; + sha256 = "0cgg42ys7liab754n9nwbanwl3i7iz587933vvhf5k9zmvx4jqhb"; + name = "tokodon-22.06.tar.xz"; }; }; vakzination = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/vakzination-22.04.tar.xz"; - sha256 = "0zadygzw4xzpwbdnb6dwjjjls1h915gp9xaf59kbfbmzwb6m4mf8"; - name = "vakzination-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/vakzination-22.06.tar.xz"; + sha256 = "0wa58a9fps9i0brbppcdkda1przxckg7sir8f2p8k842k2qnsvbp"; + name = "vakzination-22.06.tar.xz"; }; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix index 13ba738c46fb..0b7446b7ddab 100644 --- a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix @@ -48,6 +48,15 @@ rustPlatform.buildRustPackage rec { "--skip=test_next_ambiguous_interactive" ]; + # Fixed in next release + patches = [ + (fetchpatch { + url = "https://github.com/arxanas/git-branchless/commit/8bed1e83495a448f479103d2d4b75745aa512667.patch"; + sha256 = "sha256-bFfXBYxfgx1TxlJ+/2Gh9WsgL2vCJKwwbq4JD8/2c1w="; + name = "fix-tests-for-latest-git"; + }) + ]; + meta = with lib; { description = "A suite of tools to help you visualize, navigate, manipulate, and repair your commit history"; homepage = "https://github.com/arxanas/git-branchless"; diff --git a/pkgs/development/python-modules/bsuite/default.nix b/pkgs/development/python-modules/bsuite/default.nix index c577e6142f44..955cd4951d7a 100644 --- a/pkgs/development/python-modules/bsuite/default.nix +++ b/pkgs/development/python-modules/bsuite/default.nix @@ -20,9 +20,12 @@ , trfl , optax , pytestCheckHook -, dm-sonnet }: +, dm-sonnet +, rlax +, distrax +}: -buildPythonPackage rec { +let bsuite = buildPythonPackage rec { pname = "bsuite"; version = "0.3.5"; @@ -49,10 +52,12 @@ buildPythonPackage rec { ]; checkInputs = [ + distrax dm-haiku dm-sonnet optax pytestCheckHook + rlax tensorflow-probability trfl ]; @@ -61,15 +66,6 @@ buildPythonPackage rec { "bsuite" ]; - disabledTestPaths = [ - # Disabled because tests require module rlax but this results in infinite - # recursion error - "bsuite/baselines/jax/actor_critic/run_test.py" - "bsuite/baselines/jax/actor_critic_rnn/run_test.py" - "bsuite/baselines/jax/boot_dqn/run_test.py" - "bsuite/baselines/jax/dqn/run_test.py" - ]; - disabledTests = [ # Tests require network connection "test_run9" @@ -89,6 +85,13 @@ buildPythonPackage rec { "test_episode_truncation" ]; + # escape infinite recursion with rlax + doCheck = false; + + passthru.tests = { + check = bsuite.overridePythonAttrs (_: { doCheck = true; }); + }; + meta = with lib; { description = '' Core RL Behaviour Suite. A collection of reinforcement learning @@ -98,4 +101,4 @@ buildPythonPackage rec { license = licenses.asl20; maintainers = with maintainers; [ onny ]; }; -} +}; in bsuite diff --git a/pkgs/development/python-modules/ghapi/default.nix b/pkgs/development/python-modules/ghapi/default.nix index 002dbeaa0c8d..162ea67ad29d 100644 --- a/pkgs/development/python-modules/ghapi/default.nix +++ b/pkgs/development/python-modules/ghapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ghapi"; - version = "0.1.21"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fastai"; repo = "ghapi"; rev = "refs/tags/${version}"; - sha256 = "sha256-6VcsIcRhIHByd1aPZLIJ+g4o1einHpyJuSamwh1Ag5M="; + sha256 = "sha256-yFJ7Ek2kfFvkZwjrvvx3AXKFE4vRVsLYTSHfs+nr0Rg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 43a349c8f2eb..4ad242570027 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2022.7.12"; + version = "2022.7.13"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-9ErXsJUFM0Us9ChkYvpa2bNEy3CBJwfYAz4vnk2wu4Q="; + sha256 = "sha256-wvvoYcTkOJP5xa0GngD7nCuBfm0x+rZkQdW5qFQX7u8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index cb37545aa449..d87393aec301 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.24.0"; + version = "1.24.36.post1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-ITZItcLZ/Im/tWptkKXGc+H1lT4m1mIlljTP/w+6pNo="; + hash = "sha256-O9fgb5reUFnq4hgdep8aQef6gHrT6UwByZAYOOh+Cr4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 495af838487e..55a596e7ecb8 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.99"; + version = "2.1.100"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-P+r0JOSVwIVWkQROvsbpUocwB4x0HrVyy9oY9CdNj6s="; + hash = "sha256-CEYoP55w/Zq7RI1u8sbY9vjqDjT9jSIzDuoRIMmxlfY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index 97a769628fe0..471932ff83f7 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/pkgs/development/tools/ocaml/camlp4/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchzip, which, ocaml, ocamlbuild }: -if lib.versionAtLeast ocaml.version "4.14" +if lib.versionAtLeast ocaml.version "4.15" then throw "camlp4 is not available for OCaml ${ocaml.version}" else @@ -41,6 +41,9 @@ let param = { "4.13" = { version = "4.13+1"; sha256 = "0fzxa1zdhk74mlxpin7p90flks6sp4gkc0mfclmj9zak15rii55n"; }; + "4.14" = { + version = "4.14+1"; + sha256 = "sha256-cPN3GioZT/Zt6uzbjGUPEGVJcPQdsAnCkU/AQoPfvuo="; }; }.${ocaml.meta.branch}; in diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index 0ba8e3b3d31a..d753b4822253 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "1.74.3"; + version = "2.5.0"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-savbS/1j6PJqmkk6c+XMOUEkrLZNU2p0YbN8rHfz2po="; + sha256 = "sha256-VNYZMeKX3QJNxwWK+gn8LIm/W6l4NAjJtCG6nlO9Clc="; }; doCheck = false; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-7B8cmrDYufhlIMv2r6TSD+C8NLE2Juewgy4XYYr+QKs="; + cargoSha256 = "sha256-Nn7GolRtBs2eVBPT75hqXiTNrqNZfcSPdHwXWkb48NA="; meta = with lib; { homepage = "https://docs.sentry.io/cli/"; diff --git a/pkgs/os-specific/linux/rtl8189fs/default.nix b/pkgs/os-specific/linux/rtl8189fs/default.nix new file mode 100644 index 000000000000..c1fe5e9733fa --- /dev/null +++ b/pkgs/os-specific/linux/rtl8189fs/default.nix @@ -0,0 +1,22 @@ +{ lib, kernel, rtl8189es, fetchFromGitHub }: + +# rtl8189fs is a branch of the rtl8189es driver +rtl8189es.overrideAttrs (drv: rec { + name = "rtl8189fs-${kernel.version}-${version}"; + version = "2022-05-20"; + + src = fetchFromGitHub { + owner = "jwrdegoede"; + repo = "rtl8189ES_linux"; + rev = "71500c28164369800041d1716ac513457179ce93"; + sha256 = "sha256-JTv+ssSv5toNcZ5wR6p0Cywdk87z9Bdq0ftU0ekr/98="; + }; + + meta = with lib; { + description = "Driver for Realtek rtl8189fs"; + homepage = "https://github.com/jwrdegoede/rtl8189ES_linux/tree/rtl8189fs"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ puffnfresh ]; + }; +}) diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix index 7714fccf5d82..606bcf0ac2e1 100644 --- a/pkgs/servers/atlassian/crowd.nix +++ b/pkgs/servers/atlassian/crowd.nix @@ -1,7 +1,14 @@ { lib, stdenv, fetchurl, home ? "/var/lib/crowd" , port ? 8092, proxyUrl ? null, openidPassword ? "WILL_NEVER_BE_SET" }: -stdenv.mkDerivation rec { +let + optionalWarning = cond: msg: + if cond then lib.warn msg + else lib.id; +in + +optionalWarning (openidPassword != "WILL_NEVER_BE_SET") "Using `crowdProperties` is deprecated!" +(stdenv.mkDerivation rec { pname = "atlassian-crowd"; version = "5.0.1"; @@ -46,4 +53,4 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ fpletz globin ]; }; -} +}) diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index d0b11d9b7c16..42c04e694c66 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -14,21 +14,13 @@ stdenv.mkDerivation rec { pname = "lighttpd"; - version = "1.4.64"; + version = "1.4.65"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz"; - sha256 = "sha256-4Uidn6dJb78uBxwzi1k7IwDTjCPx5ZZ+UsnvSC4bDiY="; + sha256 = "sha256-vw+mimKfvEBAI6kSs3fnAEkzHWeXvLtLPo30w7QjKL4="; }; - patches = [ - (fetchpatch { - name = "macos-10.12-avoid-ccrandomgeneratebytes.patch"; - url = "https://redmine.lighttpd.net/projects/lighttpd/repository/14/revisions/6791f71b20a127b5b0091020dd065f4f9c7cafb6/diff?format=diff"; - sha256 = "1x5ybkvxwinl7s1nv3rrc57m4mj38q0gbyjp1ijr4w5lhabw4vzs"; - }) - ]; - postPatch = '' patchShebangs tests # Linux sandbox has an empty hostname and not /etc/hosts, which fails some tests diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index fe6d43e7175e..01cdddfd398f 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -46,8 +46,8 @@ in { ''; nextcloud23 = generic { - version = "23.0.6"; - sha256 = "34fbc3a6c16a623f57971b8c4df7c5e62b3650728edec7d05ec116b295040548"; + version = "23.0.7"; + sha256 = "89a53d3447d1dcb7ea382d18accf52223040336d08899f0b7568c6dd8a36cd50"; }; nextcloud24 = generic { diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index 9d0e9f62b5dc..e2c09414f39e 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -33,7 +33,7 @@ xorg, }: let - version = "1.32.2"; + version = "1.32.4"; rpath = lib.makeLibraryPath [ alsa-lib @@ -82,10 +82,12 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "sha256-ceQp4EiLEWy8niGC0uUdWJrvmdt9Ijt29YdLt7vtcyY="; + sha256 = "sha256-w66ky83VkPhoa4OibzcsaLSWhoI4DQvUGWaKsBuCB7Q="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; + # NOTE While MongoDB Compass is available to darwin, I do not have resources to test it + # Feel free to make a PR adding support if desired in stdenv.mkDerivation { pname = "mongodb-compass"; @@ -128,7 +130,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "The GUI for MongoDB"; maintainers = with maintainers; [ bryanasdev000 ]; - homepage = "https://www.mongodb.com/products/compass"; + homepage = "https://github.com/mongodb-js/compass"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.sspl; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0361d44bc6f2..b5cf4cd42cb7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2601,15 +2601,44 @@ with pkgs; go-audit = callPackage ../tools/system/go-audit { }; - gopass = callPackage ../tools/security/gopass { }; + gopass = callPackage ../tools/security/gopass { + buildGoModule = __buildGo118ModuleCL417615; + }; - gopass-hibp = callPackage ../tools/security/gopass/hibp.nix { }; + gopass-hibp = callPackage ../tools/security/gopass/hibp.nix { + buildGoModule = __buildGo118ModuleCL417615; + }; - gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { }; + gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { + buildGoModule = __buildGo118ModuleCL417615; + }; - git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { }; + git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { + buildGoModule = __buildGo118ModuleCL417615; + }; - gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { }; + gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { + buildGoModule = __buildGo118ModuleCL417615; + }; + + # custom override for go 1.18 including the revert of CL411617, CL417615. + # Can be dropped if/once go 1.18.5 is released with CL417615. + # or when staging go 1.18.4 includes the revert. + __buildGo118ModuleCL417615 = let + fetchBase64Patch = args: (fetchpatch args).overrideAttrs (o: { + postFetch = "mv $out p; base64 -d p > $out; " + o.postFetch; + }); + in darwin.apple_sdk_11_0.callPackage ../development/go-modules/generic { + go = buildPackages.go_1_18.overrideAttrs (oldAttrs: rec { + patches = oldAttrs.patches or [] ++ [ + # https://go-review.googlesource.com/c/go/+/417615/ + (fetchBase64Patch { + url = "https://go-review.googlesource.com/changes/go~417615/revisions/3/patch"; + sha256 = "sha256-Gu5eZUwGGch7et75A/BNynbs4VlQUBClVUxjxPkdjOs="; + }) + ]; + }); + }; gosh = callPackage ../tools/security/gosh { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index fe258c7f49ac..56be9add0ba1 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -374,6 +374,8 @@ in { rtl8189es = callPackage ../os-specific/linux/rtl8189es { }; + rtl8189fs = callPackage ../os-specific/linux/rtl8189fs { }; + rtl8723bs = callPackage ../os-specific/linux/rtl8723bs { }; rtl8812au = callPackage ../os-specific/linux/rtl8812au { };