From cf90db8b708b01909ecdc1ca1f579db1f49005ce Mon Sep 17 00:00:00 2001 From: Bouke van der Bijl Date: Tue, 14 Mar 2023 14:15:17 +0100 Subject: [PATCH 01/51] nixiso/opentelemetry-collector: init --- nixos/modules/module-list.nix | 1 + .../monitoring/opentelemetry-collector.nix | 73 +++++++++++++++++++ .../misc/opentelemetry-collector/default.nix | 1 + 3 files changed, 75 insertions(+) create mode 100644 nixos/modules/services/monitoring/opentelemetry-collector.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 314d67419b7f..9457ac15ab57 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -733,6 +733,7 @@ ./services/monitoring/munin.nix ./services/monitoring/nagios.nix ./services/monitoring/netdata.nix + ./services/monitoring/opentelemetry-collector.nix ./services/monitoring/parsedmarc.nix ./services/monitoring/prometheus/alertmanager.nix ./services/monitoring/prometheus/default.nix diff --git a/nixos/modules/services/monitoring/opentelemetry-collector.nix b/nixos/modules/services/monitoring/opentelemetry-collector.nix new file mode 100644 index 000000000000..1d211b689777 --- /dev/null +++ b/nixos/modules/services/monitoring/opentelemetry-collector.nix @@ -0,0 +1,73 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mkEnableOption mkIf mkOption types getExe; + + cfg = config.services.opentelemetry-collector; + opentelemetry-collector = cfg.package; + + settingsFormat = pkgs.formats.yaml {}; +in { + options.services.opentelemetry-collector = { + enable = mkEnableOption (lib.mdDoc "Opentelemetry Collector"); + + package = mkOption { + type = types.package; + default = pkgs.opentelemetry-collector; + defaultText = lib.literalExpression "pkgs.opentelemetry-collector"; + description = lib.mdDoc "The opentelemetry-collector package to use."; + }; + + settings = mkOption { + type = settingsFormat.type; + default = {}; + description = lib.mdDoc '' + Specify the configuration for Opentelemetry Collector in Nix. + + See https://opentelemetry.io/docs/collector/configuration/ for available options. + ''; + }; + + configFile = mkOption { + type = types.nullOr types.path; + default = null; + description = lib.mdDoc '' + Specify a path to a configuration file that Opentelemetry Collector should use. + ''; + }; + }; + + config = mkIf cfg.enable { + assertions = [{ + assertion = ( + (cfg.settings == {}) != (cfg.configFile == null) + ); + message = '' + Please specify a configuration for Opentelemetry Collector with either + 'services.opentelemetry-collector.settings' or + 'services.opentelemetry-collector.configFile'. + ''; + }]; + + systemd.services.opentelemetry-collector = { + description = "Opentelemetry Collector Service Daemon"; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = let + conf = if cfg.configFile == null + then settingsFormat.generate "config.yaml" cfg.settings + else cfg.configFile; + in + { + ExecStart = "${getExe opentelemetry-collector} --config=file:${conf}"; + DynamicUser = true; + Restart = "always"; + ProtectSystem = "full"; + DevicePolicy = "closed"; + NoNewPrivileges = true; + WorkingDirectory = "/var/lib/opentelemetry-collector"; + StateDirectory = "opentelemetry-collector"; + }; + }; + }; +} diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index e9448f84fd24..ce412ec844f1 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -48,5 +48,6 @@ buildGoModule rec { ''; license = licenses.asl20; maintainers = with maintainers; [ uri-canva jk ]; + mainProgram = "otelcorecol"; }; } From 40875c6b6e51ef54e1e1db4242dad463726c91df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BE=E5=9C=B0=20=E5=B8=8C=E7=95=99=E8=80=B6?= <65301509+KiruyaMomochi@users.noreply.github.com> Date: Mon, 20 Mar 2023 03:29:00 +0800 Subject: [PATCH 02/51] cpupower: inherit patches from kernel --- pkgs/os-specific/linux/cpupower/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/cpupower/default.nix b/pkgs/os-specific/linux/cpupower/default.nix index cfc0ace8e0a0..13e2fc78b821 100644 --- a/pkgs/os-specific/linux/cpupower/default.nix +++ b/pkgs/os-specific/linux/cpupower/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "cpupower"; - inherit (kernel) version src; + inherit (kernel) version src patches; nativeBuildInputs = [ gettext ]; buildInputs = [ pciutils ]; From bec0dbe358538527bc1ba7e3ce8aa7679c709b1a Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Sun, 26 Feb 2023 21:21:53 +0100 Subject: [PATCH 03/51] streamlink: 5.3.0 -> 5.5.1 https://github.com/streamlink/streamlink/releases/tag/5.3.1 https://github.com/streamlink/streamlink/releases/tag/5.4.0 https://github.com/streamlink/streamlink/releases/tag/5.5.0 https://github.com/streamlink/streamlink/releases/tag/5.5.1 --- pkgs/applications/video/streamlink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 664cbcf2db3f..dbc48d1d1574 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -6,12 +6,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "5.3.0"; + version = "5.5.1"; format = "pyproject"; src = python3Packages.fetchPypi { inherit pname version; - hash = "sha256-+9MSSzPYZ8gwOeQLehR41SklfdcUn8Pa6TI//lh9twE="; + hash = "sha256-srT+jWQ22+e87HjeLUu3gBVjiFYUNbYaGWMVbp/F+9A="; }; nativeCheckInputs = with python3Packages; [ From 7798b4b06e6f5bc663a5f71c3e28b7cd2652a40d Mon Sep 17 00:00:00 2001 From: Hans Christian Schmitz Date: Thu, 18 May 2023 17:51:56 +0200 Subject: [PATCH 04/51] networkmanager-openconnect: 1.2.8 -> 1.2.10 Changelog: https://gitlab.gnome.org/GNOME/NetworkManager-openconnect/-/tags/1.2.10 --- .../networking/networkmanager/openconnect/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/openconnect/default.nix b/pkgs/tools/networking/networkmanager/openconnect/default.nix index 2c095ff804dc..426039b19f60 100644 --- a/pkgs/tools/networking/networkmanager/openconnect/default.nix +++ b/pkgs/tools/networking/networkmanager/openconnect/default.nix @@ -7,12 +7,12 @@ , openconnect , intltool , pkg-config -, autoreconfHook , networkmanager , gcr , libsecret , file , gtk3 +, webkitgtk_4_1 , libnma , libnma-gtk4 , gtk4 @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "NetworkManager-openconnect"; - version = "1.2.8"; + version = "1.2.10"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager-openconnect/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Xe2qeF2C2OI53dCCv6xSUMaR6WRGS+GAe2gnJjYzzcw="; + sha256 = "hEtr9k7K25e0pox3bbiapebuflm9JLAYAihAaGMTZGQ="; }; patches = [ @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { libxml2 openconnect networkmanager + webkitgtk_4_1 # required, for SSO ] ++ lib.optionals withGnome [ gtk3 libnma From 457f56813d21053aa3a58a6a6b5d6dcb3b019e6c Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Sat, 20 May 2023 15:49:08 +0900 Subject: [PATCH 05/51] k3s: add "1_26" builder which can be used for 1_27 too This is meant to make it easier to maintain multiple versions of the package without having to copy+paste folders every time. We can still copy+paste if the builders diverge enough to warrant it. --- .../{1_26/default.nix => builders/1_26.nix} | 60 +++++++++---------- .../networking/cluster/k3s/default.nix | 23 +++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 53 insertions(+), 32 deletions(-) rename pkgs/applications/networking/cluster/k3s/{1_26/default.nix => builders/1_26.nix} (91%) create mode 100644 pkgs/applications/networking/cluster/k3s/default.nix diff --git a/pkgs/applications/networking/cluster/k3s/1_26/default.nix b/pkgs/applications/networking/cluster/k3s/builders/1_26.nix similarity index 91% rename from pkgs/applications/networking/cluster/k3s/1_26/default.nix rename to pkgs/applications/networking/cluster/k3s/builders/1_26.nix index f7dbe7e6839e..fa34782d39a2 100644 --- a/pkgs/applications/networking/cluster/k3s/1_26/default.nix +++ b/pkgs/applications/networking/cluster/k3s/builders/1_26.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , makeWrapper , socat , iptables @@ -27,6 +26,30 @@ , pkgsBuildBuild }: +{ + # git tag + k3sVersion, + # commit hash + k3sCommit, + k3sRepoSha256 ? lib.fakeHash, + k3sVendorSha256 ? lib.fakeHash, + # taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L47 + k3sRootVersion, + k3sRootSha256 ? lib.fakeHash, + # Based on the traefik charts here: https://github.com/k3s-io/k3s/blob/d71ab6317e22dd34673faa307a412a37a16767f6/scripts/download#L29-L32 + # see also https://github.com/k3s-io/k3s/blob/d71ab6317e22dd34673faa307a412a37a16767f6/manifests/traefik.yaml#L8 + chartVersions, + # taken from ./scripts/version.sh VERSION_CNIPLUGINS https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L45 + k3sCNIVersion, + k3sCNISha256 ? lib.fakeHash, + # taken from ./scripts/version.sh VERSION_CONTAINERD + containerdVersion, + containerdSha256 ? lib.fakeHash, + # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag + criCtlVersion, + updateScript ? null, +}: + # k3s is a kinda weird derivation. One of the main points of k3s is the # simplicity of it being one binary that can perform several tasks. # However, when you have a good package manager (like nix), that doesn't @@ -47,31 +70,6 @@ # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.26.4+k3s1"; # k3s git tag - k3sCommit = "8d0255af07e95b841952563253d27b0d10bd72f0"; # k3s git commit at the above version - k3sRepoSha256 = "0qlszdnlsvj3hzx2p0wl3zhaw908w8a62z6vlf2g69a3c75f55cs"; - k3sVendorSha256 = "sha256-JXTsZYtTspu/pWMRSS2BcegktawBJ6BK7YEKbz1J/ao="; - - # nix generated by update.sh - # Based on the traefik charts here: https://github.com/k3s-io/k3s/blob/d71ab6317e22dd34673faa307a412a37a16767f6/scripts/download#L29-L32 - # see also https://github.com/k3s-io/k3s/blob/d71ab6317e22dd34673faa307a412a37a16767f6/manifests/traefik.yaml#L8 - # At the time of writing, there are two traefik charts, and that's it - charts = import ./chart-versions.nix; - - # taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L47 - k3sRootVersion = "0.12.1"; - k3sRootSha256 = "0724yx3zk89m2239fmdgwzf9w672pik71xqrvgb7pdmknmmdn9f4"; - - # taken from ./scripts/version.sh VERSION_CNIPLUGINS https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L45 - k3sCNIVersion = "1.1.1-k3s1"; - k3sCNISha256 = "14mb3zsqibj1sn338gjmsyksbm0mxv9p016dij7zidccx2rzn6nl"; - - # taken from ./scripts/version.sh VERSION_CONTAINERD - containerdVersion = "1.6.19-k3s1"; - containerdSha256 = "12dwqh77wplg30kdi73d90qni23agw2cwxjd2p5lchq86mpmmwwr"; - - # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag - criCtlVersion = "1.26.0-rc.0-k3s1"; baseMeta = with lib; { description = "A lightweight Kubernetes distribution"; @@ -99,8 +97,8 @@ let ]; # bundled into the k3s binary - traefikChart = fetchurl charts.traefik; - traefik-crdChart = fetchurl charts.traefik-crd; + traefikChart = fetchurl chartVersions.traefik; + traefik-crdChart = fetchurl chartVersions.traefik-crd; # so, k3s is a complicated thing to package # This derivation attempts to avoid including any random binaries from the @@ -168,7 +166,7 @@ let # derivation when we've built all the binaries, but haven't bundled them in # with generated bindata yet. - k3sServer = buildGoModule rec { + k3sServer = buildGoModule { pname = "k3s-server"; version = k3sVersion; @@ -322,7 +320,7 @@ buildGoModule rec { $out/bin/k3s --version | grep -F "v${k3sVersion}" >/dev/null ''; - passthru.updateScript = ./update.sh; + passthru.updateScript = updateScript; passthru.mkTests = version: let k3s_version = "k3s_" + lib.replaceStrings ["."] ["_"] (lib.versions.majorMinor version); diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix new file mode 100644 index 000000000000..52beacf7e6c1 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, callPackage }: + +let + # The 1_26 builder can compile 1.26, and hopefully newer versions + k3s_1_26_builder = import ./builders/1_26.nix; +in +{ + k3s_1_26 = (callPackage k3s_1_26_builder { }) { + k3sVersion = "1.26.4+k3s1"; + k3sCommit = "8d0255af07e95b841952563253d27b0d10bd72f0"; + k3sRepoSha256 = "0qlszdnlsvj3hzx2p0wl3zhaw908w8a62z6vlf2g69a3c75f55cs"; + k3sVendorSha256 = "sha256-JXTsZYtTspu/pWMRSS2BcegktawBJ6BK7YEKbz1J/ao="; + chartVersions = import ./1_26/chart-versions.nix; + k3sRootVersion = "0.12.1"; + k3sRootSha256 = "0724yx3zk89m2239fmdgwzf9w672pik71xqrvgb7pdmknmmdn9f4"; + k3sCNIVersion = "1.1.1-k3s1"; + k3sCNISha256 = "14mb3zsqibj1sn338gjmsyksbm0mxv9p016dij7zidccx2rzn6nl"; + containerdVersion = "1.6.19-k3s1"; + containerdSha256 = "12dwqh77wplg30kdi73d90qni23agw2cwxjd2p5lchq86mpmmwwr"; + criCtlVersion = "1.26.0-rc.0-k3s1"; + updateScript = ./1_26/update-script.sh; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 42bfd2693429..7db17064d0f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31674,7 +31674,7 @@ with pkgs; k3s_1_24 = callPackage ../applications/networking/cluster/k3s/1_24 { }; k3s_1_25 = callPackage ../applications/networking/cluster/k3s/1_25 { }; - k3s_1_26 = callPackage ../applications/networking/cluster/k3s/1_26 { }; + k3s_1_26 = (callPackage ../applications/networking/cluster/k3s { }).k3s_1_26; k3s = k3s_1_26; k3sup = callPackage ../applications/networking/cluster/k3sup { }; From c71ef26ecc9e4353589b4987d27d7c60e3b94755 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Sat, 20 May 2023 15:55:31 +0900 Subject: [PATCH 06/51] k3s: init 1.27.1+k3s1 On unstable, we're now tracking | version | EOL | |---------|-----| | 1.24 | 07/2023 | | 1.25 | 10/2023 | | 1.26 | 02/2024 | | 1.27 | 06/2024 | This commit adds 1.27 using the 1_26 builder introduced in the last commit. Notably, this commit also updates the 'update.sh' script to work for the new setup I have here. --- .../cluster/k3s/1_27/chart-versions.nix | 10 ++ .../networking/cluster/k3s/1_27/update.sh | 127 ++++++++++++++++++ .../networking/cluster/k3s/1_27/versions.nix | 14 ++ .../networking/cluster/k3s/default.nix | 6 +- pkgs/top-level/all-packages.nix | 7 +- 5 files changed, 161 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix create mode 100755 pkgs/applications/networking/cluster/k3s/1_27/update.sh create mode 100644 pkgs/applications/networking/cluster/k3s/1_27/versions.nix diff --git a/pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix new file mode 100644 index 000000000000..8c40604d0f1c --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix @@ -0,0 +1,10 @@ +{ + traefik-crd = { + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-20.3.1+up20.3.0.tgz"; + sha256 = "1775vjldvqvhzdbzanxhbaqbmkih09yb91im651q8bc7z5sb9ckn"; + }; + traefik = { + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-20.3.1+up20.3.0.tgz"; + sha256 = "1rj0f0n0vgjcbzfwzhqmsd501i2f6vw145w9plbp8gwdyzmg2nc6"; + }; +} diff --git a/pkgs/applications/networking/cluster/k3s/1_27/update.sh b/pkgs/applications/networking/cluster/k3s/1_27/update.sh new file mode 100755 index 000000000000..427e2a33d9c9 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_27/update.sh @@ -0,0 +1,127 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnugrep gnused jq yq-go nix-prefetch + +set -x -eu -o pipefail + +WORKDIR=$(mktemp -d) +trap "rm -rf ${WORKDIR}" EXIT + +NIXPKGS_ROOT="$(git rev-parse --show-toplevel)"/ +NIXPKGS_K3S_PATH=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P)/ +cd ${NIXPKGS_K3S_PATH} + +LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json +curl --silent -f ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + https://api.github.com/repos/k3s-io/k3s/releases > ${LATEST_TAG_RAWFILE} + +LATEST_TAG_NAME=$(jq 'map(.tag_name)' ${LATEST_TAG_RAWFILE} | \ + grep -v -e rc -e engine | tail -n +2 | head -n -1 | sed 's|[", ]||g' | sort -rV | head -n1) + +K3S_VERSION=$(echo ${LATEST_TAG_NAME} | sed 's/^v//') + +K3S_COMMIT=$(curl --silent -f ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + https://api.github.com/repos/k3s-io/k3s/tags \ + | jq -r "map(select(.name == \"${LATEST_TAG_NAME}\")) | .[0] | .commit.sha") + +K3S_REPO_SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/k3s-io/k3s/archive/refs/tags/${LATEST_TAG_NAME}.tar.gz) + +FILE_SCRIPTS_DOWNLOAD=${WORKDIR}/scripts-download +curl --silent -f https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts/download > $FILE_SCRIPTS_DOWNLOAD + +FILE_SCRIPTS_VERSION=${WORKDIR}/scripts-version.sh +curl --silent -f https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts/version.sh > $FILE_SCRIPTS_VERSION + +FILE_TRAEFIK_MANIFEST=${WORKDIR}/traefik.yml +curl --silent -f -o "$FILE_TRAEFIK_MANIFEST" https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/manifests/traefik.yaml + +CHART_FILES=( $(yq eval --no-doc .spec.chart "$FILE_TRAEFIK_MANIFEST" | xargs -n1 basename) ) +# These files are: +# 1. traefik-crd-20.3.1+up20.3.0.tgz +# 2. traefik-20.3.1+up20.3.0.tgz +# at the time of writing + +if [[ "${#CHART_FILES[@]}" != "2" ]]; then + echo "New manifest charts added, the packaging scripts will need to be updated: ${CHART_FILES}" + exit 1 +fi + +CHARTS_URL=https://k3s.io/k3s-charts/assets +# Get metadata for both files +rm -f chart-versions.nix.update +cat > chart-versions.nix.update < $FILE_GO_MOD + + +K3S_ROOT_VERSION=$(grep 'VERSION_ROOT=' ${FILE_SCRIPTS_VERSION} \ + | cut -d'=' -f2 | sed -e 's/"//g' -e 's/^v//') +K3S_ROOT_SHA256=$(nix-prefetch-url --quiet --unpack \ + "https://github.com/k3s-io/k3s-root/releases/download/v${K3S_ROOT_VERSION}/k3s-root-amd64.tar") + +CNIPLUGINS_VERSION=$(grep 'VERSION_CNIPLUGINS=' ${FILE_SCRIPTS_VERSION} \ + | cut -d'=' -f2 | sed -e 's/"//g' -e 's/^v//') +CNIPLUGINS_SHA256=$(nix-prefetch-url --quiet --unpack \ + "https://github.com/rancher/plugins/archive/refs/tags/v${CNIPLUGINS_VERSION}.tar.gz") + +CONTAINERD_VERSION=$(grep 'VERSION_CONTAINERD=' ${FILE_SCRIPTS_VERSION} \ + | cut -d'=' -f2 | sed -e 's/"//g' -e 's/^v//') +CONTAINERD_SHA256=$(nix-prefetch-url --quiet --unpack \ + "https://github.com/k3s-io/containerd/archive/refs/tags/v${CONTAINERD_VERSION}.tar.gz") + +CRI_CTL_VERSION=$(grep github.com/kubernetes-sigs/cri-tools ${FILE_GO_MOD} \ + | head -n1 | awk '{print $4}' | sed -e 's/"//g' -e 's/^v//') + +setKV () { + sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ${NIXPKGS_K3S_PATH}default.nix +} + +FAKE_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; + +cat >versions.nix < ${K3S_VERSION}" +fi diff --git a/pkgs/applications/networking/cluster/k3s/1_27/versions.nix b/pkgs/applications/networking/cluster/k3s/1_27/versions.nix new file mode 100644 index 000000000000..b06e30ba5c96 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_27/versions.nix @@ -0,0 +1,14 @@ +{ + k3sVersion = "1.27.1+k3s1"; + k3sCommit = "bc5b42c27908ab430101eff0db0a0b22f870bd7a"; + k3sRepoSha256 = "1xj3blfayrsfbcsljjdaswy49hhz8yiwf1d85arnsgbn8fidswpm"; + k3sVendorSha256 = "sha256-+sM2fjS88kxMQzra2t+jU1IaKCoJpW7p3w7lCOv5mMU="; + chartVersions = import ./chart-versions.nix; + k3sRootVersion = "0.12.1"; + k3sRootSha256 = "0724yx3zk89m2239fmdgwzf9w672pik71xqrvgb7pdmknmmdn9f4"; + k3sCNIVersion = "1.1.1-k3s1"; + k3sCNISha256 = "14mb3zsqibj1sn338gjmsyksbm0mxv9p016dij7zidccx2rzn6nl"; + containerdVersion = "1.6.19-k3s1"; + containerdSha256 = "12dwqh77wplg30kdi73d90qni23agw2cwxjd2p5lchq86mpmmwwr"; + criCtlVersion = "1.26.0-rc.0-k3s1"; +} diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 52beacf7e6c1..5a6b68eb5a9a 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -18,6 +18,10 @@ in containerdVersion = "1.6.19-k3s1"; containerdSha256 = "12dwqh77wplg30kdi73d90qni23agw2cwxjd2p5lchq86mpmmwwr"; criCtlVersion = "1.26.0-rc.0-k3s1"; - updateScript = ./1_26/update-script.sh; + }; + + # 1_27 can be built with the same builder as 1_26 + k3s_1_27 = (callPackage k3s_1_26_builder { }) (import ./1_27/versions.nix) // { + updateScript = ./1_27/update-script.sh; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7db17064d0f3..90b5c3503b9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31674,8 +31674,11 @@ with pkgs; k3s_1_24 = callPackage ../applications/networking/cluster/k3s/1_24 { }; k3s_1_25 = callPackage ../applications/networking/cluster/k3s/1_25 { }; - k3s_1_26 = (callPackage ../applications/networking/cluster/k3s { }).k3s_1_26; - k3s = k3s_1_26; + inherit (callPackage ../applications/networking/cluster/k3s { }) + k3s_1_26 + k3s_1_27 + ; + k3s = k3s_1_27; k3sup = callPackage ../applications/networking/cluster/k3sup { }; From 2257ccd54463d051611862d6a82753238eff22fd Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Mon, 22 May 2023 17:18:23 +0900 Subject: [PATCH 07/51] k3s: name builder less confusingly Per PR feedback --- .../cluster/k3s/{builders/1_26.nix => builder.nix} | 6 ++++++ pkgs/applications/networking/cluster/k3s/default.nix | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) rename pkgs/applications/networking/cluster/k3s/{builders/1_26.nix => builder.nix} (97%) diff --git a/pkgs/applications/networking/cluster/k3s/builders/1_26.nix b/pkgs/applications/networking/cluster/k3s/builder.nix similarity index 97% rename from pkgs/applications/networking/cluster/k3s/builders/1_26.nix rename to pkgs/applications/networking/cluster/k3s/builder.nix index fa34782d39a2..0d3d127e4844 100644 --- a/pkgs/applications/networking/cluster/k3s/builders/1_26.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -1,3 +1,9 @@ +# builder.nix contains a "builder" expression that, given k3s version and hash +# variables, creates a package for that version. +# Due to variance in k3s's build process, this builder only works for k3s 1.26+ +# currently. +# It is likely we will have to split out additional builders for additional +# versions in the future, or customize this one further. { lib , makeWrapper , socat diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 5a6b68eb5a9a..d8ecd79b5cae 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -1,11 +1,10 @@ { lib, stdenv, callPackage }: let - # The 1_26 builder can compile 1.26, and hopefully newer versions - k3s_1_26_builder = import ./builders/1_26.nix; + k3s_builder = import ./builder.nix; in { - k3s_1_26 = (callPackage k3s_1_26_builder { }) { + k3s_1_26 = (callPackage k3s_builder { }) { k3sVersion = "1.26.4+k3s1"; k3sCommit = "8d0255af07e95b841952563253d27b0d10bd72f0"; k3sRepoSha256 = "0qlszdnlsvj3hzx2p0wl3zhaw908w8a62z6vlf2g69a3c75f55cs"; @@ -21,7 +20,7 @@ in }; # 1_27 can be built with the same builder as 1_26 - k3s_1_27 = (callPackage k3s_1_26_builder { }) (import ./1_27/versions.nix) // { + k3s_1_27 = (callPackage k3s_builder { }) (import ./1_27/versions.nix) // { updateScript = ./1_27/update-script.sh; }; } From 7573c269a899af49e88007e46154d9a263fac843 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Tue, 4 Apr 2023 20:12:51 +0200 Subject: [PATCH 08/51] nixos/tests/apfs: clean up code - Use `runTest` instead of `handleTest`, which simplifies the code a little - Use `lib.maintainers` instead of `pkgs.lib.maintainers` - Remove unused function argument `pkgs` - Change test name in the kernel module from `test` to `apfs`, since that seems to be a common pattern for the name --- nixos/tests/all-tests.nix | 2 +- nixos/tests/apfs.nix | 8 ++++---- pkgs/os-specific/linux/apfs/default.nix | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index e597a26f31bb..ba16cd6b883f 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -108,7 +108,7 @@ in { alps = handleTest ./alps.nix {}; amazon-init-shell = handleTest ./amazon-init-shell.nix {}; apcupsd = handleTest ./apcupsd.nix {}; - apfs = handleTest ./apfs.nix {}; + apfs = runTest ./apfs.nix; apparmor = handleTest ./apparmor.nix {}; atd = handleTest ./atd.nix {}; atop = handleTest ./atop.nix {}; diff --git a/nixos/tests/apfs.nix b/nixos/tests/apfs.nix index 9fe689951c78..15ed5aa7f573 100644 --- a/nixos/tests/apfs.nix +++ b/nixos/tests/apfs.nix @@ -1,8 +1,8 @@ -import ./make-test-python.nix ({ pkgs, ... }: { +{ lib, ... }: { name = "apfs"; - meta.maintainers = with pkgs.lib.maintainers; [ Luflosi ]; + meta.maintainers = with lib.maintainers; [ Luflosi ]; - nodes.machine = { pkgs, ... }: { + nodes.machine = { virtualisation.emptyDiskImages = [ 1024 ]; boot.supportedFilesystems = [ "apfs" ]; @@ -62,4 +62,4 @@ import ./make-test-python.nix ({ pkgs, ... }: { "apfsck /dev/vdb", ) ''; -}) +} diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix index 70c344903f54..590266fab34b 100644 --- a/pkgs/os-specific/linux/apfs/default.nix +++ b/pkgs/os-specific/linux/apfs/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { "INSTALL_MOD_PATH=$(out)" ]; - passthru.tests.test = nixosTests.apfs; + passthru.tests.apfs = nixosTests.apfs; meta = with lib; { description = "APFS module for linux"; From f95647d1f6524a4411d89bc2f8e13851b6082ee9 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Tue, 28 Mar 2023 23:38:00 +0200 Subject: [PATCH 09/51] python3Packages.pyqtchart: init at 5.15.6 --- .../python-modules/pyqtchart/default.nix | 77 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 ++ 2 files changed, 82 insertions(+) create mode 100644 pkgs/development/python-modules/pyqtchart/default.nix diff --git a/pkgs/development/python-modules/pyqtchart/default.nix b/pkgs/development/python-modules/pyqtchart/default.nix new file mode 100644 index 000000000000..3f95fe791574 --- /dev/null +++ b/pkgs/development/python-modules/pyqtchart/default.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pyqt5 +, pyqt-builder +, python +, pythonOlder +, qtcharts +, setuptools +, sip +}: + +buildPythonPackage rec { + pname = "pyqtchart"; + version = "5.15.6"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "PyQtChart"; + inherit version; + hash = "sha256-JpF5b+kqKUphdZKlxcNeeF3JH3dZ3vnrItp532N2Izk="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "[tool.sip.project]" "[tool.sip.project]''\nsip-include-dirs = [\"${pyqt5}/${python.sitePackages}/PyQt5/bindings\"]" + ''; + + outputs = [ "out" "dev" ]; + + enableParallelBuilding = true; + # HACK: paralellize compilation of make calls within pyqt's setup.py + # pkgs/stdenv/generic/setup.sh doesn't set this for us because + # make gets called by python code and not its build phase + # format=pyproject means the pip-build-hook hook gets used to build this project + # pkgs/development/interpreters/python/hooks/pip-build-hook.sh + # does not use the enableParallelBuilding flag + preBuild = '' + export MAKEFLAGS+="''${enableParallelBuilding:+-j$NIX_BUILD_CORES}" + ''; + + dontWrapQtApps = true; + + nativeBuildInputs = [ + sip + qtcharts + setuptools + pyqt-builder + ]; + + buildInputs = [ + qtcharts + ]; + + propagatedBuildInputs = [ + pyqt5 + ]; + + dontConfigure = true; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ + "PyQt5.QtChart" + ]; + + meta = with lib; { + description = "Python bindings for the Qt Charts library"; + homepage = "https://riverbankcomputing.com/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ panicgh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c394e42aada2..a027439e6912 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9171,6 +9171,11 @@ self: super: with self; { pyqt6-webengine = callPackage ../development/python-modules/pyqt6-webengine.nix { }; + pyqtchart = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtchart { + inherit (self) buildPythonPackage pyqt5 pyqt-builder python pythonOlder + setuptools sip; + }; + pyqtgraph = callPackage ../development/python-modules/pyqtgraph { }; pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { From 82070ce6fd7b96e9581551d26e9d205d144be4eb Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Wed, 29 Mar 2023 01:50:01 +0200 Subject: [PATCH 10/51] python3Packages.pyqt3d: init at 5.15.6 --- .../python-modules/pyqt3d/default.nix | 77 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 ++ 2 files changed, 82 insertions(+) create mode 100644 pkgs/development/python-modules/pyqt3d/default.nix diff --git a/pkgs/development/python-modules/pyqt3d/default.nix b/pkgs/development/python-modules/pyqt3d/default.nix new file mode 100644 index 000000000000..c6129a08680e --- /dev/null +++ b/pkgs/development/python-modules/pyqt3d/default.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pyqt5 +, pyqt-builder +, python +, pythonOlder +, qt3d +, setuptools +, sip +}: + +buildPythonPackage rec { + pname = "pyqt3d"; + version = "5.15.6"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "PyQt3D"; + inherit version; + hash = "sha256-fWxtVc2PwiGzE8mVwPhymjdxFJJvA3f46QEdRevziBw="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "[tool.sip.project]" "[tool.sip.project]''\nsip-include-dirs = [\"${pyqt5}/${python.sitePackages}/PyQt5/bindings\"]" + ''; + + outputs = [ "out" "dev" ]; + + enableParallelBuilding = true; + # HACK: paralellize compilation of make calls within pyqt's setup.py + # pkgs/stdenv/generic/setup.sh doesn't set this for us because + # make gets called by python code and not its build phase + # format=pyproject means the pip-build-hook hook gets used to build this project + # pkgs/development/interpreters/python/hooks/pip-build-hook.sh + # does not use the enableParallelBuilding flag + preBuild = '' + export MAKEFLAGS+="''${enableParallelBuilding:+-j$NIX_BUILD_CORES}" + ''; + + dontWrapQtApps = true; + + nativeBuildInputs = [ + sip + qt3d + setuptools + pyqt-builder + ]; + + buildInputs = [ + qt3d + ]; + + propagatedBuildInputs = [ + pyqt5 + ]; + + dontConfigure = true; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ + "PyQt5.Qt3DCore" + ]; + + meta = with lib; { + description = "Python bindings for the Qt 3D framework"; + homepage = "https://riverbankcomputing.com/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ panicgh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a027439e6912..32e8b1416c8c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9171,6 +9171,11 @@ self: super: with self; { pyqt6-webengine = callPackage ../development/python-modules/pyqt6-webengine.nix { }; + pyqt3d = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt3d { + inherit (self) buildPythonPackage pyqt5 pyqt-builder python pythonOlder + setuptools sip; + }; + pyqtchart = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtchart { inherit (self) buildPythonPackage pyqt5 pyqt-builder python pythonOlder setuptools sip; From de21e91ff9b48480b382f2787e3769b86f190efb Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Fri, 31 Mar 2023 23:48:57 +0200 Subject: [PATCH 11/51] python3Packages.pyqtdatavisualization: init at 5.15.5 --- .../pyqtdatavisualization/default.nix | 77 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 ++ 2 files changed, 82 insertions(+) create mode 100644 pkgs/development/python-modules/pyqtdatavisualization/default.nix diff --git a/pkgs/development/python-modules/pyqtdatavisualization/default.nix b/pkgs/development/python-modules/pyqtdatavisualization/default.nix new file mode 100644 index 000000000000..1561e9d4be51 --- /dev/null +++ b/pkgs/development/python-modules/pyqtdatavisualization/default.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pyqt5 +, pyqt-builder +, python +, pythonOlder +, qtdatavis3d +, setuptools +, sip +}: + +buildPythonPackage rec { + pname = "pyqtdatavisualization"; + version = "5.15.5"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "PyQtDataVisualization"; + inherit version; + hash = "sha256-iSf496pwhX7wDFHj379vg92fOFX0FuDVMVknYcu53H8="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "[tool.sip.project]" "[tool.sip.project]''\nsip-include-dirs = [\"${pyqt5}/${python.sitePackages}/PyQt5/bindings\"]" + ''; + + outputs = [ "out" "dev" ]; + + enableParallelBuilding = true; + # HACK: paralellize compilation of make calls within pyqt's setup.py + # pkgs/stdenv/generic/setup.sh doesn't set this for us because + # make gets called by python code and not its build phase + # format=pyproject means the pip-build-hook hook gets used to build this project + # pkgs/development/interpreters/python/hooks/pip-build-hook.sh + # does not use the enableParallelBuilding flag + preBuild = '' + export MAKEFLAGS+="''${enableParallelBuilding:+-j$NIX_BUILD_CORES}" + ''; + + dontWrapQtApps = true; + + nativeBuildInputs = [ + sip + qtdatavis3d + setuptools + pyqt-builder + ]; + + buildInputs = [ + qtdatavis3d + ]; + + propagatedBuildInputs = [ + pyqt5 + ]; + + dontConfigure = true; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ + "PyQt5.QtDataVisualization" + ]; + + meta = with lib; { + description = "Python bindings for the Qt Data Visualization library"; + homepage = "https://riverbankcomputing.com/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ panicgh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 32e8b1416c8c..11438c5fa6e4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9181,6 +9181,11 @@ self: super: with self; { setuptools sip; }; + pyqtdatavisualization = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtdatavisualization { + inherit (self) buildPythonPackage pyqt5 pyqt-builder python pythonOlder + setuptools sip; + }; + pyqtgraph = callPackage ../development/python-modules/pyqtgraph { }; pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { From c856aad7728c715153bbf2ecade6b66d80067a48 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sat, 1 Apr 2023 00:54:39 +0200 Subject: [PATCH 12/51] python3Packages.pyqt5: add QtSerialPort --- pkgs/development/python-modules/pyqt/5.x.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index f43038fac296..c24d9f0870f1 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -17,6 +17,7 @@ , withWebKit ? false , withWebSockets ? false , withLocation ? false +, withSerialPort ? false }: buildPythonPackage rec { @@ -86,6 +87,7 @@ buildPythonPackage rec { ++ lib.optional withWebKit qtwebkit ++ lib.optional withWebSockets qtwebsockets ++ lib.optional withLocation qtlocation + ++ lib.optional withSerialPort qtserialport ; buildInputs = with libsForQt5; [ @@ -99,6 +101,7 @@ buildPythonPackage rec { ++ lib.optional withWebKit qtwebkit ++ lib.optional withWebSockets qtwebsockets ++ lib.optional withLocation qtlocation + ++ lib.optional withSerialPort qtserialport ; propagatedBuildInputs = [ @@ -130,6 +133,7 @@ buildPythonPackage rec { ++ lib.optional withMultimedia "PyQt5.QtMultimedia" ++ lib.optional withConnectivity "PyQt5.QtBluetooth" ++ lib.optional withLocation "PyQt5.QtPositioning" + ++ lib.optional withSerialPort "PyQt5.QtSerialPort" ; meta = with lib; { From dff0b1b4084c64f87a369daddcaee9a12733f05d Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sat, 1 Apr 2023 01:05:04 +0200 Subject: [PATCH 13/51] python3Packages.pyqt5: add QtDesigner --- pkgs/development/python-modules/pyqt/5.x.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index c24d9f0870f1..6bb268d21995 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -18,6 +18,7 @@ , withWebSockets ? false , withLocation ? false , withSerialPort ? false +, withTools ? false }: buildPythonPackage rec { @@ -88,6 +89,7 @@ buildPythonPackage rec { ++ lib.optional withWebSockets qtwebsockets ++ lib.optional withLocation qtlocation ++ lib.optional withSerialPort qtserialport + ++ lib.optional withTools qttools ; buildInputs = with libsForQt5; [ @@ -102,6 +104,7 @@ buildPythonPackage rec { ++ lib.optional withWebSockets qtwebsockets ++ lib.optional withLocation qtlocation ++ lib.optional withSerialPort qtserialport + ++ lib.optional withTools qttools ; propagatedBuildInputs = [ @@ -134,6 +137,7 @@ buildPythonPackage rec { ++ lib.optional withConnectivity "PyQt5.QtBluetooth" ++ lib.optional withLocation "PyQt5.QtPositioning" ++ lib.optional withSerialPort "PyQt5.QtSerialPort" + ++ lib.optional withTools "PyQt5.QtDesigner" ; meta = with lib; { From 1887a9e9a5531548c90ce17b5d0b125bbcb41f34 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Jun 2023 10:52:05 +0000 Subject: [PATCH 14/51] nghttp3: 0.11.0 -> 0.12.0 --- pkgs/development/libraries/nghttp3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix index 38e996330e71..9dc95036945e 100644 --- a/pkgs/development/libraries/nghttp3/default.nix +++ b/pkgs/development/libraries/nghttp3/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "nghttp3"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - hash = "sha256-fZMFSQ8RCVxuoLrisa8lLqjNVe4fIuGqbyKtkC/u02M="; + hash = "sha256-jbD//8BNqzX2T2F0JH+Vsoi/D+8HZIPXGnHoj3hzqPk="; }; outputs = [ "out" "dev" "doc" ]; From 61e5bba2b7239d15719700603ffc04f11ecaf36e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sat, 3 Jun 2023 10:54:06 +0200 Subject: [PATCH 15/51] gcc11: 11.3.0 -> 11.4.0 --- pkgs/development/compilers/gcc/11/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index 8513f03d2da1..416908126975 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -50,7 +50,7 @@ with lib; with builtins; let majorVersion = "11"; - version = "${majorVersion}.3.0"; + version = "${majorVersion}.4.0"; disableBootstrap = !stdenv.hostPlatform.isDarwin; inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -58,7 +58,6 @@ let majorVersion = "11"; patches = [ # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 ../fix-bug-80431.patch - ./fix-struct-redefinition-on-glibc-2.36.patch ../install-info-files-serially.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch @@ -75,9 +74,9 @@ let majorVersion = "11"; ++ optionals stdenv.isDarwin [ (fetchpatch { # There are no upstream release tags in https://github.com/iains/gcc-11-branch. - # 2d280e7 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-11.3.0 - url = "https://github.com/iains/gcc-11-branch/compare/2d280e7eafc086e9df85f50ed1a6526d6a3a204d..gcc-11.3-darwin-r2.diff"; - sha256 = "sha256-LFAXUEoYD7YeCG8V9mWanygyQOI7U5OhCRIKOVCCDAg="; + # ff4bf32 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-11.4.0 + url = "https://github.com/iains/gcc-11-branch/compare/ff4bf326d03e750a8d4905ea49425fe7d15a04b8..gcc-11.4-darwin-r0.diff"; + hash = "sha256-6prPgR2eGVJs7vKd6iM1eZsEPCD1ShzLns2Z+29vlt4="; }) ] # https://github.com/osx-cross/homebrew-avr/issues/280#issuecomment-1272381808 @@ -167,7 +166,7 @@ lib.pipe (stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "sha256-tHzygYaR9bHiHfK7OMeV+sLPvWQO3i0KXhyJ4zijrDk="; + hash = "sha256-Py2yIrAH6KSiPNW6VnJu8I6LHx6yBV7nLBQCzqc6jdk="; }; inherit patches; From 91f5da5ba17a38bd1ef1a2c74fb8b73c96bb7bc3 Mon Sep 17 00:00:00 2001 From: michaelBelsanti Date: Mon, 19 Jun 2023 22:41:32 -0400 Subject: [PATCH 16/51] protonup-qt: 2.7.7 -> 2.8.0 --- pkgs/applications/misc/protonup-qt/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/protonup-qt/default.nix b/pkgs/applications/misc/protonup-qt/default.nix index dab36aaeefd2..f52b2681495b 100644 --- a/pkgs/applications/misc/protonup-qt/default.nix +++ b/pkgs/applications/misc/protonup-qt/default.nix @@ -1,14 +1,14 @@ { appimageTools, fetchurl, lib }: let pname = "protonup-qt"; - version = "2.7.7"; + version = "2.8.0"; src = fetchurl { url = "https://github.com/DavidoTek/ProtonUp-Qt/releases/download/v${version}/ProtonUp-Qt-${version}-x86_64.AppImage"; - sha256 = "sha256-eDi13DYS4Rtj3ouuhRoET1Ctc4D7p50khqXNOSBIvto="; + hash = "sha256-o3Tsrdrj5qDcTqhdgdf4Lcpp9zfBQY+/l3Ohm1A/pm4="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in -appimageTools.wrapType2 rec { +appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' @@ -27,6 +27,7 @@ appimageTools.wrapType2 rec { license = licenses.gpl3; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; mainProgram = "protonup-qt"; + changelog = "https://github.com/DavidoTek/ProtonUp-Qt/releases/tag/v${version}"; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ michaelBelsanti ]; }; From 058a2b24ce29a81198de920b9470e5f931363fbb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Jun 2023 03:21:09 +0000 Subject: [PATCH 17/51] python310Packages.primer3: 1.0.0 -> 2.0.0 --- pkgs/development/python-modules/primer3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/primer3/default.nix b/pkgs/development/python-modules/primer3/default.nix index 6a82ba130a7f..0fe161093a75 100644 --- a/pkgs/development/python-modules/primer3/default.nix +++ b/pkgs/development/python-modules/primer3/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "primer3"; - version = "1.0.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "libnano"; repo = "primer3-py"; rev = "refs/tags/v${version}"; - hash = "sha256-o9B8TN3mOchOO7dz34mI3NDtIhHSlA9+lMNsYcxhTE0="; + hash = "sha256-Ku2PVrWYWPKnNXeUQmstQedJg1O0hsQl4/iEnAMMEaY="; }; nativeBuildInputs = [ cython ] From 729b60e70d5900a460ace93440c4580fdf3db8f3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 Jun 2023 08:14:38 +0200 Subject: [PATCH 18/51] python310Packages.primer3: add changelog to meta --- .../python-modules/primer3/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/primer3/default.nix b/pkgs/development/python-modules/primer3/default.nix index 0fe161093a75..0d5ec7d98f32 100644 --- a/pkgs/development/python-modules/primer3/default.nix +++ b/pkgs/development/python-modules/primer3/default.nix @@ -18,17 +18,25 @@ buildPythonPackage rec { hash = "sha256-Ku2PVrWYWPKnNXeUQmstQedJg1O0hsQl4/iEnAMMEaY="; }; - nativeBuildInputs = [ cython ] - ++ lib.optionals stdenv.isDarwin [ gcc ]; + nativeBuildInputs = [ + cython + ] ++ lib.optionals stdenv.isDarwin [ + gcc + ]; # pytestCheckHook leads to a circular import issue - nativeCheckInputs = [ click ]; + nativeCheckInputs = [ + click + ]; - pythonImportsCheck = [ "primer3" ]; + pythonImportsCheck = [ + "primer3" + ]; meta = with lib; { description = "Oligo analysis and primer design"; homepage = "https://github.com/libnano/primer3-py"; + changelog = "https://github.com/libnano/primer3-py/blob/v${version}/CHANGES"; license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ fab ]; }; From fdd5d7e8262ff9d77329f357f2b7a9f201a31657 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 Jun 2023 08:15:27 +0200 Subject: [PATCH 19/51] python310Packages.primer3: add format - disable on unsupported Python releases --- pkgs/development/python-modules/primer3/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/primer3/default.nix b/pkgs/development/python-modules/primer3/default.nix index 0d5ec7d98f32..84068a9d9671 100644 --- a/pkgs/development/python-modules/primer3/default.nix +++ b/pkgs/development/python-modules/primer3/default.nix @@ -5,11 +5,15 @@ , cython , gcc , click +, pythonOlder }: buildPythonPackage rec { pname = "primer3"; version = "2.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "libnano"; From 0000008f033124cba34f7a1b0b4ac19cfe22bb75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jun 2023 00:43:02 +0200 Subject: [PATCH 20/51] emote: 3.1.0 -> 4.0.1 --- pkgs/tools/inputmethods/emote/default.nix | 25 ++++++++++------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/inputmethods/emote/default.nix b/pkgs/tools/inputmethods/emote/default.nix index 21d50d76d4cd..15e9a4968535 100644 --- a/pkgs/tools/inputmethods/emote/default.nix +++ b/pkgs/tools/inputmethods/emote/default.nix @@ -1,20 +1,18 @@ -{ lib, fetchFromGitHub, python3Packages, wrapGAppsHook, gobject-introspection, gtk3, keybinder3, xdotool, pango, gdk-pixbuf, atk }: +{ lib, fetchFromGitHub, python3Packages, wrapGAppsHook, gobject-introspection, keybinder3, xdotool }: python3Packages.buildPythonApplication rec { pname = "emote"; - version = "3.1.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "tom-james-watson"; repo = "Emote"; rev = "v${version}"; - sha256 = "sha256-brGU5LzE9A1F5AVNIuyd8vFKEh58ijRB5qVEID/KJfY="; + sha256 = "sha256-+GpL4Rp0ECsxXGP9dWZbVNkH7H2GF1brDTLsB+TQY5A="; }; postPatch = '' - substituteInPlace setup.py \ - --replace "pygobject==3.36.0" "pygobject" \ - --replace "manimpango==0.3.0" "manimpango" + sed -i setup.py -e '/==.*/d' substituteInPlace emote/config.py --replace 'os.environ.get("SNAP")' "'$out/share/emote'" substituteInPlace emote/picker.py --replace 'os.environ.get("SNAP_VERSION", "dev build")' "'$version'" substituteInPlace snap/gui/emote.desktop --replace "Icon=\''${SNAP}/usr/share/icons/emote.svg" "Icon=emote.svg" @@ -26,22 +24,21 @@ python3Packages.buildPythonApplication rec { ]; buildInputs = [ - atk - gdk-pixbuf - gtk3 + # used by gobject-introspection's setup-hook and only detected at runtime keybinder3 - pango ]; - propagatedBuildInputs = [ - python3Packages.manimpango - python3Packages.pygobject3 + propagatedBuildInputs = with python3Packages; [ + dbus-python + manimpango + pygobject3 # not listed in setup.py + setproctitle ]; postInstall = '' install -D snap/gui/emote.desktop $out/share/applications/emote.desktop install -D snap/gui/emote.svg $out/share/pixmaps/emote.svg - install -D -t $out/share/emote/static static/{NotoColorEmoji.ttf,emojis.csv,logo.svg,style.css} + install -D -t $out/share/emote/static static/{emojis.csv,logo.svg,style.css} ''; dontWrapGApps = true; From 7232ffd13fdf582d4040eb8f8ebf5b64dec3f51a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 Jun 2023 03:49:19 +0000 Subject: [PATCH 21/51] sq: 0.36.2 -> 0.38.0 --- pkgs/development/tools/sq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/sq/default.nix b/pkgs/development/tools/sq/default.nix index d66623c057b3..16765656118c 100644 --- a/pkgs/development/tools/sq/default.nix +++ b/pkgs/development/tools/sq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sq"; - version = "0.36.2"; + version = "0.38.0"; src = fetchFromGitHub { owner = "neilotoole"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EuNB39FcpkFHWgyQkOTqm5WUTEHHgmuqssM2qLycvTM="; + sha256 = "sha256-h8rCHtBTckLjRxi79N26pYiCJSI/UKUbwUTsQXD7Sco="; }; - vendorHash = "sha256-nzXYKV3pZToh9UzCTADpzZQNmfEAL4lshJmC/sj0zs0="; + vendorHash = "sha256-VcqCscheXYgWT88ZExJWdwRMT5Ir0C49S5+Hp557jiw="; proxyVendor = true; From 8b5699bf6744fea17facff29f1b3d0d459f38c99 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 Jun 2023 06:27:27 +0000 Subject: [PATCH 22/51] helm-ls: 0.0.4 -> 0.0.5 --- pkgs/development/tools/language-servers/helm-ls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/language-servers/helm-ls/default.nix b/pkgs/development/tools/language-servers/helm-ls/default.nix index 9adf18204eef..a1b58f686a50 100644 --- a/pkgs/development/tools/language-servers/helm-ls/default.nix +++ b/pkgs/development/tools/language-servers/helm-ls/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "helm-ls"; - version = "0.0.4"; + version = "0.0.5"; src = fetchFromGitHub { owner = "mrjosh"; repo = "helm-ls"; rev = "v${version}"; - hash = "sha256-1hzAfmeHLjgvySrEVONnFG/UAEFVAYbUAYEgzOF29b0="; + hash = "sha256-GRnE9GC9pIcOfcVtlqx/yCkQz9rmxpkAfRGa6GZBzJE="; }; - vendorHash = "sha256-hYEQUaE1njzs1Miv/ux7Yw6npLEUfcb/wKyL+j5Zrwg="; + vendorHash = "sha256-wMYrgAgAEgwfjMLP81H0cKWm/kh63ppDkSiymfsaj7U="; nativeBuildInputs = [ installShellFiles ]; From 6490b62699cf72af2640566fe1e6b29d23a520b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 Jun 2023 08:21:34 +0000 Subject: [PATCH 23/51] afterburn: 5.4.2 -> 5.4.3 --- pkgs/tools/admin/afterburn/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/afterburn/default.nix b/pkgs/tools/admin/afterburn/default.nix index 2338d3396030..c3d3cf09107b 100644 --- a/pkgs/tools/admin/afterburn/default.nix +++ b/pkgs/tools/admin/afterburn/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "afterburn"; - version = "5.4.2"; + version = "5.4.3"; src = fetchFromGitHub { owner = "coreos"; repo = "afterburn"; rev = "v${version}"; - sha256 = "sha256-MJPJAzAzlfOEgTErwnXKWUChjy7tWQxjNX87c76bBNY="; + sha256 = "sha256-IxAmamWJjM8DAEihH3lYgOLKOcSRvh48GSIX797Nhjo="; }; - cargoHash = "sha256-OuN36DTLuVHwB/zKiQoTda6gYHLpX9Z/WBD1me6xpKM="; + cargoHash = "sha256-vQTxqAnnfjg4zFSOPLIcchRjqv0HJ3L2jBSNubpO9DM="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; From d81e489e7903061b975bbc0380e9053ee85b353e Mon Sep 17 00:00:00 2001 From: Konecho <45135096+Konecho@users.noreply.github.com> Date: Wed, 21 Jun 2023 17:21:16 +0800 Subject: [PATCH 24/51] nb: add fish shell completion --- pkgs/tools/misc/nb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/nb/default.nix b/pkgs/tools/misc/nb/default.nix index 6824563b35f3..c01a8084a41b 100644 --- a/pkgs/tools/misc/nb/default.nix +++ b/pkgs/tools/misc/nb/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' - installShellCompletion etc/nb-completion.{bash,zsh} + installShellCompletion --cmd nb etc/nb-completion.{bash,zsh,fish} ''; meta = with lib; { From c548a98550dbc002eec56325ce02522d43327942 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 21 Jun 2023 12:33:00 +0200 Subject: [PATCH 25/51] nvidia-vaapi-driver: 0.0.9 -> 0.0.10 --- .../libraries/nvidia-vaapi-driver/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix index 5e559af9357b..4a1976be2915 100644 --- a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix +++ b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "nvidia-vaapi-driver"; - version = "0.0.9"; + version = "0.0.10"; src = fetchFromGitHub { owner = "elFarto"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mQtprgm6QonYiMUPPIcCbWxPQ/b2XuQiOkROZNPYaQk="; + sha256 = "sha256-j6AIleVZCgV7CD7nP/dKz5we3sUW9pldy0QKi8xwXB0="; }; nativeBuildInputs = [ @@ -39,14 +39,6 @@ stdenv.mkDerivation rec { libva ]; - # Note: Attempt to remove on next release after 0.0.9 - # nixpkgs reference: https://github.com/NixOS/nixpkgs/pull/221978#issuecomment-1483892437 - # upstream: https://github.com/elFarto/nvidia-vaapi-driver/issues/188 - NIX_CFLAGS_COMPILE = [ - "-Wno-error=format=" - "-Wno-error=int-conversion" - ]; - postFixup = '' addOpenGLRunpath "$out/lib/dri/nvidia_drv_video.so" ''; From d211e2e54a8c2423665e83c70e931186fa3697e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jun 2023 13:13:22 +0200 Subject: [PATCH 26/51] codespell: 2.2.4 -> 2.2.5 Diff: https://github.com/codespell-project/codespell/compare/v2.2.4...v2.2.5 --- pkgs/development/tools/codespell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/codespell/default.nix b/pkgs/development/tools/codespell/default.nix index b0497015810c..859ce0a7468f 100644 --- a/pkgs/development/tools/codespell/default.nix +++ b/pkgs/development/tools/codespell/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "codespell"; - version = "2.2.4"; + version = "2.2.5"; format = "pyproject"; src = fetchFromGitHub { owner = "codespell-project"; repo = "codespell"; rev = "v${version}"; - sha256 = "sha256-hyTy6zAH5WrW5Jn/g0irH9xGZErnXJMSUYZaNxMvq2Y="; + sha256 = "sha256-Cu1bbLzVOAvPNzTavaMUfW2SCnQHc9mOM+IHAgVHhT4="; }; postPatch = '' From 6ad7facb148bb270b85248bc490f9e25e0aa861b Mon Sep 17 00:00:00 2001 From: Ivan Bastrakov Date: Mon, 19 Jun 2023 21:13:03 +0300 Subject: [PATCH 27/51] maintainers: rename ggwpaiushtha to bastaynav --- maintainers/maintainer-list.nix | 19 ++++++++++--------- .../editors/vscode/extensions/default.nix | 2 +- .../themes/catppuccin-kvantum/default.nix | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cb12c8629dec..f7c5ba0261d1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1794,6 +1794,16 @@ fingerprint = "A3E1 C409 B705 50B3 BF41 492B 5684 0A61 4DBE 37AE"; }]; }; + bastaynav = { + name = "Ivan Bastrakov"; + email = "bastaynav@proton.me"; + matrix = "@bastaynav:matrix.org"; + github = "bastaynav"; + githubId = 6987136; + keys = [{ + fingerprint = "2C6D 37D4 6AA1 DCDA BE8D F346 43E2 CF4C 01B9 4940"; + }]; + }; basvandijk = { email = "v.dijk.bas@gmail.com"; github = "basvandijk"; @@ -5825,15 +5835,6 @@ githubId = 3217744; name = "Peter Ferenczy"; }; - ggwpaiushtha = { - name = "Ivan"; - email = "ggwpaiushtha@gmail.com"; - github = "GGwpAiushtha"; - githubId = 6987136; - keys = [{ - fingerprint = "2C6D 37D4 6AA1 DCDA BE8D F346 43E2 CF4C 01B9 4940"; - }]; - }; ghostbuster91 = { name = "Kasper Kondzielski"; email = "kghost0@gmail.com"; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index dd583683d589..4129ca37172a 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3445,7 +3445,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=vscode-icons-team.vscode-icons"; homepage = "https://github.com/vscode-icons/vscode-icons"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.ggwpaiushtha ]; + maintainers = [ lib.maintainers.bastaynav ]; }; }; diff --git a/pkgs/data/themes/catppuccin-kvantum/default.nix b/pkgs/data/themes/catppuccin-kvantum/default.nix index 222f9178ff4f..0588695b5bdf 100644 --- a/pkgs/data/themes/catppuccin-kvantum/default.nix +++ b/pkgs/data/themes/catppuccin-kvantum/default.nix @@ -33,6 +33,6 @@ in homepage = "https://github.com/catppuccin/Kvantum"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ggwpaiushtha]; + maintainers = with maintainers; [ bastaynav ]; }; } From 0bcf683c66751e608655912074cd62e572bf63e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jun 2023 13:19:05 +0200 Subject: [PATCH 28/51] systeroid: 0.4.1 -> 0.4.2 Diff: https://github.com/orhun/systeroid/compare/v0.4.1...v0.4.2 --- pkgs/tools/system/systeroid/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/systeroid/default.nix b/pkgs/tools/system/systeroid/default.nix index 09eaa2505205..299312a5d9ba 100644 --- a/pkgs/tools/system/systeroid/default.nix +++ b/pkgs/tools/system/systeroid/default.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "systeroid"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1qZ0vryWFGoIC3gdgJv6HolqCV8fogAZnjGHYnbP8Es="; + sha256 = "sha256-yEsDtjoV0NQPG/PJnVMBBMuPDBdK2kIfUWxtfkvRI04="; }; postPatch = '' @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { --replace '"/usr/share/doc/kernel-doc-*/Documentation/*",' '"${linux-doc}/share/doc/linux-doc/*",' ''; - cargoHash = "sha256-aWkWufHZaAmebdDdrgrIbQrSSzj/RgymQ4hOkGtY2Zc="; + cargoHash = "sha256-Plu7JxTFjLUXWLmIax/QPgq7QzdQd0vFinj+Gx03AQQ="; buildInputs = [ xorg.libxcb From 69beba6b7c9af2850a04d0ddcb4411c81a93ce8e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 21 Jun 2023 13:20:03 +0200 Subject: [PATCH 29/51] batman-adv: 2023.0 -> 2023.1 --- pkgs/os-specific/linux/batman-adv/version.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/batman-adv/version.nix b/pkgs/os-specific/linux/batman-adv/version.nix index 371d41b1c570..e1c026fb533a 100644 --- a/pkgs/os-specific/linux/batman-adv/version.nix +++ b/pkgs/os-specific/linux/batman-adv/version.nix @@ -1,9 +1,9 @@ { - version = "2023.0"; + version = "2023.1"; sha256 = { - batman-adv = "sha256-LOTsBAYyUue/7DorP6KmGztCx7BNaYumATK/qx1gpc0="; - alfred = "sha256-xeytzlDoIoqRK0iUVnrUXW/x0ro5kcl4RW5L75t9utE="; - batctl = "sha256-EQcewCth4B4F74Awt72o/xXlxwspSmQgRZLFtssx7SI="; + batman-adv = "sha256-9GpyhmYKXsNQahvn72C0ccUaxwVQWX1ZgEBHmre5Nrg="; + alfred = "sha256-Q4BIJI83N1fTqL3ny8bbZoX00BBdEw2i9aVPKQkMaXQ="; + batctl = "sha256-5b9HMF2VWrsZkkS9Dl//q5YQixr/q9DZcFUz+AWTlfE="; }; } From 237bd856cfb1b5d5dd34ea3ef9882cb14ada93a6 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 21 Jun 2023 14:49:51 +0300 Subject: [PATCH 30/51] wireshark: fix build on x86_64-darwin --- pkgs/applications/networking/sniffers/wireshark/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 092c3d88950c..50ef0bab7982 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ asciidoctor bison cmake ninja flex makeWrapper pkg-config python3 perl ] ++ lib.optionals withQt [ qt6.wrapQtAppsHook wrapGAppsHook ]; - depsBuildBuild = [ buildPackages.stdenv.cc ]; + depsBuildBuild = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ buildPackages.stdenv.cc ]; buildInputs = [ gettext diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 790acf39453c..de78942ec5e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30941,8 +30941,8 @@ with pkgs; welle-io = libsForQt5.callPackage ../applications/radio/welle-io { }; - wireshark = callPackage ../applications/networking/sniffers/wireshark { - inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration; + wireshark = qt6Packages.callPackage ../applications/networking/sniffers/wireshark { + inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices SystemConfiguration; libpcap = libpcap.override { withBluez = stdenv.isLinux; }; }; wireshark-qt = wireshark; From c705bcbafa5c21194c40c09214568bbddd7208d5 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 21 Jun 2023 14:51:04 +0300 Subject: [PATCH 31/51] wasmedge: fix build on x86_64-darwin --- pkgs/development/tools/wasmedge/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/wasmedge/default.nix b/pkgs/development/tools/wasmedge/default.nix index 0c0e22bf1c79..d0ad7cf8a947 100644 --- a/pkgs/development/tools/wasmedge/default.nix +++ b/pkgs/development/tools/wasmedge/default.nix @@ -1,6 +1,6 @@ { lib , fetchFromGitHub -, llvmPackages +, llvmPackages_12 , boost , cmake , spdlog @@ -11,6 +11,7 @@ }: let + llvmPackages = llvmPackages_12; stdenv = llvmPackages.stdenv; in stdenv.mkDerivation (finalAttrs: { @@ -61,7 +62,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ asl20 ]; description = "A lightweight, high-performance, and extensible WebAssembly runtime for cloud native, edge, and decentralized applications"; maintainers = with maintainers; [ dit7ya ]; - # error: no member named 'utimensat' in the global namespace - broken = stdenv.isDarwin && stdenv.isx86_64; + platforms = platforms.all; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 790acf39453c..679f2d79a00a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13795,9 +13795,8 @@ with pkgs; wasm-tools = callPackage ../tools/misc/wasm-tools { }; - wasmedge = callPackage ../development/tools/wasmedge { - llvmPackages = llvmPackages_12; - inherit (darwin.apple_sdk.frameworks) Foundation; + wasmedge = darwin.apple_sdk_11_0.callPackage ../development/tools/wasmedge { + inherit (darwin.apple_sdk_11_0.frameworks) Foundation; }; welkin = callPackage ../tools/graphics/welkin { }; From dea415130ab72179e264acdaa864578b8c8077f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 21 Jun 2023 07:50:22 +0100 Subject: [PATCH 32/51] clickhouse: compress tarball --- pkgs/servers/clickhouse/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 12d2b3228304..ffa10568ffff 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -34,7 +34,10 @@ in mkDerivation rec { repo = "ClickHouse"; rev = "v${version}-lts"; fetchSubmodules = true; - hash = "sha256-fVwwMj0WbyCbe4WfpYMGVM6vXFgHsjg9MUZbNyd+a/w="; + name = "clickhouse-${rev}.tar.gz"; + hash = if stdenv.isDarwin + then "sha256-VaUGbUyDilYPK4iBv/nICOsfeolNQeBSEtC71gBTkpE=" + else "sha256-NH+OW6zr8XBmJr68fX1WIy8Wt7cLWFMskIv7Be0TLEU="; postFetch = '' # delete files that make the source too big rm -rf $out/contrib/llvm-project/llvm/test @@ -44,6 +47,18 @@ in mkDerivation rec { # fix case insensitivity on macos https://github.com/NixOS/nixpkgs/issues/39308 rm -rf $out/contrib/sysroot/linux-* rm -rf $out/contrib/liburing/man + + # compress to not exceed the 2GB output limit + # try to make a deterministic tarball + tar -I 'gzip -n' \ + --sort=name \ + --mtime=1970-01-01 \ + --owner=root --group=root \ + --numeric-owner --mode=go=rX,u+rw,a-s \ + --transform='s@^@source/@S' \ + -cf temp -C "$out" . + rm -r "$out" + mv temp "$out" ''; }; From 80dcb8f6bbe300ae6a4bd208eec2f487f20504d1 Mon Sep 17 00:00:00 2001 From: Tyler Langlois Date: Tue, 9 May 2023 11:31:47 -0600 Subject: [PATCH 33/51] nixos/opentelemetry-collector: add nixosTest MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit a45a1a51e57eff974922b19d80b77ff0c23771f0) Signed-off-by: Domen Kožar --- nixos/tests/all-tests.nix | 1 + nixos/tests/opentelemetry-collector.nix | 76 +++++++++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 nixos/tests/opentelemetry-collector.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index ee1f6bb8059f..f5211e191b04 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -506,6 +506,7 @@ in { openstack-image-metadata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).metadata or {}; openstack-image-userdata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).userdata or {}; opentabletdriver = handleTest ./opentabletdriver.nix {}; + opentelemetry-collector = handleTest ./opentelemetry-collector.nix {}; owncast = handleTest ./owncast.nix {}; image-contents = handleTest ./image-contents.nix {}; orangefs = handleTest ./orangefs.nix {}; diff --git a/nixos/tests/opentelemetry-collector.nix b/nixos/tests/opentelemetry-collector.nix new file mode 100644 index 000000000000..9a56a22ca47e --- /dev/null +++ b/nixos/tests/opentelemetry-collector.nix @@ -0,0 +1,76 @@ +import ./make-test-python.nix ({ pkgs, ...} : let + port = 4318; +in { + name = "opentelemetry-collector"; + meta = with pkgs.lib.maintainers; { + maintainers = [ tylerjl ]; + }; + + nodes.machine = { ... }: { + networking.firewall.allowedTCPPorts = [ port ]; + services.opentelemetry-collector = { + enable = true; + settings = { + exporters.logging.verbosity = "detailed"; + receivers.otlp.protocols.http = {}; + service = { + pipelines.logs = { + receivers = [ "otlp" ]; + exporters = [ "logging" ]; + }; + }; + }; + }; + virtualisation.forwardPorts = [{ + host.port = port; + guest.port = port; + }]; + }; + + extraPythonPackages = p: [ + p.requests + p.types-requests + ]; + + # Send a log event through the OTLP pipeline and check for its + # presence in the collector logs. + testScript = /* python */ '' + import requests + import time + + from uuid import uuid4 + + flag = str(uuid4()) + + machine.wait_for_unit("opentelemetry-collector.service") + machine.wait_for_open_port(${toString port}) + + event = { + "resourceLogs": [ + { + "resource": {"attributes": []}, + "scopeLogs": [ + { + "logRecords": [ + { + "timeUnixNano": str(time.time_ns()), + "severityNumber": 9, + "severityText": "Info", + "name": "logTest", + "body": { + "stringValue": flag + }, + "attributes": [] + }, + ] + } + ] + } + ] + } + + response = requests.post("http://localhost:${toString port}/v1/logs", json=event) + assert response.status_code == 200 + assert flag in machine.execute("journalctl -u opentelemetry-collector")[-1] + ''; +}) From d33a9ca353650eec8bcf13fb2c969c177541f37b Mon Sep 17 00:00:00 2001 From: meppu Date: Wed, 21 Jun 2023 15:14:44 +0300 Subject: [PATCH 34/51] osu-lazer-bin: 2023.617.0 -> 2023.621.0 --- pkgs/games/osu-lazer/bin.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/osu-lazer/bin.nix b/pkgs/games/osu-lazer/bin.nix index 227eb7ca7fe6..bc813e9be81e 100644 --- a/pkgs/games/osu-lazer/bin.nix +++ b/pkgs/games/osu-lazer/bin.nix @@ -7,21 +7,21 @@ let pname = "osu-lazer-bin"; - version = "2023.617.0"; + version = "2023.621.0"; name = "${pname}-${version}"; osu-lazer-bin-src = { aarch64-darwin = { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - sha256 = "sha256-aO1yd2ha0/Adfm2GDg5atRCucPNZahxXW1Nb6tgnby0="; + sha256 = "sha256-TM2yGr8XmovcVxSXlI+AuddGJ+Qd+slYIqTpLpmGUyo="; }; x86_64-darwin = { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - sha256 = "sha256-lGNcIS3QVrlur2z5cpoAxKK2a3KED9mWjtiCYycosQM="; + sha256 = "sha256-8yW45ZOpvd74aY42T/apQhIDOKLdYP/5Z/YZYsByrJk="; }; x86_64-linux = { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - sha256 = "sha256-g/jBY7L06PrIHQ/2W52Itr+BkKIXEaYIHzyVMZHcrkk="; + sha256 = "sha256-21n04TSDBrsxTj/Os5lHLWiTzma5A6BAcyvrMofFj9g="; }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); From 202e5a3625d05aec2b6694d8ccde46b692379070 Mon Sep 17 00:00:00 2001 From: meppu Date: Wed, 21 Jun 2023 15:14:54 +0300 Subject: [PATCH 35/51] osu-lazer: 2023.617.0 -> 2023.621.0 --- pkgs/games/osu-lazer/default.nix | 4 ++-- pkgs/games/osu-lazer/deps.nix | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 1a399d674685..01c621ed9703 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -17,13 +17,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2023.617.0"; + version = "2023.621.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "sha256-Bnbf8H+ThDOQPUIRd27iMtVqZditBxm8E5IZF+q1Cog="; + sha256 = "sha256-ejptMzhRQcYEFa5c9XurYxaFZOUgTuAfe7qlGYhNX08="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 002f60bd5de3..db453a1833ac 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -4,7 +4,7 @@ { fetchNuGet }: [ (fetchNuGet { pname = "AutoMapper"; version = "12.0.1"; sha256 = "0s0wjl4ck3sal8a50x786wxs9mbca7bxaqk3558yx5wpld4h4z3b"; }) (fetchNuGet { pname = "Clowd.Squirrel"; version = "2.9.42"; sha256 = "1xxrr9jmgn343d467nz40569mkybinnmxaxyc4fhgy6yddvzk1y0"; }) - (fetchNuGet { pname = "CodeFileSanity"; version = "0.0.36"; sha256 = "0d37aax33kd49ac2kji54wada252w9qsrdlx53w00mw3pfwdpplz"; }) + (fetchNuGet { pname = "CodeFileSanity"; version = "0.0.37"; sha256 = "03ja3g66lb0smjmkr3yf28h7fy52wwbdnf6p268zfla3azh006pq"; }) (fetchNuGet { pname = "DiffPlex"; version = "1.7.1"; sha256 = "1q78r70pirgb7j5wkh454ws237lihh0fig212cpbj02cz53c2h6j"; }) (fetchNuGet { pname = "DiscordRichPresence"; version = "1.1.3.18"; sha256 = "0p4bhaggjjfd4gl06yiphqgncxgcq2bws4sjkrw0n2ldf3hgrps3"; }) (fetchNuGet { pname = "FFmpeg.AutoGen"; version = "4.3.0.1"; sha256 = "0n6x57mnnvcjnrs8zyvy07h5zm4bcfy9gh4n4bvd9fx5ys4pxkvv"; }) @@ -134,15 +134,15 @@ (fetchNuGet { pname = "ppy.ManagedBass"; version = "2022.1216.0"; sha256 = "19nnj1hq2v21mrplnivjr9c4y3wg4hhfnc062sjgzkmiv1cchvf8"; }) (fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; sha256 = "1vw573mkligpx9qiqasw1683cqaa1kgnxhlnbdcj9c4320b1pwjm"; }) (fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; sha256 = "185bpvgbnd8y20r7vxb1an4pd1aal9b7b5wvmv3knz0qg8j0chd9"; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2023.608.0"; sha256 = "0qf9z0307sh1skixql23v4vjkz1jwz6qhjdzqhhyb708hx9p7a03"; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2023.620.0"; sha256 = "10rq2dvfrjxcq01n6ixwsanxpzp55ax8flnvnc6fr2bi4bh9ajxy"; }) (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2022.525.0"; sha256 = "1zsqj3xng06bb46vg79xx35n2dsh3crqg951r1ga2gxqzgzy4nk0"; }) - (fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2022.1222.1"; sha256 = "1pwwsp4rfzl6166mhrn5lsnyazpckhfh1m6ggf9d1lw2wb58vxfr"; }) + (fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.619.0"; sha256 = "0ilzv4c0fh2y96cm8h9d65v1dbafj2myirn8nia4f0wxafyq3cjr"; }) (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2023.605.0"; sha256 = "1628yh97ginvx0i1dlpkmkw9hzvri5fj11b111lqy7xirfy7i66b"; }) (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; sha256 = "0j4a9n39pqm0cgdcps47p5n2mqph3h94r7hmf0bs59imif4jxvjy"; }) (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.669-alpha"; sha256 = "0frazc37k9nqzk3sqcy3jzibg9v6dp0ga95yx0rkmjm8jfbw3l9r"; }) - (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.3-g31346ea477"; sha256 = "0wrb1skyj58p23ryjkmlk8f1sdhplr5c43w31sw8bhv0yqmhjd80"; }) - (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.3-g31346ea477"; sha256 = "0x4i7v7z9n4yryi68h973f5kxiszjdy3hvkgbk4wa9g2skxyknhx"; }) - (fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.3-g31346ea477"; sha256 = "1k5by3zn4ih6d82l7rif25305js885qic44al47msidrq09rnacz"; }) + (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.3-g7beb1270bf"; sha256 = "1xsdmkby36vqhhdjl11v6p1dbd5adwb2mslkv5dj934fn4lmj9sy"; }) + (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.3-g7beb1270bf"; sha256 = "0n4aj5nx81yfsfj1zn2c9ffv2807lm2npn0v7rks7972m1fhn48n"; }) + (fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.3-g7beb1270bf"; sha256 = "1nwh1pnwvf4smd7f00igaa4plqf3hl2vc9wsw2mbljr04s800mpp"; }) (fetchNuGet { pname = "ppy.Veldrid.SPIRV"; version = "1.0.15-g3e4b9f196a"; sha256 = "0ijainvin0v01pk282985v0mwwa1s2b683wxg23jzk69pbvpyq6g"; }) (fetchNuGet { pname = "Realm"; version = "10.20.0"; sha256 = "0gy0l2r7726wb6i599n55dn9035h0g7k0binfiy2dy9bjwz60jqk"; }) (fetchNuGet { pname = "Realm.Fody"; version = "10.20.0"; sha256 = "0rwcbbzr41iww3k59rjgy5xy7bna1x906h5blbllpywgpc2l5afw"; }) From cf66aa9b55ce0fb9e3174c4089224cc12f046432 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 26 Mar 2023 16:14:19 -0700 Subject: [PATCH 36/51] borgbackup: 1.2.3 -> 1.2.4 Changelog: https://github.com/borgbackup/borg/blob/1.2.4/docs/changes.rst Co-authored-by: Franz Pletz --- pkgs/tools/backup/borgbackup/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix index 5aaffabd9325..5104dfd37512 100644 --- a/pkgs/tools/backup/borgbackup/default.nix +++ b/pkgs/tools/backup/borgbackup/default.nix @@ -11,29 +11,19 @@ , zstd , installShellFiles , nixosTests -, fetchpatch , fetchPypi }: python3.pkgs.buildPythonApplication rec { pname = "borgbackup"; - version = "1.2.3"; + version = "1.2.4"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-4yQY+GM8lvqWgTUqVutjuY4pQgNHLBFKUkJwnTaWZ4U="; + hash = "sha256-pL1U6UaegbejCmcRQjEVq8gY2c2ETsscoOYQS8U3Tag="; }; - patches = [ - (fetchpatch { - # Fix HashIndexSizeTestCase.test_size_on_disk_accurate problems on ZFS, - # see https://github.com/borgbackup/borg/issues/7250 - url = "https://github.com/borgbackup/borg/pull/7252/commits/fe3775cf8078c18d8fe39a7f42e52e96d3ecd054.patch"; - hash = "sha256-gdssHfhdkmRfSAOeXsq9Afg7xqGM3NLIq4QnzmPBhw4="; - }) - ]; - postPatch = '' # sandbox does not support setuid/setgid/sticky bits substituteInPlace src/borg/testsuite/archiver.py \ @@ -125,6 +115,7 @@ python3.pkgs.buildPythonApplication rec { outputs = [ "out" "doc" "man" ]; meta = with lib; { + changelog = "https://github.com/borgbackup/borg/blob/${version}/docs/changes.rst"; description = "Deduplicating archiver with compression and encryption"; homepage = "https://www.borgbackup.org"; license = licenses.bsd3; From f127904a2b36cbcff8da2adefe07c59c4e99a2be Mon Sep 17 00:00:00 2001 From: Patrizio Bekerle Date: Wed, 21 Jun 2023 14:30:29 +0200 Subject: [PATCH 37/51] sensible-utils: init at 0.0.18 (#237715) --- pkgs/tools/misc/sensible-utils/default.nix | 40 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/tools/misc/sensible-utils/default.nix diff --git a/pkgs/tools/misc/sensible-utils/default.nix b/pkgs/tools/misc/sensible-utils/default.nix new file mode 100644 index 000000000000..f6e8d95f5cd3 --- /dev/null +++ b/pkgs/tools/misc/sensible-utils/default.nix @@ -0,0 +1,40 @@ +{ stdenv, lib, fetchFromGitLab, makeWrapper, bash }: + +stdenv.mkDerivation rec { + pname = "sensible-utils"; + version = "0.0.18"; + + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "debian"; + repo = "sensible-utils"; + rev = "debian/${version}"; + sha256 = "sha256-fZJKPnEkPfo/3luUcHzAmGB2k1nkA4ATEQMSz0aN0YY="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontConfigure = true; + + installPhase = '' + mkdir -p $out/bin + + cp sensible-browser sensible-editor sensible-pager sensible-terminal $out/bin/ + ''; + + meta = with lib; { + description = "The package provides utilities used by programs to sensibly select and spawn an appropriate browser, editor, or pager."; + longDescription = '' + The specific utilities included are: + - sensible-browser + - sensible-editor + - sensible-pager + ''; + homepage = "https://salsa.debian.org/debian/sensible-utils"; + changelog = "https://salsa.debian.org/debian/sensible-utils/-/tags"; + license = licenses.gpl2; + maintainers = with maintainers; [ pbek ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec146342702a..1ca39b2a0022 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1184,6 +1184,8 @@ with pkgs; closureInfo = callPackage ../build-support/closure-info.nix { }; + sensible-utils = callPackage ../tools/misc/sensible-utils { }; + serverspec = callPackage ../tools/misc/serverspec { }; setupSystemdUnits = callPackage ../build-support/setup-systemd-units.nix { }; From 355a2731b821f4694784137fc2fdd465aeba4c18 Mon Sep 17 00:00:00 2001 From: mdarocha Date: Tue, 20 Jun 2023 17:23:01 +0200 Subject: [PATCH 38/51] python310Packages.clr-loader: init at 0.2.5 --- .../python-modules/clr-loader/default.nix | 79 +++++++++++++++++++ .../python-modules/clr-loader/deps.nix | 11 +++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 92 insertions(+) create mode 100644 pkgs/development/python-modules/clr-loader/default.nix create mode 100644 pkgs/development/python-modules/clr-loader/deps.nix diff --git a/pkgs/development/python-modules/clr-loader/default.nix b/pkgs/development/python-modules/clr-loader/default.nix new file mode 100644 index 000000000000..2c74dc30d1c5 --- /dev/null +++ b/pkgs/development/python-modules/clr-loader/default.nix @@ -0,0 +1,79 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pytestCheckHook +, dotnetCorePackages +, setuptools +, buildDotnetModule +, cffi +}: + +let + pname = "clr_loader"; + version = "0.2.5"; + src = fetchPypi { + inherit pname version; + sha256 = "sha256-gu1ftlRynRT9iCludLtrhOss+5dv9LfUnU5En9eKIms="; + }; + + # This buildDotnetModule is used only to get nuget sources, the actual + # build is done in `buildPythonPackage` below. + dotnet-build = buildDotnetModule { + inherit pname version src; + projectFile = [ "netfx_loader/ClrLoader.csproj" "example/example.csproj" ]; + nugetDeps = ./deps.nix; + }; +in +buildPythonPackage { + inherit pname version src; + + format = "pyproject"; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'dynamic = ["version"]' 'version = "${version}"' + ''; + + nativeBuildInputs = [ + setuptools + dotnetCorePackages.sdk_6_0 + ]; + + propagatedBuildInputs = [ + cffi + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # TODO: mono does not work due to https://github.com/NixOS/nixpkgs/issues/7307 + "test_mono" + "test_mono_debug" + "test_mono_signal_chaining" + "test_mono_set_dir" + ]; + + # Perform dotnet restore based on the nuget-source + preConfigure = '' + dotnet restore "netfx_loader/ClrLoader.csproj" \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --source "${dotnet-build.nuget-source}" + + dotnet restore "example/example.csproj" \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --source "${dotnet-build.nuget-source}" + ''; + + passthru.fetch-deps = dotnet-build.fetch-deps; + + meta = with lib; { + description = "Generic pure Python loader for .NET runtimes"; + homepage = "https://pythonnet.github.io/clr-loader/"; + license = licenses.mit; + maintainers = with maintainers; [ mdarocha ]; + }; +} diff --git a/pkgs/development/python-modules/clr-loader/deps.nix b/pkgs/development/python-modules/clr-loader/deps.nix new file mode 100644 index 000000000000..df303afaa791 --- /dev/null +++ b/pkgs/development/python-modules/clr-loader/deps.nix @@ -0,0 +1,11 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.0"; sha256 = "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.0"; sha256 = "00vkn4c6i0rn1l9pv912y0wgb9h6ks76qah8hvk441nari8fqbm1"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net47"; version = "1.0.0"; sha256 = "00v56phfn01ahf4fq7zanz6hjyzpp00hkkk4a190l0dywrv387i6"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) + (fetchNuGet { pname = "NXPorts"; version = "1.0.0"; sha256 = "02zva596c3vsnlhi1b1391vbfl8a6142dvm61r8j1c70b07916lj"; }) +] diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 64a42bb61cce..a484ff895335 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1871,6 +1871,8 @@ self: super: with self; { clip-anytorch = callPackage ../development/python-modules/clip-anytorch { }; + clr-loader = callPackage ../development/python-modules/clr-loader { }; + cock = callPackage ../development/python-modules/cock { }; class-doc = callPackage ../development/python-modules/class-doc { }; From 6c376a4f8ca7de76d92be61659a94fa35fa8b5e3 Mon Sep 17 00:00:00 2001 From: mdarocha Date: Tue, 20 Jun 2023 17:23:02 +0200 Subject: [PATCH 39/51] python310Packages.pythonnet: 2.5.2 -> 3.0.1 --- .../python-modules/pythonnet/default.nix | 112 ++++------ .../python-modules/pythonnet/deps.nix | 194 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 6 +- 3 files changed, 239 insertions(+), 73 deletions(-) create mode 100644 pkgs/development/python-modules/pythonnet/deps.nix diff --git a/pkgs/development/python-modules/pythonnet/default.nix b/pkgs/development/python-modules/pythonnet/default.nix index 1f4142b3245f..91dc505a3d83 100644 --- a/pkgs/development/python-modules/pythonnet/default.nix +++ b/pkgs/development/python-modules/pythonnet/default.nix @@ -1,75 +1,54 @@ -{ stdenv -, lib +{ lib , fetchPypi -, fetchNuGet , buildPythonPackage , pytestCheckHook , pycparser , psutil -, pkg-config -, dotnetbuildhelpers -, clang -, glib -, mono +, dotnet-sdk +, buildDotnetModule +, clr-loader +, setuptools }: let - - dotnetPkgs = [ - (fetchNuGet { - pname = "UnmanagedExports"; - version = "1.2.7"; - sha256 = "0bfrhpmq556p0swd9ssapw4f2aafmgp930jgf00sy89hzg2bfijf"; - outputFiles = [ "*" ]; - }) - (fetchNuGet { - pname = "NUnit"; - version = "3.12.0"; - sha256 = "1880j2xwavi8f28vxan3hyvdnph4nlh5sbmh285s4lc9l0b7bdk2"; - outputFiles = [ "*" ]; - }) - (fetchNuGet { - pname = "System.ValueTuple"; - version = "4.5.0"; - sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; - outputFiles = [ "*" ]; - }) - ]; - -in - -buildPythonPackage rec { pname = "pythonnet"; - version = "2.5.2"; - + version = "3.0.1"; src = fetchPypi { - inherit pname version; - sha256 = "1qzdc6jd7i9j7p6bcihnr98y005gv1358xqdr1plpbpnl6078a5p"; + pname = "pythonnet"; + inherit version; + sha256 = "sha256-7U9/f5VRVAQRLds9oWOOGhATy1bmTEjE+mAwPwKwo90="; }; - postPatch = '' - substituteInPlace setup.py --replace 'self._install_packages()' '#self._install_packages()' - ''; + # This buildDotnetModule is used only to get nuget sources, the actual + # build is done in `buildPythonPackage` below. + dotnet-build = buildDotnetModule { + inherit pname version src; + nugetDeps = ./deps.nix; + }; +in +buildPythonPackage { + inherit pname version src; - preConfigure = '' - [ -z "''${dontPlacateNuget-}" ] && placate-nuget.sh - [ -z "''${dontPlacatePaket-}" ] && placate-paket.sh + format = "pyproject"; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'dynamic = ["version"]' 'version = "${version}"' ''; nativeBuildInputs = [ + setuptools + dotnet-sdk + ]; + + propagatedBuildInputs = [ pycparser + clr-loader + ]; - pkg-config - dotnetbuildhelpers - clang - - mono - - ] ++ dotnetPkgs; - - buildInputs = [ - glib - mono + pytestFlagsArray = [ + # Run tests using .NET Core, Mono is unsupported for now due to find_library problem in clr-loader + "--runtime coreclr" ]; nativeCheckInputs = [ @@ -77,26 +56,23 @@ buildPythonPackage rec { psutil # needed for memory leak tests ]; - preBuild = '' - rm -rf packages - mkdir packages - - ${builtins.concatStringsSep "\n" ( - builtins.map ( - x: ''ln -s ${x}/lib/dotnet/${x.pname} ./packages/${x.pname}.${x.version}'' - ) dotnetPkgs)} - - # Setting TERM=xterm fixes an issue with terminfo in mono: System.Exception: Magic number is wrong: 542 - export TERM=xterm + # Perform dotnet restore based on the nuget-source + preConfigure = '' + dotnet restore \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --source ${dotnet-build.nuget-source} ''; + # Rerun this when updating to refresh Nuget dependencies + passthru.fetch-deps = dotnet-build.fetch-deps; + meta = with lib; { - broken = stdenv.isDarwin; - description = ".Net and Mono integration for Python"; + description = ".NET integration for Python"; homepage = "https://pythonnet.github.io"; license = licenses.mit; # badPlatforms = [ "aarch64-linux" ]; - maintainers = with maintainers; [ jraygauthier ]; + maintainers = with maintainers; [ jraygauthier mdarocha ]; }; } diff --git a/pkgs/development/python-modules/pythonnet/deps.nix b/pkgs/development/python-modules/pythonnet/deps.nix new file mode 100644 index 000000000000..43d3a4992c7b --- /dev/null +++ b/pkgs/development/python-modules/pythonnet/deps.nix @@ -0,0 +1,194 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "BenchmarkDotNet"; version = "0.13.1"; sha256 = "1kgypxfp34vjy9kvqq8csznsjbnv37pp4r0457i5l1j6zrsm76rp"; }) + (fetchNuGet { pname = "BenchmarkDotNet.Annotations"; version = "0.13.1"; sha256 = "0fizarpvdajwcvfhd45c35xrnrci5rbn5ksf3zvlw4q300hnlsir"; }) + (fetchNuGet { pname = "CommandLineParser"; version = "2.4.3"; sha256 = "1aca3q25n3dg55v4j3kzlzfzd5k2jpy6zhp8x7g74pdfdqzrhg55"; }) + (fetchNuGet { pname = "Iced"; version = "1.8.0"; sha256 = "12cgd9p3jm81wd7m8bp3pm20gmrmbad2hcwzynhz644h3062nn24"; }) + (fetchNuGet { pname = "Lost.Compat.NullabilityAttributes"; version = "0.0.4"; sha256 = "1h8m1n4x1p69xh86ia1rf4dcr17w965fpxws7d3458r4w1wl143a"; }) + (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "1.1.1"; sha256 = "1bb5p4zlnfn88skkvymxfsn0jybqncl4356hwnic9jxdq2d4fz1w"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "2.6.1"; sha256 = "1plk343h9fyxg08b9bcnlqyaq00cbnc1v73pj9nbcyphmgf5bqfp"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "2.10.0"; sha256 = "1l690xqrhmkasns5ghz0vqj8n2xyl5yrwan5gs52hwfxdwahqaaj"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "2.10.0"; sha256 = "0saabsr81crawdzs2cnzyjp5cgg2hk5k6q7n0i0pxghswb0m4dxk"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.11.0"; sha256 = "0f41l3kks6wk5vjaxpjh8m2flnrvlbvqgqflamhv8rfz4y8ifgdv"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.0.0"; sha256 = "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.6.2"; sha256 = "1wwmg6hn4dp2mvwn2bm81wccdw149lq17xdnpz17mvg4zcwmax7g"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.NETCore.Client"; version = "0.2.61701"; sha256 = "1ic1607jj4ln8dbibf1fz5v9svk9x2kqlgvhndc6ijaqnbc4wcr1"; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.Runtime"; version = "1.1.126102"; sha256 = "0w7jcxkd4cix6dbh0szawilmykjmdc1rqysllrpwb7ivrxzazypn"; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.Tracing.TraceEvent"; version = "2.0.61"; sha256 = "0gq51l4yyyn8dir6w41im9fwhw9r6jz6n7jm4zhmvvway5ijbcac"; }) + (fetchNuGet { pname = "Microsoft.DotNet.InternalAbstractions"; version = "1.0.0"; sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x"; }) + (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "2.1.0"; sha256 = "1qydvyyinj3b5mraazjal3n2k7jqhn05b6n1a2f3qjkqkxi63dmy"; }) + (fetchNuGet { pname = "Microsoft.Net.Compilers.Toolset"; version = "4.0.1"; sha256 = "08njbdnmjzjd6phys94w0di3vcxfq7pniad6s3jc5f65r9s1f0w2"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.11.0"; sha256 = "1a2y6vw6p9xp3w72zq2lwrjl8bxv87s9d7zd2dh4zwbzh1c5slxl"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.6.2"; sha256 = "1a658bnh5q3lfkrr81h3lyx1mc3hggnjr1bpmim71rr2s42ad70v"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.0"; sha256 = "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.0"; sha256 = "00vkn4c6i0rn1l9pv912y0wgb9h6ks76qah8hvk441nari8fqbm1"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net472"; version = "1.0.0"; sha256 = "1bqinq2nxnpqxziypg1sqy3ly0nymxxjpn8fwkn3rl4vl6gdg3rc"; }) + (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "1.1.1"; sha256 = "0xkdqs7az2cprar7jzjlgjpd64l6f8ixcmwmpkdm03fyb4s5m0bg"; }) + (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "1.1.1"; sha256 = "099y35f2npvva3jk1zp8hn0vb9pwm2l0ivjasdly6y2idv53s5yy"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.11.0"; sha256 = "1fc0ghk1cny4i8w43b94pxhl0srxisv6kaflkkp30ncsa9szhkxh"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.6.2"; sha256 = "0asbrbdyyig1p034smf79lszzbfv1cn6q181i7d4p2vsiqpjp9sj"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.11.0"; sha256 = "0hp1vndf2jhyg1f3miq4g2068z5kpfzy6nmswm25vymghxp1ws4k"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.6.2"; sha256 = "0lcj8kkcnxbwiaw6j0xf4fxqpa6z0s41nq52spvckfg4367lg4fg"; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) + (fetchNuGet { pname = "NonCopyableAnalyzer"; version = "0.7.0"; sha256 = "1jry36p53fkk3fn9pawgg7qiv79j30y0kvd4xrnd58d7zg7zzdj0"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; }) + (fetchNuGet { pname = "NUnit"; version = "3.12.0"; sha256 = "1880j2xwavi8f28vxan3hyvdnph4nlh5sbmh285s4lc9l0b7bdk2"; }) + (fetchNuGet { pname = "NUnit"; version = "3.13.3"; sha256 = "0wdzfkygqnr73s6lpxg5b1pwaqz9f414fxpvpdmf72bvh4jaqzv6"; }) + (fetchNuGet { pname = "NUnit3TestAdapter"; version = "3.16.1"; sha256 = "1pzhmapfdszsfza7zjr3zrlz4fssdxsyiwmlj76a40mbhxhfa4q9"; }) + (fetchNuGet { pname = "NUnit3TestAdapter"; version = "3.17.0"; sha256 = "0kxc6z3b8ccdrcyqz88jm5yh5ch9nbg303v67q8sp5hhs8rl8nk6"; }) + (fetchNuGet { pname = "NUnit3TestAdapter"; version = "4.5.0"; sha256 = "1srx1629s0k1kmf02nmz251q07vj6pv58mdafcr5dr0bbn1fh78i"; }) + (fetchNuGet { pname = "Perfolizer"; version = "0.2.1"; sha256 = "012aqqi3y3nfikqmn26yajpwd52c04zlzp0p91iyslw7mf26qncy"; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.4.0"; sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) + (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) + (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) + (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) + (fetchNuGet { pname = "System.ComponentModel.EventBasedAsync"; version = "4.3.0"; sha256 = "1rv9bkb8yyhqqqrx6x95njv6mdxlbvv527b44mrd93g8fmgkifl7"; }) + (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) + (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { pname = "System.Diagnostics.FileVersionInfo"; version = "4.3.0"; sha256 = "094hx249lb3vb336q7dg3v257hbxvz2jnalj695l7cg5kxzqwai7"; }) + (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.3.0"; sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; }) + (fetchNuGet { pname = "System.Diagnostics.StackTrace"; version = "4.3.0"; sha256 = "0ash4h9k0m7xsm0yl79r0ixrdz369h7y922wipp5gladmlbvpyjd"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) + (fetchNuGet { pname = "System.Management"; version = "4.5.0"; sha256 = "19z5x23n21xi94bgl531l9hrm64nyw9d5fpd7klfvr5xfsbh9jwr"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.5.0"; sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.5.0"; sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.3.0"; sha256 = "0lgxg1gn7pg7j0f942pfdc9q7wamzxsgq3ng248ikdasxz0iadkv"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.2"; sha256 = "1sh63dz0dymqcwmprp0nadm77b83vmm7lyllpv578c397bslb8hj"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Parallel"; version = "4.3.0"; sha256 = "1rr3qa4hxwyj531s4nb3bwrxnxxwz617i0n9gh6x7nr7dd3ayzgh"; }) + (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) + (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) + (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) + (fetchNuGet { pname = "System.Xml.XPath"; version = "4.3.0"; sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; }) + (fetchNuGet { pname = "System.Xml.XPath.XDocument"; version = "4.3.0"; sha256 = "1wxckyb7n1pi433xzz0qcwcbl1swpra64065mbwwi8dhdc4kiabn"; }) + (fetchNuGet { pname = "System.Xml.XPath.XmlDocument"; version = "4.3.0"; sha256 = "1h9lh7qkp0lff33z847sdfjj8yaz98ylbnkbxlnsbflhj9xyfqrm"; }) +] diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a484ff895335..8a7dd8cac18c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9961,11 +9961,7 @@ self: super: with self; { python-nest = callPackage ../development/python-modules/python-nest { }; - pythonnet = callPackage - ../development/python-modules/pythonnet { - # Using `mono > 5`, tests are failing.. - mono = pkgs.mono5; - }; + pythonnet = callPackage ../development/python-modules/pythonnet { }; python-nmap = callPackage ../development/python-modules/python-nmap { }; From 643634a5133e1c014bdfd4bd010805e6c5b7f0c4 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 21 Jun 2023 20:39:58 +0800 Subject: [PATCH 40/51] ustreamer: 5.38 -> 5.41 Diff: https://github.com/pikvm/ustreamer/compare/v5.38...v5.41 --- pkgs/applications/video/ustreamer/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/video/ustreamer/default.nix b/pkgs/applications/video/ustreamer/default.nix index 77ad5af676ed..59da5b324425 100644 --- a/pkgs/applications/video/ustreamer/default.nix +++ b/pkgs/applications/video/ustreamer/default.nix @@ -2,23 +2,20 @@ stdenv.mkDerivation rec { pname = "ustreamer"; - version = "5.38"; + version = "5.41"; src = fetchFromGitHub { owner = "pikvm"; repo = "ustreamer"; rev = "v${version}"; - sha256 = "sha256-pc1Pf8KnjGPb74GbcmHaj/XCD0wjgiglaAKjnZUa6Ag="; + hash = "sha256-N70wBKiKfOhlAR9qOSkc6dlO44lJXHWiUYb8nwXMKxo="; }; buildInputs = [ libbsd libevent libjpeg ]; - enableParallelBuilding = true; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; - installPhase = '' - mkdir -p $out/bin - cp ustreamer $out/bin/ - ''; + enableParallelBuilding = true; meta = with lib; { homepage = "https://github.com/pikvm/ustreamer"; From 13acdc21b762429b4c5c4bbe5a97bb5fa07a0175 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 21 Jun 2023 04:20:00 +0000 Subject: [PATCH 41/51] terraform: 1.5.0 -> 1.5.1 Diff: https://github.com/hashicorp/terraform/compare/v1.5.0...v1.5.1 Changelog: https://github.com/hashicorp/terraform/blob/v1.5.1/CHANGELOG.md --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 10f6c744cc3e..6995ee8f1c4d 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -166,8 +166,8 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.5.0"; - hash = "sha256-QLCmA4u0br9EyQ244VcpLW5GkZm+bhq2/vvxSbYolCY="; + version = "1.5.1"; + hash = "sha256-dqnJGIoUJP37Z77TR2RBxP94Hx3AZbx90m8z1FoYdw0="; vendorHash = "sha256-tfCfJj39VP+P4qhJTpEIAi4XB+6VYtVKkV/bTrtnFA0="; patches = [ ./provider-path-0_15.patch ]; passthru = { From 6c78e60cf26dad184cb1d44059e7ef15858a7d1e Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Fri, 31 Mar 2023 16:36:19 +0200 Subject: [PATCH 42/51] noto-fonts-blob-emoji-bin: 14.0.1 -> 15.0 --- pkgs/data/fonts/noto-fonts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 600074002f53..4c5412f08cda 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -228,14 +228,14 @@ rec { noto-fonts-emoji-blob-bin = let pname = "noto-fonts-emoji-blob-bin"; - version = "14.0.1"; + version = "15.0"; in stdenvNoCC.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/C1710/blobmoji/releases/download/v${version}/Blobmoji.ttf"; - hash = "sha256-w9s7uF6E6nomdDmeKB4ATcGB/5A4sTwDvwHT3YGXz8g="; + hash = "sha256-3MPWZ1A2ups171dNIiFTJ3C1vZiGy6I8ZF70aUfrePk="; }; dontUnpack = true; From 4b42083a9dee7edd882003274ac8ca51aa80b35c Mon Sep 17 00:00:00 2001 From: skorpy Date: Wed, 21 Jun 2023 13:22:04 +0200 Subject: [PATCH 43/51] kubernetes: 1.27.2 -> 1.27.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 75d9f12e5a4e..944607955e00 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.27.2"; + version = "1.27.3"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - hash = "sha256-9Xeehm9E9ZZheS1Wgl4INAIIa0mZc+MMyr/0d81dsSg="; + hash = "sha256-g/YRwhhGjeBhbSFS/6xJbljTTMiwJHE3WRySwJlzKys="; }; vendorHash = null; From 988484206fb82f90e0fc1ba34af0c43ec8ba5bc1 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Wed, 21 Jun 2023 17:37:14 +0300 Subject: [PATCH 44/51] catppuccin-gtk: 0.4.1 -> 0.6.1 --- pkgs/data/themes/catppuccin-gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/catppuccin-gtk/default.nix b/pkgs/data/themes/catppuccin-gtk/default.nix index 47cdc6e8ce9c..4bda31746622 100644 --- a/pkgs/data/themes/catppuccin-gtk/default.nix +++ b/pkgs/data/themes/catppuccin-gtk/default.nix @@ -28,13 +28,13 @@ lib.checkListOfEnum "${pname}: tweaks" validTweaks tweaks stdenvNoCC.mkDerivation rec { inherit pname; - version = "0.4.1"; + version = "0.6.1"; src = fetchFromGitHub { owner = "catppuccin"; repo = "gtk"; rev = "v${version}"; - sha256 = "sha256-dzRXt9/OdPyiy3mu9pmPYeu69OXCnR+zEqbD1C5BKqM="; + sha256 = "sha256-b03V/c2do5FSm4Q0yN7V0RuoQX1fYsBd//Hj3R5MESI="; }; nativeBuildInputs = [ gtk3 sassc ]; From 563c6e2009a5178de99e16c26dfdc1d66a31f9fe Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Wed, 26 Apr 2023 14:05:21 +0100 Subject: [PATCH 45/51] obs-studio-plugins.obs-source-switcher: init at unstable-2023-04-19 --- .../video/obs-studio/plugins/default.nix | 2 + .../plugins/obs-source-switcher.nix | 37 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-source-switcher.nix diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index 394203bf391f..38e81d407f34 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -44,6 +44,8 @@ obs-source-record = callPackage ./obs-source-record.nix { }; + obs-source-switcher = callPackage ./obs-source-switcher.nix { }; + obs-teleport = callPackage ./obs-teleport { }; obs-transition-table = qt6Packages.callPackage ./obs-transition-table.nix { }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-source-switcher.nix b/pkgs/applications/video/obs-studio/plugins/obs-source-switcher.nix new file mode 100644 index 000000000000..b336ddf91203 --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-source-switcher.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, obs-studio +}: + +stdenv.mkDerivation rec { + pname = "obs-source-switcher"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "exeldro"; + repo = "obs-source-switcher"; + rev = "8babf207d140e52114b6db63d98749d7a0a2758b"; + sha256 = "sha256-J/NdIGsSXCtSOGF72pJZqqN5Y73eJfrA72LgZcTlP5o="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ obs-studio ]; + + cmakeFlags = [ + "-DBUILD_OUT_OF_TREE=On" + ]; + + postInstall = '' + rm -rf $out/obs-plugins $out/data + ''; + + meta = with lib; { + description = "Plugin for OBS Studio to switch between a list of sources"; + homepage = "https://github.com/exeldro/obs-source-switcher"; + maintainers = with maintainers; [ flexiondotorg ]; + license = licenses.gpl2Plus; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} From b69e2110e95c00e7e1458626f9ba59a3fc51e58e Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Wed, 3 May 2023 11:41:12 +0100 Subject: [PATCH 46/51] obs-studio-plugins.obs-vertical-canvas: init at 1.2.2 --- .../video/obs-studio/plugins/default.nix | 2 + .../plugins/obs-vertical-canvas.nix | 42 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index 38e81d407f34..5c014942f53d 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -52,6 +52,8 @@ obs-vaapi = callPackage ./obs-vaapi { }; + obs-vertical-canvas = qt6Packages.callPackage ./obs-vertical-canvas.nix { }; + obs-vintage-filter = callPackage ./obs-vintage-filter.nix { }; obs-vkcapture = callPackage ./obs-vkcapture.nix { diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix new file mode 100644 index 000000000000..a92acb29a90f --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, curl +, obs-studio +, qtbase +}: + +stdenv.mkDerivation rec { + pname = "obs-vertical-canvas"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "Aitum"; + repo = "obs-vertical-canvas"; + rev = version; + sha256 = "sha256-9NXIJPF6ubd9M3t5pmSQvADoLmm+XolRhIvhbqw9R04="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ curl obs-studio qtbase ]; + + cmakeFlags = [ + "-DBUILD_OUT_OF_TREE=On" + ]; + + dontWrapQtApps = true; + + postInstall = '' + rm -rf $out/data + rm -rf $out/obs-plugins + ''; + + meta = with lib; { + description = "Plugin for OBS Studio to add vertical canvas"; + homepage = "https://github.com/Aitum/obs-vertical-canvas"; + maintainers = with maintainers; [ flexiondotorg ]; + license = licenses.gpl2Plus; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} From 5572bc1827e2a15dbef7d8b67a50ea90a38b72d2 Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Wed, 26 Apr 2023 15:06:14 +0100 Subject: [PATCH 47/51] obs-cli: init at 0.5.0 --- pkgs/applications/misc/obs-cli/default.nix | 40 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/applications/misc/obs-cli/default.nix diff --git a/pkgs/applications/misc/obs-cli/default.nix b/pkgs/applications/misc/obs-cli/default.nix new file mode 100644 index 000000000000..f62fa6a84013 --- /dev/null +++ b/pkgs/applications/misc/obs-cli/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, makeWrapper +}: + +buildGoModule rec { + pname = "obs-cli"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "muesli"; + repo = "obs-cli"; + rev = "refs/tags/v${version}"; + hash = "sha256-4tjS+PWyP/T0zs4IGE6VQ5c+3tuqxlBwfpPBVEcim6c="; + }; + + vendorHash = "sha256-tjQOHvmhHyVMqIJQvFaisEqci1wkB4ke/a+GSgwXzCo="; + + proxyVendor = true; + + nativeBuildInputs = [ + makeWrapper + ]; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + description = "OBS-cli is a command-line remote control for OBS"; + homepage = "https://github.com/muesli/obs-cli"; + changelog = "https://github.com/muesli/obs-cli/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ flexiondotorg ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1da71c0b2a73..8f4c8fe1ae1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33468,6 +33468,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; + obs-cli = callPackage ../applications/misc/obs-cli { }; + obs-studio = qt6Packages.callPackage ../applications/video/obs-studio { ffmpeg_4 = ffmpeg-full; }; From ecfdc3556869189946d204b2a7d35bedc8e6dd10 Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Wed, 21 Jun 2023 10:29:24 +0100 Subject: [PATCH 48/51] obs-studio-plugins.obs-gradient-source: init at 0.3.1 --- .../video/obs-studio/plugins/default.nix | 2 + .../plugins/obs-gradient-source.nix | 37 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-gradient-source.nix diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index 5c014942f53d..6f304e7d98ae 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -20,6 +20,8 @@ obs-command-source = callPackage ./obs-command-source.nix { }; + obs-gradient-source = callPackage ./obs-gradient-source.nix { }; + obs-gstreamer = callPackage ./obs-gstreamer.nix { }; obs-hyperion = qt6Packages.callPackage ./obs-hyperion/default.nix { }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-gradient-source.nix b/pkgs/applications/video/obs-studio/plugins/obs-gradient-source.nix new file mode 100644 index 000000000000..fa86c25ef72d --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-gradient-source.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, obs-studio +}: + +stdenv.mkDerivation rec { + pname = "obs-gradient-source"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "exeldro"; + repo = "obs-gradient-source"; + rev = version; + sha256 = "sha256-4u7RzF2b7EWwsfEtRvGDifue34jJM4MaYpwumu0MFpQ="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ obs-studio ]; + + cmakeFlags = [ + "-DBUILD_OUT_OF_TREE=On" + ]; + + postInstall = '' + rm -rf $out/obs-plugins $out/data + ''; + + meta = with lib; { + description = "Plugin for adding a gradient Source to OBS Studio"; + homepage = "https://github.com/exeldro/obs-gradient-source"; + maintainers = with maintainers; [ flexiondotorg ]; + license = licenses.gpl2Plus; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} From 1f7283e668e52f6a53eacedcabbe9ca85543a92a Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Thu, 27 Apr 2023 11:16:47 +0100 Subject: [PATCH 49/51] obs-studio-plugins.obs-text-pthread: init at 2.0.2 --- .../video/obs-studio/plugins/default.nix | 2 + .../obs-studio/plugins/obs-text-pthread.nix | 39 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index 6f304e7d98ae..373d4dccad2b 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -50,6 +50,8 @@ obs-teleport = callPackage ./obs-teleport { }; + obs-text-pthread = callPackage ./obs-text-pthread.nix { }; + obs-transition-table = qt6Packages.callPackage ./obs-transition-table.nix { }; obs-vaapi = callPackage ./obs-vaapi { }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix b/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix new file mode 100644 index 000000000000..94efde5003cf --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, cairo +, obs-studio +, pango +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "obs-text-pthread"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "norihiro"; + repo = "obs-text-pthread"; + rev = version; + sha256 = "sha256-HN8tSagxmk6FusDrp7d0fi15ardFgUCZBiYkeBqUI34="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ cairo obs-studio pango ]; + + postInstall = '' + mkdir $out/lib $out/share + mv $out/obs-plugins/64bit $out/lib/obs-plugins + rm -rf $out/obs-plugins + mv $out/data $out/share/obs + ''; + + meta = with lib; { + description = "Rich text source plugin for OBS Studio"; + homepage = "https://github.com/norihiro/obs-text-pthread"; + maintainers = with maintainers; [ flexiondotorg ]; + license = licenses.gpl2Plus; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} From 3923eeb462005fe77d4273228c563ea139fa070e Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Wed, 21 Jun 2023 11:43:33 +0100 Subject: [PATCH 50/51] obs-studio-plugins.obs-scale-to-sound: init at 1.2.3 --- .../video/obs-studio/plugins/default.nix | 2 + .../obs-studio/plugins/obs-scale-to-sound.nix | 40 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-scale-to-sound.nix diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index 373d4dccad2b..ea23bb2413fb 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -40,6 +40,8 @@ obs-pipewire-audio-capture = callPackage ./obs-pipewire-audio-capture.nix { }; + obs-scale-to-sound = callPackage ./obs-scale-to-sound.nix { }; + obs-shaderfilter = qt6Packages.callPackage ./obs-shaderfilter.nix { }; obs-source-clone = callPackage ./obs-source-clone.nix { }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-scale-to-sound.nix b/pkgs/applications/video/obs-studio/plugins/obs-scale-to-sound.nix new file mode 100644 index 000000000000..5716439655d4 --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-scale-to-sound.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, obs-studio +}: + +stdenv.mkDerivation rec { + pname = "obs-scale-to-sound"; + version = "1.2.3"; + + src = fetchFromGitHub { + owner = "dimtpap"; + repo = "obs-scale-to-sound"; + rev = version; + sha256 = "sha256-q/zNHPazNwmd7GHXrxNgajtOhcW+oTgH9rkIBzJpdpA="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ obs-studio ]; + + cmakeFlags = [ + "-DBUILD_OUT_OF_TREE=On" + ]; + + postInstall = '' + mkdir $out/lib $out/share + mv $out/obs-plugins/64bit $out/lib/obs-plugins + rm -rf $out/obs-plugins + mv $out/data $out/share/obs + ''; + + meta = with lib; { + description = "OBS filter plugin that scales a source reactively to sound levels"; + homepage = "https://github.com/dimtpap/obs-scale-to-sound"; + maintainers = with maintainers; [ flexiondotorg ]; + license = licenses.gpl2Plus; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} From 44956ebcbcc86a54f3e26dc45d29bd585c897d86 Mon Sep 17 00:00:00 2001 From: Tom McLaughlin Date: Wed, 21 Jun 2023 10:16:13 -0700 Subject: [PATCH 51/51] npm-check: init at 6.0.1 (#237510) * npm-check: init at 6.0.1 * Update pkgs/development/tools/npm-check/default.nix Co-authored-by: OTABI Tomoya * Update pkgs/development/tools/npm-check/default.nix Co-authored-by: OTABI Tomoya * Fix semicolon * Add changelog * Update pkgs/development/tools/npm-check/default.nix Co-authored-by: OTABI Tomoya --------- Co-authored-by: OTABI Tomoya --- pkgs/development/tools/npm-check/default.nix | 30 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/tools/npm-check/default.nix diff --git a/pkgs/development/tools/npm-check/default.nix b/pkgs/development/tools/npm-check/default.nix new file mode 100644 index 000000000000..3e1ad56e4414 --- /dev/null +++ b/pkgs/development/tools/npm-check/default.nix @@ -0,0 +1,30 @@ +{ buildNpmPackage +, fetchFromGitHub +, lib +}: + +buildNpmPackage rec { + pname = "npm-check"; + version = "6.0.1"; + + src = fetchFromGitHub { + owner = "dylang"; + repo = "npm-check"; + rev = "v${version}"; + hash = "sha256-F7bMvGqOxJzoaw25VR6D90UNwT8HxZ4PZhhQEvQFDn4="; + }; + + npmDepsHash = "sha256-KRLgLWikcCWMF8/cOxThom6DHE9ar6WO/9HtosJQnLE="; + + npmFlags = [ "--legacy-peer-deps" ]; + + dontNpmBuild = true; + + meta = with lib; { + description = "Check for outdated, incorrect, and unused dependencies"; + homepage = "https://github.com/dylang/npm-check"; + changelog = "https://github.com/dylang/npm-check/releases/tag/v${version}"; + license = licenses.mit; + maintainers = [ maintainers.thomasjm ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 706e935d7d05..5a915ef484ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10611,6 +10611,8 @@ with pkgs; notable = callPackage ../applications/misc/notable { }; + npm-check = callPackage ../development/tools/npm-check { }; + nth = with python3Packages; toPythonApplication name-that-hash; ntlmrecon = callPackage ../tools/security/ntlmrecon { };