From 77d82ccb4f95cd308c022dd3497afc896c3dc6e3 Mon Sep 17 00:00:00 2001 From: Moritz Hedtke Date: Tue, 29 Jun 2021 16:09:05 +0200 Subject: [PATCH 01/11] discord: Fix autoupdate script It didn't properly detect which of the versions it updated. (cherry picked from commit 83af8ef00e33affadd1df45af48866f24625566c) --- .../instant-messengers/discord/base.nix | 11 +++++- .../discord/update-discord.sh | 36 ------------------- 2 files changed, 10 insertions(+), 37 deletions(-) delete mode 100755 pkgs/applications/networking/instant-messengers/discord/update-discord.sh diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix index 110d3ffb00e..9614d52742e 100644 --- a/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -5,6 +5,7 @@ , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence , mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu +, writeScript, common-updater-scripts }: let @@ -69,7 +70,15 @@ in stdenv.mkDerivation rec { mimeType = "x-scheme-handler/discord"; }; - passthru.updateScript = ./update-discord.sh; + passthru.updateScript = writeScript "discord-update-script" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl gnugrep common-updater-scripts + set -eou pipefail; + url=$(curl -sI "https://discordapp.com/api/download/${builtins.replaceStrings ["discord-" "discord"] ["" "stable"] pname}?platform=linux&format=tar.gz" | grep -oP 'location: \K\S+') + version=''${url##https://dl*.discordapp.net/apps/linux/} + version=''${version%%/*.tar.gz} + ${common-updater-scripts}/bin/update-source-version ${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix + ''; meta = with lib; { description = "All-in-one cross-platform voice and text chat for gamers"; diff --git a/pkgs/applications/networking/instant-messengers/discord/update-discord.sh b/pkgs/applications/networking/instant-messengers/discord/update-discord.sh deleted file mode 100755 index 34c1574c65a..00000000000 --- a/pkgs/applications/networking/instant-messengers/discord/update-discord.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env bash -# script to generate ./default.nix - -set -e -exec >"${BASH_SOURCE%/*}/default.nix" - -cat < Date: Tue, 29 Jun 2021 14:26:53 +0000 Subject: [PATCH 02/11] =?UTF-8?q?discord-canary:=200.0.125=20=E2=86=92=200?= =?UTF-8?q?.0.126?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 06d387bfb2efd319db7cf4d7af048da9bba3a766) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index f7435aa3ae3..d2d8c9a3ec5 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -27,10 +27,10 @@ in { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.125"; + version = "0.0.126"; src = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "0ly5a6l7rvl54mc39xma14jrcrf11q3ndnkkr16by5hy3palmz9g"; + sha256 = "EraTDRKd6t0c9U68tSRdGkeB1hfqNS4KUewEXwkL8io="; }; }; }.${branch} From cdbfb44f4876b21a8290cb389c7a30843e6217ee Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 15 Jul 2021 21:58:49 +0200 Subject: [PATCH 03/11] Update pkgs/applications/networking/instant-messengers/discord/base.nix (cherry picked from commit 1f62e37efbf92dffe80a759dfb54281c7e4834a7) --- .../applications/networking/instant-messengers/discord/base.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix index 9614d52742e..173f59ff419 100644 --- a/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -77,7 +77,7 @@ in stdenv.mkDerivation rec { url=$(curl -sI "https://discordapp.com/api/download/${builtins.replaceStrings ["discord-" "discord"] ["" "stable"] pname}?platform=linux&format=tar.gz" | grep -oP 'location: \K\S+') version=''${url##https://dl*.discordapp.net/apps/linux/} version=''${version%%/*.tar.gz} - ${common-updater-scripts}/bin/update-source-version ${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix + update-source-version ${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix ''; meta = with lib; { From 5a7a7e2b306dd7a139cff6565a6aa1c3ce7419a0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 19 May 2021 15:47:00 -0700 Subject: [PATCH 04/11] containerd: 1.5.1 -> 1.5.2, use buildGoModule (cherry picked from commit daed0cc14f83ecde8190feba3e80246d5a2b88a3) --- .../virtualization/containerd/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 5435c88f58d..ca9ae20f346 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -1,6 +1,6 @@ { lib , fetchFromGitHub -, buildGoPackage +, buildGoModule , btrfs-progs , go-md2man , installShellFiles @@ -8,19 +8,20 @@ , nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "containerd"; - version = "1.5.1"; + version = "1.5.2"; + + outputs = [ "out" "man" ]; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-jVyg+fyMuDnV/TM0Z2t+Cr17a6XBv11aWijhsqMnA5s="; + sha256 = "sha256-RDLAmPBjDHCx9al+gstUTrvKc/L0vAm8IEd/mvX5Als="; }; - goPackagePath = "github.com/containerd/containerd"; - outputs = [ "out" "man" ]; + vendorSha256 = null; nativeBuildInputs = [ go-md2man installShellFiles util-linux ]; @@ -28,11 +29,9 @@ buildGoPackage rec { buildFlags = [ "VERSION=v${version}" "REVISION=${src.rev}" ]; - BUILDTAGS = [ ] - ++ lib.optional (btrfs-progs == null) "no_btrfs"; + BUILDTAGS = lib.optionals (btrfs-progs == null) [ "no_btrfs" ]; buildPhase = '' - cd go/src/${goPackagePath} patchShebangs . make binaries man $buildFlags ''; From c557fc6061f4a9e66f6ccd48c511cd2acd155da7 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 17 Jun 2021 08:52:14 +1000 Subject: [PATCH 05/11] runc: use buildGoModule (cherry picked from commit d152d3cc423f102b183c25d9f0aeb9eab414a9d8) --- pkgs/applications/virtualization/runc/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 795971a7492..b3578e175d4 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -1,6 +1,6 @@ { lib , fetchFromGitHub -, buildGoPackage +, buildGoModule , go-md2man , installShellFiles , pkg-config @@ -14,7 +14,7 @@ , nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "runc"; version = "1.0.0-rc95"; @@ -25,7 +25,7 @@ buildGoPackage rec { sha256 = "sha256-q4sXcvJO9gyo7m0vlaMrwh7ZZHYa58FJy3GatWndS6M="; }; - goPackagePath = "github.com/opencontainers/runc"; + vendorSha256 = null; outputs = [ "out" "man" ]; nativeBuildInputs = [ go-md2man installShellFiles makeWrapper pkg-config which ]; @@ -36,7 +36,6 @@ buildGoPackage rec { buildPhase = '' runHook preBuild - cd go/src/${goPackagePath} patchShebangs . make ${toString makeFlags} runc man runHook postBuild From 3d0968b53eb775c78d7ccc484052af95fdbbe77f Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 6 Jun 2021 14:24:26 +0300 Subject: [PATCH 06/11] docker: 20.10.6 -> 20.10.7 (cherry picked from commit ff2c16095d559ed0a89a972ed93faeb3f8e24749) --- pkgs/applications/virtualization/docker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index bec51af81ac..e746d17f55f 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -220,14 +220,14 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* docker_20_10 = callPackage dockerGen rec { - version = "20.10.6"; + version = "20.10.7"; rev = "v${version}"; - sha256 = "15kknb26vyzjgqmn8r81a1sy1i5br6bvngqd5xljihppnxvp2gvl"; + sha256 = "1r854jrjph4v1n5lr82z0cl0241ycili4qr3qh3k3bmqx790cds3"; moby-src = fetchFromGitHub { owner = "moby"; repo = "moby"; rev = "v${version}"; - sha256 = "1l4ra9bsvydaxd2fy7dgxp7ynpp0mrlwvcdhxiafw596559ab6qk"; + sha256 = "0xhn11kgcbzda4z9j0rflvq0nfivizh3jrzhanwn5vnghafy4zqw"; }; runcRev = "b9ee9c6314599f1b4a7f497e1f1f856fe433d3b7"; # v1.0.0-rc95 runcSha256 = "18sbvmlvb6kird4w3rqsfrjdj7n25firabvdxsl0rxjfy9r1g2xb"; From 405f6e41f88b7ee757b1a25fdc3c5f40a5b2b023 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 6 Jun 2021 14:32:42 +0300 Subject: [PATCH 07/11] docker: improve readability, drop unneeded substitutes (cherry picked from commit 1553e742f522da7cc4cf7e9d79c0dc53d8da86b4) --- .../virtualization/docker/default.nix | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index e746d17f55f..4328267d577 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -75,6 +75,10 @@ rec { extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute2 iptables e2fsprogs xz xfsprogs procps util-linux git ]); + postPatch = '' + patchShebangs . + ''; + buildPhase = '' export GOCACHE="$TMPDIR/go-cache" # build engine @@ -86,11 +90,6 @@ rec { cd - ''; - postPatch = '' - patchShebangs . - substituteInPlace ./hack/make.sh --replace libsystemd-journal libsystemd - ''; - installPhase = '' cd ./go/src/${goPackagePath} install -Dm755 ./bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd @@ -142,6 +141,14 @@ rec { sqlite lvm2 btrfs-progs systemd libseccomp ] ++ optionals (buildxSupport) [ docker-buildx ]; + postPatch = '' + patchShebangs . + substituteInPlace ./scripts/build/.variables --replace "set -eu" "" + '' + optionalString buildxSupport '' + substituteInPlace ./cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \ + ${lib.strings.makeSearchPathOutput "bin" "libexec/docker/cli-plugins" [docker-buildx]} + ''; + # Keep eyes on BUILDTIME format - https://github.com/docker/cli/blob/${version}/scripts/build/.variables buildPhase = '' export GOCACHE="$TMPDIR/go-cache" @@ -160,14 +167,6 @@ rec { cd - ''; - postPatch = '' - patchShebangs . - substituteInPlace ./scripts/build/.variables --replace "set -eu" "" - '' + optionalString buildxSupport '' - substituteInPlace ./cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \ - ${lib.strings.makeSearchPathOutput "bin" "libexec/docker/cli-plugins" [docker-buildx]} - ''; - outputs = ["out" "man"]; installPhase = '' From 66b051a57633f83ab500512f5593e6a2d8239edf Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 6 Jun 2021 14:35:36 +0300 Subject: [PATCH 08/11] docker: enable buildx support by default (cherry picked from commit 2c7bdb05dee8d8e5e9b3bd763554618c27b50a24) --- pkgs/applications/virtualization/docker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 4328267d577..ac8e5437733 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -8,7 +8,7 @@ rec { , moby-src , runcRev, runcSha256 , containerdRev, containerdSha256 - , tiniRev, tiniSha256, buildxSupport ? false + , tiniRev, tiniSha256, buildxSupport ? true # package dependencies , stdenv, fetchFromGitHub, buildGoPackage , makeWrapper, installShellFiles, pkg-config From 867a90866ed6c6ccd2f74a3552d4cbaf41e6e8d2 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Tue, 15 Jun 2021 13:12:02 +0300 Subject: [PATCH 09/11] docker: narrow patchShebangs (cherry picked from commit fc38adafeaae8c83997b8dcf7671da3db8bb277f) --- pkgs/applications/virtualization/docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index ac8e5437733..ab1ebc9c04f 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -76,7 +76,7 @@ rec { extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute2 iptables e2fsprogs xz xfsprogs procps util-linux git ]); postPatch = '' - patchShebangs . + patchShebangs hack/make.sh hack/make/ ''; buildPhase = '' @@ -142,7 +142,7 @@ rec { ] ++ optionals (buildxSupport) [ docker-buildx ]; postPatch = '' - patchShebangs . + patchShebangs man scripts/build/ substituteInPlace ./scripts/build/.variables --replace "set -eu" "" '' + optionalString buildxSupport '' substituteInPlace ./cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \ From ae97d0fb4dc163d7e3ff79c255a2368b36e99c26 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Mon, 12 Jul 2021 19:33:03 +0300 Subject: [PATCH 10/11] docker: add @mikroskeem to maintainers (cherry picked from commit e2b28504ab046141e2405bebc08f5e8dfacda986) --- pkgs/applications/virtualization/docker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index ab1ebc9c04f..bcced9a6055 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -208,7 +208,7 @@ rec { homepage = "https://www.docker.com/"; description = "An open source project to pack, ship and run any application as a lightweight container"; license = licenses.asl20; - maintainers = with maintainers; [ offline tailhook vdemeester periklis ]; + maintainers = with maintainers; [ offline tailhook vdemeester periklis mikroskeem ]; platforms = with platforms; linux ++ darwin; }; From 9317b77a1d205d72b23ab69ebc5ee748900dd7dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 25 Jul 2021 12:40:12 +0200 Subject: [PATCH 11/11] imagemagick6: 6.9.12-17 -> 6.9.12-19 (cherry picked from commit 3bb091640bc7deb719759deab43cd2e206520b2a) --- pkgs/applications/graphics/ImageMagick/6.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index 1e4d2aa0733..2ce0bc608ed 100644 --- a/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -16,13 +16,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "6.9.12-17"; + version = "6.9.12-19"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick6"; rev = version; - sha256 = "sha256-yZXvxl9Tbl3JRBmRcfsjbkaxywtD08SuUnJayKfwk9M="; + sha256 = "sha256-8KofT9aNd8SXL0YBQ0RUOTccVxQNacvJL1uYPZiSPkY="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big