chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update dependencies

Browse source
This commit is contained in:
Charlotte Van Petegem 2023-07-16 13:57:01 +02:00
parent ad8619eb1e
commit 2703721e64
No known key found for this signature in database
GPG key ID: 019E764B7184435A
2 changed files with 18 additions and 253 deletions
Download patch file Download diff file Expand all files Collapse all files

36
flake.lock generated
View file

@ -45,11 +45,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1689453594, "lastModified": 1689496997,
"narHash": "sha256-X8n5oO6dBEDlU6UMIwsyK2XD7lfZj7Ey528syeN9qeY=", "narHash": "sha256-+v32k1QmXUB7AcdMGIOAVPMEBHiUMBMuyamWC2/p3ow=",
"owner": "accentor", "owner": "accentor",
"repo": "api", "repo": "api",
"rev": "1325d692f48da5c035f01d8156ec403d9bfc261f", "rev": "d0fd9d96611f5058b501e24fb54d078559a9b2f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -178,11 +178,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1689480175, "lastModified": 1689507145,
"narHash": "sha256-esfvClbx/gs/8gC2ZLeZQNyzmeaWDsUUS5djlmOWnQc=", "narHash": "sha256-2ojaMkso1b0StMq54HxQP/7CE6K69GwHCF4lc9qhLk0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "4c3cb10e40504e91e3619b770030c675d6278302", "rev": "aa9011e25ca971ee914cc8db9224d213b691e8b0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -309,11 +309,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1689447223, "lastModified": 1689495092,
"narHash": "sha256-A5vQBtWYamvGf3c2IEhAmwIkXBzuzrkpnMYbLvc+lEY=", "narHash": "sha256-yZu2j5FpLZEPhJQQutMCPTxa1VMigLPabLYvLTq6ASM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f5b03feb33629cb2b6dd513935637e8cc718a5ba", "rev": "2f84579a70b8c74e5ebb37299a0c3ba279f09382",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -395,11 +395,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1689373857, "lastModified": 1689444953,
"narHash": "sha256-mtBksyvhhT98Zsm9tYHuMKuLwUKDwv+BGTl6K5nOGhY=", "narHash": "sha256-0o56bfb2LC38wrinPdCGLDScd77LVcr7CrH1zK7qvDg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dfdbcc428f365071f0ca3888f6ec8c25c3792885", "rev": "8acef304efe70152463a6399f73e636bcc363813",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -473,11 +473,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1689482051, "lastModified": 1689506127,
"narHash": "sha256-MIVcHtBinng711juCWrxMjCNFFSBeu8wuq/8F75F7d0=", "narHash": "sha256-n9+9qDi9v36oritr702Z8zJc3NrBhNLQN+SstCFUobA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "c4ac2ea99190785209eb1f377ef7e57036eff512", "rev": "127d79170f199eb58cd768a9a14f21ae8590aa33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -594,11 +594,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1689449742, "lastModified": 1689492954,
"narHash": "sha256-0jJaE4ef5SLeMqympiSEbp5m2uRIE4oCjeZHj9tG854=", "narHash": "sha256-iY7mtRRmkomasPCAxM3PEC2PI7Wb/LXPbhUgjjGc7MM=",
"owner": "chvp", "owner": "chvp",
"repo": "tetris", "repo": "tetris",
"rev": "5a0567be17ab7ce40418eb45f7341a6a753a7829", "rev": "4b1503b8406e745df0bbedbb19d387519cc5de9b",
"type": "github" "type": "github"
}, },
"original": { "original": {

235
patches/241146.patch
View file

@ -1,235 +0,0 @@
diff --git a/pkgs/applications/networking/p2p/libutp/3.4.nix b/pkgs/applications/networking/p2p/libutp/3.4.nix
new file mode 100644
index 0000000000000..46c1dda8b9cfe
--- /dev/null
+++ b/pkgs/applications/networking/p2p/libutp/3.4.nix
@@ -0,0 +1,30 @@
+{ stdenv, lib, fetchFromGitHub, cmake, unstableGitUpdater }:
+
+stdenv.mkDerivation rec {
+ pname = "libutp";
+ version = "unstable-2017-01-02";
+
+ src = fetchFromGitHub {
+ # Use transmission fork from post-3.4-transmission branch
+ owner = "transmission";
+ repo = pname;
+ rev = "9cb9f9c4f0073d78b08d6542cebaea6564ecadfe";
+ hash = "sha256-dpbX1h/gpuVIAXC4hwwuRwQDJ0pwVVEsgemOVN0Dv9Q=";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ passthru = {
+ updateScript = unstableGitUpdater {
+ branch = "post-3.4-transmission";
+ };
+ };
+
+ meta = with lib; {
+ description = "uTorrent Transport Protocol library";
+ homepage = "https://github.com/transmission/libutp";
+ license = licenses.mit;
+ maintainers = with maintainers; [ emilytrau ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix
new file mode 100644
index 0000000000000..6ad2c8dd08283
--- /dev/null
+++ b/pkgs/applications/networking/p2p/transmission/4.nix
@@ -0,0 +1,162 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, cmake
+, pkg-config
+, python3
+, openssl
+, curl
+, libevent
+, inotify-tools
+, systemd
+, zlib
+, pcre
+, libb64
+, libutp
+, libdeflate
+, utf8cpp
+, fmt
+, libpsl
+, miniupnpc
+, dht
+, libnatpmp
+, libiconv
+, darwin
+ # Build options
+, enableGTK3 ? false
+, gtkmm3
+, xorg
+, wrapGAppsHook
+, enableQt ? false
+, qt5
+, nixosTests
+, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
+, enableDaemon ? true
+, enableCli ? true
+, installLib ? false
+, apparmorRulesFromClosure
+}:
+
+stdenv.mkDerivation rec {
+ pname = "transmission";
+ version = "4.0.3";
+
+ src = fetchFromGitHub {
+ owner = "transmission";
+ repo = "transmission";
+ rev = version;
+ hash = "sha256-P7omd49xLmReo9Zrg0liO1msUVzCa5CxH7PGmH4oPzg=";
+ fetchSubmodules = true;
+ };
+
+ outputs = [ "out" "apparmor" ];
+
+ cmakeFlags =
+ let
+ mkFlag = opt: if opt then "ON" else "OFF";
+ in
+ [
+ "-DENABLE_MAC=OFF" # requires xcodebuild
+ "-DENABLE_GTK=${mkFlag enableGTK3}"
+ "-DENABLE_QT=${mkFlag enableQt}"
+ "-DENABLE_DAEMON=${mkFlag enableDaemon}"
+ "-DENABLE_CLI=${mkFlag enableCli}"
+ "-DINSTALL_LIB=${mkFlag installLib}"
+ ] ++ lib.optionals stdenv.isDarwin [
+ # Transmission sets this to 10.13 if not explicitly specified, see https://github.com/transmission/transmission/blob/0be7091eb12f4eb55f6690f313ef70a66795ee72/CMakeLists.txt#L7-L16.
+ "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}"
+ ];
+
+ postPatch = ''
+ # Clean third-party libraries to ensure system ones are used.
+ # Excluding gtest since it is hardcoded to vendored version. The rest of the listed libraries are not packaged.
+ pushd third-party
+ for f in *; do
+ if [[ ! $f =~ googletest|wildmat|fast_float|wide-integer|jsonsl ]]; then
+ rm -r "$f"
+ fi
+ done
+ popd
+ rm \
+ cmake/FindFmt.cmake \
+ cmake/FindUtfCpp.cmake
+ # Upstream uses different config file name.
+ substituteInPlace CMakeLists.txt --replace 'find_package(UtfCpp)' 'find_package(utf8cpp)'
+ '';
+
+ nativeBuildInputs = [
+ pkg-config
+ cmake
+ python3
+ ]
+ ++ lib.optionals enableGTK3 [ wrapGAppsHook ]
+ ++ lib.optionals enableQt [ qt5.wrapQtAppsHook ]
+ ;
+
+ buildInputs = [
+ curl
+ dht
+ fmt
+ libb64
+ libdeflate
+ libevent
+ libnatpmp
+ libpsl
+ libutp
+ miniupnpc
+ openssl
+ pcre
+ utf8cpp
+ zlib
+ ]
+ ++ lib.optionals enableQt [ qt5.qttools qt5.qtbase ]
+ ++ lib.optionals enableGTK3 [ gtkmm3 xorg.libpthreadstubs ]
+ ++ lib.optionals enableSystemd [ systemd ]
+ ++ lib.optionals stdenv.isLinux [ inotify-tools ]
+ ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Foundation ];
+
+ postInstall = ''
+ mkdir $apparmor
+ cat >$apparmor/bin.transmission-daemon <<EOF
+ include <tunables/global>
+ $out/bin/transmission-daemon {
+ include <abstractions/base>
+ include <abstractions/nameservice>
+ include <abstractions/ssl_certs>
+ include "${apparmorRulesFromClosure { name = "transmission-daemon"; } ([
+ curl libevent openssl pcre zlib libdeflate libpsl libnatpmp miniupnpc
+ ] ++ lib.optionals enableSystemd [ systemd ]
+ ++ lib.optionals stdenv.isLinux [ inotify-tools ]
+ )}"
+ r @{PROC}/sys/kernel/random/uuid,
+ r @{PROC}/sys/vm/overcommit_memory,
+ r @{PROC}/@{pid}/environ,
+ r @{PROC}/@{pid}/mounts,
+ rwk /tmp/tr_session_id_*,
+
+ r $out/share/transmission/web/**,
+
+ include <local/bin.transmission-daemon>
+ }
+ EOF
+ '';
+
+ meta = {
+ description = "A fast, easy and free BitTorrent client";
+ longDescription = ''
+ Transmission is a BitTorrent client which features a simple interface
+ on top of a cross-platform back-end.
+ Feature spotlight:
+ * Uses fewer resources than other clients
+ * Native Mac, GTK and Qt GUI clients
+ * Daemon ideal for servers, embedded systems, and headless use
+ * All these can be remote controlled by Web and Terminal clients
+ * Bluetack (PeerGuardian) blocklists with automatic updates
+ * Full encryption, DHT, and PEX support
+ '';
+ homepage = "http://www.transmissionbt.com/";
+ license = with lib.licenses; [ gpl2Plus mit ];
+ maintainers = with lib.maintainers; [ astsmtl ];
+ platforms = lib.platforms.unix;
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e1e5ba3897736..da3910ca91ec9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -32671,6 +32671,7 @@ with pkgs;
libvmi = callPackage ../development/libraries/libvmi { };
libutp = callPackage ../applications/networking/p2p/libutp { };
+ libutp_3_4 = callPackage ../applications/networking/p2p/libutp/3.4.nix { };
lifelines = callPackage ../applications/misc/lifelines { };
@@ -35212,6 +35213,18 @@ with pkgs;
transmission-gtk = transmission.override { enableGTK3 = true; };
transmission-qt = transmission.override { enableQt = true; };
+ transmission_4 = callPackage ../applications/networking/p2p/transmission/4.nix {
+ fmt = fmt_9;
+ libutp = libutp_3_4;
+ };
+ libtransmission_4 = transmission_4.override {
+ installLib = true;
+ enableDaemon = false;
+ enableCli = false;
+ };
+ transmission_4-gtk = transmission_4.override { enableGTK3 = true; };
+ transmission_4-qt = transmission_4.override { enableQt = true; };
+
transmission-remote-gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk { };
transgui = callPackage ../applications/networking/p2p/transgui { };