diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/networking')
30 files changed, 271 insertions, 132 deletions
diff --git a/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json b/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json index 9662b1b54e0d..65ce8374f357 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json +++ b/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,15 +1,15 @@ { - "packageVersion": "120.0-1", + "packageVersion": "120.0.1-1", "source": { - "rev": "120.0-1", - "sha256": "1wms3kyimmfzl64rbphgap2sm87lwkl0pr24rx4rxf3px3bq97f3" + "rev": "120.0.1-1", + "sha256": "0kvfa97m7dq1b030d62zblpb445fkbgb2w19bckxwxv7mx36awy7" }, "settings": { - "rev": "b587388bdbe63511c478cb8b5f82c2e80040414c", - "sha256": "03cw6wh7358pgld4qgs534pl2lnfvwc0xl2yyb3n3pyvmba6cyrp" + "rev": "9dac02778ebed3e2614da52c36b7cede45f4f602", + "sha256": "0flk6v50cyiaajzcz9gm1hig00vkw9xdbjd5rdxidrmhcqxy24vy" }, "firefox": { - "version": "120.0", - "sha512": "31d5f9e1d4173280c8de6d9b8551bc6bba5e2c49b84f944f50d42002d5b39c2fb743bc130f26c81160388a102b8301b94a0a378ecdfa6f943860f971a860df8c" + "version": "120.0.1", + "sha512": "dd0e3eb234d58c39431d1f100834ef4bcc8cfb89ff471a37b948eda4dd3874b63b1979cda39a0db0dd3b4a579b5f09a7d2d1f39d26fd9f2b8d5635e4b8738b6c" } } diff --git a/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix b/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix index 02e000cf4e65..785c03755c13 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix @@ -41,7 +41,7 @@ , at-spi2-core , autoPatchelfHook , wrapGAppsHook -, qt5 +, qt6 , proprietaryCodecs ? false , vivaldi-ffmpeg-codecs }: @@ -51,11 +51,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "100.0.4815.47"; + version = "105.0.4970.21"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - hash = "sha256-746imLXqxzf9zK2QEVRuWkLA6m+HHXBYZFUwTD0HEVc="; + hash = "sha256-fgbR7qAWKaZgxMeMo1/le8g1/zSoTl+5iIJeKl1Rc3Y="; }; unpackPhase = "dpkg-deb -x $src ."; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { dpkg autoPatchelfHook wrapGAppsHook - qt5.wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ @@ -103,6 +103,7 @@ stdenv.mkDerivation rec { nss pango stdenv.cc.cc.lib + qt6.qtbase ]; runtimeDependencies = [ @@ -128,6 +129,9 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp -r usr $out cp -r usr/share $out/share + + # we already using QT6, autopatchelf wants to patch this as well + rm $out/usr/lib/x86_64-linux-gnu/opera/libqt5_shim.so ln -s $out/usr/bin/opera $out/bin/opera ''; diff --git a/nixpkgs/pkgs/applications/networking/browsers/palemoon/bin.nix b/nixpkgs/pkgs/applications/networking/browsers/palemoon/bin.nix index 2ea777728f95..aa2337f86d70 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -9,6 +9,7 @@ , gtk2-x11 , withGTK3 ? true , gtk3 +, libglvnd , libXt , libpulseaudio , makeDesktopItem @@ -18,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "32.5.0"; + version = "32.5.1"; src = fetchzip { urls = [ @@ -26,9 +27,9 @@ stdenv.mkDerivation (finalAttrs: { "https://rm-us.palemoon.org/release/palemoon-${finalAttrs.version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz" ]; hash = if withGTK3 then - "sha256-1MJ5K9Zc/BHeQwwlq3XyUV8XTFEpPytNyTnsDpE1tBI=" + "sha256-hWqL/WoRRigw8cNeJImOQLM8hewyS3PYNGr2WYP+cMk=" else - "sha256-xXunZTqoc2A+ilosRUUluxDwewD3xwITF5nb5Lbyv7Y="; + "sha256-dlBnXP3WUgQ0spkLRowfzMcPArhGfpowsvwgCA+kvUA="; }; preferLocalBuild = true; @@ -147,6 +148,7 @@ stdenv.mkDerivation (finalAttrs: { gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ ffmpeg + libglvnd libpulseaudio ]}" ) diff --git a/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix b/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix deleted file mode 100644 index fa5fad4934c1..000000000000 --- a/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ stdenv, buildNpmPackage, fetchFromGitHub, electron, makeWrapper, python3, makeDesktopItem, nix-update-script, lib }: - -buildNpmPackage rec { - pname = "vieb"; - version = "10.4.0"; - - src = fetchFromGitHub { - owner = "Jelmerro"; - repo = pname; - rev = version; - hash = "sha256-SQQDlOSP1MZeN6BHdahpxpZ0e60lgA4ph0r2jkmTdP8="; - }; - - postPatch = '' - sed -i '/"electron"/d' package.json - ''; - - npmDepsHash = "sha256-yCWSEuhiP6DfcFns6uyUrLBJeQbOK7yJ9QfGhHkTlHI="; - makeCacheWritable = true; - dontNpmBuild = true; - - nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isAarch64 python3; - - desktopItem = makeDesktopItem { - name = "vieb"; - exec = "vieb %U"; - icon = "vieb"; - desktopName = "Web Browser"; - genericName = "Web Browser"; - categories = [ "Network" "WebBrowser" ]; - mimeTypes = [ - "text/html" - "application/xhtml+xml" - "x-scheme-handler/http" - "x-scheme-handler/https" - ]; - }; - - postInstall = '' - install -Dm0644 {${desktopItem},$out}/share/applications/vieb.desktop - - pushd $out/lib/node_modules/vieb/app/img/icons - for file in *.png; do - install -Dm0644 $file $out/share/icons/hicolor/''${file//.png}/apps/vieb.png - done - popd - - makeWrapper ${electron}/bin/electron $out/bin/vieb \ - --add-flags $out/lib/node_modules/vieb/app \ - --set npm_package_version ${version} - ''; - - distPhase = ":"; # disable useless $out/tarballs directory - - passthru.updateScript = nix-update-script {}; - - meta = with lib; { - homepage = "https://vieb.dev/"; - changelog = "https://github.com/Jelmerro/Vieb/releases/tag/${version}"; - description = "Vim Inspired Electron Browser"; - maintainers = with maintainers; [ gebner tejing ]; - platforms = platforms.unix; - license = licenses.gpl3Plus; - }; -} diff --git a/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix b/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix index 4abcb0321d8c..41dd4cbb08b9 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "7.4.1"; + version = "7.5.0"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-T8fPD0i15U/PzDOAVP0sifLYFHr76jD1o7q+nn+N0cY="; + sha256 = "sha256-LWfS722V0ubh4QaUNuGwrvFsVAzA9Hd5xLlDfTG0PBs="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/driftctl/default.nix b/nixpkgs/pkgs/applications/networking/cluster/driftctl/default.nix index 4104c40bf045..b116f566c5ce 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/driftctl/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/driftctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "driftctl"; - version = "0.39.0"; + version = "0.40.0"; src = fetchFromGitHub { owner = "snyk"; repo = "driftctl"; rev = "v${version}"; - sha256 = "sha256-1i5x05q0Mo3E3ExM9qONRtQCH3nO7pXyNqOaAtz7qYE="; + sha256 = "sha256-IDKfW0NCEsgKXpHA7SwkHjMeoGAIYITlDVR/vI/b9hk="; }; - vendorHash = "sha256-H/+LORl7Bjy1NshjtWDzj13YCrlQQgtBr4+Rz/rxQkY="; + vendorHash = "sha256-JFvC9PReziktHSXbltGkGHjVR8hTM1hPJ0OqrZQXRQM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/eks-node-viewer/default.nix b/nixpkgs/pkgs/applications/networking/cluster/eks-node-viewer/default.nix index 80538f0f111c..33c350b6bcb9 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/eks-node-viewer/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/eks-node-viewer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eks-node-viewer"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kfX9BzARDWUOBIu67j60K38uwkRELxd/gXtEHOHAXS8="; + sha256 = "sha256-BK84hxbwZSJDO5WoyborJnVBS5pB69jTMU1csgiT0sw="; }; - vendorHash = "sha256-7axI7R8cTntc1IcOwVPmPj8MHeIvhbnkYKQdqu5fZOU="; + vendorHash = "sha256-EJAL5jNftA/g5H6WUMBJ98EyRp7QJ1C53EKr6GRz71I="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix b/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix index 924052c2d9b0..dbd04f026dfa 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix @@ -12,9 +12,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.31.2"; + version = "1.32.0"; - vendorHash = "sha256-5ChPdSIRI+Q3OLW+joukMpIFbUjU4TKpXT4wAARVVP8="; + vendorHash = "sha256-MzB+my1NwvZx9qfojuOlTHmuY6CyLFlrgr4UEuC5FBk="; doCheck = false; @@ -22,7 +22,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-Ha0liXc2oXJ3dLty1veN5xN5BUKIiNXe8NTGqWDbTD0="; + sha256 = "sha256-2EWaMpcr4F1wRzIP1rPg1a/Sjd1x+oo2ee90k4Ie8cU="; }; nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix b/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix index 0d2a26478e7c..96e6d9eec7d2 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - hash = "sha256-PR3vhNfY84vKQaAMKmPPmY7kK3BRxELAC34NfMYXQPk="; + hash = "sha256-jjYSvY7NT9G/tcsM+9qHnsL81QKItyVMZZWuD2mpln0="; }; - vendorHash = "sha256-qLxUAICm/SGy2iHAbg+12xmId+P335dFyjltYlB45iw="; + vendorHash = "sha256-O48QzyQLkt7T9j+CKQG8TcHlmtS+ykoMoCamsEswPjk="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix b/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix index 826be33128a1..1bf5980acb4a 100644 --- a/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix +++ b/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "4.6.1"; + version = "4.6.2"; src = fetchFromGitHub { owner = "StackExchange"; repo = "dnscontrol"; rev = "v${version}"; - sha256 = "sha256-FJxr3uq2f8jDG3g06SRO8sTIc6qHqSAOJVYHr4Ug1ag="; + hash = "sha256-FcEpUNFPwottpuIsO53voucKULTkWOdbDgEXKYLb9LQ="; }; - vendorHash = "sha256-O7uuUkS9kX0TdevSg1mrrPMVl4kMZW3rwoIVb/eaNiM="; + vendorHash = "sha256-cW6urAJ3H30HY4Q7JLWFsQebg6YhdGSBgICWMl85v9U="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix index acc6f8948fc0..45c7e556a71d 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -109,6 +109,7 @@ stdenv.mkDerivation rec { description = "Desktop client for the Matrix protocol"; homepage = "https://github.com/Nheko-Reborn/nheko"; license = licenses.gpl3Plus; + mainProgram = "nheko"; maintainers = with maintainers; [ ekleog fpletz ]; platforms = platforms.all; # Should be fixable if a higher clang version is used, see: diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 683b1d7550cb..c545ac79a242 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,8 +1,8 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.39.1"; - hash = "sha256-dDbUpxXpQg1SoVyYO33Nczqf+WmWDPNE6cmw792wjGY="; + version = "6.40.0"; + hash = "sha256-vyXHlycPSyEyv938IKzGM6pdERHHerx2CLY/U+WMrH4="; }; signal-desktop-beta = { dir = "Signal Beta"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index d069e0a1f446..d7cf9a2d2c1e 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -80,14 +80,14 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "4.11.8"; + version = "4.12.2"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-VuMcqbGo1t1J7I8kXdqsw/01Mth9YKEbiy8aNtM3azw="; + hash = "sha256-jIOJ7iFF2SMZOBTVzc0ECEZrkXPY060jk3fxt7kIWSg="; }; patches = [ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index dddbfb799396..1964925924cd 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2023-11-01"; + version = "unstable-2023-11-17"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "71cce98c5fb1d9328892d55f70db711afd5b1aef"; - sha256 = "sha256-cEow6Hrp00nchfNtuABsLfD07KtlErWxh0NFv2uPQdQ="; + rev = "76a3513d7f25d6623d92463fbe6470d9001b66a8"; + sha256 = "sha256-nubFELIHxn9yQiFGDqcYtVN9rjXizzkiV07ypWY9v48="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix index 6ca9bdc0e764..89405033bcac 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix @@ -6,20 +6,21 @@ , openssl , CoreServices , Security +, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "twitch-tui"; - version = "2.5.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "Xithrius"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-oqsLqmyLrvb8u9cj68OemUfunbP98/BZjmoGl1Mctrk="; + hash = "sha256-UPcJHuqDnyg2U3aNtd44dqt2iC2iLkR4wzsOjAByISw="; }; - cargoHash = "sha256-DEHMF6sTH3BF8lqOV5G4F3+Tsafrhzr0YLqSgV3gq9I="; + cargoHash = "sha256-HFBCLYjrDAPU2EZ1NQ+A0mAFo5jvj79Ghge6+D1PBAg="; nativeBuildInputs = [ pkg-config @@ -30,6 +31,7 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security + SystemConfiguration ]; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix index 952ca75bb6af..96854c3cdb62 100644 --- a/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix @@ -36,14 +36,14 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "4.1.1"; + version = "4.1.2"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; - hash = "sha256-d0I4YU2OY+TT1ac6bLZA7Hb+BsyYK4eoySNlFXkndnU="; + hash = "sha256-mpuRD752i7nefHrJRPXbjyM4M/NFsuUF4W7G7zXv+7U="; }; # Why is this needed? https://github.com/weechat/weechat/issues/2031 diff --git a/nixpkgs/pkgs/applications/networking/juju/default.nix b/nixpkgs/pkgs/applications/networking/juju/default.nix index 17d80e496e31..1a914a065b09 100644 --- a/nixpkgs/pkgs/applications/networking/juju/default.nix +++ b/nixpkgs/pkgs/applications/networking/juju/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "juju"; - version = "3.2.3"; + version = "3.3.0"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "juju-${version}"; - sha256 = "sha256-sUlM4bLy/kluZmGOzMACz92GG46XYKicNPP5k2FPSGA="; + sha256 = "sha256-8VSSTeN4a1zvMi4L4dR3q+kWKgYq8Jg1jDvFjEBD7jI="; }; - vendorHash = "sha256-mPEixXVuxAqgkBoNqIYnZaFJynHJsnmamaHqyh/svwQ="; + vendorHash = "sha256-3hZywUpJe6g8IujbK0hcp12S6OKswLj/YYJGuPG06Es="; # Disable tests because it attempts to use a mongodb instance doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 896c2a6c269c..b7167d261b21 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -44,11 +44,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.50.1"; + version = "3.50.2"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "5CA240m4Mrkbprxg+Zxkte0AjrDrM7wipU8p9I7r1Zg="; + sha256 = "D4M1214mmFRHi01tlHLu2s0Kiev3+0+DdWJDMMqqcSA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/p2p/libutp/3.4.nix b/nixpkgs/pkgs/applications/networking/p2p/libutp/3.4.nix index aa2853d3bd05..dfff1eeed239 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/libutp/3.4.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/libutp/3.4.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "libutp"; - version = "unstable-2023-10-16"; + version = "unstable-2023-11-14"; src = fetchFromGitHub { # Use transmission fork from post-3.4-transmission branch owner = "transmission"; repo = pname; - rev = "2589200eac82fc91b65979680e4b3c026dff0278"; - hash = "sha256-wsDqdbMWVm3ubTbg5XClEWutJz1irSIazVLFeCyAAL4="; + rev = "52645d6d0fb16009e11d2f84469d2e43b7b6b48a"; + hash = "sha256-pcPVkDEEtriN9zlEcVFKwKhhh51wpJGxYlcu7bH1RkI="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/networking/pjsip/default.nix b/nixpkgs/pkgs/applications/networking/pjsip/default.nix index 4ed0bad26c6f..1943a395bd7b 100644 --- a/nixpkgs/pkgs/applications/networking/pjsip/default.nix +++ b/nixpkgs/pkgs/applications/networking/pjsip/default.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "pjsip"; - version = "2.13.1"; + version = "2.14"; src = fetchFromGitHub { owner = finalAttrs.pname; repo = "pjproject"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-R1iKIkWyNCRV2PjQgTqKmJYUgHAZrREanD60Jz6MY1Y="; + hash = "sha256-PWCeIvnBAOqbcNYPhIY7hykdvLzoD9lssSViCCPNT68="; }; patches = [ @@ -35,12 +35,19 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional stdenv.isLinux alsa-lib ++ lib.optionals stdenv.isDarwin [ AppKit CoreFoundation Security ]; + env = lib.optionalAttrs (stdenv.cc.libcxx != null) { + # work around https://github.com/NixOS/nixpkgs/issues/166205 + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + } // lib.optionalAttrs stdenv.cc.isClang { + CXXFLAGS = "-std=c++11"; + } // lib.optionalAttrs stdenv.isDarwin { + NIX_CFLAGS_LINK = "-headerpad_max_install_names"; + }; + preConfigure = '' export LD=$CC ''; - NIX_CFLAGS_LINK = lib.optionalString stdenv.isDarwin "-headerpad_max_install_names"; - postBuild = lib.optionalString pythonSupport '' make -C pjsip-apps/src/swig/python ''; diff --git a/nixpkgs/pkgs/applications/networking/powerdns-admin/0001-Fix-flask-2.3-issue.patch b/nixpkgs/pkgs/applications/networking/powerdns-admin/0001-Fix-flask-2.3-issue.patch new file mode 100644 index 000000000000..8645e0dbfa7d --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/powerdns-admin/0001-Fix-flask-2.3-issue.patch @@ -0,0 +1,25 @@ +From 29b58e29c813d9bf0b31139a19b556614c28638e Mon Sep 17 00:00:00 2001 +From: Flakebi <flakebi@t-online.de> +Date: Sat, 2 Dec 2023 16:26:22 +0100 +Subject: [PATCH 1/6] Fix flask 2.3 issue + +'Blueprint' object has no attribute 'before_app_first_request' +--- + powerdnsadmin/routes/index.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/powerdnsadmin/routes/index.py b/powerdnsadmin/routes/index.py +index d56ce61..2176bd6 100644 +--- a/powerdnsadmin/routes/index.py ++++ b/powerdnsadmin/routes/index.py +@@ -46,7 +46,6 @@ index_bp = Blueprint('index', + url_prefix='/') + + +-@index_bp.before_app_first_request + def register_modules(): + global google + global github +-- +2.42.0 + diff --git a/nixpkgs/pkgs/applications/networking/powerdns-admin/0002-Remove-cssrewrite-filter.patch b/nixpkgs/pkgs/applications/networking/powerdns-admin/0002-Remove-cssrewrite-filter.patch new file mode 100644 index 000000000000..9b442d5f3d7d --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/powerdns-admin/0002-Remove-cssrewrite-filter.patch @@ -0,0 +1,34 @@ +From c60a9658fe2ca429327680fbffb86f609d98c52c Mon Sep 17 00:00:00 2001 +From: Flakebi <flakebi@t-online.de> +Date: Sat, 2 Dec 2023 16:27:49 +0100 +Subject: [PATCH 2/6] Remove cssrewrite filter + +--- + powerdnsadmin/assets.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/powerdnsadmin/assets.py b/powerdnsadmin/assets.py +index d46d431..3c582be 100644 +--- a/powerdnsadmin/assets.py ++++ b/powerdnsadmin/assets.py +@@ -13,7 +13,7 @@ css_login = Bundle( + 'node_modules/@fortawesome/fontawesome-free/css/all.css', + 'node_modules/icheck/skins/square/blue.css', + 'node_modules/admin-lte/dist/css/adminlte.css', +- filters=('rcssmin', 'cssrewrite'), ++ filters=('rcssmin'), + output='generated/login.css') + + js_login = Bundle( +@@ -37,7 +37,7 @@ css_main = Bundle( + 'node_modules/admin-lte/dist/css/adminlte.css', + 'custom/css/custom.css', + 'node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker.css', +- filters=('rcssmin', 'cssrewrite'), ++ filters=('rcssmin'), + output='generated/main.css') + + js_main = Bundle( +-- +2.42.0 + diff --git a/nixpkgs/pkgs/applications/networking/powerdns-admin/0003-Fix-flask-migrate-4.0-compatibility.patch b/nixpkgs/pkgs/applications/networking/powerdns-admin/0003-Fix-flask-migrate-4.0-compatibility.patch new file mode 100644 index 000000000000..c9956ae22f75 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/powerdns-admin/0003-Fix-flask-migrate-4.0-compatibility.patch @@ -0,0 +1,25 @@ +From 8c320a34bcca6dc2c1b423a1445235bf178b653e Mon Sep 17 00:00:00 2001 +From: Flakebi <flakebi@t-online.de> +Date: Sat, 2 Dec 2023 16:31:02 +0100 +Subject: [PATCH 3/6] Fix flask-migrate 4.0 compatibility + +See https://github.com/PowerDNS-Admin/PowerDNS-Admin/issues/1376 +--- + migrations/env.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/migrations/env.py b/migrations/env.py +index 4742e14..739d753 100755 +--- a/migrations/env.py ++++ b/migrations/env.py +@@ -73,7 +73,6 @@ def run_migrations_online(): + context.configure(connection=connection, + target_metadata=target_metadata, + process_revision_directives=process_revision_directives, +- render_as_batch=config.get_main_option('sqlalchemy.url').startswith('sqlite:'), + **current_app.extensions['migrate'].configure_args) + + try: +-- +2.42.0 + diff --git a/nixpkgs/pkgs/applications/networking/powerdns-admin/0004-Fix-flask-session-and-powerdns-admin-compatibility.patch b/nixpkgs/pkgs/applications/networking/powerdns-admin/0004-Fix-flask-session-and-powerdns-admin-compatibility.patch new file mode 100644 index 000000000000..b1aaa8c531d1 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/powerdns-admin/0004-Fix-flask-session-and-powerdns-admin-compatibility.patch @@ -0,0 +1,26 @@ +From 4b4ac26ef1cbb0b5b2354c251b216498325d0411 Mon Sep 17 00:00:00 2001 +From: Flakebi <flakebi@t-online.de> +Date: Sat, 2 Dec 2023 16:31:50 +0100 +Subject: [PATCH 4/6] Fix flask-session and powerdns-admin compatibility + +flask-session and powerdns-admin both try to add sqlalchemy to flask. +Reuse the database for flask-session. +--- + powerdnsadmin/__init__.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/powerdnsadmin/__init__.py b/powerdnsadmin/__init__.py +index d447a00..653af33 100755 +--- a/powerdnsadmin/__init__.py ++++ b/powerdnsadmin/__init__.py +@@ -60,6 +60,7 @@ def create_app(config=None): + if 'SESSION_TYPE' in os.environ: + app.config['SESSION_TYPE'] = os.environ.get('SESSION_TYPE') + ++ app.config['SESSION_SQLALCHEMY'] = models.base.db + sess = Session(app) + + # create sessions table if using sqlalchemy backend +-- +2.42.0 + diff --git a/nixpkgs/pkgs/applications/networking/powerdns-admin/0005-Use-app-context-to-create-routes.patch b/nixpkgs/pkgs/applications/networking/powerdns-admin/0005-Use-app-context-to-create-routes.patch new file mode 100644 index 000000000000..b6931c25d546 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/powerdns-admin/0005-Use-app-context-to-create-routes.patch @@ -0,0 +1,27 @@ +From 3eb1a408758b68543c73d5214b467c2905fbea2a Mon Sep 17 00:00:00 2001 +From: Flakebi <flakebi@t-online.de> +Date: Sat, 2 Dec 2023 16:32:36 +0100 +Subject: [PATCH 5/6] Use app context to create routes + +Routes creates session database tables, so it needs a context. +--- + powerdnsadmin/__init__.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/powerdnsadmin/__init__.py b/powerdnsadmin/__init__.py +index 653af33..bc6f7df 100755 +--- a/powerdnsadmin/__init__.py ++++ b/powerdnsadmin/__init__.py +@@ -73,7 +73,8 @@ def create_app(config=None): + # Load app's components + assets.init_app(app) + models.init_app(app) +- routes.init_app(app) ++ with app.app_context(): ++ routes.init_app(app) + services.init_app(app) + + # Register filters +-- +2.42.0 + diff --git a/nixpkgs/pkgs/applications/networking/powerdns-admin/0006-Register-modules-before-starting.patch b/nixpkgs/pkgs/applications/networking/powerdns-admin/0006-Register-modules-before-starting.patch new file mode 100644 index 000000000000..dd552cc28403 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/powerdns-admin/0006-Register-modules-before-starting.patch @@ -0,0 +1,27 @@ +From 86dcc9f308d2ca65704953f1ff9fe043d743e536 Mon Sep 17 00:00:00 2001 +From: Flakebi <flakebi@t-online.de> +Date: Sat, 2 Dec 2023 16:33:45 +0100 +Subject: [PATCH 6/6] Register modules before starting + +Fixes flask 2.3: 'Blueprint' object has no attribute 'before_app_first_request' +--- + run.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/run.py b/run.py +index 5ffcde3..52e719d 100755 +--- a/run.py ++++ b/run.py +@@ -1,6 +1,9 @@ + #!/usr/bin/env python3 + from powerdnsadmin import create_app ++from .powerdnsadmin.routes.index import register_modules + + if __name__ == '__main__': + app = create_app() ++ with app.app_context(): ++ register_modules() + app.run(debug=True, host=app.config.get('BIND_ADDRESS', '127.0.0.1'), port=app.config.get('PORT', '9191')) +-- +2.42.0 + diff --git a/nixpkgs/pkgs/applications/networking/powerdns-admin/default.nix b/nixpkgs/pkgs/applications/networking/powerdns-admin/default.nix index 1e89c1b2cb46..61a728d983b3 100644 --- a/nixpkgs/pkgs/applications/networking/powerdns-admin/default.nix +++ b/nixpkgs/pkgs/applications/networking/powerdns-admin/default.nix @@ -19,6 +19,10 @@ let lima lxml passlib pyasn1 pytimeparse pyyaml jinja2 itsdangerous webcolors werkzeug zipp zxcvbn ]; + all_patches = [ + ./0001-Fix-flask-2.3-issue.patch + ]; + assets = mkYarnPackage { inherit src version; packageJSON = ./package.json; @@ -35,9 +39,9 @@ let }; nativeBuildInputs = pythonDeps; - patchPhase = '' - sed -i -r -e "s|'rcssmin',\s?'cssrewrite'|'rcssmin'|g" powerdnsadmin/assets.py - ''; + patches = all_patches ++ [ + ./0002-Remove-cssrewrite-filter.patch + ]; buildPhase = '' # The build process expects the directory to be writable # with node_modules at a specific path @@ -86,15 +90,15 @@ in stdenv.mkDerivation { exec python -m gunicorn.app.wsgiapp "powerdnsadmin:create_app()" "$@" ''; + patches = all_patches ++ [ + ./0003-Fix-flask-migrate-4.0-compatibility.patch + ./0004-Fix-flask-session-and-powerdns-admin-compatibility.patch + ./0005-Use-app-context-to-create-routes.patch + ./0006-Register-modules-before-starting.patch + ]; + postPatch = '' rm -r powerdnsadmin/static powerdnsadmin/assets.py - # flask-migrate 4.0 compatibility: https://github.com/PowerDNS-Admin/PowerDNS-Admin/issues/1376 - substituteInPlace migrations/env.py --replace "render_as_batch=config.get_main_option('sqlalchemy.url').startswith('sqlite:')," "" - # flask-session and powerdns-admin both try to add sqlalchemy to flask. - # Reuse the database for flask-session - substituteInPlace powerdnsadmin/__init__.py --replace "sess = Session(app)" "app.config['SESSION_SQLALCHEMY'] = models.base.db; sess = Session(app)" - # Routes creates session database tables, so it needs a context - substituteInPlace powerdnsadmin/__init__.py --replace "routes.init_app(app)" "with app.app_context(): routes.init_app(app)" ''; installPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/remote/aws-workspaces/default.nix b/nixpkgs/pkgs/applications/networking/remote/aws-workspaces/default.nix index 4cc21a2269d6..b1e11510530a 100644 --- a/nixpkgs/pkgs/applications/networking/remote/aws-workspaces/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/aws-workspaces/default.nix @@ -1,6 +1,6 @@ { stdenv, lib , makeWrapper, dpkg, fetchurl, autoPatchelfHook -, curl, libkrb5, lttng-ust, libpulseaudio, gtk3, openssl_1_1, icu70, webkitgtk, librsvg, gdk-pixbuf, libsoup, glib-networking, graphicsmagick_q16, libva, libusb1, hiredis +, curl, libkrb5, lttng-ust, libpulseaudio, gtk3, openssl_1_1, icu70, webkitgtk, librsvg, gdk-pixbuf, libsoup, glib-networking, graphicsmagick_q16, libva, libusb1, hiredis, xcbutil }: stdenv.mkDerivation rec { @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { hiredis libusb1 libva + xcbutil ]; unpackPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 03d56274bd79..bf14b0321943 100644 --- a/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -5,6 +5,7 @@ , libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin , libpulseaudio, pcsclite, glib-networking, llvmPackages_12, opencv4 , libfaketime +, libinput, libcap, libjson, libsecret, libcanberra-gtk3 , homepage, version, prefix, hash @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { ${homepage} (if you do not find version ${version} there, try at - https://www.citrix.com/downloads/workspace-app/ + https://www.citrix.com/downloads/workspace-app/) Once you have downloaded the file, please use the following command and re-run the installation: @@ -80,11 +81,16 @@ stdenv.mkDerivation rec { gtk_engines heimdal krb5 + libcap + libcanberra-gtk3 libcxx libcxxabi + libinput libjpeg + libjson libpng12 libpulseaudio + libsecret libsoup libvorbis libxml2 @@ -119,6 +125,8 @@ stdenv.mkDerivation rec { xorg.libXrender xorg.libXtst xorg.libxcb + xorg.xprop + xorg.xdpyinfo ]; installPhase = let diff --git a/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix index 2422d7eb8efb..f1b1a83102ac 100644 --- a/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -33,6 +33,17 @@ let x86hash = "4a7da238286ae28d7baf0fefa1e7e09d077c8bc56c2bf7bec00da42c331bee59"; x64suffix = "17"; x86suffix = "17"; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest21.html"; + }; + + "23.09.0" = { + major = "23"; + minor = "9"; + patch = "0"; + x64hash = "7b06339654aa27258d6dfa922828b43256e780b282d07109f452246c7aa27514"; + x86hash = "95436fb289602cf31c65b7df89da145fc170233cb2e758a2f11116f15b57d382"; + x64suffix = "24"; + x86suffix = "24"; homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; }; |