From 9486375887757abc92b78fe961f598b41b9353c3 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 5 Feb 2021 12:57:32 +0100 Subject: [PATCH 01/18] nixos/service-runner: fix evaluation Follow-up to: nixos/systemd: allow preStart with other ExecStartPre cmdlines #109976 As the additional ExecStartPre and ExecStartPost are now lists, update their processing by service-runner.nix --- nixos/modules/testing/service-runner.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/testing/service-runner.nix b/nixos/modules/testing/service-runner.nix index 99a9f979068..76e9d4a68c4 100644 --- a/nixos/modules/testing/service-runner.nix +++ b/nixos/modules/testing/service-runner.nix @@ -52,7 +52,7 @@ let # Run the ExecStartPre program. FIXME: this could be a list. my $preStart = < Date: Tue, 9 Feb 2021 00:13:44 +0000 Subject: [PATCH 02/18] visidata: 2.2 -> 2.2.1 --- pkgs/applications/misc/visidata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index 62be9393a0a..b7f9d6ca1a6 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -15,13 +15,13 @@ }: buildPythonApplication rec { pname = "visidata"; - version = "2.2"; + version = "2.2.1"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - sha256 = "14169q74vpighxnmpxf3nwi19vrv7p76ybb1zp7h8q2harysxkgl"; + sha256 = "1gkvnywjg0n3n7d855ivclsj3d8mzihhkgv9a18srcszkmyix903"; }; propagatedBuildInputs = [ From 01348aae1eadc50f2f99b7dfc170d9e9cface55a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 9 Feb 2021 02:19:07 +0000 Subject: [PATCH 03/18] emacs.pkgs.jam-mode: init at 0.3 --- .../editors/emacs-modes/jam-mode/default.nix | 22 +++++++++++++++++++ .../editors/emacs-modes/manual-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/jam-mode/default.nix diff --git a/pkgs/applications/editors/emacs-modes/jam-mode/default.nix b/pkgs/applications/editors/emacs-modes/jam-mode/default.nix new file mode 100644 index 00000000000..0fd698ad2c1 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/jam-mode/default.nix @@ -0,0 +1,22 @@ +{ trivialBuild, lib, fetchurl }: + +trivialBuild rec { + pname = "jam-mode"; + version = "0.3"; + + src = fetchurl { + url = "https://dev.gentoo.org/~ulm/distfiles/jam-mode-${version}.el.xz"; + sha256 = "1jchgiy2rgvnb3swr6ar72yas6pj4inpgpcq78q01q6snflmi2fh"; + }; + + unpackPhase = '' + xz -cd $src > jam-mode.el + ''; + + meta = with lib; { + description = "An Emacs major mode for editing Jam files"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ qyliss ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix index 1ff64fe2813..5f7d602264f 100644 --- a/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -111,6 +111,8 @@ helm-words = callPackage ./helm-words { }; + jam-mode = callPackage ./jam-mode { }; + org-mac-link = callPackage ./org-mac-link { }; From d6529dd53e74372bd52d57778d594c7172416296 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 10 Feb 2021 00:38:37 +0000 Subject: [PATCH 04/18] kakoune: enable parallel building Tested at -j4. --- pkgs/applications/editors/kakoune/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 93a9e1a05a6..1f3b2685fee 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { export version="v${version}" ''; + enableParallelBuilding = true; + doInstallCheck = true; installCheckPhase = '' $out/bin/kak -ui json -e "kill 0" From 7c035b9fb5f542e7edb5a06020c5685b72d6ff3f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Feb 2021 04:33:00 +0000 Subject: [PATCH 05/18] fetchmail: 6.4.15 -> 6.4.16 --- pkgs/applications/misc/fetchmail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index 01493e13181..d1659822bb2 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, openssl }: let - version = "6.4.15"; + version = "6.4.16"; in stdenv.mkDerivation { pname = "fetchmail"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "sha256-c1shdHSTfhPPzeotQqNGv2hIfg1h7+vk0Nnt3LOia5Y="; + sha256 = "sha256-BEuaCsA6+653RJed7+Pi4y45FBvKaP0Mje2i7UCIT7k="; }; buildInputs = [ openssl ]; From c831e4e9e4d2ba1ad75674b1ba352f93817873db Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 11 Feb 2021 04:20:00 +0000 Subject: [PATCH 06/18] podman: 2.2.1 -> 3.0.0 https://github.com/containers/podman/releases/tag/v3.0.0 --- pkgs/applications/virtualization/podman/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 5c03951e17e..e82ab35a344 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "podman"; - version = "2.2.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "166ch73pqx76ppfkhfg3zqxr71jf5pk5asl5bb5rwhyzf7f057q5"; + sha256 = "141ii271w2azvhl8ragrgzmir9iq9npl8wmh5dr31kvq4z4syxw1"; }; vendorSha256 = null; @@ -55,8 +55,9 @@ buildGoModule rec { mv bin/{podman-remote,podman} '' + '' install -Dm555 bin/podman $out/bin/podman - installShellCompletion --bash completions/bash/podman - installShellCompletion --zsh completions/zsh/_podman + installShellCompletion --bash completions/bash/* + installShellCompletion --fish completions/fish/* + installShellCompletion --zsh completions/zsh/* MANDIR=$man/share/man make install.man-nobuild ''; @@ -65,6 +66,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://podman.io/"; description = "A program for managing pods, containers and container images"; + changelog = "https://github.com/containers/podman/blob/v${version}/changelog.txt"; license = licenses.asl20; maintainers = with maintainers; [ marsam ] ++ teams.podman.members; platforms = platforms.unix; From 8628c902961ceb1cd9a1bc062051a50f0cbf44c5 Mon Sep 17 00:00:00 2001 From: Steve Purcell Date: Thu, 11 Feb 2021 18:02:40 +1300 Subject: [PATCH 07/18] ecl: 20.4.24 -> 21.2.1, enable Darwin - Incorporates the latest upstream release - Removes now-defunct patches - Enable builds on non-Linux Unixes, ie. Darwin --- pkgs/development/compilers/ecl/default.nix | 32 ++-------------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index 0b4ea9b8389..b2c9e6c6dbd 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -11,10 +11,10 @@ let s = # Generated upstream information rec { baseName="ecl"; - version="20.4.24"; + version="21.2.1"; name="${baseName}-${version}"; url="https://common-lisp.net/project/ecl/static/files/release/${name}.tgz"; - sha256="01qgdmr54wkj854f69qdm9sybrvd6gd21dpx4askdaaqybnkh237"; + sha256="000906nnq25177bgsfndiw3iqqgrjc9spk10hzk653sbz3f7anmi"; }; buildInputs = [ libtool autoconf automake texinfo makeWrapper @@ -36,38 +36,12 @@ stdenv.mkDerivation { }; patches = [ - # https://trac.sagemath.org/ticket/22191#comment:237 - (fetchurl { - name = "ECL_WITH_LISP_FPE.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/ECL_WITH_LISP_FPE.patch?h=9.2"; - sha256 = "0b194613avcmzr1k9gq725z41wdkg5rsa0q21kdw050iqpprcj1c"; - }) - # https://gitlab.com/embeddable-common-lisp/ecl/-/merge_requests/1 (fetchurl { name = "write_error.patch"; url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/write_error.patch?h=9.2"; sha256 = "1lvdvh77blnxp0zbd27dsbq1ljkb5qblabf1illszn4j7qgq88fh"; }) - - # Three patches to fix ecl's unicode handling (https://trac.sagemath.org/ticket/30122) - (fetchurl { - name = "0001-unicode-fix-ecl_string_case-for-non-ascii-characters.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/0001-unicode-fix-ecl_string_case-for-non-ascii-characters.patch?h=9.2"; - sha256 = "0z8pnhawivrrbg4vz144nr2sz64jxp7764hn6df13bgkz84iqbmk"; - }) - - (fetchurl { - name = "0002-cosmetic-fix-some-compiler-warnings.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/0002-cosmetic-fix-some-compiler-warnings.patch?h=9.2"; - sha256 = "0msx3say9igwr9z5ywnr3gs6vsndnzlx47fmzwzh4l0m274cnia8"; - }) - - (fetchurl { - name = "0003-printer-fix-printing-of-symbols-with-non-ascii-names.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/0003-printer-fix-printing-of-symbols-with-non-ascii-names.patch?h=9.2"; - sha256 = "0ln5dsx6p265fkph3bl5wblgfi3f7frb4jl6v473wz3ibvcx1x9a"; - }) ]; configureFlags = [ @@ -96,6 +70,6 @@ stdenv.mkDerivation { homepage = "https://common-lisp.net/project/ecl/"; license = lib.licenses.mit ; maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } From 5b65668814033fbdcb9fe23b0528155b86f261b9 Mon Sep 17 00:00:00 2001 From: Steve Purcell Date: Fri, 12 Feb 2021 10:04:54 +1300 Subject: [PATCH 08/18] ecl: prefer fetchpath to fetchurl where appropriate --- pkgs/development/compilers/ecl/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index b2c9e6c6dbd..79a290a6c1c 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl +{lib, stdenv, fetchurl, fetchpatch , libtool, autoconf, automake , texinfo , gmp, mpfr, libffi, makeWrapper @@ -37,10 +37,9 @@ stdenv.mkDerivation { patches = [ # https://gitlab.com/embeddable-common-lisp/ecl/-/merge_requests/1 - (fetchurl { - name = "write_error.patch"; + (fetchpatch { url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/write_error.patch?h=9.2"; - sha256 = "1lvdvh77blnxp0zbd27dsbq1ljkb5qblabf1illszn4j7qgq88fh"; + sha256 = "0hfxacpgn4919hg0mn4wf4m8r7y592r4gw7aqfnva7sckxi6w089"; }) ]; From 04e9e9e51046fe58acb74ea4c9d27383cdeaa33e Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 2 Oct 2020 12:50:27 +0800 Subject: [PATCH 09/18] nixos/captive-browser: make it work without a fixed interface nixpkgs-fmt makes this a lot noisier than it has to be --- nixos/modules/programs/captive-browser.nix | 86 +++++++++++----------- 1 file changed, 45 insertions(+), 41 deletions(-) diff --git a/nixos/modules/programs/captive-browser.nix b/nixos/modules/programs/captive-browser.nix index 4d59ea8d0fd..1f223e2475c 100644 --- a/nixos/modules/programs/captive-browser.nix +++ b/nixos/modules/programs/captive-browser.nix @@ -1,7 +1,6 @@ { config, lib, pkgs, ... }: with lib; - let cfg = config.programs.captive-browser; in @@ -27,15 +26,17 @@ in # the options below are the same as in "captive-browser.toml" browser = mkOption { type = types.str; - default = concatStringsSep " " [ "${pkgs.chromium}/bin/chromium" - "--user-data-dir=\${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive" - ''--proxy-server="socks5://$PROXY"'' - ''--host-resolver-rules="MAP * ~NOTFOUND , EXCLUDE localhost"'' - "--no-first-run" - "--new-window" - "--incognito" - "http://cache.nixos.org/" - ]; + default = concatStringsSep " " [ + ''${pkgs.chromium}/bin/chromium'' + ''--user-data-dir=''${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive'' + ''--proxy-server="socks5://$PROXY"'' + ''--host-resolver-rules="MAP * ~NOTFOUND , EXCLUDE localhost"'' + ''--no-first-run'' + ''--new-window'' + ''--incognito'' + ''-no-default-browser-check'' + ''http://cache.nixos.org/'' + ]; description = '' The shell (/bin/sh) command executed once the proxy starts. When browser exits, the proxy exits. An extra env var PROXY is available. @@ -81,42 +82,45 @@ in config = mkIf cfg.enable { - programs.captive-browser.dhcp-dns = mkOptionDefault ( - if config.networking.networkmanager.enable then - "${pkgs.networkmanager}/bin/nmcli dev show ${escapeShellArg cfg.interface} | ${pkgs.gnugrep}/bin/fgrep IP4.DNS" - else if config.networking.dhcpcd.enable then - "${pkgs.dhcpcd}/bin/dhcpcd -U ${escapeShellArg cfg.interface} | ${pkgs.gnugrep}/bin/fgrep domain_name_servers" - else if config.networking.useNetworkd then - "${cfg.package}/bin/systemd-networkd-dns ${escapeShellArg cfg.interface}" - else - "${config.security.wrapperDir}/udhcpc --quit --now -f -i ${escapeShellArg cfg.interface} -O dns --script ${ - pkgs.writeScript "udhcp-script" '' - #!/bin/sh - if [ "$1" = bound ]; then - echo "$dns" - fi - ''}" - ); + programs.captive-browser.dhcp-dns = + let + iface = prefix: + optionalString cfg.bindInterface (concatStringsSep " " (map escapeShellArg [ prefix cfg.interface ])); + in + mkOptionDefault ( + if config.networking.networkmanager.enable then + "${pkgs.networkmanager}/bin/nmcli dev show ${iface ""} | ${pkgs.gnugrep}/bin/fgrep IP4.DNS" + else if config.networking.dhcpcd.enable then + "${pkgs.dhcpcd}/bin/dhcpcd ${iface "-U"} | ${pkgs.gnugrep}/bin/fgrep domain_name_servers" + else if config.networking.useNetworkd then + "${cfg.package}/bin/systemd-networkd-dns ${iface ""}" + else + "${config.security.wrapperDir}/udhcpc --quit --now -f ${iface "-i"} -O dns --script ${ + pkgs.writeShellScript "udhcp-script" '' + if [ "$1" = bound ]; then + echo "$dns" + fi + ''}" + ); security.wrappers.udhcpc = { - capabilities = "cap_net_raw+p"; - source = "${pkgs.busybox}/bin/udhcpc"; + capabilities = "cap_net_raw+p"; + source = "${pkgs.busybox}/bin/udhcpc"; }; security.wrappers.captive-browser = { - capabilities = "cap_net_raw+p"; - source = pkgs.writeScript "captive-browser" '' - #!${pkgs.bash}/bin/bash - export XDG_CONFIG_HOME=${pkgs.writeTextDir "captive-browser.toml" '' - browser = """${cfg.browser}""" - dhcp-dns = """${cfg.dhcp-dns}""" - socks5-addr = """${cfg.socks5-addr}""" - ${optionalString cfg.bindInterface '' - bind-device = """${cfg.interface}""" - ''} - ''} - exec ${cfg.package}/bin/captive-browser - ''; + capabilities = "cap_net_raw+p"; + source = pkgs.writeShellScript "captive-browser" '' + export XDG_CONFIG_HOME=${pkgs.writeTextDir "captive-browser.toml" '' + browser = """${cfg.browser}""" + dhcp-dns = """${cfg.dhcp-dns}""" + socks5-addr = """${cfg.socks5-addr}""" + ${optionalString cfg.bindInterface '' + bind-device = """${cfg.interface}""" + ''} + ''} + exec ${cfg.package}/bin/captive-browser + ''; }; }; } From ce4a9f4c49516ea5bb3a7558baa6793cc9a02b14 Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Fri, 12 Feb 2021 14:48:26 +0800 Subject: [PATCH 10/18] aws-sam-cli: remove andreabedini from maintainers --- pkgs/development/tools/aws-sam-cli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 8a48b43312e..402e12efab0 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -96,6 +96,6 @@ buildPythonApplication rec { homepage = "https://github.com/awslabs/aws-sam-cli"; description = "CLI tool for local development and testing of Serverless applications"; license = licenses.asl20; - maintainers = with maintainers; [ andreabedini lo1tuma ]; + maintainers = with maintainers; [ lo1tuma ]; }; } From 91c180188fd7d1bc379eabdb64bdb67f3a428ed1 Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Fri, 12 Feb 2021 14:48:56 +0800 Subject: [PATCH 11/18] aws-sam-translator: remove andreabedini from maintainers --- pkgs/development/python-modules/aws-sam-translator/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 52298faa0cc..07f250ea867 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -30,6 +30,5 @@ buildPythonPackage rec { homepage = "https://github.com/awslabs/serverless-application-model"; description = "Python library to transform SAM templates into AWS CloudFormation templates"; license = lib.licenses.asl20; - maintainers = [ lib.maintainers.andreabedini ]; }; } From c5a0f63e194c82aba8a2e53b00d111abe4566430 Mon Sep 17 00:00:00 2001 From: Andrea Bedini Date: Fri, 12 Feb 2021 14:39:46 +0800 Subject: [PATCH 12/18] maintainers: remove andreabedini I haven't used Nix or NixOS in a while. <3 :wave: --- maintainers/maintainer-list.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ddebdbb3260..a2041231a48 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -544,12 +544,6 @@ githubId = 638836; name = "Andreas Rammhold"; }; - andreabedini = { - email = "andrea@kzn.io"; - github = "andreabedini"; - githubId = 69135; - name = "Andrea Bedini"; - }; andreasfelix = { email = "fandreas@physik.hu-berlin.de"; github = "andreasfelix"; From e99678639dfbfa651ba84c3030ea5568cb9e975c Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Thu, 11 Feb 2021 23:28:02 -0800 Subject: [PATCH 13/18] libaom: only disable cpu detectio on arm64 and do it as recommended Having `OFF` instead of `0` makes x86_64 build unhappy. --- pkgs/development/libraries/libaom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index 0522cdf2d50..e35f8385915 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -32,9 +32,9 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DENABLE_TESTS=OFF" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # CPU detection isn't supported on Darwin and breaks the aarch64-darwin build: - "-DCONFIG_RUNTIME_CPU_DETECT=OFF" + "-DCONFIG_RUNTIME_CPU_DETECT=0" ]; postFixup = '' From edf3a8376e51458cb44fa282a372fec9517761c3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 4 Feb 2021 19:56:05 +0100 Subject: [PATCH 14/18] =?UTF-8?q?ocamlPackages.ppx=5Fderiving=5Fprotobuf:?= =?UTF-8?q?=202.7=20=E2=86=92=203.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ppx_deriving_protobuf/default.nix | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix index 7828f2172ab..6f23af44b94 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix @@ -1,28 +1,24 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, cppo, ppx_tools, ppx_deriving -, ppxfind }: - -if lib.versionAtLeast ocaml.version "4.11" -then throw "ppx_deriving_protobuf is not available for OCaml ${ocaml.version}" -else +{ lib, fetchurl, buildDunePackage, cppo, ppx_deriving +, ppxlib +}: buildDunePackage rec { pname = "ppx_deriving_protobuf"; - version = "2.7"; + version = "3.0.0"; - src = fetchFromGitHub { - owner = "ocaml-ppx"; - repo = pname; - rev = "v${version}"; - sha256 = "0aq4f3gbkhhai0c8i5mcw2kpqy8l610f4dknwkrxh0nsizwbwryn"; + useDune2 = true; + + src = fetchurl { + url = "https://github.com/ocaml-ppx/ppx_deriving_protobuf/releases/download/v${version}/ppx_deriving_protobuf-v${version}.tbz"; + sha256 = "1dc1vxnkd0cnrgac5v3zbaj2lq1d2w8118mp1cmsdxylp06yz1sj"; }; - buildInputs = [ cppo ppx_tools ppxfind ppx_deriving ]; + buildInputs = [ cppo ppxlib ppx_deriving ]; meta = with lib; { homepage = "https://github.com/ocaml-ppx/ppx_deriving_protobuf"; description = "A Protocol Buffers codec generator for OCaml"; license = licenses.mit; maintainers = [ maintainers.vyorkin ]; - broken = true; }; } From 971a2aa66b05a51e71f9b38baa5f118e1ad47f19 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Feb 2021 08:33:41 +0000 Subject: [PATCH 15/18] eudev: 3.2.9 -> 3.2.10 --- pkgs/os-specific/linux/eudev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index 3d26fc3b005..c8562cc5f3c 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="eudev"; - version = "3.2.9"; + version = "3.2.10"; name="${baseName}-${version}"; url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz"; - sha256 = "1z6lfhhbjs6j7pbp6ybn17ywjsdl87ql6g1p3m2y26aa10cqcqc9"; + sha256 = "sha256-h7sCjUcP0bhRaTSbRMVdW3M3M9wtUN3xGW4CZyXq0DQ="; }; nativeBuildInputs = [ pkg-config ]; From 801c70690a7e96de47c7828a995145b0c253a2b3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 12 Feb 2021 07:35:35 +0100 Subject: [PATCH 16/18] linuxPackaes.wireguard: 1.0.20201221 -> 1.0.20210124 Announcement: https://lists.zx2c4.com/pipermail/wireguard/2021-January/006349.html --- pkgs/os-specific/linux/wireguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 41ab1a0f539..36223562578 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -7,11 +7,11 @@ assert lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "1.0.20201221"; + version = "1.0.20210124"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "sha256-8RPJEk+6NaJP3LNZYEncLlkdrw2jHxNekKwEr+YpHeQ="; + sha256 = "sha256-ZiHnKDYziiNvNV1/HjEluC83600RYCvgbUuPiRATRYE="; }; hardeningDisable = [ "pic" ]; From 5ea8bde3e7384026259365d1e31e0b5aaa4c6b9d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 12 Feb 2021 10:24:06 +0100 Subject: [PATCH 17/18] citrix_workspace: add 21.01.0.14 ChangeLog: https://docs.citrix.com/en-us/citrix-workspace-app-for-linux/whats-new.html#whats-new-in-2101 --- .../networking/remote/citrix-workspace/sources.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix index eb59f90e6dd..75eb4645f4f 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -65,6 +65,17 @@ let x86hash = "0f982d5y9k4hscqfmqpfs277cqw1pvp191ybvg5p8rxk12fh67vf"; x64suffix = "12"; x86suffix = "12"; + homepage = "https://www.citrix.com/de-de/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2012.html"; + }; + + "21.01.0" = { + major = "21"; + minor = "1"; + patch = "0"; + x64hash = "01m9g1bs6iiqbd778gjps2zznvqijlyn3mfw38aa0w1rr6ms326a"; + x86hash = "1mmx5r3wi9i6bwh4kdlpw446m8kijkaar8shi0q1n21fv0ygg3r5"; + x64suffix = "14"; + x86suffix = "14"; homepage = "https://www.citrix.com/de-de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23f49df6329..10eb9c1e7be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3121,7 +3121,7 @@ in circus = callPackage ../tools/networking/circus { }; - citrix_workspace = citrix_workspace_20_12_0; + citrix_workspace = citrix_workspace_21_01_0; inherit (callPackage ../applications/networking/remote/citrix-workspace { }) citrix_workspace_20_04_0 @@ -3129,6 +3129,7 @@ in citrix_workspace_20_09_0 citrix_workspace_20_10_0 citrix_workspace_20_12_0 + citrix_workspace_21_01_0 ; citra = libsForQt5.callPackage ../misc/emulators/citra { }; From b4f237643429515c3b1cd537a180ca43b004da43 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 12 Feb 2021 12:40:32 +0100 Subject: [PATCH 18/18] gitRepo: 2.12.1 -> 2.12.2 --- pkgs/applications/version-management/git-repo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index beacc265092..f6250563fc9 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.12.1"; + version = "2.12.2"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-9w8kGMgxvbeKpri+zC8mcsbC6pnwqbLbKu1XB5tfBBo="; + sha256 = "sha256-E0HGianaTNRVJsFh8tb1wdxEARRXzkFG2OHU6op5oQ4="; }; patches = [ ./import-ssl-module.patch ];