From 8027d95ff01ba1a9dbc9f960a929ffe4e306d25c Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sat, 22 Jul 2023 15:38:42 +0800 Subject: [PATCH 01/77] xrootd: enable structured attributes --- pkgs/tools/networking/xrootd/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/networking/xrootd/default.nix b/pkgs/tools/networking/xrootd/default.nix index e5aad1b4ee9b..bb8576e7af97 100644 --- a/pkgs/tools/networking/xrootd/default.nix +++ b/pkgs/tools/networking/xrootd/default.nix @@ -24,6 +24,9 @@ }: stdenv.mkDerivation (finalAttrs: { + + __structuredAttrs = true; + pname = "xrootd"; version = "5.5.5"; From 9c80ef7f16acb29560154af94615768d16858559 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Fri, 26 May 2023 17:26:47 +0800 Subject: [PATCH 02/77] xrootd: wrap executables with [DY]LD_LIBRARY_PATH --- pkgs/tools/networking/xrootd/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/xrootd/default.nix b/pkgs/tools/networking/xrootd/default.nix index bb8576e7af97..47496173642c 100644 --- a/pkgs/tools/networking/xrootd/default.nix +++ b/pkgs/tools/networking/xrootd/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , cmake , cppunit +, makeWrapper , pkg-config , curl , fuse @@ -58,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + makeWrapper pkg-config ]; @@ -104,7 +106,18 @@ stdenv.mkDerivation (finalAttrs: { "-DENABLE_TESTS=TRUE" ]; - postFixup = lib.optionalString (externalEtc != null) '' + makeWrapperArgs = [ + # Workaround the library-not-found issue + # happening to binaries compiled with xrootd libraries. + # See #169677 + "--prefix" "${lib.optionalString stdenv.hostPlatform.isDarwin "DY"}LD_LIBRARY_PATH" ":" "${placeholder "out"}/lib" + ]; + + postFixup = '' + while IFS= read -r FILE; do + wrapProgram "$FILE" "''${makeWrapperArgs[@]}" + done < <(find "$bin/bin" -mindepth 1 -maxdepth 1 -type f,l -perm -a+x) + '' + lib.optionalString (externalEtc != null) '' mv "$out"/etc{,.orig} ln -s ${lib.escapeShellArg externalEtc} "$out/etc" ''; From bc744410f5b6e406b2ac2cd0a000db6c88fdc2bd Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Fri, 26 May 2023 17:30:25 +0800 Subject: [PATCH 03/77] xrootd.fetchxrd: remove duplicated wrapping --- pkgs/tools/networking/xrootd/fetchxrd.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/networking/xrootd/fetchxrd.nix b/pkgs/tools/networking/xrootd/fetchxrd.nix index b7a77f80549b..c5ec8f02e783 100644 --- a/pkgs/tools/networking/xrootd/fetchxrd.nix +++ b/pkgs/tools/networking/xrootd/fetchxrd.nix @@ -21,11 +21,9 @@ inherit url; urls = if urls == [ ] then lib.singleton url else urls; } - # Set [DY]LD_LIBRARY_PATH to workaround #169677 - # TODO: Remove the library path after #200830 get merged '' for u in $urls; do - ${lib.optionalString buildPlatform.isDarwin "DY"}LD_LIBRARY_PATH=${lib.makeLibraryPath [ xrootd ]} xrdcp --force "$u" "$out" + xrdcp --force "$u" "$out" ret=$? (( ret != 0 )) || break done From 4f318516389444054791920017c5e3e29bfb2c1c Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 3 Aug 2023 07:57:02 +0800 Subject: [PATCH 04/77] xrootd.fetchxrd: show progress bar with --verbose Show the progress bar and other information during the download. Provide a way to distinguish connection interrupt from authentication failure. --- pkgs/tools/networking/xrootd/fetchxrd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/xrootd/fetchxrd.nix b/pkgs/tools/networking/xrootd/fetchxrd.nix index c5ec8f02e783..5bad585186ac 100644 --- a/pkgs/tools/networking/xrootd/fetchxrd.nix +++ b/pkgs/tools/networking/xrootd/fetchxrd.nix @@ -23,7 +23,7 @@ } '' for u in $urls; do - xrdcp --force "$u" "$out" + xrdcp --verbose --force "$u" "$out" ret=$? (( ret != 0 )) || break done From 95f76d1d100df7126ce202606745557710aa1c33 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Fri, 21 Jul 2023 02:46:47 +0800 Subject: [PATCH 05/77] xrootd: opt out systemd where it breaks --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af68261a0fb9..2ef5f06ea73c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1889,7 +1889,10 @@ with pkgs; xpaste = callPackage ../tools/text/xpaste { }; - xrootd = callPackage ../tools/networking/xrootd { }; + xrootd = callPackage ../tools/networking/xrootd { + # Workaround systemd static build breakage + systemd = if systemd.meta.broken then null else systemd; + }; yabridge = callPackage ../tools/audio/yabridge { wine = wineWowPackages.staging; From 759ec1113d0a1d6315b38bd83ec3562dacc08238 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Thu, 7 Sep 2023 10:27:20 +0800 Subject: [PATCH 06/77] nixos/network-interfaces: stop wrapping ping with cap_net_raw From systemd 243 release note[1]: This release enables unprivileged programs (i.e. requiring neither setuid nor file capabilities) to send ICMP Echo (i.e. ping) requests by turning on the "net.ipv4.ping_group_range" sysctl of the Linux kernel for the whole UNIX group range, i.e. all processes. So this wrapper is not needed any more. See also [2] and [3]. This patch also removes: - apparmor profiles in NixOS for ping itself and the wrapped one - other references for the wrapped ping [1]: https://github.com/systemd/systemd/blob/8e2d9d40b33bc8e8f5d3479fb075d3fab32a4184/NEWS#L6457-L6464 [2]: https://github.com/systemd/systemd/pull/13141 [3]: https://fedoraproject.org/wiki/Changes/EnableSysctlPingGroupRange --- .../development/activation-script.section.md | 2 +- nixos/modules/security/apparmor/profiles.nix | 6 ----- .../home-automation/home-assistant.nix | 3 ++- nixos/modules/tasks/network-interfaces.nix | 22 ------------------- nixos/tests/systemd.nix | 2 +- pkgs/servers/monitoring/plugins/default.nix | 8 ++++--- 6 files changed, 9 insertions(+), 34 deletions(-) diff --git a/nixos/doc/manual/development/activation-script.section.md b/nixos/doc/manual/development/activation-script.section.md index c339258c6dc4..cc317a6a01aa 100644 --- a/nixos/doc/manual/development/activation-script.section.md +++ b/nixos/doc/manual/development/activation-script.section.md @@ -69,4 +69,4 @@ do: `/etc/group` and `/etc/shadow`. This also creates home directories - `usrbinenv` creates `/usr/bin/env` - `var` creates some directories in `/var` that are not service-specific -- `wrappers` creates setuid wrappers like `ping` and `sudo` +- `wrappers` creates setuid wrappers like `sudo` diff --git a/nixos/modules/security/apparmor/profiles.nix b/nixos/modules/security/apparmor/profiles.nix index 8eb630b5a48a..0bf90a008655 100644 --- a/nixos/modules/security/apparmor/profiles.nix +++ b/nixos/modules/security/apparmor/profiles.nix @@ -2,10 +2,4 @@ let apparmor = config.security.apparmor; in { config.security.apparmor.packages = [ pkgs.apparmor-profiles ]; -config.security.apparmor.policies."bin.ping".profile = lib.mkIf apparmor.policies."bin.ping".enable '' - include "${pkgs.iputils.apparmor}/bin.ping" - include "${pkgs.inetutils.apparmor}/bin.ping" - # Note that including those two profiles in the same profile - # would not work if the second one were to re-include . -''; } diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index 0b8b1d719418..bf32382652d1 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -586,11 +586,12 @@ in { "~@privileged" ] ++ optionals (any useComponent componentsUsingPing) [ "capset" + "setuid" ]; UMask = "0077"; }; path = [ - "/run/wrappers" # needed for ping + pkgs.unixtools.ping # needed for ping ]; }; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 0d4033ca9430..e11fd3aaec37 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -1385,28 +1385,6 @@ in val = tempaddrValues.${opt}.sysctl; in nameValuePair "net.ipv6.conf.${replaceStrings ["."] ["/"] i.name}.use_tempaddr" val)); - security.wrappers = { - ping = { - owner = "root"; - group = "root"; - capabilities = "cap_net_raw+p"; - source = "${pkgs.iputils.out}/bin/ping"; - }; - }; - security.apparmor.policies."bin.ping".profile = lib.mkIf config.security.apparmor.policies."bin.ping".enable (lib.mkAfter '' - /run/wrappers/bin/ping { - include - include - rpx /run/wrappers/wrappers.*/ping, - } - /run/wrappers/wrappers.*/ping { - include - include - capability net_raw, - capability setpcap, - } - ''); - # Set the host and domain names in the activation script. Don't # clear it if it's not configured in the NixOS configuration, # since it may have been set by dhcpcd in the meantime. diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix index 3c36291b733d..5fb7ba53ad84 100644 --- a/nixos/tests/systemd.nix +++ b/nixos/tests/systemd.nix @@ -169,7 +169,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { # Do some IP traffic output_ping = machine.succeed( - "systemd-run --wait -- /run/wrappers/bin/ping -c 1 127.0.0.1 2>&1" + "systemd-run --wait -- ping -c 1 127.0.0.1 2>&1" ) with subtest("systemd reports accounting data on system.slice"): diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix index c7823789081b..2f6122caa69e 100644 --- a/pkgs/servers/monitoring/plugins/default.nix +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -21,6 +21,7 @@ , openldap , procps , runtimeShell +, unixtools }: let @@ -33,6 +34,7 @@ let lm_sensors net-snmp procps + unixtools.ping ]; mailq = runCommand "mailq-wrapper" { preferLocalBuild = true; } '' @@ -58,7 +60,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-yLhHOSrPFRjW701aOL8LPe4OnuJxL6f+dTxNqm0evIg="; }; - # TODO: Awful hack. Grrr... this of course only works on NixOS. + # TODO: Awful hack. Grrr... # Anyway the check that configure performs to figure out the ping # syntax is totally impure, because it runs an actual ping to # localhost (which won't work for ping6 if IPv6 support isn't @@ -74,8 +76,8 @@ stdenv.mkDerivation rec { -e 's|^DEFAULT_PATH=.*|DEFAULT_PATH=\"${binPath}\"|' configureFlagsArray+=( - --with-ping-command='/run/wrappers/bin/ping -4 -n -U -w %d -c %d %s' - --with-ping6-command='/run/wrappers/bin/ping -6 -n -U -w %d -c %d %s' + --with-ping-command='ping -4 -n -U -w %d -c %d %s' + --with-ping6-command='ping -6 -n -U -w %d -c %d %s' ) install -Dm555 ${share} $out/share From 029ffb46fb6c6b76eddfd5121c40e3deb214e633 Mon Sep 17 00:00:00 2001 From: rexxDigital Date: Mon, 2 Oct 2023 12:30:07 +0200 Subject: [PATCH 07/77] maintainers: add rexxDigital --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 068b1ad3d798..2b3843b5e634 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14665,6 +14665,12 @@ githubId = 165283; name = "Alexey Kutepov"; }; + rexxDigital = { + email = "joellarssonpriv@gmail.com"; + github = "rexxDigital"; + githubId = 44014925; + name = "Rexx Larsson"; + }; rgnns = { email = "jglievano@gmail.com"; github = "rgnns"; From 9cf05b5d6b96f4bd069b6f5a996f75ab1d6b90a8 Mon Sep 17 00:00:00 2001 From: traxys Date: Sat, 22 Apr 2023 20:14:09 +0200 Subject: [PATCH 08/77] python310Packages.watchdog-gevent: init at 0.1.1 --- .../watchdog-gevent/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/watchdog-gevent/default.nix diff --git a/pkgs/development/python-modules/watchdog-gevent/default.nix b/pkgs/development/python-modules/watchdog-gevent/default.nix new file mode 100644 index 000000000000..e1b812b9612f --- /dev/null +++ b/pkgs/development/python-modules/watchdog-gevent/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, gevent +, pytestCheckHook +, watchdog +}: + +buildPythonPackage rec { + pname = "watchdog-gevent"; + version = "0.1.1"; + format = "setuptools"; + + # Need to fetch from github because tests are not present in pypi + src = fetchFromGitHub { + owner = "Bogdanp"; + repo = "watchdog_gevent"; + rev = "v${version}"; + hash = "sha256-FESm3fNuLmOg2ilI/x8U9LuAimHLnahcTHYzW/nzOVY="; + }; + + propagatedBuildInputs = [ watchdog gevent ]; + + postPatch = '' + sed -i setup.cfg \ + -e 's:--cov watchdog_gevent::' \ + -e 's:--cov-report html::' + ''; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "watchdog_gevent" ]; + + meta = with lib; { + description = "A gevent-based observer for watchdog"; + homepage = "https://github.com/Bogdanp/watchdog_gevent"; + license = licenses.asl20; + maintainers = with maintainers; [ traxys ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1004d365de7d..39d04cf68917 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13915,6 +13915,8 @@ self: super: with self; { inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; }; + watchdog-gevent = callPackage ../development/python-modules/watchdog-gevent { }; + watchfiles = callPackage ../development/python-modules/watchfiles { inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; }; From 548e9790a3816af3b8d01aa46dd23f65498570c1 Mon Sep 17 00:00:00 2001 From: traxys Date: Sat, 22 Apr 2023 21:11:06 +0200 Subject: [PATCH 09/77] python310Packages.staticmap: init at 0.5.7 --- .../python-modules/staticmap/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/staticmap/default.nix diff --git a/pkgs/development/python-modules/staticmap/default.nix b/pkgs/development/python-modules/staticmap/default.nix new file mode 100644 index 000000000000..bb3eac8655bd --- /dev/null +++ b/pkgs/development/python-modules/staticmap/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pillow +, requests +}: + +buildPythonPackage rec { + pname = "staticmap"; + version = "0.5.7"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-x6lrkCumEpLoGMILCBBhnWuBps21C8wauS1QrE2yCn8="; + }; + + propagatedBuildInputs = [ requests pillow ]; + + pythonImportsCheck = [ "staticmap" ]; + + # Tests seem to be broken + doCheck = false; + + meta = with lib; { + description = "A small, python-based library for creating map images with lines and markers"; + homepage = "https://pypi.org/project/staticmap/"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ traxys ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 39d04cf68917..f8e0b39260e8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12553,6 +12553,8 @@ self: super: with self; { static3 = callPackage ../development/python-modules/static3 { }; + staticmap = callPackage ../development/python-modules/staticmap { }; + staticjinja = callPackage ../development/python-modules/staticjinja { }; statistics = callPackage ../development/python-modules/statistics { }; From 5e3fc68fd4a4b610639aaafec14810e93a430f94 Mon Sep 17 00:00:00 2001 From: traxys Date: Sat, 22 Apr 2023 21:21:28 +0200 Subject: [PATCH 10/77] python310Packages.dramatiq: init at 1.14.2 --- .../python-modules/dramatiq/default.nix | 106 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 108 insertions(+) create mode 100644 pkgs/development/python-modules/dramatiq/default.nix diff --git a/pkgs/development/python-modules/dramatiq/default.nix b/pkgs/development/python-modules/dramatiq/default.nix new file mode 100644 index 000000000000..8b7300d786f5 --- /dev/null +++ b/pkgs/development/python-modules/dramatiq/default.nix @@ -0,0 +1,106 @@ +{ lib +, stdenv +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, gevent +, pika +, prometheus-client +, pylibmc +, pytestCheckHook +, redis +, watchdog +, watchdog-gevent +}: + +buildPythonPackage rec { + pname = "dramatiq"; + version = "1.14.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Bogdanp"; + repo = "dramatiq"; + rev = "v${version}"; + hash = "sha256-yv6HUJI7wsAQdBJ5QNv7qXhtzPvCsrF1389kyemAV7Y="; + }; + + propagatedBuildInputs = [ + prometheus-client + ]; + + passthru.optional-dependencies = { + all = [ + gevent + pika + pylibmc + redis + watchdog + watchdog-gevent + ]; + gevent = [ + gevent + ]; + memcached = [ + pylibmc + ]; + rabbitmq = [ + pika + ]; + redis = [ + redis + ]; + watch = [ + watchdog + watchdog-gevent + ]; + }; + + nativeCheckInputs = [ pytestCheckHook pika redis pylibmc ]; + + postPatch = '' + sed -i ./setup.cfg \ + -e 's:--cov dramatiq::' \ + -e 's:--cov-report html::' \ + -e 's:--benchmark-autosave::' \ + -e 's:--benchmark-compare::' \ + ''; + + disabledTests = [ + # Requires a running redis + "test_after_process_boot_call_has_no_blocked_signals" + "test_cli_can_be_reloaded_on_sighup" + "test_cli_can_watch_for_source_code_changes" + "test_cli_fork_functions_have_no_blocked_signals" + "test_consumer_threads_have_no_blocked_signals" + "test_middleware_fork_functions_have_no_blocked_signals" + "test_redis_broker_can_connect_via_client" + "test_redis_broker_can_connect_via_url" + "test_redis_process_100k_messages_with_cli" + "test_redis_process_10k_fib_with_cli" + "test_redis_process_1k_latency_with_cli" + "test_worker_threads_have_no_blocked_signals" + # Requires a running rabbitmq + "test_rabbitmq_broker_can_be_passed_a_list_of_parameters_for_failover" + "test_rabbitmq_broker_can_be_passed_a_list_of_uri_for_failover" + "test_rabbitmq_broker_can_be_passed_a_semicolon_separated_list_of_uris" + "test_rabbitmq_broker_connections_are_lazy" + "test_rabbitmq_process_100k_messages_with_cli" + "test_rabbitmq_process_10k_fib_with_cli" + "test_rabbitmq_process_1k_latency_with_cli" + ] ++ lib.optionals stdenv.isDarwin [ + # Takes too long for darwin ofborg + "test_retry_exceptions_can_specify_a_delay" + ]; + + pythonImportsCheck = [ "dramatiq" ]; + + meta = with lib; { + description = "Background Processing for Python 3"; + homepage = "https://github.com/Bogdanp/dramatiq"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ traxys ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f8e0b39260e8..0afae2847973 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3244,6 +3244,8 @@ self: super: with self; { dragonfly = callPackage ../development/python-modules/dragonfly { }; + dramatiq = callPackage ../development/python-modules/dramatiq { }; + drawille = callPackage ../development/python-modules/drawille { }; drawilleplot = callPackage ../development/python-modules/drawilleplot { }; From 5f554d4cd41ee9dcf317260656b471e813816112 Mon Sep 17 00:00:00 2001 From: traxys Date: Sat, 22 Apr 2023 23:25:39 +0200 Subject: [PATCH 11/77] python310Packages.periodiq: init at 0.12.1 --- .../python-modules/periodiq/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/python-modules/periodiq/default.nix diff --git a/pkgs/development/python-modules/periodiq/default.nix b/pkgs/development/python-modules/periodiq/default.nix new file mode 100644 index 000000000000..5ed6a028aa38 --- /dev/null +++ b/pkgs/development/python-modules/periodiq/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitLab +, poetry-core +, dramatiq +, pendulum +, setuptools +, pytest-mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "periodiq"; + version = "0.12.1"; + format = "pyproject"; + + disabled = pythonOlder "3.5"; + + src = fetchFromGitLab { + owner = "bersace"; + repo = "periodiq"; + rev = "v${version}"; + hash = "sha256-Ar0n+Wi1OUtRdhVxrU7Nz4je8ylaHgPZbXE0a30hzU0="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'poetry>=0.12' 'poetry-core' \ + --replace 'poetry.masonry.api' 'poetry.core.masonry.api' + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + dramatiq + pendulum + setuptools + ]; + + nativeCheckInputs = [ pytestCheckHook pytest-mock ]; + + pytestFlagsArray = [ "tests/unit" ]; + + pythonImportsCheck = [ "periodiq" ]; + + meta = with lib; { + description = "Simple Scheduler for Dramatiq Task Queue"; + homepage = "https://pypi.org/project/periodiq/"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ traxys ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0afae2847973..1e41cfcf3d7f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8091,6 +8091,8 @@ self: super: with self; { periodictable = callPackage ../development/python-modules/periodictable { }; + periodiq = callPackage ../development/python-modules/periodiq { }; + permissionedforms = callPackage ../development/python-modules/permissionedforms { }; persim = callPackage ../development/python-modules/persim { }; From bec31afea79150165c3952aeb947781b0cd206af Mon Sep 17 00:00:00 2001 From: traxys Date: Sat, 22 Apr 2023 22:50:47 +0200 Subject: [PATCH 12/77] python310Packages.flask-dramatiq: init at 0.6.0 --- .../python-modules/flask-dramatiq/default.nix | 85 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 87 insertions(+) create mode 100644 pkgs/development/python-modules/flask-dramatiq/default.nix diff --git a/pkgs/development/python-modules/flask-dramatiq/default.nix b/pkgs/development/python-modules/flask-dramatiq/default.nix new file mode 100644 index 000000000000..6f8884516f49 --- /dev/null +++ b/pkgs/development/python-modules/flask-dramatiq/default.nix @@ -0,0 +1,85 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitLab +, poetry-core +, dramatiq +, flask +, requests +, pytestCheckHook +, flask-migrate +, periodiq +, postgresql +, postgresqlTestHook +, psycopg2 +}: + +buildPythonPackage { + pname = "flask-dramatiq"; + version = "0.6.0"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitLab { + owner = "bersace"; + repo = "flask-dramatiq"; + rev = "840209e9bf582b4dda468e8bba515f248f3f8534"; + hash = "sha256-qjV1zyVzHPXMt+oUeGBdP9XVlbcSz2MF9Zygj543T4w="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'poetry>=0.12' 'poetry-core' \ + --replace 'poetry.masonry.api' 'poetry.core.masonry.api' + + patchShebangs --build ./example.py + + sed -i ./tests/unit/pytest.ini \ + -e 's:--cov=flask_dramatiq::' \ + -e 's:--cov-report=term-missing::' + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + dramatiq + ]; + + nativeCheckInputs = [ + pytestCheckHook + flask + requests + flask-migrate + periodiq + postgresql + postgresqlTestHook + psycopg2 + ] ++ dramatiq.optional-dependencies.rabbitmq; + + postgresqlTestSetupPost = '' + substituteInPlace config.py \ + --replace 'SQLALCHEMY_DATABASE_URI = f"postgresql://{PGUSER}:{PGPASSWORD}@{PGHOST}/{PGDATABASE}"' \ + "SQLALCHEMY_DATABASE_URI = \"postgresql://$PGUSER/$PGDATABASE?host=$PGHOST\"" + python3 ./example.py db upgrade + ''; + + pytestFlagsArray = [ "-x" "tests/func/" "tests/unit"]; + + pythonImportsCheck = [ "flask_dramatiq" ]; + + # Does HTTP requests to localhost + disabledTests = [ + "test_fast" + "test_other" + ]; + + meta = with lib; { + description = "Adds Dramatiq support to your Flask application"; + homepage = "https://gitlab.com/bersace/flask-dramatiq"; + license = licenses.bsd3; + maintainers = with maintainers; [ traxys ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1e41cfcf3d7f..c55264e87fbb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3941,6 +3941,8 @@ self: super: with self; { flask-cors = callPackage ../development/python-modules/flask-cors { }; + flask-dramatiq = callPackage ../development/python-modules/flask-dramatiq { }; + flask-elastic = callPackage ../development/python-modules/flask-elastic { }; flask-expects-json = callPackage ../development/python-modules/flask-expects-json { }; From f2bf0dbd4e8d26b7db861307a9ac224c4fde5eec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Tue, 10 Oct 2023 18:25:22 +0200 Subject: [PATCH 13/77] =?UTF-8?q?fishPlugins.tide:=205.6.0=20=E2=86=92=206?= =?UTF-8?q?.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christina Sørensen --- pkgs/shells/fish/plugins/tide.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/fish/plugins/tide.nix b/pkgs/shells/fish/plugins/tide.nix index 94cbfaa6b8f9..39afd487afdb 100644 --- a/pkgs/shells/fish/plugins/tide.nix +++ b/pkgs/shells/fish/plugins/tide.nix @@ -4,13 +4,13 @@ # Refer to the following comment to get you setup: https://github.com/NixOS/nixpkgs/pull/201646#issuecomment-1320893716 buildFishPlugin rec { pname = "tide"; - version = "5.6.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "IlanCosman"; repo = "tide"; rev = "v${version}"; - hash = "sha256-cCI1FDpvajt1vVPUd/WvsjX/6BJm6X1yFPjqohmo1rI="; + hash = "sha256-oLD7gYFCIeIzBeAW1j62z5FnzWAp3xSfxxe7kBtTLgA="; }; #buildFishplugin will only move the .fish files, but tide has a tide configure function From f5701c559273a46f0c8d172f6e32b7b9baabc89f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Oct 2023 04:28:53 +0000 Subject: [PATCH 14/77] openai-whisper-cpp: 1.4.0 -> 1.4.2 --- pkgs/tools/audio/openai-whisper-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/openai-whisper-cpp/default.nix b/pkgs/tools/audio/openai-whisper-cpp/default.nix index f6d83690824f..f19425201cde 100644 --- a/pkgs/tools/audio/openai-whisper-cpp/default.nix +++ b/pkgs/tools/audio/openai-whisper-cpp/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "whisper-cpp"; - version = "1.4.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "ggerganov"; repo = "whisper.cpp"; rev = "refs/tags/v${version}" ; - hash = "sha256-176MpooVQrq1dXC62h8Yyyhw6IjCA50tp1J4DQPSePQ="; + hash = "sha256-Qea9zGLJ41D+l8h1Sg/KJI6Ou02jtbRIxYPGoabM8nY="; }; # The upstream download script tries to download the models to the From a9a9c7df7a212e820c5e4091ea2a8925a177d4a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Oct 2023 07:25:52 +0000 Subject: [PATCH 15/77] python310Packages.annotated-types: 0.5.0 -> 0.6.0 --- pkgs/development/python-modules/annotated-types/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/annotated-types/default.nix b/pkgs/development/python-modules/annotated-types/default.nix index 645e3c40c48c..85e2379507c6 100644 --- a/pkgs/development/python-modules/annotated-types/default.nix +++ b/pkgs/development/python-modules/annotated-types/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "annotated-types"; - version = "0.5.0"; + version = "0.6.0"; format = "pyproject"; src = fetchFromGitHub { owner = "annotated-types"; repo = "annotated-types"; - rev = "v${version}"; - hash = "sha256-zCsWfJ8BQuov8FN+hlm9XBKWAAQ/KHPK/x024A8k2kE="; + rev = "refs/tags/v${version}"; + hash = "sha256-SZ9/rXYcns4DFM6vk6SRKvuv3MY3T7xO9aW7WAQqtVE="; }; nativeBuildInputs = [ From 9478a7ef8220b0a74dffcca2bdd46c10ae93fd59 Mon Sep 17 00:00:00 2001 From: traxys Date: Sat, 22 Apr 2023 23:57:57 +0200 Subject: [PATCH 16/77] fit-trackee: init at 0.7.15 --- .../geospatial/fit-trackee/default.nix | 105 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 107 insertions(+) create mode 100644 pkgs/servers/geospatial/fit-trackee/default.nix diff --git a/pkgs/servers/geospatial/fit-trackee/default.nix b/pkgs/servers/geospatial/fit-trackee/default.nix new file mode 100644 index 000000000000..c7bc7fbc2e5b --- /dev/null +++ b/pkgs/servers/geospatial/fit-trackee/default.nix @@ -0,0 +1,105 @@ +{ lib +, python3 +, fetchFromGitHub +, fetchPypi +, postgresql +, postgresqlTestHook +}: +let + python = python3.override { + packageOverrides = self: super: { + sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { + version = "1.4.49"; + src = fetchPypi { + pname = "SQLAlchemy"; + inherit version; + hash = "sha256-Bv8ly64ww5bEt3N0ZPKn/Deme32kCZk7GCsCTOyArtk="; + }; + # Remove "test/typing" that does not exist + disabledTestPaths = [ + "test/aaa_profiling" + "test/ext/mypy" + ]; + }); + }; + }; + +in +python.pkgs.buildPythonApplication rec { + pname = "fit-trackee"; + version = "0.7.22"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "SamR1"; + repo = "FitTrackee"; + rev = "v${version}"; + hash = "sha256-aPQ8jLssN9nx0Bpd/44E3sQi2w0cR8ecG76DJjreeHA="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace psycopg2-binary psycopg2 \ + --replace 'poetry>=0.12' 'poetry-core' \ + --replace 'poetry.masonry.api' 'poetry.core.masonry.api' + ''; + + nativeBuildInputs = [ + python3.pkgs.poetry-core + ]; + + propagatedBuildInputs = with python.pkgs; [ + authlib + babel + dramatiq + flask + flask-bcrypt + flask-dramatiq + flask-limiter + flask-migrate + gpxpy + gunicorn + humanize + psycopg2 + pyjwt + pyopenssl + pytz + shortuuid + sqlalchemy + staticmap + ua-parser + ] ++ dramatiq.optional-dependencies.redis; + + pythonImportsCheck = [ "fittrackee" ]; + + nativeCheckInputs = with python.pkgs; [ + pytestCheckHook + freezegun + postgresqlTestHook + postgresql + ]; + + pytestFlagsArray = [ + "fittrackee" + ]; + + postgresqlTestSetupPost = '' + export DATABASE_TEST_URL=postgresql://$PGUSER/$PGDATABAS?host=$PGHOST + ''; + + postInstall = '' + mkdir -p $out/var/share/fittrackee-instance + ''; + + preCheck = '' + export TMP=$(mktemp -d) + ''; + + meta = with lib; { + description = "Self-hosted outdoor activity tracker :bicyclist"; + homepage = "https://github.com/SamR1/FitTrackee"; + changelog = "https://github.com/SamR1/FitTrackee/blob/${src.rev}/CHANGELOG.md"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ traxys ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 358d79cc695e..a5f1109b4ee7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27708,6 +27708,8 @@ with pkgs; ### SERVERS / GEOSPATIAL + fit-trackee = callPackage ../servers/geospatial/fit-trackee { }; + geoserver = callPackage ../servers/geospatial/geoserver { }; mapcache = callPackage ../servers/geospatial/mapcache { }; From ccd99e8d17afe0d8633b324db6972621f209e0d8 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 17 Oct 2023 10:01:21 +0300 Subject: [PATCH 17/77] fail2ban: fix cross The `updatePyExec` thing is weird, but necessary to avoid referencing the build python. https://github.com/fail2ban/fail2ban/blob/132c719386730c132f8a77820eab0b3dc58e967b/fail2ban/setup.py#L27 --- pkgs/tools/security/fail2ban/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 780f1b4dfb0c..d26429b813de 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec { substituteInPlace setup.py --replace /usr/share/doc/ share/doc/ # see https://github.com/NixOS/nixpkgs/issues/4968 - ${python3.interpreter} setup.py install_data --install-dir=$out --root=$out + ${python3.pythonForBuild.interpreter} setup.py install_data --install-dir=$out --root=$out ''; postInstall = @@ -61,6 +61,11 @@ python3.pkgs.buildPythonApplication rec { rm -r "${sitePackages}/etc" installManPage man/*.[1-9] + + # This is a symlink to the build python version created by `updatePyExec`, seemingly to assure the same python version is used? + rm $out/bin/fail2ban-python + ln -s ${python3.interpreter} $out/bin/fail2ban-python + '' + lib.optionalString stdenv.isLinux '' # see https://github.com/NixOS/nixpkgs/issues/4968 rm -r "${sitePackages}/usr" From 06752bb288d022e03af201077aab8a76de1eed99 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Oct 2023 21:46:45 +0000 Subject: [PATCH 18/77] python311Packages.rtree: 1.0.1 -> 1.1.0 --- pkgs/development/python-modules/rtree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rtree/default.nix b/pkgs/development/python-modules/rtree/default.nix index 7d4e14196314..0de516ec85f0 100644 --- a/pkgs/development/python-modules/rtree/default.nix +++ b/pkgs/development/python-modules/rtree/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "rtree"; - version = "1.0.1"; + version = "1.1.0"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Rtree"; inherit version; - hash = "sha256-IiEhaZwwOmQGXYSb9wOLHsq8N7Zcf6NAvts47w6AVCk="; + hash = "sha256-b47lBN3l0AWyWwiq9b4LNASvOtX+zm4d3N41kIp5ipU="; }; postPatch = '' From 9887a4e63091505a6f0f8f064462cc6a598cb263 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Oct 2023 12:40:28 +0000 Subject: [PATCH 19/77] python311Packages.logilab-common: 1.10.0 -> 1.11.0 --- pkgs/development/python-modules/logilab/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix index 9467f003c703..b03fd98eefe8 100644 --- a/pkgs/development/python-modules/logilab/common.nix +++ b/pkgs/development/python-modules/logilab/common.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "logilab-common"; - version = "1.10.0"; + version = "1.11.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-MoXt3tta5OimJUjOkWSMDCmXV0aS8N0W5bcANwAelYY="; + hash = "sha256-lWl6654nbOBCec24iJ7GGKEcYy/gYDn9wMil3PPqWkk="; }; nativeBuildInputs = [ From bff80fa4b4f1f795e5da8833ff424d95628252ff Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Wed, 18 Oct 2023 17:37:20 +0300 Subject: [PATCH 20/77] mold: 2.2.0 -> 2.3.0 --- pkgs/development/tools/mold/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index 2cbc016a2933..d3d1303edeef 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "rui314"; repo = "mold"; rev = "v${version}"; - hash = "sha256-ePX80hzzIzSJdGUX96GyxYWcdbXxXyuyNQqj5RDSkKU="; + hash = "sha256-TgDGAYdJjqGQradB7UJlV2emvG7q4F9ctzPaGRUgvxU="; }; nativeBuildInputs = [ From 99b58813ea9e1aa7520c1dd762a6fed9e72d56ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Oct 2023 02:17:16 +0000 Subject: [PATCH 21/77] rsbkb: 1.2 -> 1.2.1 --- pkgs/tools/text/rsbkb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/rsbkb/default.nix b/pkgs/tools/text/rsbkb/default.nix index fd02babac0b0..1510a63b050f 100644 --- a/pkgs/tools/text/rsbkb/default.nix +++ b/pkgs/tools/text/rsbkb/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "rsbkb"; - version = "1.2"; + version = "1.2.1"; src = fetchFromGitHub { owner = "trou"; repo = "rsbkb"; rev = "release-${version}"; - hash = "sha256-Y6YTjEbefNUPcl6rNYWVZLGZYTUPr5pvfLabS+zDWqA="; + hash = "sha256-+plf7BoYpEFPRsGKNrvLF8TAU3Z7nyx6Td6uRBoNGiE="; }; - cargoHash = "sha256-RMX+ZdPaqtqRJvhHFJJrPZnBGwQwZSCXNg1oNo+v2+8="; + cargoHash = "sha256-HyosR/5tZCRU2CNnnGITEuESW30Zq3s33UFNcLmEWIA="; # Setup symlinks for all the utilities, # busybox style From 6da0ccfd1f67aa386bb759c7b0d051678236dfb9 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 18 Oct 2023 22:55:28 -0500 Subject: [PATCH 22/77] dooit: 2.0.1 -> 2.0.2 --- pkgs/tools/misc/dooit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/dooit/default.nix b/pkgs/tools/misc/dooit/default.nix index ab7db4a2cb7c..50e66b882530 100644 --- a/pkgs/tools/misc/dooit/default.nix +++ b/pkgs/tools/misc/dooit/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "dooit"; - version = "2.0.1"; + version = "2.0.2"; format = "pyproject"; src = fetchFromGitHub { owner = "kraanzu"; repo = "dooit"; rev = "v${version}"; - hash = "sha256-iQAGD6zrBBd4fJONaB7to1OJpAJUO0zeA1xhVQZBkMc="; + hash = "sha256-9Cyt38/tg611t/uODQjVAS/Ea2tUWTBmDqJehUpZJmU="; }; nativeBuildInputs = with python3.pkgs; [ From e55fb26e217fc8bd4a8896a093063216e61c561d Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 18 Oct 2023 23:36:03 -0500 Subject: [PATCH 23/77] dooit: 2.0.2 -> 2.1.0 --- pkgs/tools/misc/dooit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/dooit/default.nix b/pkgs/tools/misc/dooit/default.nix index 50e66b882530..b8aa6c8809ff 100644 --- a/pkgs/tools/misc/dooit/default.nix +++ b/pkgs/tools/misc/dooit/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "dooit"; - version = "2.0.2"; + version = "2.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "kraanzu"; repo = "dooit"; rev = "v${version}"; - hash = "sha256-9Cyt38/tg611t/uODQjVAS/Ea2tUWTBmDqJehUpZJmU="; + hash = "sha256-ZCEBpaQHaFb09MUlN6acYB3LrfX456uRbhVh9YPz7NU="; }; nativeBuildInputs = with python3.pkgs; [ From 97e3336a5b3690c915981f3cfad34d1c9061eb5d Mon Sep 17 00:00:00 2001 From: r-vdp Date: Thu, 19 Oct 2023 08:40:56 +0200 Subject: [PATCH 24/77] fish: use the subcommand style for the status command The flag style has been deprecated and will eventually be removed. --- nixos/modules/programs/fish.nix | 4 ++-- pkgs/shells/fish/default.nix | 2 +- pkgs/shells/fish/wrapper.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix index b500b8f24b2c..e6ac6e9957ba 100644 --- a/nixos/modules/programs/fish.nix +++ b/nixos/modules/programs/fish.nix @@ -208,7 +208,7 @@ in end # if we haven't sourced the login config, do it - status --is-login; and not set -q __fish_nixos_login_config_sourced + status is-login; and not set -q __fish_nixos_login_config_sourced and begin ${sourceEnv "loginShellInit"} @@ -220,7 +220,7 @@ in end # if we haven't sourced the interactive config, do it - status --is-interactive; and not set -q __fish_nixos_interactive_config_sourced + status is-interactive; and not set -q __fish_nixos_interactive_config_sourced and begin ${fishAbbrs} ${fishAliases} diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 4df95a9ca6fe..bd816f9a8991 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -79,7 +79,7 @@ let # note that this is required: # 1. For all shells, not just login shells (mosh needs this as do some other command-line utilities) # 2. Before the shell is initialized, so that config snippets can find the commands they use on the PATH - builtin status --is-login + builtin status is-login or test -z "$__fish_nixos_env_preinit_sourced" -a -z "$ETC_PROFILE_SOURCED" -a -z "$ETC_ZSHENV_SOURCED" ${if fishEnvPreInit != null then '' and begin diff --git a/pkgs/shells/fish/wrapper.nix b/pkgs/shells/fish/wrapper.nix index 75213809821f..62ae03ec9ef9 100644 --- a/pkgs/shells/fish/wrapper.nix +++ b/pkgs/shells/fish/wrapper.nix @@ -18,7 +18,7 @@ let name = "wrapfish.aliases.fish"; destination = "/share/fish/vendor_conf.d/aliases.fish"; text = '' - status --is-interactive; and begin + status is-interactive; and begin # Aliases ${aliasesStr} end From fe01240ca329f41d5a739f83430c52c12aa40da1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Oct 2023 06:41:01 +0000 Subject: [PATCH 25/77] kaniko: 1.16.0 -> 1.17.0 --- pkgs/applications/networking/cluster/kaniko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kaniko/default.nix b/pkgs/applications/networking/cluster/kaniko/default.nix index 7639c95a971f..13ccf5599ce7 100644 --- a/pkgs/applications/networking/cluster/kaniko/default.nix +++ b/pkgs/applications/networking/cluster/kaniko/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "kaniko"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "kaniko"; rev = "v${version}"; - hash = "sha256-PTcPlYJ0IHWNQKBJcMiotGp6GPH3qY3f6sJKgUVSTZU="; + hash = "sha256-O4FPz62QnvG+Q2l4Gr/O0XFpkXE2G4RO/G6KNDdanzk="; }; vendorHash = null; From b5bafbed03c45977c495a579e3c3317fd45f5ba7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Oct 2023 06:47:03 +0000 Subject: [PATCH 26/77] kubernetes: 1.28.2 -> 1.28.3 --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 97d3a3140209..ac142ca3597e 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -20,13 +20,13 @@ buildGoModule rec { pname = "kubernetes"; - version = "1.28.2"; + version = "1.28.3"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - hash = "sha256-7juoX4nFvQbIIbhTlnIYVUEYUJGwu+aKrpw4ltujjXI="; + hash = "sha256-lb9FAk3b6J92viyHzLCzbYRxhQS94/FQvDr1m1kdTq8="; }; vendorHash = null; From b853b43812d7beec26e247291cad10f4de25351b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 Oct 2023 11:54:19 +0200 Subject: [PATCH 27/77] python311Packages.crytic-compile: 0.3.4 -> 0.3.5 Changelog: https://github.com/crytic/crytic-compile/releases/tag/0.3.5 --- .../development/python-modules/crytic-compile/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/crytic-compile/default.nix b/pkgs/development/python-modules/crytic-compile/default.nix index 4e725dd8cde2..26e7080c2139 100644 --- a/pkgs/development/python-modules/crytic-compile/default.nix +++ b/pkgs/development/python-modules/crytic-compile/default.nix @@ -6,20 +6,21 @@ , pythonOlder , setuptools , solc-select +, toml }: buildPythonPackage rec { pname = "crytic-compile"; - version = "0.3.4"; + version = "0.3.5"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "crytic"; repo = "crytic-compile"; rev = "refs/tags/${version}"; - hash = "sha256-CeoACtgvMweDbIvYguK2Ca+iTBFONWcE2b0qUkBbQSU="; + hash = "sha256-aO2K0lc3qjKK8CZAbu/lotI5QJ/R+8npSIRX4a6HdrI="; }; propagatedBuildInputs = [ @@ -27,6 +28,7 @@ buildPythonPackage rec { pycryptodome setuptools solc-select + toml ]; # Test require network access From ca30f40806231289bce7a9c0bacb95c5fa6da37d Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 19 Oct 2023 12:33:46 +0200 Subject: [PATCH 28/77] jenkins: 2.414.2 -> 2.414.3 https://www.jenkins.io/changelog-stable//#v2.414.3 --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index c90845ddcd73..aa4de161d9ce 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.414.2"; + version = "2.414.3"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - hash = "sha256-kiu/Ymn92tYUu2VAJB7QzlUjpKUyginhX157t//VZbg="; + hash = "sha256-LZMlS8GG3zSbxK0GtrHddXxJMZDwVY0RHb2pUXqEe1k="; }; nativeBuildInputs = [ makeWrapper ]; From 0f14d6b1ba61ca286307346181918ea4c48f36b6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 Oct 2023 12:40:10 +0200 Subject: [PATCH 29/77] python311Packages.google-cloud-asset: 3.19.1 -> 3.20.0 Changelog: https://github.com/googleapis/python-asset/blob/v3.20.0/CHANGELOG.md --- .../development/python-modules/google-cloud-asset/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index f38a83a2c087..c430d23c32f6 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.19.1"; + version = "3.20.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Rmd01HHVOThqSwfnoIrTaMjxqHFuGcKAjwKp3hD4S5o="; + hash = "sha256-lJLC1igiY0OYLu3eyuOvJ2KmFr9n4su8T7LPgWlUtCk="; }; propagatedBuildInputs = [ From 8d33b6159ad0d5fcc2e04522859e3ccd44077f23 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 Oct 2023 12:42:31 +0200 Subject: [PATCH 30/77] python311Packages.google-cloud-automl: 2.11.2 -> 2.11.3 Changelog: https://github.com/googleapis/python-automl/blob/v2.11.3/CHANGELOG.md --- .../python-modules/google-cloud-automl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index fcbddee2fdde..b12ee489cc29 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.11.2"; + version = "2.11.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-w4kzOe8az6zcMLoNYbfkvC5Aq5zCbSNw6+PHYZkEZqI="; + hash = "sha256-VcqQn7w2sTpDHKfniwkwsEXDa8YIV+G1jlbPOu8NVl0="; }; propagatedBuildInputs = [ From 2fec70e76cd5f5e6067ee2d6f7500de4e53099dc Mon Sep 17 00:00:00 2001 From: jfvillablanca <31008330+jfvillablanca@users.noreply.github.com> Date: Thu, 19 Oct 2023 19:20:16 +0800 Subject: [PATCH 31/77] pythonPackages.types-click: init at 7.1.8 --- .../python-modules/types-click/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/types-click/default.nix diff --git a/pkgs/development/python-modules/types-click/default.nix b/pkgs/development/python-modules/types-click/default.nix new file mode 100644 index 000000000000..78c99fe42808 --- /dev/null +++ b/pkgs/development/python-modules/types-click/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +}: + +let + pname = "types-click"; + version = "7.1.8"; +in +buildPythonPackage { + inherit pname version; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-tmBJaL5kAdxRYxHKUHCKCii6p6DLhA79dBLw27/04JI="; + }; + + nativeBuildInputs = [ setuptools ]; + + meta = with lib; { + description = "Collection of library stubs for Python, with static types"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ jfvillablanca ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 67123ec5a10d..0dd42931c495 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14935,6 +14935,8 @@ self: super: with self; { types-beautifulsoup4 = callPackage ../development/python-modules/types-beautifulsoup4 { }; + types-click = callPackage ../development/python-modules/types-click { }; + types-colorama = callPackage ../development/python-modules/types-colorama { }; types-dateutil = callPackage ../development/python-modules/types-dateutil { }; From cdc6b6ba53be034b1eda8a3d89f721872f41ba2b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 Oct 2023 14:27:28 +0200 Subject: [PATCH 32/77] python311Packages.aws-adfs: 2.2.1 -> 2.8.1 Diff: https://github.com/venth/aws-adfs/compare/refs/tags/v2.2.1...2.8.1 Changelog: https://github.com/venth/aws-adfs/releases/tag/v2.8.1 --- .../python-modules/aws-adfs/default.nix | 26 +++++-------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index 85a4f6bbe680..3a32d82ec935 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -5,7 +5,6 @@ , click , configparser , fetchFromGitHub -, fetchpatch , fido2 , lxml , poetry-core @@ -19,16 +18,16 @@ buildPythonPackage rec { pname = "aws-adfs"; - version = "2.2.1"; - format = "pyproject"; + version = "2.8.1"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "venth"; repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-REJYuOGq22onMj4WcfA7i4/cG99UGZA9D99ESIKY1A8="; + rev = "refs/tags/v${version}"; + hash = "sha256-tpCDP924lNSaPJggj3A94U2Ur+TgxTXtV660OyQJEeY="; }; nativeBuildInputs = [ @@ -47,20 +46,6 @@ buildPythonPackage rec { requests-kerberos ]; - patches = [ - # Apply new fido2 api (See: venth/aws-adfs#243) - (fetchpatch { - url = "https://github.com/venth/aws-adfs/commit/09836d89256f3537270d760d8aa30ab9284725a8.diff"; - hash = "sha256-pAAJvOa43BXtyWvV8hsLe2xqd5oI+vzndckRTRol61s="; - }) - ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'boto3 = "^1.20.50"' 'boto3 = "*"' \ - --replace 'botocore = ">=1.12.6"' 'botocore = "*"' - ''; - nativeCheckInputs = [ pytestCheckHook toml @@ -77,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Command line tool to ease AWS CLI authentication against ADFS"; homepage = "https://github.com/venth/aws-adfs"; + changelog = "https://github.com/venth/aws-adfs/releases/tag/v${version}"; license = licenses.psfl; maintainers = with maintainers; [ bhipple ]; }; From 17acba4cd1bb63c174b48a0b7bedb103f08e1eba Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Thu, 19 Oct 2023 15:48:42 +0300 Subject: [PATCH 33/77] stdenvAdapters.useMoldLinker: set `allowedRequisites` to `null` --- pkgs/stdenv/adapters.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 1024bf2ce4d8..f7d7053c77a9 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -197,16 +197,10 @@ rec { ''; }; in stdenv.override (old: { - cc = stdenv.cc.override { - inherit bintools; - }; - allowedRequisites = - (lib.optional (stdenv.allowedRequisites or null != null) stdenv.allowedRequisites) - ++ [ bintools pkgs.mold ] - # need to `outputSpecified = false` to make getLib work - ++ (builtins.map (p: lib.getLib (p // { outputSpecified = false; })) pkgs.mold.buildInputs); - # gcc >12.1.0 supports '-fuse-ld=mold' - # the wrap ld above in bintools supports gcc <12.1.0 and shouldn't harm >12.1.0 + allowedRequisites = null; + cc = stdenv.cc.override { inherit bintools; }; + # gcc >12.1.0 supports '-fuse-ld=mold' + # the wrap ld above in bintools supports gcc <12.1.0 and shouldn't harm >12.1.0 # https://github.com/rui314/mold#how-to-use } // lib.optionalAttrs (stdenv.cc.isClang || (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12")) { mkDerivationFromStdenv = extendMkDerivationArgs old (args: { From 061c8d6d3ee66d63d19af5b4b9ba214c92a0cf0c Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Thu, 19 Oct 2023 15:49:25 +0300 Subject: [PATCH 34/77] mold: make some of the tests Linux only --- pkgs/development/tools/mold/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index d3d1303edeef..530fbb1666c7 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -11,6 +11,8 @@ , zstd , buildPackages +, clangStdenv +, gccStdenv , hello , mold , mold-wrapped @@ -89,11 +91,13 @@ stdenv.mkDerivation rec { in { version = testers.testVersion { package = mold; }; + } // lib.optionalAttrs stdenv.isLinux { + adapter-gcc = helloTest "adapter-gcc" (hello.override (old: { stdenv = useMoldLinker gccStdenv; })); + adapter-llvm = helloTest "adapter-llvm" (hello.override (old: { stdenv = useMoldLinker clangStdenv; })); wrapped = helloTest "wrapped" (hello.overrideAttrs (previousAttrs: { nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ mold-wrapped ]; NIX_CFLAGS_LINK = toString (previousAttrs.NIX_CFLAGS_LINK or "") + " -fuse-ld=mold"; })); - adapter = helloTest "adapter" (hello.override (old: { stdenv = useMoldLinker old.stdenv; })); }; }; From db94ccb2958162ebcf27aee921f8e2e13f114173 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Oct 2023 13:13:26 +0000 Subject: [PATCH 35/77] sile: 0.14.11 -> 0.14.12 --- pkgs/tools/typesetting/sile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index 7c436ac419b2..6b5498656b0e 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -46,11 +46,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "sile"; - version = "0.14.11"; + version = "0.14.12"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${finalAttrs.version}/sile-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-JXlgiK1XyZZSe5QXz06zwEAnVYhiIZhhIaBmfxAgRS4="; + sha256 = "sha256-iyxNi4Y2zaeR6HUf/IVW1M7mB0WhM2yxOqDkb1oAkHg="; }; configureFlags = [ From 4e193f887976c4bf8a07e0460af917237aa01652 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 Oct 2023 15:19:21 +0200 Subject: [PATCH 36/77] aws-iam-authenticator: 0.6.11 -> 0.6.12 Diff: https://github.com/kubernetes-sigs/aws-iam-authenticator/compare/refs/tags/v0.6.11...v0.6.12 Changelog: https://github.com/kubernetes-sigs/aws-iam-authenticator/releases/tag/v0.6.12 --- .../aws-iam-authenticator/default.nix | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/tools/security/aws-iam-authenticator/default.nix index 4f1dcf318282..f186c43721f4 100644 --- a/pkgs/tools/security/aws-iam-authenticator/default.nix +++ b/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -1,23 +1,27 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "aws-iam-authenticator"; - version = "0.6.11"; + version = "0.6.12"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; - rev = "v${version}"; - hash = "sha256-4bZnGgf/H2/uLhh8ip8rrA+U0vA+1SO5uhjLK40j3wE="; + rev = "refs/tags/v${version}"; + hash = "sha256-IIlAsxxEYjR7+wdWExdsQAH0x4yOXZ+bVQWwn7mrhRw="; }; vendorHash = "sha256-RcZqnyZtonE4qeu+llL1OPGPG93/Rx8ESWM5wapZ1BM="; ldflags = let PKG = "sigs.k8s.io/aws-iam-authenticator"; in [ - "-s" "-w" - "-X ${PKG}/pkg.Version=${version}" - "-X ${PKG}/pkg.BuildDate=1970-01-01T01:01:01Z" - "-X ${PKG}/pkg.CommitID=${version}" + "-s" + "-w" + "-X=${PKG}/pkg.Version=${version}" + "-X=${PKG}/pkg.BuildDate=1970-01-01T01:01:01Z" + "-X ?${PKG}/pkg.CommitID=${version}" ]; subPackages = [ "cmd/aws-iam-authenticator" ]; @@ -25,7 +29,8 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/kubernetes-sigs/aws-iam-authenticator"; description = "AWS IAM credentials for Kubernetes authentication"; + changelog = "https://github.com/kubernetes-sigs/aws-iam-authenticator/releases/tag/v${version}"; license = licenses.asl20; - maintainers = [ maintainers.srhb ]; + maintainers = with maintainers; [ srhb ]; }; } From 545ac55f77a6c44407cd925d2a782678e10790e1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 Oct 2023 15:47:58 +0200 Subject: [PATCH 37/77] evil-winrm: 3.3 -> 3.5 Diff: https://github.com/Hackplayers/evil-winrm/compare/v3.3...v3.5 Changelog: https://github.com/Hackplayers/evil-winrm/releases/tag/v3.5 --- pkgs/tools/security/evil-winrm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/evil-winrm/default.nix b/pkgs/tools/security/evil-winrm/default.nix index fe10bfaefec0..8a1da72add4a 100644 --- a/pkgs/tools/security/evil-winrm/default.nix +++ b/pkgs/tools/security/evil-winrm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "evil-winrm"; - version = "3.3"; + version = "3.5"; src = fetchFromGitHub { owner = "Hackplayers"; repo = "evil-winrm"; rev = "v${version}"; - sha256 = "sha256-uWhRkq7I/XRWSUpR8lWRhDImE6x0pX9/B3gKhRIhkf8="; + sha256 = "sha256-8Lyo7BgypzrHMEcbYlxo/XWwOtBqs2tczYnc3+XEbeA="; }; env = bundlerEnv { From caa9d4ac43029fe4abc7d27dddf7e73da17b927a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 Oct 2023 15:52:42 +0200 Subject: [PATCH 38/77] evil-winrm: refactor - update changelog entry --- pkgs/tools/security/evil-winrm/default.nix | 24 +++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/evil-winrm/default.nix b/pkgs/tools/security/evil-winrm/default.nix index 8a1da72add4a..30420c7aad68 100644 --- a/pkgs/tools/security/evil-winrm/default.nix +++ b/pkgs/tools/security/evil-winrm/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, bundlerEnv }: +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, bundlerEnv +}: stdenv.mkDerivation rec { pname = "evil-winrm"; @@ -7,8 +12,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Hackplayers"; repo = "evil-winrm"; - rev = "v${version}"; - sha256 = "sha256-8Lyo7BgypzrHMEcbYlxo/XWwOtBqs2tczYnc3+XEbeA="; + rev = "refs/tags/v${version}"; + hash = "sha256-8Lyo7BgypzrHMEcbYlxo/XWwOtBqs2tczYnc3+XEbeA="; }; env = bundlerEnv { @@ -18,8 +23,13 @@ stdenv.mkDerivation rec { gemset = ./gemset.nix; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ env.wrappedRuby ]; + nativeBuildInputs = [ + makeWrapper + ]; + + buildInputs = [ + env.wrappedRuby + ]; installPhase = '' mkdir -p $out/bin @@ -27,9 +37,9 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/Hackplayers/evil-winrm"; - changelog = "https://github.com/Hackplayers/evil-winrm/releases/tag/v${version}"; description = "WinRM shell for hacking/pentesting"; + homepage = "https://github.com/Hackplayers/evil-winrm"; + changelog = "https://github.com/Hackplayers/evil-winrm/blob/v${version}/CHANGELOG.md"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ elohmeier ]; }; From 558b9e173c8091fec3b738f5c8d12a7d6bda6de4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Thu, 19 Oct 2023 16:09:43 +0200 Subject: [PATCH 39/77] eza: 0.14.2 -> 0.15.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christina Sørensen --- pkgs/by-name/ez/eza/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index e7181d59afaf..804446d6fe7a 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.14.2"; + version = "0.15.0"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-eST70KMdGgbTo4FNL3K5YGn9lwIGroG4y4ExKDb30hU="; + hash = "sha256-52vBN/EdO0R2Lt/Iv33Odl437I8kgUhxXwtUuiaAcAU="; }; - cargoHash = "sha256-h5ooNR0IeXWyY6PuZM/bQLkX4F0eZsEY2eoIgo0nRFA="; + cargoHash = "sha256-j6FsI6FpBXtaNcVDY84UBcqifXuJxBRW5Gdln8pq7Iw="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] From 3b8df3ab1f22fa170c4c337fd5f704098362aedf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Oct 2023 14:11:16 +0000 Subject: [PATCH 40/77] sketchybar-app-font: 1.0.16 -> 1.0.17 --- pkgs/data/fonts/sketchybar-app-font/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/sketchybar-app-font/default.nix b/pkgs/data/fonts/sketchybar-app-font/default.nix index c66d649de187..df68dbb844c5 100644 --- a/pkgs/data/fonts/sketchybar-app-font/default.nix +++ b/pkgs/data/fonts/sketchybar-app-font/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sketchybar-app-font"; - version = "1.0.16"; + version = "1.0.17"; src = fetchurl { url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/sketchybar-app-font.ttf"; - hash = "sha256-58gRCEJix9pnZEcoo6bm2zWduP0xXl3WWC6mt36SGuo="; + hash = "sha256-sDMasHVcITTSUP9B87w4I7IZ44tYmabNNWl+kE3dUoE="; }; dontUnpack = true; From 1df087c1cc38351bd0731782aac14a5ddcc0cd91 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 19 Oct 2023 10:15:56 -0400 Subject: [PATCH 41/77] ov: 0.32.0 -> 0.32.1 Diff: https://github.com/noborus/ov/compare/refs/tags/v0.32.0...v0.32.1 Changelog: https://github.com/noborus/ov/releases/tag/v0.32.1 --- pkgs/tools/text/ov/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/ov/default.nix b/pkgs/tools/text/ov/default.nix index e988f1c2f204..2a70d7cdaa54 100644 --- a/pkgs/tools/text/ov/default.nix +++ b/pkgs/tools/text/ov/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "ov"; - version = "0.32.0"; + version = "0.32.1"; src = fetchFromGitHub { owner = "noborus"; repo = "ov"; rev = "refs/tags/v${version}"; - hash = "sha256-mQ1KwElD8RizOT2trHWo4T1QiZ974xwhQCCa5snpnZM="; + hash = "sha256-S84CMC02KJ5eevLxVkapCdjZh4PH95u/0AK4tpkOx2k="; }; - vendorHash = "sha256-XACdtJdACMKQ5gSJcjGAPNGPFL1Tbt6QOovl15mvFGI="; + vendorHash = "sha256-1NdvUdPPr0Twx0hyve4/vvDR2cU+mGyws3UIf8jHfbw="; ldflags = [ "-s" From 823f5bb125d1907ac26352e0c8b8e696c7062608 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 19 Oct 2023 10:24:57 -0400 Subject: [PATCH 42/77] runme: 1.7.7 -> 1.7.8 Diff: https://github.com/stateful/runme/compare/v1.7.7...v1.7.8 Changelog: https://github.com/stateful/runme/releases/tag/v1.7.8 --- pkgs/development/tools/misc/runme/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/runme/default.nix b/pkgs/development/tools/misc/runme/default.nix index 67a69db81426..3795476c3e16 100644 --- a/pkgs/development/tools/misc/runme/default.nix +++ b/pkgs/development/tools/misc/runme/default.nix @@ -12,7 +12,7 @@ buildGo121Module rec { pname = "runme"; - version = "1.7.7"; + version = "1.7.8"; src = fetchFromGitHub { owner = "stateful"; From 056245c6bda90d0302cb104220d5a1a742d8e820 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Oct 2023 14:42:43 +0000 Subject: [PATCH 43/77] slint-lsp: 1.1.1 -> 1.2.2 --- pkgs/development/tools/misc/slint-lsp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/slint-lsp/default.nix b/pkgs/development/tools/misc/slint-lsp/default.nix index 028f2f8d5029..0eb55d14c005 100644 --- a/pkgs/development/tools/misc/slint-lsp/default.nix +++ b/pkgs/development/tools/misc/slint-lsp/default.nix @@ -25,14 +25,14 @@ let in rustPlatform.buildRustPackage rec { pname = "slint-lsp"; - version = "1.1.1"; + version = "1.2.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-ENv17Az6yzUwD39HDfoD7Bmvs6LHjVp85PaYkTw6jW0="; + sha256 = "sha256-+1nuezax7aV9b+L11zzIouA8QEWduqBzPiT6jvCGMac="; }; - cargoHash = "sha256-wL46QhY3Cq2KFLETPRhUWb77o1vNrRA2w1NBAtBc0yo="; + cargoHash = "sha256-o7HDhNtjA0/JybJCiEejR8PcRIdJim+/wq4q8xj9A5Q="; nativeBuildInputs = [ cmake pkg-config fontconfig ]; buildInputs = rpathLibs ++ [ xorg.libxcb.dev ] From 23dfd1c846efa748e55a8d4e3f0730cb7244d99b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Oct 2023 14:46:35 +0000 Subject: [PATCH 44/77] slweb: 0.6.11 -> 0.9.0 --- pkgs/applications/misc/slweb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/slweb/default.nix b/pkgs/applications/misc/slweb/default.nix index 1c6931fadcd4..ee5e01b79956 100644 --- a/pkgs/applications/misc/slweb/default.nix +++ b/pkgs/applications/misc/slweb/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "slweb"; - version = "0.6.11"; + version = "0.9.0"; src = fetchFromSourcehut { owner = "~strahinja"; repo = "slweb"; rev = "v${finalAttrs.version}"; - hash = "sha256-+bKapK/s1pmo1NRRslf7V4ogWTtchFNWpzi+S8YG6+4="; + hash = "sha256-QDHcp5pCmapgOlJpDDyyC12JOfh/biDyF6O+iKGbOGg="; }; nativeBuildInputs = [ redo-apenwarr ]; From 9281941375e3ace35af658945f2a70bfee5d77d5 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Thu, 19 Oct 2023 22:45:51 +0800 Subject: [PATCH 45/77] perlPackages.CryptBcrypt: init at 0.011 --- pkgs/top-level/perl-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 67f2c91beabd..a2e52504af7b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4758,6 +4758,19 @@ with self; { }; }; + CryptBcrypt = buildPerlPackage { + pname = "Crypt-Bcrypt"; + version = "0.011"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LE/LEONT/Crypt-Bcrypt-0.011.tar.gz"; + hash = "sha256-Z/ymiwUm5zTi2VvGsyutAcMZ5Yer9j5M80Itpmu+o6A="; + }; + meta = { + description = "modern bcrypt implementation"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CryptBlowfish = buildPerlPackage { pname = "Crypt-Blowfish"; version = "2.14"; From a0630d8973ed0b4773de6f1c6bddd139f129008e Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Thu, 19 Oct 2023 19:46:31 +0800 Subject: [PATCH 46/77] perlPackages.FileReadBackwards: 1.05 -> 1.06 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 67f2c91beabd..d8c8581f54b8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9715,10 +9715,10 @@ with self; { FileReadBackwards = buildPerlPackage { pname = "File-ReadBackwards"; - version = "1.05"; + version = "1.06"; src = fetchurl { - url = "mirror://cpan/authors/id/U/UR/URI/File-ReadBackwards-1.05.tar.gz"; - hash = "sha256-grJhr4dQfMPn5miZxFcQTryNHAn7hcU/Z8H5D3DxjW4="; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/File-ReadBackwards-1.06.tar.gz"; + hash = "sha256-MrKgVJOJqviIde8D1+u//y1ZeeyoW3yBL2tLsQ0QL2I="; }; meta = { description = "Read a file backwards by lines"; From 698e7d3440772ec8fde239387e7f79e4296a8856 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Thu, 19 Oct 2023 22:47:45 +0800 Subject: [PATCH 47/77] perlPackages.JSONValidator: 5.08 -> 5.14 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 67f2c91beabd..f3fc0e03ffc9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12986,13 +12986,13 @@ with self; { JSONValidator = buildPerlPackage { pname = "JSON-Validator"; - version = "5.08"; + version = "5.14"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-5.08.tar.gz"; - hash = "sha256-QPaWjtcfxv1Ij6Q1Ityhk5NDhUCSth/eZgHwcWZHeFg="; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-5.14.tar.gz"; + hash = "sha256-YISl1AdeQhqTj/su6XuFBPqjXoZtD3tbWBETr17ijhs="; }; buildInputs = [ TestDeep ]; - propagatedBuildInputs = [ DataValidateDomain DataValidateIP Mojolicious NetIDNEncode YAMLLibYAML ]; + propagatedBuildInputs = [ Mojolicious YAMLLibYAML ]; meta = { description = "Validate data against a JSON schema"; homepage = "https://github.com/mojolicious/json-validator"; From 94c796a420f0219ccb9a992f2b88008bcee499fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Oct 2023 15:11:39 +0000 Subject: [PATCH 48/77] snac2: 2.41 -> 2.42 --- pkgs/servers/snac2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/snac2/default.nix b/pkgs/servers/snac2/default.nix index b13b6c2b9fcf..49c2c27890ff 100644 --- a/pkgs/servers/snac2/default.nix +++ b/pkgs/servers/snac2/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "snac2"; - version = "2.41"; + version = "2.42"; src = fetchFromGitea { domain = "codeberg.org"; owner = "grunfink"; repo = pname; rev = version; - hash = "sha256-WVbGORth3paDo1eK/J7MPUstVQifcU7ksVEb87vknN0="; + hash = "sha256-cLSbmEZj5lyMtZMM2vaWqdrXFk1/VPws9yBPhSUka2E="; }; buildInputs = [ curl openssl ]; From 085c3bac1042b1f30d1d42a0a80b3fd9d3d8fd52 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Thu, 19 Oct 2023 23:35:47 +0800 Subject: [PATCH 49/77] perlPackages.Future: 0.48 -> 0.50 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 67f2c91beabd..dd6678205421 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10115,12 +10115,12 @@ with self; { Future = buildPerlModule { pname = "Future"; - version = "0.48"; + version = "0.50"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-0.48.tar.gz"; - hash = "sha256-D+ixXBQvKjBKMXGKIKEFA6m0TMASw69eN7i34koHUqM="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-0.50.tar.gz"; + hash = "sha256-wDXj2eaaOvFEszrINN7p5lrTYPKlHbnxWNw0Ls3dX0Q="; }; - buildInputs = [ TestFatal TestIdentity TestRefcount ]; + buildInputs = [ Test2Suite ]; meta = { description = "Represent an operation awaiting completion"; license = with lib.licenses; [ artistic1 gpl1Plus ]; From 00134c03d59fcc027eed7a7e6d8888f6222a8a45 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Thu, 19 Oct 2023 23:37:35 +0800 Subject: [PATCH 50/77] perlPackages.FutureAsyncAwait: 0.58 -> 0.66 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 67f2c91beabd..770c263a4ba1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10129,12 +10129,12 @@ with self; { FutureAsyncAwait = buildPerlModule rec { pname = "Future-AsyncAwait"; - version = "0.58"; + version = "0.66"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-0.58.tar.gz"; - hash = "sha256-OLtJ9jabBUrAUuaNomR/4i0Io605rgNuJ6KRELtOQi4="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-0.66.tar.gz"; + hash = "sha256-xqD03kYr8yS1usoXddGZ7DJGo1jBPbm2Ssv82+bl7CE="; }; - buildInputs = [ TestRefcount TestFatal ]; + buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ Future XSParseKeyword XSParseSublike ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; meta = { From 61db791a8a6d9addf863b77b7d6ddb80e913608c Mon Sep 17 00:00:00 2001 From: rexxDigital Date: Fri, 6 Oct 2023 08:42:13 +0200 Subject: [PATCH 51/77] reactphysics3d: init at 0.9.0 --- pkgs/by-name/re/reactphysics3d/package.nix | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 pkgs/by-name/re/reactphysics3d/package.nix diff --git a/pkgs/by-name/re/reactphysics3d/package.nix b/pkgs/by-name/re/reactphysics3d/package.nix new file mode 100644 index 000000000000..f775d7d54240 --- /dev/null +++ b/pkgs/by-name/re/reactphysics3d/package.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation (finalAttrs: { + pname = "reactphysics3d"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "DanielChappuis"; + repo = "reactphysics3d"; + rev = "v${finalAttrs.version}"; + hash = "sha256-AUdsUXsygsGfS8H+AHEV1fSrrX7zGmfsaTONYUG3zqk="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "An open source C++ physics engine library"; + homepage = "https://www.reactphysics3d.com"; + maintainers = with maintainers; [ rexxDigital ]; + license = licenses.zlib; + platforms = platforms.all; + }; +}) From be68df309d58be39eacd1e17e71b14cae07a8614 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Thu, 5 Oct 2023 22:43:18 +0200 Subject: [PATCH 52/77] nixos/outline: Add the possibility of using local storage instead of S3 --- .../manual/release-notes/rl-2311.section.md | 2 + nixos/modules/services/web-apps/outline.nix | 50 ++++++++++++++----- 2 files changed, 39 insertions(+), 13 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 587a08b6cf47..27d94b4cb89f 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -294,6 +294,8 @@ - DocBook option documentation is no longer supported, all module documentation now uses markdown. +- `services.outline` can now be configured to use local filesystem storage instead of S3 storage using [services.outline.storage.storageType](#opt-services.outline.storage.storageType). + - `buildGoModule` `go-modules` attrs have been renamed to `goModules`. - The `fonts.fonts` and `fonts.enableDefaultFonts` options have been renamed to `fonts.packages` and `fonts.enableDefaultPackages` respectively. diff --git a/nixos/modules/services/web-apps/outline.nix b/nixos/modules/services/web-apps/outline.nix index 1d8298963e6d..0e3bd07c1fc1 100644 --- a/nixos/modules/services/web-apps/outline.nix +++ b/nixos/modules/services/web-apps/outline.nix @@ -117,13 +117,14 @@ in storage = lib.mkOption { description = lib.mdDoc '' To support uploading of images for avatars and document attachments an - s3-compatible storage must be provided. AWS S3 is recommended for + s3-compatible storage can be provided. AWS S3 is recommended for redundancy however if you want to keep all file storage local an alternative such as [minio](https://github.com/minio/minio) can be used. + Local filesystem storage can also be used. - A more detailed guide on setting up S3 is available - [here](https://wiki.generaloutline.com/share/125de1cc-9ff6-424b-8415-0d58c809a40f). + A more detailed guide on setting up storage is available + [here](https://docs.getoutline.com/s/hosting/doc/file-storage-N4M0T6Ypu7). ''; example = lib.literalExpression '' { @@ -136,6 +137,19 @@ in ''; type = lib.types.submodule { options = { + storageType = lib.mkOption { + type = lib.types.enum [ "local" "s3" ]; + description = lib.mdDoc "File storage type, it can be local or s3."; + default = "s3"; + }; + localRootDir = lib.mkOption { + type = lib.types.str; + description = lib.mdDoc '' + If `storageType` is `local`, this sets the parent directory + under which all attachments/images go. + ''; + default = "/var/lib/outline/data"; + }; accessKey = lib.mkOption { type = lib.types.str; description = lib.mdDoc "S3 access key."; @@ -557,7 +571,10 @@ in systemd.tmpfiles.rules = [ "f ${cfg.secretKeyFile} 0600 ${cfg.user} ${cfg.group} -" "f ${cfg.utilsSecretFile} 0600 ${cfg.user} ${cfg.group} -" - "f ${cfg.storage.secretKeyFile} 0600 ${cfg.user} ${cfg.group} -" + (if (cfg.storage.storageType == "s3") then + "f ${cfg.storage.secretKeyFile} 0600 ${cfg.user} ${cfg.group} -" + else + "d ${cfg.storage.localRootDir} 0700 ${cfg.user} ${cfg.group} - -") ]; services.postgresql = lib.mkIf (cfg.databaseUrl == "local") { @@ -599,14 +616,6 @@ in URL = cfg.publicUrl; PORT = builtins.toString cfg.port; - AWS_ACCESS_KEY_ID = cfg.storage.accessKey; - AWS_REGION = cfg.storage.region; - AWS_S3_UPLOAD_BUCKET_URL = cfg.storage.uploadBucketUrl; - AWS_S3_UPLOAD_BUCKET_NAME = cfg.storage.uploadBucketName; - AWS_S3_UPLOAD_MAX_SIZE = builtins.toString cfg.storage.uploadMaxSize; - AWS_S3_FORCE_PATH_STYLE = builtins.toString cfg.storage.forcePathStyle; - AWS_S3_ACL = cfg.storage.acl; - CDN_URL = cfg.cdnUrl; FORCE_HTTPS = builtins.toString cfg.forceHttps; ENABLE_UPDATES = builtins.toString cfg.enableUpdateCheck; @@ -622,8 +631,21 @@ in RATE_LIMITER_ENABLED = builtins.toString cfg.rateLimiter.enable; RATE_LIMITER_REQUESTS = builtins.toString cfg.rateLimiter.requests; RATE_LIMITER_DURATION_WINDOW = builtins.toString cfg.rateLimiter.durationWindow; + + FILE_STORAGE = cfg.storage.storageType; + FILE_STORAGE_UPLOAD_MAX_SIZE = builtins.toString cfg.storage.uploadMaxSize; + FILE_STORAGE_LOCAL_ROOT_DIR = cfg.storage.localRootDir; } + (lib.mkIf (cfg.storage.storageType == "s3") { + AWS_ACCESS_KEY_ID = cfg.storage.accessKey; + AWS_REGION = cfg.storage.region; + AWS_S3_UPLOAD_BUCKET_URL = cfg.storage.uploadBucketUrl; + AWS_S3_UPLOAD_BUCKET_NAME = cfg.storage.uploadBucketName; + AWS_S3_FORCE_PATH_STYLE = builtins.toString cfg.storage.forcePathStyle; + AWS_S3_ACL = cfg.storage.acl; + }) + (lib.mkIf (cfg.slackAuthentication != null) { SLACK_CLIENT_ID = cfg.slackAuthentication.clientId; }) @@ -676,7 +698,9 @@ in script = '' export SECRET_KEY="$(head -n1 ${lib.escapeShellArg cfg.secretKeyFile})" export UTILS_SECRET="$(head -n1 ${lib.escapeShellArg cfg.utilsSecretFile})" - export AWS_SECRET_ACCESS_KEY="$(head -n1 ${lib.escapeShellArg cfg.storage.secretKeyFile})" + ${lib.optionalString (cfg.storage.storageType == "s3") '' + export AWS_SECRET_ACCESS_KEY="$(head -n1 ${lib.escapeShellArg cfg.storage.secretKeyFile})" + ''} ${lib.optionalString (cfg.slackAuthentication != null) '' export SLACK_CLIENT_SECRET="$(head -n1 ${lib.escapeShellArg cfg.slackAuthentication.secretFile})" ''} From 7f35653a7d1b51816e06e8c944cb3f0c2279703e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Oct 2023 18:08:28 +0000 Subject: [PATCH 53/77] sshocker: 0.3.3 -> 0.3.4 --- pkgs/tools/security/sshocker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/sshocker/default.nix b/pkgs/tools/security/sshocker/default.nix index b42c0a7580c3..bb8177ea3878 100644 --- a/pkgs/tools/security/sshocker/default.nix +++ b/pkgs/tools/security/sshocker/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "sshocker"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "lima-vm"; repo = "sshocker"; rev = "refs/tags/v${version}"; - hash = "sha256-Z1Dg+AeyfFmUDc3jV8/tOcUrxuyInfwubzo0cLpfFl8="; + hash = "sha256-IDbGRQSLQlT4lt2bextGYB4fJfbpLhPx3JF1eYDJ6gw="; }; - vendorHash = "sha256-ceQzYByJNXr02IDBKhYuqnKfaTbnX5T03p2US4HRu6I="; + vendorHash = "sha256-kee5D80RjCVosts/Jd6WuvtiK/J5+79HsM5ITHs15xc="; ldflags = [ "-s" From ea0dcd0ae14b99c5740acc7a1b874ea4446cb5be Mon Sep 17 00:00:00 2001 From: nicoo Date: Tue, 17 Oct 2023 10:27:43 +0000 Subject: [PATCH 54/77] nixos/systemd-boot: Avoid remote mypy executions --- nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index 6f0a62d0ea89..64c8ab74bba6 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -49,7 +49,7 @@ let ''; }; - checkedSystemdBootBuilder = pkgs.runCommand "systemd-boot" { + checkedSystemdBootBuilder = pkgs.runCommandLocal "systemd-boot" { nativeBuildInputs = [ pkgs.mypy ]; } '' install -m755 ${systemdBootBuilder} $out From 3179f5b77082c42fc1a75e9c71f21a6979614731 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Wed, 11 Oct 2023 17:56:25 -0700 Subject: [PATCH 55/77] maintainers/teams: add alejandrosame to minimal-bootstrap team --- maintainers/team-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index b8811da00299..d5705a294aaf 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -611,6 +611,7 @@ with lib.maintainers; { minimal-bootstrap = { members = [ + alejandrosame artturin emilytrau ericson2314 From d2c4f9a4fcf7fc7a4123719befc8c61aac8d3fa3 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Tue, 10 Oct 2023 19:50:29 -0700 Subject: [PATCH 56/77] minimal-bootstrap.coreutils-musl: change pname to not break `nix-env` --- pkgs/os-specific/linux/minimal-bootstrap/coreutils/default.nix | 2 +- pkgs/os-specific/linux/minimal-bootstrap/coreutils/musl.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/minimal-bootstrap/coreutils/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/coreutils/default.nix index eb4fe9bcf993..9d7480d239f2 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/coreutils/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/coreutils/default.nix @@ -6,7 +6,7 @@ , gnupatch }: let - pname = "coreutils"; + pname = "bootstrap-coreutils"; version = "5.0"; src = fetchurl { diff --git a/pkgs/os-specific/linux/minimal-bootstrap/coreutils/musl.nix b/pkgs/os-specific/linux/minimal-bootstrap/coreutils/musl.nix index dece020a5e79..14584e0a7e6d 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/coreutils/musl.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/coreutils/musl.nix @@ -12,7 +12,7 @@ , gzip }: let - pname = "coreutils"; + pname = "bootstrap-coreutils-musl"; version = "9.4"; src = fetchurl { From 39250f5df5f377509350a2b38836e2ee3365de9d Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 19 Oct 2023 12:45:07 +0100 Subject: [PATCH 57/77] nixos/qt: multiple fixes - Removal of top-level `with lib` - Allow usage of module without setting `platformTheme`, so we can set the QT_PLUGIN_PATH/QML2_IMPORT_PATH paths without theming - Add support for kvantum and some other styles - Add myself as maintainer --- nixos/modules/config/qt.nix | 158 +++++++++++++++++++++--------------- 1 file changed, 92 insertions(+), 66 deletions(-) diff --git a/nixos/modules/config/qt.nix b/nixos/modules/config/qt.nix index 2b09281e467f..da2a7f876283 100644 --- a/nixos/modules/config/qt.nix +++ b/nixos/modules/config/qt.nix @@ -1,121 +1,147 @@ { config, lib, pkgs, ... }: -with lib; - let - cfg = config.qt; - isQGnome = cfg.platformTheme == "gnome" && builtins.elem cfg.style ["adwaita" "adwaita-dark"]; - isQtStyle = cfg.platformTheme == "gtk2" && !(builtins.elem cfg.style ["adwaita" "adwaita-dark"]); - isQt5ct = cfg.platformTheme == "qt5ct"; - isLxqt = cfg.platformTheme == "lxqt"; - isKde = cfg.platformTheme == "kde"; + platformPackages = with pkgs; { + gnome = [ qgnomeplatform qgnomeplatform-qt6 ]; + gtk2 = [ libsForQt5.qtstyleplugins qt6Packages.qt6gtk2 ]; + kde = [ libsForQt5.plasma-integration libsForQt5.systemsettings ]; + lxqt = [ lxqt.lxqt-qtplugin lxqt.lxqt-config ]; + qt5ct = [ libsForQt5.qt5ct qt6Packages.qt6ct ]; + }; - packages = - if isQGnome then [ - pkgs.qgnomeplatform - pkgs.adwaita-qt - pkgs.qgnomeplatform-qt6 - pkgs.adwaita-qt6 - ] - else if isQtStyle then [ pkgs.libsForQt5.qtstyleplugins pkgs.qt6Packages.qt6gtk2 ] - else if isQt5ct then [ pkgs.libsForQt5.qt5ct pkgs.qt6Packages.qt6ct ] - else if isLxqt then [ pkgs.lxqt.lxqt-qtplugin pkgs.lxqt.lxqt-config ] - else if isKde then [ pkgs.libsForQt5.plasma-integration pkgs.libsForQt5.systemsettings ] - else throw "`qt.platformTheme` ${cfg.platformTheme} and `qt.style` ${cfg.style} are not compatible."; + stylePackages = with pkgs; { + bb10bright = [ libsForQt5.qtstyleplugins ]; + bb10dark = [ libsForQt5.qtstyleplugins ]; + cde = [ libsForQt5.qtstyleplugins ]; + cleanlooks = [ libsForQt5.qtstyleplugins ]; + gtk2 = [ libsForQt5.qtstyleplugins qt6Packages.qt6gtk2 ]; + motif = [ libsForQt5.qtstyleplugins ]; + plastique = [ libsForQt5.qtstyleplugins ]; + adwaita = [ adwaita-qt adwaita-qt6 ]; + adwaita-dark = [ adwaita-qt adwaita-qt6 ]; + adwaita-highcontrast = [ adwaita-qt adwaita-qt6 ]; + adwaita-highcontrastinverse = [ adwaita-qt adwaita-qt6 ]; + + breeze = [ libsForQt5.breeze-qt5 ]; + + kvantum = [ libsForQt5.qtstyleplugin-kvantum qt6Packages.qtstyleplugin-kvantum ]; + }; in - { - meta.maintainers = [ maintainers.romildo ]; + meta.maintainers = with lib.maintainers; [ romildo thiagokokada ]; imports = [ - (mkRenamedOptionModule ["qt5" "enable" ] ["qt" "enable" ]) - (mkRenamedOptionModule ["qt5" "platformTheme" ] ["qt" "platformTheme" ]) - (mkRenamedOptionModule ["qt5" "style" ] ["qt" "style" ]) + (lib.mkRenamedOptionModule [ "qt5" "enable" ] [ "qt" "enable" ]) + (lib.mkRenamedOptionModule [ "qt5" "platformTheme" ] [ "qt" "platformTheme" ]) + (lib.mkRenamedOptionModule [ "qt5" "style" ] [ "qt" "style" ]) ]; options = { qt = { + enable = lib.mkEnableOption (lib.mdDoc "Qt theming configuration"); - enable = mkEnableOption (lib.mdDoc "Qt theming configuration"); - - platformTheme = mkOption { - type = types.enum [ - "gtk2" - "gnome" - "lxqt" - "qt5ct" - "kde" - ]; + platformTheme = lib.mkOption { + type = with lib.types; nullOr (enum (lib.attrNames platformPackages)); + default = null; example = "gnome"; relatedPackages = [ "qgnomeplatform" "qgnomeplatform-qt6" - ["libsForQt5" "qtstyleplugins"] - ["libsForQt5" "qt5ct"] - ["lxqt" "lxqt-qtplugin"] - ["libsForQt5" "plasma-integration"] + [ "libsForQt5" "plasma-integration" ] + [ "libsForQt5" "qt5ct" ] + [ "libsForQt5" "qtstyleplugins" ] + [ "libsForQt5" "systemsettings" ] + [ "lxqt" "lxqt-config" ] + [ "lxqt" "lxqt-qtplugin" ] + [ "qt6Packages" "qt6ct" ] + [ "qt6Packages" "qt6gtk2" ] ]; description = lib.mdDoc '' Selects the platform theme to use for Qt applications. The options are - - `gtk`: Use GTK theme with [qtstyleplugins](https://github.com/qt/qtstyleplugins) - `gnome`: Use GNOME theme with [qgnomeplatform](https://github.com/FedoraQt/QGnomePlatform) + - `gtk2`: Use GTK theme with [qtstyleplugins](https://github.com/qt/qtstyleplugins) + - `kde`: Use Qt settings from Plasma. - `lxqt`: Use LXQt style set using the [lxqt-config-appearance](https://github.com/lxqt/lxqt-config) application. - `qt5ct`: Use Qt style set using the [qt5ct](https://sourceforge.net/projects/qt5ct/) - application. - - `kde`: Use Qt settings from Plasma. + and [qt6ct](https://github.com/trialuser02/qt6ct) applications. ''; }; - style = mkOption { - type = types.enum [ - "adwaita" - "adwaita-dark" - "cleanlooks" - "gtk2" - "motif" - "plastique" - ]; + style = lib.mkOption { + type = with lib.types; nullOr (enum (lib.attrNames stylePackages)); + default = null; example = "adwaita"; relatedPackages = [ "adwaita-qt" "adwaita-qt6" - ["libsForQt5" "qtstyleplugins"] - ["qt6Packages" "qt6gtk2"] + [ "libsForQt5" "breeze-qt5" ] + [ "libsForQt5" "qtstyleplugin-kvantum" ] + [ "libsForQt5" "qtstyleplugins" ] + [ "qt6Packages" "qt6gtk2" ] + [ "qt6Packages" "qtstyleplugin-kvantum" ] ]; description = lib.mdDoc '' Selects the style to use for Qt applications. The options are - - `adwaita`, `adwaita-dark`: Use Adwaita Qt style with + - `adwaita`, `adwaita-dark`, `adwaita-highcontrast`, `adawaita-highcontrastinverse`: + Use Adwaita Qt style with [adwaita](https://github.com/FedoraQt/adwaita-qt) - - `cleanlooks`, `gtk2`, `motif`, `plastique`: Use styles from + - `breeze`: Use the Breeze style from + [breeze](https://github.com/KDE/breeze) + - `bb10bright`, `bb10dark`, `cleanlooks`, `gtk2`, `motif`, `plastique`: + Use styles from [qtstyleplugins](https://github.com/qt/qtstyleplugins) + - `kvantum`: Use styles from + [kvantum](https://github.com/tsujan/Kvantum) ''; }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { + assertions = + let + gnomeStyles = [ + "adwaita" + "adwaita-dark" + "adwaita-highcontrast" + "adwaita-highcontrastinverse" + "breeze" + ]; + in + [ + { + assertion = cfg.platformTheme == "gnome" -> (builtins.elem cfg.style gnomeStyles); + message = '' + `qt.platformTheme` "gnome" must have `qt.style` set to a theme that supports both Qt and Gtk, + for example: ${lib.concatStringsSep ", " gnomeStyles}. + ''; + } + ]; environment.variables = { - QT_QPA_PLATFORMTHEME = cfg.platformTheme; - QT_STYLE_OVERRIDE = mkIf (! (isQt5ct || isLxqt || isKde)) cfg.style; + QT_QPA_PLATFORMTHEME = lib.mkIf (cfg.platformTheme != null) cfg.platformTheme; + QT_STYLE_OVERRIDE = lib.mkIf (cfg.style != null) cfg.style; }; - environment.profileRelativeSessionVariables = let - qtVersions = with pkgs; [ qt5 qt6 ]; - in { - QT_PLUGIN_PATH = map (qt: "/${qt.qtbase.qtPluginPrefix}") qtVersions; - QML2_IMPORT_PATH = map (qt: "/${qt.qtbase.qtQmlPrefix}") qtVersions; - }; - - environment.systemPackages = packages; + environment.profileRelativeSessionVariables = + let + qtVersions = with pkgs; [ qt5 qt6 ]; + in + { + QT_PLUGIN_PATH = map (qt: "/${qt.qtbase.qtPluginPrefix}") qtVersions; + QML2_IMPORT_PATH = map (qt: "/${qt.qtbase.qtQmlPrefix}") qtVersions; + }; + environment.systemPackages = + lib.optionals (cfg.platformTheme != null) (platformPackages.${cfg.platformTheme}) + ++ lib.optionals (cfg.style != null) (stylePackages.${cfg.style}); }; } From 38623a80038f638bd6da083e762e803b7616267c Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 19 Oct 2023 13:58:24 +0100 Subject: [PATCH 58/77] nixos/qt: improve module documentation --- nixos/modules/config/qt.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/config/qt.nix b/nixos/modules/config/qt.nix index da2a7f876283..f82b7ab85a8c 100644 --- a/nixos/modules/config/qt.nix +++ b/nixos/modules/config/qt.nix @@ -41,7 +41,14 @@ in options = { qt = { - enable = lib.mkEnableOption (lib.mdDoc "Qt theming configuration"); + enable = lib.mkEnableOption "" // { + description = lib.mdDoc '' + Whether to enable Qt configuration, including theming. + + Enabling this option is necessary for Qt plugins to work in the + installed profiles (e.g.: `nix-env -i` or `environment.systemPackages`). + ''; + }; platformTheme = lib.mkOption { type = with lib.types; nullOr (enum (lib.attrNames platformPackages)); From 64db4d240e8f199e9f44fe1e4d0a1a297a98e76a Mon Sep 17 00:00:00 2001 From: Jussi Kuokkanen Date: Fri, 20 Oct 2023 00:14:08 +0300 Subject: [PATCH 59/77] pkgs/README.md: clarify when meta.maintainers should be set --- pkgs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/README.md b/pkgs/README.md index bfa7e611255d..4845cfa31755 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -362,7 +362,7 @@ All versions of a package _must_ be included in `all-packages.nix` to make sure * If there is no upstream license, `meta.license` should default to `lib.licenses.unfree`. * If in doubt, try to contact the upstream developers for clarification. * `meta.mainProgram` must be set when appropriate. -* `meta.maintainers` should be set. +* `meta.maintainers` must be set for new packages. See the Nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes). From cbf86bc7704c637778b6ad6bb2d0d27a48f8f473 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Oct 2023 21:28:00 +0000 Subject: [PATCH 60/77] storj-uplink: 1.89.2 -> 1.90.1 --- pkgs/applications/networking/sync/storj-uplink/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sync/storj-uplink/default.nix b/pkgs/applications/networking/sync/storj-uplink/default.nix index f8b381b4384e..f1cf8489c808 100644 --- a/pkgs/applications/networking/sync/storj-uplink/default.nix +++ b/pkgs/applications/networking/sync/storj-uplink/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "storj-uplink"; - version = "1.89.2"; + version = "1.90.1"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-tbzdfKA3ojwTvJ+t7jLLy3iKQ/x/0lXDcb2w1XcyEhs="; + hash = "sha256-LJtNsemNbN+TLyUxSgB/wftKxOfI/y/t+qv1TjcsXzQ="; }; subPackages = [ "cmd/uplink" ]; - vendorHash = "sha256-AME5EM2j7PQ/DodK+3BiVepTRbwMqqItQbmCJ2lrGM8="; + vendorHash = "sha256-R713WhFrWT7Cgstk3SLuvvyk3/ZtT1LOH0qqmFcWzKw="; ldflags = [ "-s" "-w" ]; From cb7081284c87c236c6d6dc75b1a5aca69baf5d21 Mon Sep 17 00:00:00 2001 From: Legion Orsetti Date: Thu, 19 Oct 2023 20:57:32 +0200 Subject: [PATCH 61/77] vencord: 1.5.6 -> 1.5.7 --- pkgs/misc/vencord/default.nix | 8 ++++---- pkgs/misc/vencord/package-lock.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/vencord/default.nix b/pkgs/misc/vencord/default.nix index d26e13e95d7b..287799bcf1e0 100644 --- a/pkgs/misc/vencord/default.nix +++ b/pkgs/misc/vencord/default.nix @@ -6,8 +6,8 @@ , buildWebExtension ? false }: let - version = "1.5.6"; - gitHash = "925d709"; + version = "1.5.7"; + gitHash = "5d7ede3"; in buildNpmPackage rec { pname = "vencord"; @@ -17,7 +17,7 @@ buildNpmPackage rec { owner = "Vendicated"; repo = "Vencord"; rev = "v${version}"; - hash = "sha256-0vYnhDy7J+JFg6uMtwK+uQsHtxoXi8QskIqyQm1HsqM="; + hash = "sha256-/LrM9lBxuM5+KQJqRlP/lBV+krwZIV2GjMi33N/s+V0="; }; ESBUILD_BINARY_PATH = lib.getExe (esbuild.override { @@ -37,7 +37,7 @@ buildNpmPackage rec { npmRebuildFlags = [ "|| true" ]; makeCacheWritable = true; - npmDepsHash = "sha256-/oMQHIigAY7Jdy6S1lRXjzOnxYrvpzbyvP4z+s+k9Lw="; + npmDepsHash = "sha256-Moy7VlAgl31H8QO+aOVano92C4L/wclHhj+JTnbRM6c="; npmFlags = [ "--legacy-peer-deps" ]; npmBuildScript = if buildWebExtension then "buildWeb" else "build"; npmBuildFlags = [ "--" "--standalone" "--disable-updater" ]; diff --git a/pkgs/misc/vencord/package-lock.json b/pkgs/misc/vencord/package-lock.json index 26b54c655b08..eb01a29cb26c 100644 --- a/pkgs/misc/vencord/package-lock.json +++ b/pkgs/misc/vencord/package-lock.json @@ -1,12 +1,12 @@ { "name": "vencord", - "version": "1.5.6", + "version": "1.5.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vencord", - "version": "1.5.6", + "version": "1.5.7", "license": "GPL-3.0-or-later", "dependencies": { "@sapphi-red/web-noise-suppressor": "0.3.3", From b941c97eb2e72f5a69943281ac7ae828e4beeec3 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 20 Oct 2023 00:16:41 +0200 Subject: [PATCH 62/77] CODEOWNERS: Add myself to more parts of lib --- .github/CODEOWNERS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 6344ca3902ee..7bca80f5af88 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -24,10 +24,10 @@ # Libraries /lib @edolstra @infinisil /lib/systems @alyssais @ericson2314 @amjoseph-nixpkgs -/lib/generators.nix @edolstra @Profpatsch -/lib/cli.nix @edolstra @Profpatsch -/lib/debug.nix @edolstra @Profpatsch -/lib/asserts.nix @edolstra @Profpatsch +/lib/generators.nix @infinisil @edolstra @Profpatsch +/lib/cli.nix @infinisil @edolstra @Profpatsch +/lib/debug.nix @infinisil @edolstra @Profpatsch +/lib/asserts.nix @infinisil @edolstra @Profpatsch /lib/path.* @infinisil @fricklerhandwerk /lib/fileset @infinisil /doc/functions/fileset.section.md @infinisil From f277c9494ef2c48ef33b2b2f354fb60a24b29787 Mon Sep 17 00:00:00 2001 From: William Kral Date: Thu, 19 Oct 2023 16:18:49 -0700 Subject: [PATCH 63/77] leetcode-cli: Add shell completions --- pkgs/applications/misc/leetcode-cli/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/misc/leetcode-cli/default.nix b/pkgs/applications/misc/leetcode-cli/default.nix index be9102b6120b..4ea55b39c531 100644 --- a/pkgs/applications/misc/leetcode-cli/default.nix +++ b/pkgs/applications/misc/leetcode-cli/default.nix @@ -2,6 +2,7 @@ , fetchCrate , rustPlatform , pkg-config +, installShellFiles , openssl , dbus , sqlite @@ -24,6 +25,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config + installShellFiles ]; buildInputs = [ @@ -32,6 +34,13 @@ rustPlatform.buildRustPackage rec { sqlite ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + postInstall = '' + installShellCompletion --cmd leetcode \ + --bash <($out/bin/leetcode completions bash) \ + --fish <($out/bin/leetcode completions fish) \ + --zsh <($out/bin/leetcode completions zsh) + ''; + passthru.tests = testers.testVersion { package = leetcode-cli; command = "leetcode -V"; From 602788c8e1b187e356f541324ef5a51664f5c854 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 19 Oct 2023 20:46:44 -0400 Subject: [PATCH 64/77] python310Packages.universal-pathlib: 0.1.3 -> 0.1.4 Changelog: https://github.com/fsspec/universal_pathlib/releases/tag/v0.1.4 --- pkgs/development/python-modules/universal-pathlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/universal-pathlib/default.nix b/pkgs/development/python-modules/universal-pathlib/default.nix index 966e9c459d86..23667d02c283 100644 --- a/pkgs/development/python-modules/universal-pathlib/default.nix +++ b/pkgs/development/python-modules/universal-pathlib/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "universal-pathlib"; - version = "0.1.3"; + version = "0.1.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "universal_pathlib"; inherit version; - hash = "sha256-GgUqteBRcwHfZr5lF+n+Y82fwAgT5c5xpzcBRBrCtcg="; + hash = "sha256-guXYbRaifg6hrcfYisvLqdAtWkVIgWMXT5bZrCidsuQ="; }; nativeBuildInputs = [ From 1ccc7ebb2ac34ba6a2e1e7815be90e71c8e2897b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Oct 2023 02:17:49 +0000 Subject: [PATCH 65/77] symfony-cli: 5.5.10 -> 5.6.0 --- pkgs/development/tools/symfony-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index d626027ee186..4f7dd010b844 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.5.10"; - vendorHash = "sha256-eeVi/O4p7bF4CPqJBCpLfx1Yc5vZZ3b8RV5ERcIL8H4="; + version = "5.6.0"; + vendorHash = "sha256-1BqgnWFMk8hWwra75a5o6Rwbj5wiCUIdSnsAcB+7Mno="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - hash = "sha256-n0R+J41lJYxswMnknYAAEKwwIqOremZF73cRBYfD3CE="; + hash = "sha256-AtHRuzpKXp+WlFser0J5MR63rbO0xO4N/L3U0Q3iax8="; }; ldflags = [ From ef8a0a04d9eac1f7f369ff9b6987f7934c9a3b0e Mon Sep 17 00:00:00 2001 From: Dan Nixon Date: Tue, 13 Jun 2023 00:09:04 +0100 Subject: [PATCH 66/77] maintainers: add dannixon --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 37164565c13c..83e04b930568 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3886,6 +3886,13 @@ githubId = 107034852; name = "Daniyal Suri"; }; + dannixon = { + email = "dan@dan-nixon.com"; + github = "DanNixon"; + githubId = 4037377; + name = "Dan Nixon"; + matrix = "@dannixon:matrix.org"; + }; dansbandit = { github = "dansbandit"; githubId = 4530687; From d06515a02065c7d2874abd54b3f18754f6a74b53 Mon Sep 17 00:00:00 2001 From: Dan Nixon Date: Tue, 13 Jun 2023 00:15:37 +0100 Subject: [PATCH 67/77] perlPackages.CryptHSXKPasswd: init at 3.6 Note that because of an upstream issue two module tests fail and dictionary file functionality does not work in either the library or `hsxkpasswd` binary. See: - https://github.com/bbusschots/hsxkpasswd/issues/42 - https://github.com/bbusschots/hsxkpasswd/issues/43 --- pkgs/top-level/perl-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4936635db735..fbca28335a01 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4947,6 +4947,26 @@ with self; { }; }; + CryptHSXKPasswd = buildPerlPackage { + pname = "Crypt-HSXKPasswd"; + version = "3.6"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BA/BARTB/Crypt-HSXKPasswd-v3.6.tar.gz"; + hash = "sha256-lZ3MX58BG/ALha0i31ZrerK/XqHTYrDeD7WuKfvEWLM="; + }; + buildInputs = [ Clone DateTime FileHomeDir FileShare FileShareDir GetoptLong JSON ListMoreUtils MathRound Readonly TextUnidecode TypeTiny ]; + meta = { + description = "A secure memorable password generator"; + homepage = "http://www.bartb.ie/hsxkpasswd"; + license = with lib.licenses; [ bsd2 ]; + maintainers = [ maintainers.dannixon ]; + mainProgram = "hsxkpasswd"; + }; + # Two tests fail as a result of https://github.com/bbusschots/hsxkpasswd/issues/42 + # (also see https://github.com/bbusschots/hsxkpasswd/issues/43) + doCheck = false; + }; + CryptIDEA = buildPerlPackage { pname = "Crypt-IDEA"; version = "1.10"; From 64fc30778c4d480e0f701edb9b57b9f2026cda23 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 18 Oct 2023 14:49:38 -0300 Subject: [PATCH 68/77] dockapps: move to windowmaker --- pkgs/by-name/wi/windowmaker/package.nix | 5 +++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/wi/windowmaker/package.nix b/pkgs/by-name/wi/windowmaker/package.nix index 2381c16f41ae..6c39eadeb05b 100644 --- a/pkgs/by-name/wi/windowmaker/package.nix +++ b/pkgs/by-name/wi/windowmaker/package.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromRepoOrCz , autoreconfHook +, callPackage , pkg-config , imagemagick , libX11 @@ -62,6 +63,10 @@ stdenv.mkDerivation (finalAttrs: { "--with-x" ]; + passthru = { + dockapps = callPackage ./dockapps { }; + }; + meta = { homepage = "http://windowmaker.org/"; description = "NeXTSTEP-like window manager"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34d9d153a437..eb0f75732755 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36483,7 +36483,7 @@ with pkgs; windowlab = callPackage ../applications/window-managers/windowlab { }; - dockapps = callPackage ../by-name/wi/windowmaker/dockapps { }; + inherit (windowmaker) dockapps; wily = callPackage ../applications/editors/wily { }; From ed5009130e4432de95ded94c535ee2604a33f188 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 18 Oct 2023 17:15:39 -0300 Subject: [PATCH 69/77] windowmaker.dockapps: refactor - Use fetchFromRepoOrCz instead of fetchgit - encapsulate dockapps-sources --- .../wi/windowmaker/dockapps/default.nix | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/wi/windowmaker/dockapps/default.nix b/pkgs/by-name/wi/windowmaker/dockapps/default.nix index 8a66fdbd67f2..4477413a2acd 100644 --- a/pkgs/by-name/wi/windowmaker/dockapps/default.nix +++ b/pkgs/by-name/wi/windowmaker/dockapps/default.nix @@ -1,20 +1,25 @@ { config, lib, pkgs }: -lib.makeScope pkgs.newScope (self: with self; { +lib.makeScope pkgs.newScope (self: { - dockapps-sources = pkgs.fetchgit { - url = "https://repo.or.cz/dockapps.git"; - rev = "b2b9d872ee61c9b329e4597c301e4417cbd9c3ea"; - sha256 = "sha256-BuSnwPIj3gUWMjj++SK+117xm/77u4gXLQzRFttei0w="; + dockapps-sources = { + pname = "dockapps-sources"; + version = "2023-10-11"; # Shall correspond to src.rev + + src = pkgs.fetchFromRepoOrCz { + repo = "dockapps"; + rev = "1bbb32008ecb58acaec9ea70e00b4ea1735408fc"; + hash = "sha256-BLUDe/cIIuh9mCtafbcBSDatUXSRD83FeyYhcbem5FU="; + }; }; - libdockapp = callPackage ./libdockapp.nix { }; + AlsaMixer-app = self.callPackage ./AlsaMixer-app.nix { }; - AlsaMixer-app = callPackage ./AlsaMixer-app.nix { }; + libdockapp = self.callPackage ./libdockapp.nix { }; - wmCalClock = callPackage ./wmCalClock.nix { }; + wmCalClock = self.callPackage ./wmCalClock.nix { }; - wmsm-app = callPackage ./wmsm-app.nix { }; + wmsm-app = self.callPackage ./wmsm-app.nix { }; - wmsystemtray = callPackage ./wmsystemtray.nix { }; + wmsystemtray = self.callPackage ./wmsystemtray.nix { }; }) From 4f3caa10b9d304cec6af5bcf3b53f6f39288db75 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 18 Oct 2023 18:31:45 -0300 Subject: [PATCH 70/77] windowmaker.dockapps.AlsaMixer-app: refactor --- .../wi/windowmaker/dockapps/AlsaMixer-app.nix | 53 +++++++++++-------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/wi/windowmaker/dockapps/AlsaMixer-app.nix b/pkgs/by-name/wi/windowmaker/dockapps/AlsaMixer-app.nix index e22b02825b75..a6b78b70b244 100644 --- a/pkgs/by-name/wi/windowmaker/dockapps/AlsaMixer-app.nix +++ b/pkgs/by-name/wi/windowmaker/dockapps/AlsaMixer-app.nix @@ -1,38 +1,47 @@ -{ lib, stdenv, dockapps-sources, pkg-config, libX11, libXpm, libXext, alsa-lib }: +{ lib +, stdenv +, alsa-lib +, dockapps-sources +, libX11 +, libXext +, libXpm +, pkg-config +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "AlsaMixer.app"; - version = "0.2.1"; - src = dockapps-sources; + inherit (dockapps-sources) version src; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXpm libXext alsa-lib ]; + sourceRoot = "${finalAttrs.src.name}/AlsaMixer.app"; - setSourceRoot = '' - export sourceRoot=$(echo */${pname}) - ''; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + alsa-lib + libX11 + libXpm + libXext + ]; + + hardeningDisable = [ "fortify" ]; dontConfigure = true; - preInstall = '' - install -d ${placeholder "out"}/bin - ''; - installPhase = '' runHook preInstall - install -t ${placeholder "out"}/bin AlsaMixer.app + install -D -t ${placeholder "out"}/bin/ AlsaMixer.app + pushd ${placeholder "out"}/bin + ln -vs AlsaMixer.app AlsaMixer runHook postInstall ''; - postInstall = '' - ln -s ${placeholder "out"}/bin/AlsaMixer.app ${placeholder "out"}/bin/AlsaMixer - ''; - - meta = with lib; { + meta = { description = "Alsa mixer application for Windowmaker"; homepage = "https://www.dockapps.net/alsamixerapp"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.bstrik ]; + license = lib.licenses.gpl2Plus; + maintainers = [ ]; }; -} +}) From 1cdcf6731912e19ab940aa6e8967ca54f57ca7aa Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 18 Oct 2023 18:36:44 -0300 Subject: [PATCH 71/77] windowmaker.dockapps.libdockapp: refactor --- .../wi/windowmaker/dockapps/libdockapp.nix | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix b/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix index aaf99ec932e6..12446bfc7262 100644 --- a/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix +++ b/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix @@ -1,30 +1,36 @@ -{ lib, stdenv, dockapps-sources, autoreconfHook, pkg-config -, libX11, libXext, libXpm, mkfontdir, fontutil }: +{ lib +, stdenv +, autoreconfHook +, dockapps-sources +, fontutil +, libX11 +, libXext +, libXpm +, mkfontdir +, pkg-config +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libdockapp"; - version = "0.7.3"; - src = dockapps-sources; + inherit (dockapps-sources) version src; + + sourceRoot = "${finalAttrs.src.name}/libdockapp"; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libX11 libXext libXpm fontutil mkfontdir ]; - setSourceRoot = '' - export sourceRoot=$(echo */${pname}) - ''; - # There is a bug on --with-font configureFlags = [ "--with-examples=no" "--with-font=no" ]; - meta = with lib; { + meta = { description = "A library providing a framework for dockapps"; homepage = "https://www.dockapps.net/libdockapp"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.bstrik ]; + license = lib.licenses.gpl2Plus; + maintainers = [ ]; }; -} +}) From b4ea4367f74079dbd5e3721569a6c0cf7afff587 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 18 Oct 2023 18:43:40 -0300 Subject: [PATCH 72/77] windowmaker.dockapps.wmCalClock: refactor --- .../wi/windowmaker/dockapps/wmCalClock.nix | 34 +++++++++++-------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/wi/windowmaker/dockapps/wmCalClock.nix b/pkgs/by-name/wi/windowmaker/dockapps/wmCalClock.nix index 9f49b4508c1c..1dc130971ded 100644 --- a/pkgs/by-name/wi/windowmaker/dockapps/wmCalClock.nix +++ b/pkgs/by-name/wi/windowmaker/dockapps/wmCalClock.nix @@ -1,17 +1,23 @@ -{ lib, stdenv, dockapps-sources -, libX11, libXpm, libXext }: +{ lib +, stdenv +, dockapps-sources +, libX11 +, libXext +, libXpm +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wmCalClock"; - version = "1.25"; - src = dockapps-sources; + inherit (dockapps-sources) version src; - buildInputs = [ libX11 libXpm libXext ]; + sourceRoot = "${finalAttrs.src.name}/wmCalClock"; - setSourceRoot = '' - export sourceRoot=$(echo */${pname}/Src) - ''; + buildInputs = [ + libX11 + libXpm + libXext + ]; preBuild = '' makeFlagsArray+=( @@ -28,11 +34,11 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=${placeholder "out"}" ]; - meta = with lib; { + meta = { description = "A Calendar clock with antialiased text"; homepage = "https://www.dockapps.net/wmcalclock"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.bstrik ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = [ ]; + platforms = lib.platforms.linux; }; -} +}) From 38af904a5df8bf040ffbc4af61f2015ab97f533c Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 18 Oct 2023 19:45:14 -0300 Subject: [PATCH 73/77] windowmaker.dockapps.wmsm-app: refactor --- .../wi/windowmaker/dockapps/wmsm-app.nix | 39 ++++++++++++------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/wi/windowmaker/dockapps/wmsm-app.nix b/pkgs/by-name/wi/windowmaker/dockapps/wmsm-app.nix index 5c68a39a1ead..6becfce9578b 100644 --- a/pkgs/by-name/wi/windowmaker/dockapps/wmsm-app.nix +++ b/pkgs/by-name/wi/windowmaker/dockapps/wmsm-app.nix @@ -1,20 +1,25 @@ -{ lib, stdenv, dockapps-sources +{ lib +, stdenv +, dockapps-sources , libX11 , libXpm , libXext -, libdockapp }: +, libdockapp +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wmsm.app"; - version = "0.2.1"; - src = dockapps-sources; + inherit (dockapps-sources) version src; - buildInputs = [ libX11 libXpm libXext libdockapp ]; + sourceRoot = "${src.name}/wmsm.app/wmsm"; - setSourceRoot = '' - export sourceRoot=$(echo */${pname}/wmsm) - ''; + buildInputs = [ + libX11 + libXext + libXpm + libdockapp + ]; env.NIX_CFLAGS_COMPILE = "-std=gnu89"; @@ -24,7 +29,9 @@ stdenv.mkDerivation rec { --replace "/usr/bin/install" "install" ''; - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; installPhase = '' runHook preInstall @@ -32,12 +39,14 @@ stdenv.mkDerivation rec { runHook postInstall ''; - installFlags = [ "PREFIX=${placeholder "out"}/bin" ]; + installFlags = [ + "PREFIX=${placeholder "out"}/bin" + ]; - meta = with lib; { + meta = { description = "System monitor for Windowmaker"; homepage = "https://www.dockapps.net/wmsmapp"; - license = licenses.gpl2; - maintainers = [ maintainers.bstrik ]; + license = lib.licenses.gpl2Plus; + maintainers = [ ]; }; -} +}) From 40eba552d4b41ffdd6f99c49d5856ac87c65c14e Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 18 Oct 2023 19:46:28 -0300 Subject: [PATCH 74/77] windowmaker.dockapps.wmsystemtray: refactor --- .../wi/windowmaker/dockapps/wmsystemtray.nix | 36 ++++++++++++++----- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/wi/windowmaker/dockapps/wmsystemtray.nix b/pkgs/by-name/wi/windowmaker/dockapps/wmsystemtray.nix index ced4cad80556..7f17475d318f 100644 --- a/pkgs/by-name/wi/windowmaker/dockapps/wmsystemtray.nix +++ b/pkgs/by-name/wi/windowmaker/dockapps/wmsystemtray.nix @@ -1,22 +1,40 @@ -{ lib, stdenv, fetchurl, pkg-config, libX11, libXpm, libXext, libXfixes, libXmu }: +{ lib +, stdenv +, fetchurl +, libX11 +, libXext +, libXfixes +, libXmu +, libXpm +, pkg-config +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wmsystemtray"; version = "1.4"; src = fetchurl { - url = "mirror://sourceforge/project/${pname}/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-jt70NpHp//BxAA4pFmx8GtQgwJVukGgVEGHogcisl+k="; + url = "mirror://sourceforge/project/wmsystemtray/wmsystemtray/wmsystemtray-${finalAttrs.version}.tar.gz"; + hash = "sha256-jt70NpHp//BxAA4pFmx8GtQgwJVukGgVEGHogcisl+k="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXpm libXext libXfixes libXmu ]; + nativeBuildInputs = [ + pkg-config + ]; - meta = with lib; { + buildInputs = [ + libX11 + libXext + libXfixes + libXmu + libXpm + ]; + + meta = { description = "A system tray for Windowmaker"; homepage = "http://wmsystemtray.sourceforge.net"; license = licenses.gpl2Only; - maintainers = [ maintainers.bstrik ]; + maintainers = [ ]; platforms = platforms.linux; }; -} +}) From e2c364f24bdd57deb2864989b8f1139210cc54c3 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 18 Oct 2023 19:48:34 -0300 Subject: [PATCH 75/77] maintainers: remove bstrik --- maintainers/maintainer-list.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 83e04b930568..87687572f3f0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2608,12 +2608,6 @@ githubId = 200617; name = "Ben Sima"; }; - bstrik = { - email = "dutchman55@gmx.com"; - github = "bstrik"; - githubId = 7716744; - name = "Berno Strik"; - }; btlvr = { email = "btlvr@protonmail.com"; github = "btlvr"; From d6340f4857b81ff9106efbb38edb52c0f84553e2 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 18 Oct 2023 20:45:45 -0300 Subject: [PATCH 76/77] windowmaker.dockapps.cputnik: init --- .../wi/windowmaker/dockapps/cputnik.nix | 46 +++++++++++++++++++ .../wi/windowmaker/dockapps/default.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/by-name/wi/windowmaker/dockapps/cputnik.nix diff --git a/pkgs/by-name/wi/windowmaker/dockapps/cputnik.nix b/pkgs/by-name/wi/windowmaker/dockapps/cputnik.nix new file mode 100644 index 000000000000..6ac10e374e0f --- /dev/null +++ b/pkgs/by-name/wi/windowmaker/dockapps/cputnik.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, dockapps-sources +, libX11 +, libXext +, libXpm +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cputnik"; + + inherit (dockapps-sources) version src; + + sourceRoot = "${finalAttrs.src.name}/cputnik/src"; + + buildInputs = [ + libX11 + libXpm + libXext + ]; + + preBuild = '' + makeFlagsArray+=( + INCS="-I${libX11.dev}/include -I${libXext.dev}/include -I${libXpm.dev}/include" + LIBS="-L${libX11}/lib -L${libXext}/lib -L${libXpm}/lib -lX11 -lXpm -lXext" + ) + ''; + + hardeningDisable = [ "format" ]; + + installPhase = '' + runHook preInstall + + install -Dm755 -t $out/bin/ cputnik + + runHook postInstall + ''; + + meta = { + description = "A Calendar clock with antialiased text"; + homepage = "https://www.dockapps.net/wmcalclock"; + license = lib.licenses.gpl2Plus; + maintainers = [ ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/wi/windowmaker/dockapps/default.nix b/pkgs/by-name/wi/windowmaker/dockapps/default.nix index 4477413a2acd..5649c618f9d4 100644 --- a/pkgs/by-name/wi/windowmaker/dockapps/default.nix +++ b/pkgs/by-name/wi/windowmaker/dockapps/default.nix @@ -15,6 +15,8 @@ lib.makeScope pkgs.newScope (self: { AlsaMixer-app = self.callPackage ./AlsaMixer-app.nix { }; + cputnik = self.callPackage ./cputnik.nix { }; + libdockapp = self.callPackage ./libdockapp.nix { }; wmCalClock = self.callPackage ./wmCalClock.nix { }; From 7ae4510daf59d5a3724161c55eae96e45aa86801 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 18 Oct 2023 22:46:22 -0300 Subject: [PATCH 77/77] windowmaker.dockapps.wmcube: init --- .../wi/windowmaker/dockapps/default.nix | 2 + .../wi/windowmaker/dockapps/wmcube.nix | 48 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 pkgs/by-name/wi/windowmaker/dockapps/wmcube.nix diff --git a/pkgs/by-name/wi/windowmaker/dockapps/default.nix b/pkgs/by-name/wi/windowmaker/dockapps/default.nix index 5649c618f9d4..84cfe01bddf3 100644 --- a/pkgs/by-name/wi/windowmaker/dockapps/default.nix +++ b/pkgs/by-name/wi/windowmaker/dockapps/default.nix @@ -21,6 +21,8 @@ lib.makeScope pkgs.newScope (self: { wmCalClock = self.callPackage ./wmCalClock.nix { }; + wmcube = self.callPackage ./wmcube.nix { }; + wmsm-app = self.callPackage ./wmsm-app.nix { }; wmsystemtray = self.callPackage ./wmsystemtray.nix { }; diff --git a/pkgs/by-name/wi/windowmaker/dockapps/wmcube.nix b/pkgs/by-name/wi/windowmaker/dockapps/wmcube.nix new file mode 100644 index 000000000000..5aaa00e23e34 --- /dev/null +++ b/pkgs/by-name/wi/windowmaker/dockapps/wmcube.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, dockapps-sources +, libX11 +, libXpm +, libXext +, libdockapp +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "wmcube"; + + inherit (dockapps-sources) version src; + + sourceRoot = "${finalAttrs.src.name}/wmcube/wmcube"; + + buildInputs = [ + libX11 + libXext + libXpm + libdockapp + ]; + + env.NIX_CFLAGS_COMPILE = "-std=gnu89"; + + preBuild = '' + makeFlagsArray=( + CC="${stdenv.cc.targetPrefix}cc" + PREFIX="${placeholder "out"}" + VERSION="${finalAttrs.version}" + LIBDIR="-L${lib.getLib libX11}/lib -L${lib.getLib libXext}/lib \ +-L${lib.getLib libXpm}/lib -L${lib.getLib libdockapp}/lib" + INCDIR="-I${lib.getDev libX11}/lib -I${lib.getDev libXext}/lib \ +-I${lib.getDev libXpm}/lib -I${lib.getDev libdockapp}/lib" + LIBS="-lm -lXpm -lXext -lX11 -ldockapp" + ) + ''; + + preInstall = '' + mkdir -pv $out/{bin,doc/wmcube-${finalAttrs.version},share/wmcube,man/man1} + ''; + + meta = { + description = "System monitor for Windowmaker"; + license = lib.licenses.gpl2Plus; + maintainers = [ ]; + }; +})