From 65db92f1d2a92fe50460fb4e0d1f60b3e62619d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 28 Apr 2021 10:56:59 -0300 Subject: [PATCH 01/52] lxqt: does not explicitly require gvfs package It is enough to enable the gvfs service. --- nixos/modules/services/x11/desktop-managers/lxqt.nix | 2 +- pkgs/desktops/lxqt/default.nix | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix index bf53082b267..fdcf27564c6 100644 --- a/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -58,8 +58,8 @@ in # Link some extra directories in /run/current-system/software/share environment.pathsToLink = [ "/share" ]; + # virtual file systems support for PCManFM-QT services.gvfs.enable = true; - services.gvfs.package = pkgs.gvfs; services.upower.enable = config.powerManagement.enable; }; diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 9e302ebbbd6..062ca4abfe8 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -52,7 +52,6 @@ let lxqt-archiver = callPackage ./lxqt-archiver {}; preRequisitePackages = [ - pkgs.gvfs # virtual file systems support for PCManFM-QT libsForQt5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel libsForQt5.libkscreen # provides plugins for screen management software pkgs.libfm From f3379482072d8d8ac05e3d750953760ed7d0260f Mon Sep 17 00:00:00 2001 From: David Wood Date: Tue, 11 May 2021 10:49:59 +0100 Subject: [PATCH 02/52] cargo-bisect-rustc: init at 0.6.0 Signed-off-by: David Wood --- .../0001-dynamically-patchelf-binaries.patch | 56 +++++++++++++++++++ .../tools/rust/cargo-bisect-rustc/default.nix | 56 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 + 3 files changed, 115 insertions(+) create mode 100644 pkgs/development/tools/rust/cargo-bisect-rustc/0001-dynamically-patchelf-binaries.patch create mode 100644 pkgs/development/tools/rust/cargo-bisect-rustc/default.nix diff --git a/pkgs/development/tools/rust/cargo-bisect-rustc/0001-dynamically-patchelf-binaries.patch b/pkgs/development/tools/rust/cargo-bisect-rustc/0001-dynamically-patchelf-binaries.patch new file mode 100644 index 00000000000..6a4967e9605 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-bisect-rustc/0001-dynamically-patchelf-binaries.patch @@ -0,0 +1,56 @@ +diff --git a/src/toolchains.rs b/src/toolchains.rs +index 4d85e7c..b1353c6 100644 +--- a/src/toolchains.rs ++++ b/src/toolchains.rs +@@ -259,6 +259,8 @@ impl Toolchain { + .map_err(InstallError::Download)?; + } + ++ nix_patchelf(tmpdir.path().to_path_buf()) ++ .expect("failed to patch toolchain for NixOS"); + fs::rename(tmpdir.into_path(), dest).map_err(InstallError::Move)?; + + Ok(()) +@@ -557,3 +559,42 @@ pub(crate) fn download_tarball( + } + download_tar_gz(client, name, &format!("{}.gz", url,), strip_prefix, dest) + } ++ ++fn nix_patchelf(mut toolchain_path: PathBuf) -> Result<(), Error> { ++ toolchain_path.push("bin"); ++ ++ for entry in toolchain_path.read_dir()? { ++ let entry = entry?; ++ if !entry.file_type()?.is_file() { ++ continue; ++ } ++ ++ eprintln!("info: you seem to be running NixOS. Attempting to patch {}", ++ entry.path().to_str().unwrap()); ++ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf") ++ .arg("--set-interpreter") ++ .arg("@dynamicLinker@") ++ .arg(entry.path()) ++ .output(); ++ } ++ ++ toolchain_path.pop(); ++ toolchain_path.push("lib"); ++ ++ for entry in toolchain_path.read_dir()? { ++ let entry = entry?; ++ if !entry.file_type()?.is_file() { ++ continue; ++ } ++ ++ eprintln!("info: you seem to be running NixOS. Attempting to patch {}", ++ entry.path().to_str().unwrap()); ++ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf") ++ .arg("--set-rpath") ++ .arg("@libPath@") ++ .arg(entry.path()) ++ .output(); ++ } ++ ++ Ok(()) ++} diff --git a/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix b/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix new file mode 100644 index 00000000000..7eef0ce6629 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix @@ -0,0 +1,56 @@ +{ stdenv +, lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, openssl +, runCommand +, patchelf +, zlib +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-bisect-rustc"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "rust-lang"; + repo = pname; + rev = "v${version}"; + hash = "sha256-LEmILWVU6hbh2FmdnQVV1Ob2MQvj+/lCr1hdRoTIOkI="; + }; + + patches = + let + patchelfPatch = runCommand "0001-dynamically-patchelf-binaries.patch" { + CC = stdenv.cc; + patchelf = patchelf; + libPath = "$ORIGIN/../lib:${lib.makeLibraryPath [ zlib ]}"; + } + '' + export dynamicLinker=$(cat $CC/nix-support/dynamic-linker) + substitute ${./0001-dynamically-patchelf-binaries.patch} $out \ + --subst-var patchelf \ + --subst-var dynamicLinker \ + --subst-var libPath + ''; + in + lib.optionals stdenv.isLinux [ patchelfPatch ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + Security + ]; + + cargoSha256 = "Ls51DQ0yScRhpkuEInCfR45+/WeaUoG935w4BJvwSRk="; + + meta = with lib; { + description = "Bisects rustc, either nightlies or CI artifacts"; + homepage = "https://github.com/rust-lang/${pname}"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ davidtwco ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7b52b65724..2b2af2e11fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11469,6 +11469,9 @@ in cargo-audit = callPackage ../tools/package-management/cargo-audit { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-bisect-rustc = callPackage ../development/tools/rust/cargo-bisect-rustc { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-c = callPackage ../development/tools/rust/cargo-c { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; From f7c2f1c8658c545fada4fbf09eb6207d495e292a Mon Sep 17 00:00:00 2001 From: wucke13 Date: Sat, 15 May 2021 19:11:36 +0200 Subject: [PATCH 03/52] libraft: 0.9.23 -> 0.10.1 --- pkgs/development/libraries/raft-canonical/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/development/libraries/raft-canonical/default.nix index 69fa7f6eadc..1ff8c2b0cc2 100644 --- a/pkgs/development/libraries/raft-canonical/default.nix +++ b/pkgs/development/libraries/raft-canonical/default.nix @@ -2,18 +2,20 @@ stdenv.mkDerivation rec { pname = "raft-canonical"; - version = "0.9.23"; + version = "0.10.1"; src = fetchFromGitHub { owner = "canonical"; repo = "raft"; rev = "v${version}"; - sha256 = "0swn95cf11fqczllmxr0nj3ig532rw4n3w6g3ckdnqka8520xjyr"; + sha256 = "sha256-Q4m0CCIArgsobhmhqLvkr7fK40SX/qBk6K5Qu0eRLaI="; }; nativeBuildInputs = [ autoreconfHook file pkg-config ]; buildInputs = [ libuv ]; + enableParallelBuilding = true; + preConfigure = '' substituteInPlace configure --replace /usr/bin/ " " ''; From 06730f57cbb773ec7db90fd943f41e14289d2fa2 Mon Sep 17 00:00:00 2001 From: wucke13 Date: Sat, 15 May 2021 19:12:52 +0200 Subject: [PATCH 04/52] dqlite: 1.5.0 -> 1.7.0 --- pkgs/development/libraries/dqlite/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index 8f67259989b..83e63abb3c6 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -1,25 +1,26 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libco-canonical -, libuv, raft-canonical, sqlite-replication }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv +, raft-canonical, sqlite-replication }: stdenv.mkDerivation rec { pname = "dqlite"; - version = "1.5.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "canonical"; repo = pname; rev = "v${version}"; - sha256 = "0h7ypigj1b6xbspzc35y89jkp84v8rqiv9qgkyqlqylr7mcw952a"; + sha256 = "sha256-lCMTmKnDv/fb5fP/Ch8AwpuNfmR+gecxeIweO6hHj5U="; }; nativeBuildInputs = [ autoreconfHook file pkg-config ]; buildInputs = [ - libco-canonical.dev libuv raft-canonical.dev sqlite-replication ]; + enableParallelBuilding = true; + # tests fail doCheck = false; From 6de508be51e1030d8755cb1b03fe9d474b2eb7e4 Mon Sep 17 00:00:00 2001 From: wucke13 Date: Sat, 15 May 2021 19:13:37 +0200 Subject: [PATCH 05/52] lxd: refactor removes libco dependencie from lxd, it's neither used nor maintained anymore by canonical --- pkgs/tools/admin/lxd/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index f0deb99c44f..7397825f714 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,7 +1,7 @@ { lib, hwdata, pkg-config, lxc, buildGoPackage, fetchurl , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq , squashfsTools, iproute2, iptables, ebtables, iptables-nftables-compat, libcap -, libco-canonical, dqlite, raft-canonical, sqlite-replication, udev +, dqlite, raft-canonical, sqlite-replication, udev , writeShellScriptBin, apparmor-profiles, apparmor-parser , criu , bash @@ -38,9 +38,9 @@ buildGoPackage rec { rm _dist/src/github.com/lxc/lxd cp -r _dist/src/* ../../.. popd - ''; - buildFlags = [ "-tags libsqlite3" ]; + makeFlagsArray+=("-tags libsqlite3") + ''; postInstall = '' # test binaries, code generation @@ -59,8 +59,8 @@ buildGoPackage rec { ''; nativeBuildInputs = [ installShellFiles pkg-config makeWrapper ]; - buildInputs = [ lxc acl libcap libco-canonical.dev dqlite.dev - raft-canonical.dev sqlite-replication udev.dev ]; + buildInputs = [ lxc acl libcap dqlite.dev raft-canonical.dev + sqlite-replication udev.dev ]; meta = with lib; { description = "Daemon based on liblxc offering a REST API to manage containers"; From 6140a39a99df2bada2bcc746de61ed8ad6304f10 Mon Sep 17 00:00:00 2001 From: Uri Baghin Date: Sun, 16 May 2021 21:38:04 +1000 Subject: [PATCH 06/52] opentelemetry-collector: init at 0.26.0 --- .../misc/opentelemetry-collector/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/misc/opentelemetry-collector/default.nix diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix new file mode 100644 index 00000000000..133d17784b0 --- /dev/null +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -0,0 +1,30 @@ +{ buildGoModule +, fetchFromGitHub +, stdenv +, lib +}: + +buildGoModule rec { + pname = "opentelemetry-collector"; + version = "0.26.0"; + + src = fetchFromGitHub { + owner = "open-telemetry"; + repo = "${pname}-contrib"; + rev = "v${version}"; + sha256 = "03713b4bkhcz61maz0r5mkd36kv3rq8rji3qcpi9zf5bkkjs1yzb"; + }; + + vendorSha256 = if stdenv.isDarwin + then "0anw3l6pq8yys2g2607ndhklb9m1i9krgjrw4wb99igavjzp3wpj" + else "04h463d2d7g6wqp5mzkqlszwzdbq0pix6j7n2s9s80lwg7nh8k3h"; + + subPackages = [ "cmd/otelcontribcol" ]; + + meta = with lib; { + homepage = "https://github.com/open-telemetry/opentelemetry-collector"; + description = "OpenTelemetry Collector"; + license = licenses.asl20; + maintainers = [ maintainers.uri-canva ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b141f19069..c632a2f8338 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7360,6 +7360,8 @@ in opae = callPackage ../development/libraries/opae { }; + opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector { }; + opentracing-cpp = callPackage ../development/libraries/opentracing-cpp { }; openvswitch = callPackage ../os-specific/linux/openvswitch { }; From 7bb30a2bc4e6c5789457b9ae5038d145d46b7a8b Mon Sep 17 00:00:00 2001 From: Uri Baghin Date: Mon, 17 May 2021 09:29:36 +1000 Subject: [PATCH 07/52] Update pkgs/tools/misc/opentelemetry-collector/default.nix Co-authored-by: Sandro --- pkgs/tools/misc/opentelemetry-collector/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index 133d17784b0..7c730c8c4a5 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "open-telemetry"; - repo = "${pname}-contrib"; + repo = "opentelemetry-collector-contrib"; rev = "v${version}"; sha256 = "03713b4bkhcz61maz0r5mkd36kv3rq8rji3qcpi9zf5bkkjs1yzb"; }; From 83e545362df52d9f848c3a3126b2922dd3868444 Mon Sep 17 00:00:00 2001 From: Matthias Thym Date: Tue, 11 May 2021 18:09:19 +0200 Subject: [PATCH 08/52] qownnotes: 21.4.0 -> 21.5.2 --- .../applications/office/qownnotes/default.nix | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 451e4b92185..71717c010dd 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -1,27 +1,28 @@ -{ mkDerivation, lib, fetchurl, qmake, qttools, qtbase, qtsvg, qtdeclarative, qtxmlpatterns, qtwayland, qtwebsockets, stdenv, qtx11extras }: +{ mkDerivation, lib, stdenv, fetchurl, qmake, qttools, qtbase, qtsvg, qtdeclarative, qtxmlpatterns, qtwebsockets, qtx11extras +, qtwayland }: mkDerivation rec { pname = "qownnotes"; - version = "21.4.0"; + version = "21.5.2"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; - # Can grab official version like so: - # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-21.4.0.tar.xz.sha256 - sha256 = "bda454031a79a768b472677036ada7501ea430482277f1694757066922428eec"; + # Fetch the checksum of current version with curl: + # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-.tar.xz.sha256 + sha256 = "cf68dc78e641ca66403621cef4002ddd09463ead2eb060812d8124d6749ba03b"; }; nativeBuildInputs = [ qmake qttools ]; - buildInputs = [ - qtbase qtsvg qtdeclarative qtxmlpatterns qtwebsockets qtx11extras - ] ++ lib.optional stdenv.isLinux qtwayland; + + buildInputs = [ qtbase qtsvg qtdeclarative qtxmlpatterns qtwebsockets qtx11extras ] + ++ lib.optionals stdenv.isLinux [ qtwayland ]; meta = with lib; { - description = "Plain-text file notepad and todo-list manager with markdown support and ownCloud / Nextcloud integration"; - + description = "Plain-text file notepad and todo-list manager with markdown support and Nextcloud/ownCloud integration."; + longDescription = "QOwnNotes is a plain-text file notepad and todo-list manager with markdown support and Nextcloud/ownCloud integration."; homepage = "https://www.qownnotes.org/"; - platforms = platforms.all; license = licenses.gpl2Only; maintainers = with maintainers; [ dtzWill totoroot ]; + platforms = platforms.linux; }; } From b0c4f223e5c460a319d2dcebd06b6f5927592ae2 Mon Sep 17 00:00:00 2001 From: wucke13 Date: Sat, 15 May 2021 19:15:22 +0200 Subject: [PATCH 09/52] libco-canonical: etc remove the package as, canonical deleted it. It's not used anymore. --- .../libraries/libco-canonical/default.nix | 39 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 pkgs/development/libraries/libco-canonical/default.nix diff --git a/pkgs/development/libraries/libco-canonical/default.nix b/pkgs/development/libraries/libco-canonical/default.nix deleted file mode 100644 index a01bbf7419c..00000000000 --- a/pkgs/development/libraries/libco-canonical/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config }: - -with lib; - -stdenv.mkDerivation rec { - pname = "libco-canonical"; - version = "20"; - - src = fetchFromGitHub { - owner = "canonical"; - repo = "libco"; - rev = "v${version}"; - sha256 = "0r5b1r0sxngx349s5a3zkkvfw5by9y492kr34b25gjspzvjchlxq"; - }; - - nativeBuildInputs = [ pkg-config ]; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - outputs = [ "dev" "out" ]; - - patchPhase = '' - # upstream project assumes all build products will go into single directory - # `$prefix` but we need `includedir` to point to "dev", not "out" - # - # pkgs/build-support/setup-hooks/multiple-outputs.sh would normally patch - # this automatically, but it fails here due to use of absolute paths - - substituteInPlace Makefile \ - --replace "@includedir@|\$(PREFIX)" "@includedir@|${placeholder "dev"}" - ''; - - meta = { - description = "A cooperative multithreading library written in C89"; - homepage = "https://github.com/canonical/libco"; - license = licenses.isc; - maintainers = with maintainers; [ wucke13 ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b8a804f9aaa..9c377525b83 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -374,6 +374,7 @@ mapAliases ({ libindicate-gtk3 = throw "libindacate-gtk2 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 libindicate-gtk2 = throw "libindacate-gtk3 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 libcap_progs = libcap.out; # added 2016-04-29 + libco-canonical = throw "libco-canonical: Canonical deleted the repo, libco-canonical is not used anymore."; # added 2021-05-16 libdbusmenu_qt5 = libsForQt5.libdbusmenu; # added 2015-12-19 libdbusmenu-glib = libdbusmenu; # added 2018-05-01 liberation_ttf_v1_from_source = liberation_ttf_v1; # added 2018-12-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 177e25ea3c9..f488f66a298 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15588,8 +15588,6 @@ in libclxclient = callPackage ../development/libraries/libclxclient { }; - libco-canonical = callPackage ../development/libraries/libco-canonical { }; - libconfuse = callPackage ../development/libraries/libconfuse { }; libcangjie = callPackage ../development/libraries/libcangjie { }; From a98f5738d27bfd1568bb7bc50970b4cc0890c841 Mon Sep 17 00:00:00 2001 From: Timothy Klim Date: Tue, 18 May 2021 09:43:12 +0700 Subject: [PATCH 10/52] =?UTF-8?q?scala=5F2=5F13:=202.13.5=20=E2=86=92=202.?= =?UTF-8?q?13.6=20dotty:=203.0.0-RC3=20=E2=86=92=203.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/scala/2.x.nix | 4 ++-- pkgs/development/compilers/scala/dotty-bare.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/scala/2.x.nix b/pkgs/development/compilers/scala/2.x.nix index a0a5f1a2b22..fe821f18c15 100644 --- a/pkgs/development/compilers/scala/2.x.nix +++ b/pkgs/development/compilers/scala/2.x.nix @@ -26,8 +26,8 @@ let }; "2.13" = { - version = "2.13.5"; - sha256 = "1ah5rw6xqksiayi5i95r3pcff961q71ilishzn2kmg673z0j2b7d"; + version = "2.13.6"; + sha256 = "Sd+SUDzRHMPGSWg9s2jlh4t+eS5AFW0jd+UjJuk17UM="; pname = "scala_2_13"; }; }; diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/dotty-bare.nix index 66b6cf7737a..05d1ead1fb6 100644 --- a/pkgs/development/compilers/scala/dotty-bare.nix +++ b/pkgs/development/compilers/scala/dotty-bare.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, ncurses }: stdenv.mkDerivation rec { - version = "3.0.0-RC3"; + version = "3.0.0"; pname = "dotty-bare"; src = fetchurl { url = "https://github.com/lampepfl/dotty/releases/download/${version}/scala3-${version}.tar.gz"; - sha256 = "1xp9nql2l62fra8p29fgk3srdbvza9g5inxr8p0sihsrp0bgxa0m"; + sha256 = "/F2yv4XH0I3oC3IFqj+jwpzShCtTEfTzg+J26Xl+P+Y="; }; propagatedBuildInputs = [ jre ncurses.dev ] ; From 05065605f6f3406bdba7cf15dd380f597ac2a18f Mon Sep 17 00:00:00 2001 From: ilian Date: Tue, 30 Mar 2021 15:05:05 +0200 Subject: [PATCH 11/52] reaper: 6.25 -> 6.28 --- pkgs/applications/audio/reaper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 19def55a15c..ccf9e15ef20 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "reaper"; - version = "6.25"; + version = "6.28"; src = fetchurl { url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - sha256 = "0i1idlr4ar28wvwcvwn9hqzb63kki1x1995cr87a9slxfa7zcshb"; + hash = "sha256-38HSjR+rQWPzMOjq1abLn/MP3DCz5YzBg0v2kBsQmR4="; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; From bafeb2034634bb434fa6684afea1a86bd893c474 Mon Sep 17 00:00:00 2001 From: ilian Date: Wed, 31 Mar 2021 12:05:14 +0200 Subject: [PATCH 12/52] reaper: fix desktop integration --- pkgs/applications/audio/reaper/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index ccf9e15ef20..48504a312c4 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -8,6 +8,8 @@ , lame , ffmpeg , vlc +, xdg-utils +, which , jackSupport ? true, libjack2 , pulseaudioSupport ? config.pulseaudio or true, libpulseaudio @@ -22,7 +24,12 @@ stdenv.mkDerivation rec { hash = "sha256-38HSjR+rQWPzMOjq1abLn/MP3DCz5YzBg0v2kBsQmR4="; }; - nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + nativeBuildInputs = [ + autoPatchelfHook + makeWrapper + xdg-utils # Required for desktop integration + which + ]; buildInputs = [ alsaLib @@ -41,7 +48,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - XDG_DATA_HOME="$out/share" ./install-reaper.sh \ + HOME="$out/share" XDG_DATA_HOME="$out/share" ./install-reaper.sh \ --install $out/opt \ --integrate-user-desktop rm $out/opt/REAPER/uninstall-reaper.sh From 51ba5aa59048071a830d72429d2b50ca294efd34 Mon Sep 17 00:00:00 2001 From: Kho-Dialga Date: Sat, 1 May 2021 22:49:34 -0600 Subject: [PATCH 13/52] proton-caller 2.2.3 fixed Changed license to gpl3Only and removed stdenv Removed doCheck = true in proton-caller Co-authored-by: legendofmiracles <30902201+legendofmiracles@users.noreply.github.com> version fixed fixed maintainers on proton-caller --- pkgs/misc/emulators/proton-caller/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/misc/emulators/proton-caller/default.nix diff --git a/pkgs/misc/emulators/proton-caller/default.nix b/pkgs/misc/emulators/proton-caller/default.nix new file mode 100644 index 00000000000..f1770ba8906 --- /dev/null +++ b/pkgs/misc/emulators/proton-caller/default.nix @@ -0,0 +1,31 @@ +{ lib, fetchFromGitHub, rustPlatform, installShellFiles }: + +rustPlatform.buildRustPackage rec { + pname = "proton-caller"; + version = "2.2.3"; + + src = fetchFromGitHub { + owner = "caverym"; + repo = pname; + rev = "version"; + sha256 = "0968pmapg6157q4rvfp690l1sjnws8hm62lvm8kaaqysac339z7z"; + }; + + cargoSha256 = "1vp2vvgy8z350a59k1c3s5ww6w2wikiha4s7jkkz9khl0spn19a8"; + + nativeBuildInputs = [ installShellFiles ]; + + outputs = [ "out" "man" ]; + + postInstall = '' + installManPage manual/proton-call.6 + ''; + + meta = with lib; { + description = "Run Windows programs with Proton"; + changelog = "https://github.com/caverym/proton-caller/releases/tag/${version}"; + homepage = "https://github.com/caverym/proton-caller"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ kho-dialga ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b485168c6ec..30bc72ac217 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -275,6 +275,8 @@ in protoc-gen-twirp_typescript = callPackage ../development/tools/protoc-gen-twirp_typescript { }; + proton-caller = callPackage ../misc/emulators/proton-caller { }; + ptags = callPackage ../development/tools/misc/ptags { }; ptouch-print = callPackage ../misc/ptouch-print { }; From f6266050735e2939f350ae51675f9a89776b58ec Mon Sep 17 00:00:00 2001 From: Kho-Dialga Date: Tue, 18 May 2021 09:13:40 -0600 Subject: [PATCH 14/52] maintainers: add kho-dialga --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 60c6f093f3b..2da61c45cdf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5164,6 +5164,12 @@ githubId = 546087; name = "Kristoffer K. Føllesdal"; }; + kho-dialga = { + email = "ivandashenyou@gmail.com"; + github = "kho-dialga"; + githubId = 55767703; + name = "Iván Brito"; + }; khumba = { email = "bog@khumba.net"; github = "khumba"; From 379582b3ae5eba301f782c94ae44e3720b34da80 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Tue, 18 May 2021 13:02:50 -0400 Subject: [PATCH 15/52] mtail: 3.0.0-rc43 -> 3.0.0-rc46 --- pkgs/servers/monitoring/mtail/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix index b8a1c7bc50d..c0a7e1129a1 100644 --- a/pkgs/servers/monitoring/mtail/default.nix +++ b/pkgs/servers/monitoring/mtail/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mtail"; - version = "3.0.0-rc43"; + version = "3.0.0-rc46"; src = fetchFromGitHub { owner = "google"; repo = "mtail"; rev = "v${version}"; - sha256 = "1lw7gz6fh3z7j4hin4q6y3wxxl4sgd4li1c0z60hmvfs671n6dg9"; + sha256 = "sha256-/PiwrXr/oG/euWDOqcXvKKvyvQbp11Ks8LjmmJjDtdU="; }; - vendorSha256 = "0zymch6xfnyzjzizrjljmscqf8m99580zxjwc2rb9hn0324shcwq"; + vendorSha256 = "sha256-aBGJ+JJjm9rt7Ic90iWY7vGtZQN0u6jlBnAMy1nivQM="; doCheck = false; From 738ec84b7676ca919dfee37d43fab8d8b1b32a53 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 18 May 2021 21:31:53 +0200 Subject: [PATCH 16/52] fcft: 2.3.3 -> 2.4.0 https://codeberg.org/dnkl/fcft/releases/tag/2.4.0 --- pkgs/development/libraries/fcft/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix index e9cd3571c76..c431e6e2b3c 100644 --- a/pkgs/development/libraries/fcft/default.nix +++ b/pkgs/development/libraries/fcft/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, pkg-config, meson, ninja, scdoc +{ stdenv, lib, fetchzip, pkg-config, meson, ninja, scdoc , freetype, fontconfig, pixman, tllist, check , withHarfBuzz ? true , harfbuzz @@ -6,12 +6,11 @@ stdenv.mkDerivation rec { pname = "fcft"; - version = "2.3.3"; + version = "2.4.0"; - src = fetchgit { - url = "https://codeberg.org/dnkl/fcft.git"; - rev = version; - sha256 = "0314r038jl17hrhc9nrbx30jk0pz8ckbdnizws4r46b1rf4h0b1f"; + src = fetchzip { + url = "https://codeberg.org/dnkl/fcft/archive/${version}.tar.gz"; + sha256 = "0z1r0s5s3dr1g4f3ylxfcmy3xb0ax02rw9mg7z8hzh0gxazrpndx"; }; nativeBuildInputs = [ pkg-config meson ninja scdoc ]; From 075953b7905a20832ac3316f5fb28d406c3b23b8 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 18 May 2021 21:49:06 +0200 Subject: [PATCH 17/52] pythonPackages.ufonormalizer: 0.5.3 -> 0.5.4 https://github.com/unified-font-object/ufoNormalizer/releases/tag/0.5.4 --- pkgs/development/python-modules/ufonormalizer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ufonormalizer/default.nix b/pkgs/development/python-modules/ufonormalizer/default.nix index e2790482a3c..c88fe994ee8 100644 --- a/pkgs/development/python-modules/ufonormalizer/default.nix +++ b/pkgs/development/python-modules/ufonormalizer/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "ufonormalizer"; - version = "0.5.3"; + version = "0.5.4"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0ijc697nv9rff9j1nhbf5vnyaryxlndq13msi94px8aq9gzxfrbi"; + sha256 = "11l8475p3nq7azim35l5lck8vrgjgd01plnji6gg1hf9ckswr2pb"; extension = "zip"; }; From e0dbeb033494dff7c4af7e0b91ad32c147eb9180 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 19 May 2021 01:14:22 +0300 Subject: [PATCH 18/52] pythonPackages.mercantile: init at 1.2.1 --- .../python-modules/mercantile/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/mercantile/default.nix diff --git a/pkgs/development/python-modules/mercantile/default.nix b/pkgs/development/python-modules/mercantile/default.nix new file mode 100644 index 00000000000..e7f307361ed --- /dev/null +++ b/pkgs/development/python-modules/mercantile/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, click +, pytestCheckHook +, hypothesis +}: + +buildPythonPackage rec { + pname = "mercantile"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "mapbox"; + repo = pname; + rev = version; + sha256 = "sha256-DiDXO2XnD3We6NhP81z7aIHzHrHDi/nkqy98OT9986w="; + }; + + propagatedBuildInputs = [ click ]; + + checkInputs = [ pytestCheckHook hypothesis ]; + + meta = with lib; { + description = "Spherical mercator tile and coordinate utilities"; + homepage = "https://github.com/mapbox/mercantile"; + license = licenses.bsd3; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f4a87554e3b..9a77566327f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4169,6 +4169,8 @@ in { memory_profiler = callPackage ../development/python-modules/memory_profiler { }; + mercantile = callPackage ../development/python-modules/mercantile { }; + mercurial = toPythonModule (pkgs.mercurial.override { python3Packages = self; }); From ff13d6d74680f8b7bbedf5e7eec9816eab957b95 Mon Sep 17 00:00:00 2001 From: Andrei Lapshin Date: Wed, 19 May 2021 09:28:40 +0300 Subject: [PATCH 19/52] androidStudioPackages.beta: 4.2.0 -> 2020.3.1 --- pkgs/applications/editors/android-studio/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index e68e95ba542..af8ce857b53 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -14,9 +14,8 @@ let sha256Hash = "074y6i0h8zamjgvvs882im44clds3g6aq8rssl7sq1wx6hrn5q36"; }; betaVersion = { - version = "4.2.0.24"; # "Android Studio 4.2.0" - build = "202.7322048"; - sha256Hash = "1ii1zf8mv7xyql56wwkcdj5l4g3zaprdszv6r9md9r5zh78k4ccz"; + version = "2020.3.1.16"; # "Android Studio Arctic Fox (2020.3.1) Beta 1" + sha256Hash = "0mp1cmxkqc022nv8cggywbwcf8lp6r802nh8hcw5j00hcdnhkcq0"; }; latestVersion = { # canary & dev version = "2020.3.1.15"; # "Android Studio Arctic Fox (2020.3.1) Canary 15" From 51c2393f7772f1fd3a983949211e65615e7cf745 Mon Sep 17 00:00:00 2001 From: Andrei Lapshin Date: Wed, 19 May 2021 09:29:28 +0300 Subject: [PATCH 20/52] androidStudioPackages.canary: 2020.3.1 -> 2021.1.1 --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index af8ce857b53..e0cf5138310 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,8 +18,8 @@ let sha256Hash = "0mp1cmxkqc022nv8cggywbwcf8lp6r802nh8hcw5j00hcdnhkcq0"; }; latestVersion = { # canary & dev - version = "2020.3.1.15"; # "Android Studio Arctic Fox (2020.3.1) Canary 15" - sha256Hash = "0k66ibflqwdlgapir5w2v1d4zjwn6464yk2hvlmif9lsfdvd0ivv"; + version = "2021.1.1.1"; # "Android Studio Bumblebee (2021.1.1) Canary 1" + sha256Hash = "0aavmk8byw817356jm28rl998gcp3zm7x3fq14hm2awzhk5jaklm"; }; in { # Attributes are named by their corresponding release channels From 8718f93286d74c118ab82c63efe06509299e590c Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Wed, 19 May 2021 09:58:28 +0200 Subject: [PATCH 21/52] pc-ble-driver: 4.1.1 -> 4.1.4 Signed-off-by: Sirio Balmelli --- pkgs/development/libraries/pc-ble-driver/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/pc-ble-driver/default.nix b/pkgs/development/libraries/pc-ble-driver/default.nix index 1777b0856f8..5f09860cb3a 100644 --- a/pkgs/development/libraries/pc-ble-driver/default.nix +++ b/pkgs/development/libraries/pc-ble-driver/default.nix @@ -1,14 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, git, cmake, catch2, asio, udev, IOKit }: +{ lib, stdenv, fetchFromGitHub +, cmake, git +, asio, catch2, spdlog +, IOKit, udev +}: stdenv.mkDerivation rec { pname = "pc-ble-driver"; - version = "4.1.1"; + version = "4.1.4"; src = fetchFromGitHub { owner = "NordicSemiconductor"; repo = "pc-ble-driver"; rev = "v${version}"; - sha256 = "1llhkpbdbsq9d91m873vc96bprkgpb5wsm5fgs1qhzdikdhg077q"; + sha256 = "1609x17sbfi668jfwyvnfk9z29w6cgzvgv67xcpvpx5jv0czpcdj"; }; cmakeFlags = [ @@ -16,7 +20,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake git ]; - buildInputs = [ catch2 asio ]; + buildInputs = [ asio catch2 spdlog ]; propagatedBuildInputs = [ From f6dfcbc2b70edc37ace408a9410e9141054745cc Mon Sep 17 00:00:00 2001 From: JesusMtnez Date: Wed, 19 May 2021 10:14:01 +0200 Subject: [PATCH 22/52] slack: 4.15.0 -> 4.16.0 --- .../networking/instant-messengers/slack/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 6269e5c3a97..4db4580f58a 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -42,11 +42,11 @@ let pname = "slack"; - x86_64-darwin-version = "4.15.0"; - x86_64-darwin-sha256 = "12mfha0f7nciszsv7fb0zk4y10p63mh7kaw8gbk3q2fmyp8aij6l"; + x86_64-darwin-version = "4.16.0"; + x86_64-darwin-sha256 = "078f49sgazfa99vn0yyacfya3jl2vhqz7kgxh0qp56b66pnzwbxz"; - x86_64-linux-version = "4.15.0"; - x86_64-linux-sha256 = "1xzp7ql4i3n3fqfwk0400hkg4xn0pi66sy5jzqn68z33zzf7raii"; + x86_64-linux-version = "4.16.0"; + x86_64-linux-sha256 = "0dj5k7r044mibis0zymh6wryhbw2fzsch30nddfrnn6ij89hhirv"; version = { x86_64-darwin = x86_64-darwin-version; From caefe7c045ea685fac31df308dbc6a12116cb7c6 Mon Sep 17 00:00:00 2001 From: "Yc.Shen" Date: Sat, 8 May 2021 15:00:09 +0900 Subject: [PATCH 23/52] multus-cni: init at 3.7.1 --- .../networking/cluster/multus-cni/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/applications/networking/cluster/multus-cni/default.nix diff --git a/pkgs/applications/networking/cluster/multus-cni/default.nix b/pkgs/applications/networking/cluster/multus-cni/default.nix new file mode 100644 index 00000000000..d44e0441d8f --- /dev/null +++ b/pkgs/applications/networking/cluster/multus-cni/default.nix @@ -0,0 +1,37 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "multus-cni"; + version = "3.7.1"; + + src = fetchFromGitHub { + owner = "k8snetworkplumbingwg"; + repo = pname; + rev = "v${version}"; + sha256 = "04rn7ypd0cw2c33wqb9wqy1dp6ajvcp7rcv7zybffb1d40mdlds1"; + }; + + buildFlagsArray = let + multus = "gopkg.in/intel/multus-cni.v3/pkg/multus"; + commit = "f6298a3a294a79f9fbda0b8f175e521799d5f8d7"; + in [ + "-ldflags=-s -w -X '${multus}.version=v${version}' -X '${multus}.commit=${commit}'" + ]; + + preInstall = '' + mv $GOPATH/bin/cmd $GOPATH/bin/multus + ''; + + vendorSha256 = null; + + # Some of the tests require accessing a k8s cluster + doCheck = false; + + meta = with lib; { + description = "Multus CNI is a container network interface (CNI) plugin for Kubernetes that enables attaching multiple network interfaces to pods. "; + homepage = "https://github.com/k8snetworkplumbingwg/multus-cni"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ onixie ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bf82e86c9d..28eeb17f6b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22627,6 +22627,8 @@ in cni = callPackage ../applications/networking/cluster/cni {}; cni-plugins = callPackage ../applications/networking/cluster/cni/plugins.nix {}; + multus-cni = callPackage ../applications/networking/cluster/multus-cni {}; + cntr = callPackage ../applications/virtualization/cntr { }; communi = libsForQt5.callPackage ../applications/networking/irc/communi { }; From cdeaa30ae12ebfe31c308d597ddf536aeb143e39 Mon Sep 17 00:00:00 2001 From: "Yc.Shen" Date: Wed, 19 May 2021 22:18:34 +0900 Subject: [PATCH 24/52] maintainers: add onixie --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2da788a56af..c0898154498 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7451,6 +7451,12 @@ githubId = 1538622; name = "Michael Reilly"; }; + onixie = { + email = "onixie@gmail.com"; + github = "onixie"; + githubId = 817073; + name = "Yc. Shen"; + }; onsails = { email = "andrey@onsails.com"; github = "onsails"; From c1883518b692c7e97f2add407444c423d9112455 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 19 May 2021 16:10:34 +0100 Subject: [PATCH 25/52] kube3d: 4.4.3 -> 4.4.4 --- pkgs/applications/networking/cluster/kube3d/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index 1265448fc61..88ba44b2e24 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kube3d"; - version = "4.4.3"; + version = "4.4.4"; src = fetchFromGitHub { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "sha256-G8oaJtfsbSi5WaJobxUpNu9DchHfzbkpPvq23GYM99s="; + sha256 = "sha256-pfyU25MASKQMwd49IbNyyEiz3gmSOBmLdWtIKhYU2wg="; }; vendorSha256 = null; From 223f02380c4e2627fe0f9f52e6404e602661d944 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 May 2021 22:38:58 +0200 Subject: [PATCH 26/52] python3Packages.envoy-reader: init at 0.19.0 --- .../python-modules/envoy-reader/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/envoy-reader/default.nix diff --git a/pkgs/development/python-modules/envoy-reader/default.nix b/pkgs/development/python-modules/envoy-reader/default.nix new file mode 100644 index 00000000000..d72db523a21 --- /dev/null +++ b/pkgs/development/python-modules/envoy-reader/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, httpx +, pytest-asyncio +, pytest-raises +, pytest-runner +, pytestCheckHook +, respx +}: + +buildPythonPackage rec { + pname = "envoy-reader"; + version = "0.19.0"; + + src = fetchFromGitHub { + owner = "jesserizzo"; + repo = "envoy_reader"; + rev = version; + sha256 = "0jyrgm7dc6k66c94gadc69a6xsv2b48wn3b3rbpwgbssi5s7iiz6"; + }; + + nativeBuildInputs = [ + pytest-runner + ]; + + propagatedBuildInputs = [ + httpx + ]; + + checkInputs = [ + pytest-raises + pytest-asyncio + pytestCheckHook + respx + ]; + + pythonImportsCheck = [ "envoy_reader" ]; + + meta = with lib; { + description = "Python module to read from Enphase Envoy units"; + homepage = "https://github.com/jesserizzo/envoy_reader"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7bd3aa5da99..cc5cb5c8494 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2193,6 +2193,8 @@ in { envs = callPackage ../development/python-modules/envs { }; + envoy-reader = callPackage ../development/python-modules/envoy-reader { }; + enzyme = callPackage ../development/python-modules/enzyme { }; epc = callPackage ../development/python-modules/epc { }; From 5b8eb40051cea644a24c78c232716346b407122b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 May 2021 22:43:42 +0200 Subject: [PATCH 27/52] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index afdf3be0acd..7d1b5e16218 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -225,7 +225,7 @@ "emulated_roku" = ps: with ps; [ ]; # missing inputs: emulated_roku "enigma2" = ps: with ps; [ openwebifpy ]; "enocean" = ps: with ps; [ ]; # missing inputs: enocean - "enphase_envoy" = ps: with ps; [ ]; # missing inputs: envoy_reader + "enphase_envoy" = ps: with ps; [ envoy-reader ]; "entur_public_transport" = ps: with ps; [ ]; # missing inputs: enturclient "environment_canada" = ps: with ps; [ ]; # missing inputs: env_canada "envirophat" = ps: with ps; [ smbus-cffi ]; # missing inputs: envirophat From a766776d63bdf80ed36ca37e5c359445cfa56d20 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 May 2021 22:50:18 +0200 Subject: [PATCH 28/52] home-assistant: enable enphase_envoy tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 194569924c9..0da020cc0f7 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -325,6 +325,7 @@ in with py.pkgs; buildPythonApplication rec { "efergy" "emonitor" "emulated_hue" + "enphase_envoy" "esphome" "everlights" "ezviz" From d0d4af2c40aacb0186ae9cc11c914aea9d59c773 Mon Sep 17 00:00:00 2001 From: gfrascadorio Date: Sun, 16 May 2021 22:04:35 -0600 Subject: [PATCH 29/52] retry: init at v1.04 Add package for 'retry' tool that allows a script to repeat a command until it succeeds or hits a repetition threshold. 'Retry' supports replaying stdin, emitting the final stdout, and backoff delays. Applied fixes for PR comments --- pkgs/tools/system/retry/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/system/retry/default.nix diff --git a/pkgs/tools/system/retry/default.nix b/pkgs/tools/system/retry/default.nix new file mode 100644 index 00000000000..3dc4bdb1a19 --- /dev/null +++ b/pkgs/tools/system/retry/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, which, txt2man }: +stdenv.mkDerivation rec { + pname = "retry"; + version = "1.0.4"; + + nativeBuildInputs = [ autoreconfHook which txt2man ]; + + src = fetchFromGitHub { + owner = "minfrin"; + repo = "retry"; + rev = "${pname}-${version}"; + sha256 = "sha256:0jrx4yrwlf4fn3309kxraj7zgwk7gq6rz5ibswq3w3b3jfvxi8qb"; + }; + + meta = with lib; { + homepage = "https://github.com/minfrin/retry"; + description = "Retry a command until the command succeeds"; + platforms = platforms.all; + license = licenses.asl20; + # maintainers = with maintainers; [ gfrascadorio ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 725056d4140..5dac2e66115 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13567,6 +13567,8 @@ in lua = lua5; } // (config.radare or {})); + retry = callPackage ../tools/system/retry { }; + rizin = pkgs.callPackage ../development/tools/analysis/rizin { }; cutter = libsForQt515.callPackage ../development/tools/analysis/rizin/cutter.nix { }; From 30d19f22e2be94319010864913f02d89f5c94499 Mon Sep 17 00:00:00 2001 From: gfrascadorio Date: Tue, 18 May 2021 10:18:09 -0600 Subject: [PATCH 30/52] maintainers: add gfrascadorio Added new entry to maintainers Fixed new retry package to cite new maintainer --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/tools/system/retry/default.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6afb908b723..10843bf694a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3657,6 +3657,12 @@ githubId = 10353047; name = "Tobias Happ"; }; + gfrascadorio = { + email = "gfrascadorio@tutanota.com"; + github = "gfrascadorio"; + githubId = 37602871; + name = "Galois"; + }; ggpeti = { email = "ggpeti@gmail.com"; github = "ggpeti"; diff --git a/pkgs/tools/system/retry/default.nix b/pkgs/tools/system/retry/default.nix index 3dc4bdb1a19..48125d2df37 100644 --- a/pkgs/tools/system/retry/default.nix +++ b/pkgs/tools/system/retry/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "Retry a command until the command succeeds"; platforms = platforms.all; license = licenses.asl20; - # maintainers = with maintainers; [ gfrascadorio ]; + maintainers = with maintainers; [ gfrascadorio ]; }; } From 6794bb216ffac06fa3c91c11fa59944e85460850 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 20 May 2021 10:14:52 +0800 Subject: [PATCH 31/52] xf86_input_wacom: 0.36.0 -> 0.40.0, cleanup --- .../linux/xf86-input-wacom/default.nix | 56 +++++++++++++++---- 1 file changed, 44 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index e404ac72f5c..34cfd58ab4b 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -1,17 +1,49 @@ -{ lib, stdenv, fetchurl -, xorgproto, libX11, libXext, libXi, libXrandr, libXrender -, ncurses, pkg-config, xorgserver, udev, libXinerama, pixman }: +{ lib +, stdenv +, autoreconfHook +, fetchFromGitHub +, xorgproto +, libX11 +, libXext +, libXi +, libXinerama +, libXrandr +, libXrender +, ncurses +, pixman +, pkg-config +, udev +, utilmacros +, xorgserver +}: stdenv.mkDerivation rec { - name = "xf86-input-wacom-0.36.0"; + pname = "xf86-input-wacom"; + version = "0.40.0"; - src = fetchurl { - url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2"; - sha256 = "1xi39hl8ddgj9m7m2k2ll2r3wh0k0aq45fvrsv43651bhz9cbrza"; + src = fetchFromGitHub { + owner = "linuxwacom"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "sha256-0U4pAB5vsIlBewCBqQ4SLHDrwqtr9nh7knZpXZMkzck="; }; - buildInputs = [ xorgproto libX11 libXext libXi libXrandr libXrender - ncurses pkg-config xorgserver udev libXinerama pixman ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + buildInputs = [ + libX11 + libXext + libXi + libXinerama + libXrandr + libXrender + ncurses + udev + utilmacros + pixman + xorgproto + xorgserver + ]; preConfigure = '' mkdir -p $out/share/X11/xorg.conf.d @@ -22,10 +54,10 @@ stdenv.mkDerivation rec { CFLAGS = "-I${pixman}/include/pixman-1"; meta = with lib; { - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu fortuneteller2k ]; description = "Wacom digitizer driver for X11"; homepage = "http://linuxwacom.sourceforge.net"; - license = licenses.gpl2; - platforms = platforms.linux; # Probably, works with other unices as well + license = licenses.gpl2Only; + platforms = platforms.linux; # Probably, works with other unixes as well }; } From c2b1797d0f1ca5ec9d2dd709e994528702df74cf Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 20 May 2021 10:25:16 +0800 Subject: [PATCH 32/52] zls: build for baseline arch, cleanup --- pkgs/development/tools/zls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/zls/default.nix b/pkgs/development/tools/zls/default.nix index 6adf3a2ae9b..0c9a715e9bd 100644 --- a/pkgs/development/tools/zls/default.nix +++ b/pkgs/development/tools/zls/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { ''; installPhase = '' - zig build -Drelease-safe --prefix $out install + zig build -Drelease-safe -Dtarget=${stdenv.hostPlatform.parsed.cpu.name}-native --prefix $out install ''; meta = with lib; { description = "Zig LSP implementation + Zig Language Server"; changelog = "https://github.com/zigtools/zls/releases/tag/${version}"; homepage = "https://github.com/zigtools/zls"; - license = [ licenses.mit ]; + license = licenses.mit; maintainers = with maintainers; [ fortuneteller2k ]; }; } From 04ea73061a802b528e10d14e28e43e97af02dd2b Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 16 May 2021 15:05:57 +0300 Subject: [PATCH 33/52] =?UTF-8?q?keeweb:=201.17.0=20=E2=86=92=201.18.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/keeweb/default.nix | 34 +++++++++++------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/misc/keeweb/default.nix b/pkgs/applications/misc/keeweb/default.nix index 3b2ca74c642..40b176b0fb8 100644 --- a/pkgs/applications/misc/keeweb/default.nix +++ b/pkgs/applications/misc/keeweb/default.nix @@ -1,26 +1,24 @@ { lib, stdenv, fetchurl, appimageTools, undmg, libsecret, libxshmfence }: let - inherit (stdenv.hostPlatform) system; - throwSystem = throw "Unsupported system: ${system}"; - pname = "keeweb"; - version = "1.17.0"; + version = "1.18.6"; name = "${pname}-${version}"; - suffix = { - x86_64-linux = "linux.AppImage"; - x86_64-darwin = "mac.x64.dmg"; - aarch64-darwin = "mac.arm64.dmg"; - }.${system} or throwSystem; - - src = fetchurl { - url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.${suffix}"; - sha256 = { - x86_64-linux = "1c7zvwnd46d3lrlcdigv341flz44jl6mnvr6zqny5mfz221ynbj7"; - x86_64-darwin = "1n4haxychm5jjhjnpncavjh0wr4dagqi78qfsx5gwlv86hzryzwy"; - aarch64-darwin = "1j7z63cbfms02f2lhl949wy3lc376jw8kqmjfn9j949s0l5fanpb"; - }.${system} or throwSystem; + srcs = { + x86_64-linux = fetchurl { + url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.linux.AppImage"; + sha256 = "sha256-hxXs8Dfh5YQy1zaFb20KDWNl8eqFjuN5QY7tsO6+E/U="; + }; + x86_64-darwin = fetchurl { + url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.mac.x64.dmg"; + sha256 = "sha256-8+7NzaHVcLinKb57SAcJmF2Foy9RfxFhcTxzvL0JSJQ="; + }; + aarch64-darwin = fetchurl { + url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.mac.arm64.dmg"; + sha256 = "sha256-1BNY6kRS0F+AUI+80ZGFi/ek28NMP1uexo1UORz5D6g="; + }; }; + src = srcs.${stdenv.hostPlatform.system}; appimageContents = appimageTools.extract { inherit name src; @@ -32,7 +30,7 @@ let changelog = "https://github.com/keeweb/keeweb/blob/v${version}/release-notes.md"; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = builtins.attrNames srcs; }; linux = appimageTools.wrapType2 rec { From a5a5088eae8955bc781f240af54880fa78232a2f Mon Sep 17 00:00:00 2001 From: lunik1 Date: Thu, 20 May 2021 22:51:05 +0100 Subject: [PATCH 34/52] libretro.ppsspp: update to v1.11 and fix build againt ffmpeg 4.4 --- pkgs/misc/emulators/retroarch/cores.nix | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 887e79999ca..7153c378f8a 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, fetchpatch, cmake, pkg-config, makeWrapper, python27, python37, retroarch +{ lib, stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, fetchpatch, cmake, pkg-config, makeWrapper, python27, python3, retroarch , alsaLib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL -, ffmpeg_3, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump +, ffmpeg, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump , miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl , buildPackages }: @@ -831,15 +831,24 @@ in with lib.licenses; ppsspp = mkLibRetroCore { core = "ppsspp"; - src = fetchgit { - url = "https://github.com/hrydgard/ppsspp"; - rev = "bf1777f7d3702e6a0f71c7ec1fc51976e23c2327"; - sha256 = "17sym0vk72lzbh9a1501mhw98c78x1gq7k1fpy69nvvb119j37wa"; + src = fetchFromGitHub { + owner = "hrydgard"; + repo = "ppsspp"; + rev = "v1.11"; + fetchSubmodules = true; + sha256 = "sha256-vfp/vacIItlPP5dR7jzDT7oOUNFnjvvdR46yi79EJKU="; }; + patches = [ + (fetchpatch { + name = "fix_ffmpeg_4.4.patch"; # to be removed with next release + url = "https://patch-diff.githubusercontent.com/raw/hrydgard/ppsspp/pull/14176.patch"; + sha256 = "sha256-ecDoOydaLfL6+eFpahcO1TnRl866mZZVHlr6Qrib1mo="; + }) + ]; description = "ppsspp libretro port"; license = gpl2; - extraNativeBuildInputs = [ cmake pkg-config ]; - extraBuildInputs = [ libGLU libGL libzip ffmpeg_3 python37 snappy xorg.libX11 ]; + extraNativeBuildInputs = [ cmake pkg-config python3 ]; + extraBuildInputs = [ libGLU libGL libzip ffmpeg snappy xorg.libX11 ]; makefile = "Makefile"; cmakeFlags = [ "-DLIBRETRO=ON -DUSE_SYSTEM_FFMPEG=ON -DUSE_SYSTEM_SNAPPY=ON -DUSE_SYSTEM_LIBZIP=ON -DOpenGL_GL_PREFERENCE=GLVND" ]; postBuild = "mv lib/ppsspp_libretro${stdenv.hostPlatform.extensions.sharedLibrary} ppsspp_libretro${stdenv.hostPlatform.extensions.sharedLibrary}"; From 17baa1a9be1f79f384bc8591cf30847bea5067b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 22 May 2021 14:00:48 +0200 Subject: [PATCH 35/52] pythonPackages.pykeepass: 4.0.0 -> 4.0.1 --- pkgs/development/python-modules/pykeepass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix index 6e73501bfb0..e54a9c6fa20 100644 --- a/pkgs/development/python-modules/pykeepass/default.nix +++ b/pkgs/development/python-modules/pykeepass/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pykeepass"; - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "libkeepass"; repo = "pykeepass"; rev = version; - sha256 = "1zw5hjk90zfxpgq2fz4h5qzw3kmvdnlfbd32gw57l034hmz2i08v"; + sha256 = "sha256-D+loaPBpKdXyiqpdth3ANDjH6IewuKYhj/DzRE2hDn4="; }; postPatch = '' From e1a8e856316f3498176923ace906591a0e420845 Mon Sep 17 00:00:00 2001 From: Paul Schyska Date: Fri, 21 May 2021 23:11:20 +0200 Subject: [PATCH 36/52] nixos/atop: Wait for conditions I had intermittent test failures due to timing issues. This patch seems to have fixed them. --- nixos/tests/atop.nix | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/nixos/tests/atop.nix b/nixos/tests/atop.nix index a2565e610ae..1f8b005041f 100644 --- a/nixos/tests/atop.nix +++ b/nixos/tests/atop.nix @@ -14,7 +14,10 @@ let assertions = rec { ''; unit = name: state: '' with subtest("Unit ${name} should be ${state}"): - machine.require_unit_state("${name}", "${state}") + if "${state}" == "active": + machine.wait_for_unit("${name}") + else: + machine.require_unit_state("${name}", "${state}") ''; version = '' import re @@ -44,9 +47,19 @@ let assertions = rec { if present then unit "atop.service" "active" + '' - with subtest("atop.service should have written some data to /var/log/atop"): - files = int(machine.succeed("ls -1 /var/log/atop | wc -l")) - assert files > 0, "Expected at least 1 data file" + with subtest("atop.service should write some data to /var/log/atop"): + + def has_data_files(last: bool) -> bool: + files = int(machine.succeed("ls -1 /var/log/atop | wc -l")) + if files == 0: + machine.log("Did not find at least one 1 data file") + if not last: + machine.log("Will retry...") + return False + return True + + with machine.nested("Waiting for data files"): + retry(has_data_files) '' else unit "atop.service" "inactive"; atopRotateTimer = present: unit "atop-rotate.timer" (if present then "active" else "inactive"); @@ -55,11 +68,21 @@ let assertions = rec { unit "atopacct.service" "active" + '' with subtest("atopacct.service should enable process accounting"): - machine.succeed("test -f /run/pacct_source") + machine.wait_until_succeeds("test -f /run/pacct_source") with subtest("atopacct.service should write data to /run/pacct_shadow.d"): - files = int(machine.succeed("ls -1 /run/pacct_shadow.d | wc -l")) - assert files >= 1, "Expected at least 1 pacct_shadow.d file" + + def has_data_files(last: bool) -> bool: + files = int(machine.succeed("ls -1 /run/pacct_shadow.d | wc -l")) + if files == 0: + machine.log("Did not find at least one 1 data file") + if not last: + machine.log("Will retry...") + return False + return True + + with machine.nested("Waiting for data files"): + retry(has_data_files) '' else unit "atopacct.service" "inactive"; netatop = present: if present then From 9cb76c21ee134b23e72b09d0043e94ab89f83338 Mon Sep 17 00:00:00 2001 From: Paul Schyska Date: Fri, 21 May 2021 23:12:27 +0200 Subject: [PATCH 37/52] nixos/atop: Add defaultText for types.package options see: https://github.com/NixOS/nixpkgs/pull/123053#discussion_r637205826 --- nixos/modules/programs/atop.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/programs/atop.nix b/nixos/modules/programs/atop.nix index 47597a0a4d4..b45eb16e3ea 100644 --- a/nixos/modules/programs/atop.nix +++ b/nixos/modules/programs/atop.nix @@ -19,6 +19,7 @@ in package = mkOption { type = types.package; default = pkgs.atop; + defaultText = "pkgs.atop"; description = '' Which package to use for Atop. ''; @@ -36,6 +37,7 @@ in package = mkOption { type = types.package; default = config.boot.kernelPackages.netatop; + defaultText = "config.boot.kernelPackages.netatop"; description = '' Which package to use for netatop. ''; From f7d9b2016cd4bd81e08cffafd53985c2454fa399 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sat, 22 May 2021 22:05:03 +0800 Subject: [PATCH 38/52] lemonbar-xft: 2016-02-17 -> 2020-09-10, cleanup --- .../window-managers/lemonbar/xft.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/window-managers/lemonbar/xft.nix b/pkgs/applications/window-managers/lemonbar/xft.nix index b318b39709a..15b70117b89 100644 --- a/pkgs/applications/window-managers/lemonbar/xft.nix +++ b/pkgs/applications/window-managers/lemonbar/xft.nix @@ -1,23 +1,25 @@ { lib, stdenv, fetchFromGitHub, perl, libxcb, libXft }: stdenv.mkDerivation { - name = "lemonbar-xft-unstable-2016-02-17"; + pname = "lemonbar-xft"; + version = "unstable-2020-09-10"; src = fetchFromGitHub { - owner = "krypt-n"; - repo = "bar"; - rev = "a43b801ddc0f015ce8b1211f4c062fad12cd63a9"; - sha256 = "0iqas07qjvabxyvna2m9aj5bcwnkdii1izl9jxha63vz0zlsc4gd"; + owner = "drscream"; + repo = "lemonbar-xft"; + rev = "481e12363e2a0fe0ddd2176a8e003392be90ed02"; + sha256 = "sha256-BNYBbUouqqsRQaPkpg+UKg62IV9uI34gKJuiAM94CBU="; }; buildInputs = [ libxcb libXft perl ]; - prePatch = ''sed -i "s@/usr@$out@" Makefile''; + installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; - meta = { + meta = with lib; { description = "A lightweight xcb based bar with XFT-support"; - homepage = "https://github.com/krypt-n/bar"; - license = "Custom"; - platforms = lib.platforms.linux; + homepage = "https://github.com/drscream/bar"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ fortuneteller2k ]; }; } From 0331c3ecf479d03583c5caef857ede429d828806 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sat, 22 May 2021 22:08:21 +0800 Subject: [PATCH 39/52] lemonbar: use fetchFromGithub, cleanup Co-authored-by: Sandro --- .../window-managers/lemonbar/default.nix | 21 +++++++++++-------- .../window-managers/lemonbar/xft.nix | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix index 88d4b8360a5..8f553eb4b55 100644 --- a/pkgs/applications/window-managers/lemonbar/default.nix +++ b/pkgs/applications/window-managers/lemonbar/default.nix @@ -1,22 +1,25 @@ -{ lib, stdenv, fetchurl, perl, libxcb }: +{ lib, stdenv, fetchFromGitHub, perl, libxcb }: -stdenv.mkDerivation { - name = "lemonbar-1.4"; +stdenv.mkDerivation rec { + pname = "lemonbar"; + version = "1.4"; - src = fetchurl { - url = "https://github.com/LemonBoy/bar/archive/v1.4.tar.gz"; - sha256 = "0fa91vb968zh6fyg97kdaix7irvqjqhpsb6ks0ggcl59lkbkdzbv"; + src = fetchFromGitHub { + owner = "LemonBoy"; + repo = "bar"; + rev = "v${version}"; + sha256 = "sha256-lmppcnQ8r4jEuhegpTBxYqxfTTS/IrbtQVZ44HqnoWo="; }; buildInputs = [ libxcb perl ]; - prePatch = ''sed -i "s@/usr@$out@" Makefile''; + installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; meta = with lib; { description = "A lightweight xcb based bar"; homepage = "https://github.com/LemonBoy/bar"; - maintainers = [ maintainers.meisternu ]; - license = "Custom"; + maintainers = with maintainers; [ meisternu fortuneteller2k ]; + license = licenses.mit; platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/lemonbar/xft.nix b/pkgs/applications/window-managers/lemonbar/xft.nix index 15b70117b89..54e7820ec4c 100644 --- a/pkgs/applications/window-managers/lemonbar/xft.nix +++ b/pkgs/applications/window-managers/lemonbar/xft.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A lightweight xcb based bar with XFT-support"; - homepage = "https://github.com/drscream/bar"; + homepage = "https://github.com/drscream/lemonbar-xft"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ fortuneteller2k ]; From fc8eefe2fee759434282d6311aca59b17fc63f41 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sat, 22 May 2021 18:13:12 +0200 Subject: [PATCH 40/52] shattered-pixel-dungeon: 0.9.2 -> 0.9.2b --- pkgs/games/shattered-pixel-dungeon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index 2ced60ef890..a11d698b801 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -10,15 +10,15 @@ let pname = "shattered-pixel-dungeon"; - version = "0.9.2"; + version = "0.9.2b"; src = fetchFromGitHub { owner = "00-Evan"; repo = "shattered-pixel-dungeon"; # NOTE: always use the commit sha, not the tag. Tags _will_ disappear! # https://github.com/00-Evan/shattered-pixel-dungeon/issues/596 - rev = "5be9ee815f1fc6e3511a09a367d3f9d8dc55c783"; - sha256 = "0wknrf7jjnkshj4gmb1ksqiqif1rq53ffi3y29ynhcz68sa0frx6"; + rev = "eba806ef561921b86637cf26818e095556edec0d"; + sha256 = "05m4sfchccr437pxjvgzjk6nd9r3n4c4p3q8lxcc5pj6qrppk49j"; }; postPatch = '' From 2b993783de9f51afb102e39128cbaf48ed15cb27 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 23 May 2021 02:43:02 +0000 Subject: [PATCH 41/52] lynis: 3.0.3 -> 3.0.4 --- pkgs/tools/security/lynis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix index 27dc6504e8b..b0cfe261db6 100644 --- a/pkgs/tools/security/lynis/default.nix +++ b/pkgs/tools/security/lynis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lynis"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "CISOfy"; repo = pname; rev = version; - sha256 = "sha256-+RkzsBcQhHrfY8gEiJK3ptDeulJzA3IuVXiYEpyAsmk="; + sha256 = "sha256-/pF1V8ZsylQOCW7K/O0R3HYYDdsdNDVmmUar21EzpcQ="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; From 38931d97836428d9496835e848f50d3fa5df2214 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 23 May 2021 11:56:25 +0200 Subject: [PATCH 42/52] lynis: specify license --- pkgs/tools/security/lynis/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix index b0cfe261db6..b2ef8d8354b 100644 --- a/pkgs/tools/security/lynis/default.nix +++ b/pkgs/tools/security/lynis/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Security auditing tool for Linux, macOS, and UNIX-based systems"; homepage = "https://cisofy.com/lynis/"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.unix; maintainers = [ maintainers.ryneeverett ]; }; From d8c0615b4fcaa6211721fe9690778b495c62ac0f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 23 May 2021 12:43:14 +0200 Subject: [PATCH 43/52] terrascan: 1.5.1 -> 1.6.0 --- pkgs/tools/security/terrascan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index e8d080a132c..8fa8ded7b66 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pQuCVDXO9sXqCayoSAuxnzUBURJN+W2MZlzC/nV0wUc="; + sha256 = "sha256-AIHfG5Z5I91zcogHxGRP7pLauYHICX6NL0bJTp982sQ="; }; - vendorSha256 = "sha256-W3RXjjR90nfidkUldKNK0QAmI78SvtgHrZTWMzpqtMs="; + vendorSha256 = "sha256-XzZ3RudyD6YKyc3e3HvUrkXToXs2aFSSCScQgmCfxgQ="; # tests want to download a vulnerable Terraform project doCheck = false; From 4b8a57d891af9423a195e5d6ea430b8419a946ac Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 23 May 2021 06:41:56 +0000 Subject: [PATCH 44/52] betterlockscreen: 3.1.0 -> 3.1.1 --- pkgs/misc/screensavers/betterlockscreen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix index 825f867fc62..287db108697 100644 --- a/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "betterlockscreen"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "pavanjadhaw"; repo = "betterlockscreen"; rev = version; - sha256 = "14vkgdzw7mprjsvmhm3aav8gds73ngn2xxij4syq7l1mhk701wak"; + sha256 = "sha256-TA4YSd/elFuLU1ZMu+dqIOt6hK9pnzgoJudaMpIwh+U="; }; nativeBuildInputs = [ makeWrapper ]; From 555afaa94e60f0dae5572174a5f4af2ee715eb14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sun, 23 May 2021 13:33:41 +0200 Subject: [PATCH 45/52] neovide: Fix build caused by llvm multi output --- pkgs/applications/editors/neovim/neovide/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index b4c12304a9d..c0a54487329 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -66,7 +66,7 @@ rustPlatform.buildRustPackage rec { SKIA_OFFLINE_NINJA_COMMAND = "${ninja}/bin/ninja"; SKIA_OFFLINE_GN_COMMAND = "${gn}/bin/gn"; - LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; # test needs a valid fontconfig file FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; From 05aa68850cc55bad5a1829f0bd3995c82a8029db Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Sat, 22 May 2021 00:00:00 +0200 Subject: [PATCH 46/52] libgudev: support cross-compilation by disabling introspection and vala --- pkgs/development/libraries/libgudev/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index a35cf51679c..6fd108b3b7a 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -37,6 +37,9 @@ stdenv.mkDerivation rec { mesonFlags = [ # There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway "-Dtests=disabled" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-Dintrospection=disabled" + "-Dvapi=disabled" ]; passthru = { From 3f1b917deae4efd529c7d923013f36982c93d52b Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Sun, 23 May 2021 15:11:12 +0200 Subject: [PATCH 47/52] netbeans: 12.3 -> 12.4 (#124084) --- pkgs/applications/editors/netbeans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index 8931ddc3799..00497eebacf 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -3,7 +3,7 @@ }: let - version = "12.3"; + version = "12.4"; desktopItem = makeDesktopItem { name = "netbeans"; exec = "netbeans"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip"; - sha512 = "2fy696qrfbdkzmq4cwd6l7v6rsc0bf9akh61w3azc544bq3vxl3v6s31hvg3ba0nsh0jv3nbdrk6jp1l4hwgcg9zg7kf2012a1vv2nk"; + sha512 = "2jwfyq5ik0pwjd61mh0dhyw4xgpzfmgsjc947xg84n7xmns4mzgb8k5ggrss6hgqiqk7jl3psv7v837c2dxk1xdrdnkzs31cg9symbs"; }; buildCommand = '' From 02c595ebdb4f9767c8efc1718a1e886aba728822 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Sun, 23 May 2021 08:07:31 -0700 Subject: [PATCH 48/52] Prefer `pname` and `version` in `mkDerivation`s instead of `name` (#123438) Co-authored-by: Sandro Co-authored-by: nixpkgs-review --- pkgs/servers/http/apache-modules/mod_dnssd/default.nix | 5 +++-- .../http/apache-modules/tomcat-connectors/default.nix | 5 +++-- pkgs/servers/http/jboss/default.nix | 7 ++++--- pkgs/servers/http/lighttpd/default.nix | 5 +++-- pkgs/servers/http/mini-httpd/default.nix | 5 +++-- pkgs/servers/mail/clamsmtp/default.nix | 4 ++-- pkgs/servers/mail/dkimproxy/default.nix | 9 +++------ pkgs/servers/mail/dspam/default.nix | 5 +++-- pkgs/servers/mail/petidomo/default.nix | 5 +++-- pkgs/servers/mail/popa3d/default.nix | 6 +++--- pkgs/servers/mail/system-sendmail/default.nix | 3 ++- pkgs/servers/nosql/riak/2.2.0.nix | 3 ++- pkgs/servers/pies/default.nix | 5 +++-- pkgs/servers/prayer/default.nix | 5 +++-- pkgs/servers/unfs3/default.nix | 5 +++-- pkgs/servers/ursadb/default.nix | 6 +++--- pkgs/top-level/dotnet-packages.nix | 7 +++---- 17 files changed, 49 insertions(+), 41 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix index 773136a0201..a0a6235ace5 100644 --- a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix +++ b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, apacheHttpd, apr, avahi }: stdenv.mkDerivation rec { - name = "mod_dnssd-0.6"; + pname = "mod_dnssd"; + version = "0.6"; src = fetchurl { - url = "http://0pointer.de/lennart/projects/mod_dnssd/${name}.tar.gz"; + url = "http://0pointer.de/lennart/projects/mod_dnssd/${pname}-${version}.tar.gz"; sha256 = "2cd171d76eba398f03c1d5bcc468a1756f4801cd8ed5bd065086e4374997c5aa"; }; diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix index bea94a88859..20879d4aaf2 100644 --- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix +++ b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, apacheHttpd, jdk }: stdenv.mkDerivation rec { - name = "tomcat-connectors-1.2.48"; + pname = "tomcat-connectors"; + version = "1.2.48"; src = fetchurl { - url = "mirror://apache/tomcat/tomcat-connectors/jk/${name}-src.tar.gz"; + url = "mirror://apache/tomcat/tomcat-connectors/jk/${pname}-${version}-src.tar.gz"; sha256 = "15wfj1mvad15j1fqw67qbpbpwrcz3rb0zdhrq6z2sax1l05kc6yb"; }; diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix index 162d018e729..81ec4a6c6bb 100644 --- a/pkgs/servers/http/jboss/default.nix +++ b/pkgs/servers/http/jboss/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, jdk }: -stdenv.mkDerivation { - name = "jboss-as-7.1.1.Final"; +stdenv.mkDerivation rec { + pname = "jboss-as"; + version = "7.1.1.Final"; src = fetchurl { - url = "https://download.jboss.org/jbossas/7.1/jboss-as-7.1.1.Final/jboss-as-7.1.1.Final.tar.gz"; + url = "https://download.jboss.org/jbossas/${lib.versions.majorMinor version}/jboss-as-${version}/jboss-as-${version}.tar.gz"; sha256 = "1bdjw0ib9qr498vpfbg8klqw6rl11vbz7vwn6gp1r5gpqkd3zzc8"; }; diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index be631dd341e..98e378b2eed 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -15,10 +15,11 @@ assert enableWebDAV -> libuuid != null; assert enableExtendedAttrs -> attr != null; stdenv.mkDerivation rec { - name = "lighttpd-1.4.59"; + pname = "lighttpd"; + version = "1.4.59"; src = fetchurl { - url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; + url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz"; sha256 = "sha256-+5U9snPa7wjttuICVWyuij0H7tYIHJa9mQPblX0QhNU="; }; diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix index 113ccf10b8a..81a8228b027 100644 --- a/pkgs/servers/http/mini-httpd/default.nix +++ b/pkgs/servers/http/mini-httpd/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, boost }: stdenv.mkDerivation rec { - name = "mini-httpd-1.7"; + pname = "mini-httpd"; + version = "1.7"; src = fetchurl { - url = "https://download-mirror.savannah.gnu.org/releases/mini-httpd/${name}.tar.gz"; + url = "https://download-mirror.savannah.gnu.org/releases/mini-httpd/${pname}-${version}.tar.gz"; sha256 = "0jggmlaywjfbdljzv5hyiz49plnxh0har2bnc9dq4xmj1pmjgs49"; }; diff --git a/pkgs/servers/mail/clamsmtp/default.nix b/pkgs/servers/mail/clamsmtp/default.nix index fc3212453d8..1972e7d86a8 100644 --- a/pkgs/servers/mail/clamsmtp/default.nix +++ b/pkgs/servers/mail/clamsmtp/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "clamsmtp-" + version; + pname = "clamsmtp"; version = "1.10"; src = fetchurl { - url = "http://thewalter.net/stef/software/clamsmtp/${name}.tar.gz"; + url = "http://thewalter.net/stef/software/clamsmtp/${pname}-${version}.tar.gz"; sha256 = "0apr1pxifw6f1rbbsdrrwzs1dnhybg4hda3qqhqcw7p14r5xnbx5"; }; diff --git a/pkgs/servers/mail/dkimproxy/default.nix b/pkgs/servers/mail/dkimproxy/default.nix index f4905ecf4d8..c5ad8414cdd 100644 --- a/pkgs/servers/mail/dkimproxy/default.nix +++ b/pkgs/servers/mail/dkimproxy/default.nix @@ -1,14 +1,11 @@ { lib, stdenv, perlPackages, fetchurl }: -let - pkg = "dkimproxy"; - version = "1.4.1"; -in stdenv.mkDerivation rec { - name = "${pkg}-${version}"; + pname = "dkimproxy"; + version = "1.4.1"; src = fetchurl { - url = "mirror://sourceforge/dkimproxy/${name}.tar.gz"; + url = "mirror://sourceforge/dkimproxy/${pname}-${version}.tar.gz"; sha256 = "1gc5c7lg2qrlck7b0lvjfqr824ch6jkrzkpsn0gjvlzg7hfmld75"; }; diff --git a/pkgs/servers/mail/dspam/default.nix b/pkgs/servers/mail/dspam/default.nix index 6a0db5f8f8b..b33e4535ca9 100644 --- a/pkgs/servers/mail/dspam/default.nix +++ b/pkgs/servers/mail/dspam/default.nix @@ -18,10 +18,11 @@ let maintenancePath = lib.makeBinPath [ gawk gnused gnugrep coreutils which ]; in stdenv.mkDerivation rec { - name = "dspam-3.10.2"; + pname = "dspam"; + version = "3.10.2"; src = fetchurl { - url = "mirror://sourceforge/dspam/dspam/${name}/${name}.tar.gz"; + url = "mirror://sourceforge/dspam/dspam/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "1acklnxn1wvc7abn31l3qdj8q6k13s51k5gv86vka7q20jb5cxmf"; }; diff --git a/pkgs/servers/mail/petidomo/default.nix b/pkgs/servers/mail/petidomo/default.nix index 169712375c1..447e643c5c9 100644 --- a/pkgs/servers/mail/petidomo/default.nix +++ b/pkgs/servers/mail/petidomo/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, flex, bison, sendmailPath ? "/run/wrappers/bin/sendmail" }: stdenv.mkDerivation rec { - name = "petidomo-4.3"; + pname = "petidomo"; + version = "4.3"; src = fetchurl { - url = "mirror://sourceforge/petidomo/${name}.tar.gz"; + url = "mirror://sourceforge/petidomo/${pname}-${version}.tar.gz"; sha256 = "0x4dbxc4fcfg1rw5ywpcypvylnzn3y4rh0m6fz4h4cdnzb8p1lvm"; }; diff --git a/pkgs/servers/mail/popa3d/default.nix b/pkgs/servers/mail/popa3d/default.nix index d086eb09e80..9678bfe3fa2 100644 --- a/pkgs/servers/mail/popa3d/default.nix +++ b/pkgs/servers/mail/popa3d/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { - - name = "popa3d-1.0.3"; + pname = "popa3d"; + version = "1.0.3"; src = fetchurl { - url = "http://www.openwall.com/popa3d/${name}.tar.gz"; + url = "http://www.openwall.com/popa3d/${pname}-${version}.tar.gz"; sha256 = "1g48cd74sqhl496wmljhq44iyfpghaz363a1ip8nyhpjz7d57f03"; }; diff --git a/pkgs/servers/mail/system-sendmail/default.nix b/pkgs/servers/mail/system-sendmail/default.nix index a8fb65c0f42..28c54fc0fae 100644 --- a/pkgs/servers/mail/system-sendmail/default.nix +++ b/pkgs/servers/mail/system-sendmail/default.nix @@ -15,7 +15,8 @@ let script = writeText "script" '' fi ''; in stdenv.mkDerivation { - name = "system-sendmail-1.0"; + pname = "system-sendmail"; + version = "1.0"; src = script; diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix index a9a74f0b75f..6cbdab1b59f 100644 --- a/pkgs/servers/nosql/riak/2.2.0.nix +++ b/pkgs/servers/nosql/riak/2.2.0.nix @@ -26,7 +26,8 @@ let in stdenv.mkDerivation { - name = "riak-2.2.0"; + pname = "riak"; + version = "2.2.0"; nativeBuildInputs = [ unzip ]; buildInputs = [ diff --git a/pkgs/servers/pies/default.nix b/pkgs/servers/pies/default.nix index 46cc9562fb1..d96835c9497 100644 --- a/pkgs/servers/pies/default.nix +++ b/pkgs/servers/pies/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv }: stdenv.mkDerivation rec { - name = "pies-1.3"; + pname = "pies"; + version = "1.3"; src = fetchurl { - url = "mirror://gnu/pies/${name}.tar.bz2"; + url = "mirror://gnu/pies/${pname}-${version}.tar.bz2"; sha256 = "12r7rjjyibjdj08dvwbp0iflfpzl4s0zhn6cr6zj3hwf9gbzgl1g"; }; diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix index fe3cabcf9d7..c335358b6dd 100644 --- a/pkgs/servers/prayer/default.nix +++ b/pkgs/servers/prayer/default.nix @@ -5,10 +5,11 @@ let "-e 's/CCLIENT_SSL_ENABLE.*= false/CCLIENT_SSL_ENABLE=true/'"; in stdenv.mkDerivation rec { - name = "prayer-1.3.5"; + pname = "prayer"; + version = "1.3.5"; src = fetchurl { - url = "ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/${name}.tar.gz"; + url = "ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/${pname}-${version}.tar.gz"; sha256 = "135fjbxjn385b6cjys6qhbwfw61mdcl2akkll4jfpdzfvhbxlyda"; }; diff --git a/pkgs/servers/unfs3/default.nix b/pkgs/servers/unfs3/default.nix index 4e1e25f19e8..363856a5842 100644 --- a/pkgs/servers/unfs3/default.nix +++ b/pkgs/servers/unfs3/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, flex, bison }: stdenv.mkDerivation rec { - name = "unfs3-0.9.22"; + pname = "unfs3"; + version = "0.9.22"; src = fetchurl { - url = "mirror://sourceforge/unfs3/${name}.tar.gz"; + url = "mirror://sourceforge/unfs3/${pname}-${version}.tar.gz"; sha256 = "076zkyqkn56q0a8n3h65n1a68fknk4hrrp6mbhajq5s1wp5248j8"; }; diff --git a/pkgs/servers/ursadb/default.nix b/pkgs/servers/ursadb/default.nix index f86599adccb..5c699e5dfd2 100644 --- a/pkgs/servers/ursadb/default.nix +++ b/pkgs/servers/ursadb/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, cmake, zeromq, cppzmq }: -stdenv.mkDerivation { - name = "ursadb"; +stdenv.mkDerivation rec { + pname = "ursadb"; version = "1.2.0"; src = fetchurl { - url = "https://github.com/CERT-Polska/ursadb/archive/v1.2.0.tar.gz"; + url = "https://github.com/CERT-Polska/ursadb/archive/v${version}.tar.gz"; sha256 = "10dax3mswq0x4cfrpi31b7ii7bxl536wz1j11b7f5c0zw9pjxzym"; }; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index f1eaff5ec87..53af113eb30 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -847,13 +847,12 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { # }; NDeskOptions = stdenv.mkDerivation rec { - baseName = "NDesk.Options"; + pname = "NDesk.Options"; version = "0.2.1"; - name = "${baseName}-${version}"; src = fetchurl { - name = "${baseName}-${version}.tar.gz"; - url = "http://www.ndesk.org/archive/ndesk-options/ndesk-options-0.2.1.tar.gz"; + name = "${pname}-${version}.tar.gz"; + url = "http://www.ndesk.org/archive/ndesk-options/ndesk-options-${version}.tar.gz"; sha256 = "1y25bfapafwmifakjzyb9c70qqpvza8g5j2jpf08j8wwzkrb6r28"; }; From 9fad0cbd5bb2e14186c46abe873898860f2f4639 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Sun, 23 May 2021 09:35:44 -0600 Subject: [PATCH 49/52] heisenbridge: init at unstable-2021-05-23 (#123846) --- pkgs/servers/heisenbridge/default.nix | 28 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/servers/heisenbridge/default.nix diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/servers/heisenbridge/default.nix new file mode 100644 index 00000000000..b308e96cbec --- /dev/null +++ b/pkgs/servers/heisenbridge/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonPackage rec { + pname = "heisenbridge"; + version = "unstable-2021-05-23"; + + src = fetchFromGitHub { + owner = "hifi"; + repo = "heisenbridge"; + rev = "1f8df49b7e89aaeb2cbb5fee68bd29cf3eda079a"; + sha256 = "sha256-ta6n9hXRdIjfxsLy9jrzZkz6TS50/TYpFOb/BLrRWK4="; + }; + + propagatedBuildInputs = with python3Packages; [ + aiohttp + irc + pyyaml + ]; + + checkInputs = [ python3Packages.pytestCheckHook ]; + + meta = with lib; { + description = "A bouncer-style Matrix-IRC bridge."; + homepage = "https://github.com/hifi/heisenbridge"; + license = licenses.mit; + maintainers = [ maintainers.sumnerevans ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4d7b6465db..2fdd3f31b8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5582,6 +5582,8 @@ in heimdall-gui = heimdall.override { enableGUI = true; }; + heisenbridge = callPackage ../servers/heisenbridge { }; + helio-workstation = callPackage ../applications/audio/helio-workstation { }; hevea = callPackage ../tools/typesetting/hevea { }; From 3a3543edd4b83489f11bff872a3b5ed0618d3b67 Mon Sep 17 00:00:00 2001 From: Thirst Man Date: Sun, 23 May 2021 10:54:50 -0500 Subject: [PATCH 50/52] vscode: fix symlink to executable (#123811) Co-authored-by: Patrick Hilhorst Co-authored-by: Sandro --- pkgs/applications/editors/vscode/generic.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 2d8f639a0c6..8bdfc64d857 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -77,7 +77,7 @@ let '' + (if system == "x86_64-darwin" then '' mkdir -p "$out/Applications/${longName}.app" $out/bin cp -r ./* "$out/Applications/${longName}.app" - ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/code" $out/bin/${executableName} + ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/${executableName}" $out/bin/${executableName} '' else '' mkdir -p $out/lib/vscode $out/bin cp -r ./* $out/lib/vscode @@ -159,4 +159,3 @@ let }; in unwrapped - From caa041c44ba2ecd600719411359097792c2744e1 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 6 Mar 2021 21:31:59 +0100 Subject: [PATCH 51/52] GNUnet: optional Postgres support Taler requires GNUnet with Postgres support. --- pkgs/applications/networking/p2p/gnunet/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 61ff1642978..c1ba42a5e6d 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -1,7 +1,9 @@ { lib, stdenv, fetchurl, adns, curl, gettext, gmp, gnutls, libextractor , libgcrypt, libgnurl, libidn, libmicrohttpd, libtool, libunistring , makeWrapper, ncurses, pkg-config, libxml2, sqlite, zlib -, libpulseaudio, libopus, libogg, jansson, libsodium }: +, libpulseaudio, libopus, libogg, jansson, libsodium + +, postgresqlSupport ? false, postgresql }: stdenv.mkDerivation rec { pname = "gnunet"; @@ -19,7 +21,7 @@ stdenv.mkDerivation rec { adns curl gmp gnutls libextractor libgcrypt libgnurl libidn libmicrohttpd libunistring libxml2 ncurses gettext libsodium sqlite zlib libpulseaudio libopus libogg jansson - ]; + ] ++ lib.optional postgresqlSupport postgresql; preConfigure = '' # Brute force: since nix-worker chroots don't provide From 0e1ad6217ac920fffea1b4d6335fedc045c14cde Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 6 Mar 2021 23:00:17 +0100 Subject: [PATCH 52/52] taler-exchange, taler-merchant: init at 0.8.1, 0.8.0 --- .../applications/networking/taler/default.nix | 57 +++++++++++++++++++ .../networking/taler/exchange-fix-6665.patch | 48 ++++++++++++++++ pkgs/top-level/all-packages.nix | 3 + 3 files changed, 108 insertions(+) create mode 100644 pkgs/applications/networking/taler/default.nix create mode 100644 pkgs/applications/networking/taler/exchange-fix-6665.patch diff --git a/pkgs/applications/networking/taler/default.nix b/pkgs/applications/networking/taler/default.nix new file mode 100644 index 00000000000..06e389a69c8 --- /dev/null +++ b/pkgs/applications/networking/taler/default.nix @@ -0,0 +1,57 @@ +{ lib, stdenv, fetchurl, curl, gnunet, jansson, libgcrypt, libmicrohttpd +, qrencode, libsodium, libtool, pkg-config, postgresql, sqlite }: + +let + gnunet' = gnunet.override { postgresqlSupport = true; }; + + mkTaler = { pname, version, sha256 }: + extraAttrs: + stdenv.mkDerivation (extraAttrs // { + inherit pname version; + src = fetchurl { + url = "mirror://gnu/taler/${pname}-${version}.tar.gz"; + inherit sha256; + }; + enableParallelBuilding = true; + meta = with lib; { + description = "Anonymous, taxable payment system."; + homepage = "https://taler.net/"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ ehmry ]; + platforms = platforms.gnu ++ platforms.linux; + }; + }); + +in rec { + + taler-exchange = mkTaler { + pname = "taler-exchange"; + version = "0.8.1"; + sha256 = "sha256-MPt3n1JXd0Y89b1qCuF6YxptSr7henfYp97JTq1Z+x4="; + } { + buildInputs = [ + curl + jansson + libgcrypt + libmicrohttpd + libsodium + libtool + postgresql + # sqlite + ]; + propagatedBuildInputs = [ gnunet' ]; + patches = [ ./exchange-fix-6665.patch ]; + }; + + taler-merchant = mkTaler { + pname = "taler-merchant"; + version = "0.8.0"; + sha256 = "sha256-scrFLXeoQirGqhc+bSQKRl84PfUvjrp1uxF7pfOIB9Q="; + } { + nativeBuildInputs = [ pkg-config ]; + buildInputs = taler-exchange.buildInputs ++ [ qrencode taler-exchange ]; + propagatedBuildInputs = [ gnunet' ]; + PKG_CONFIG = "${pkg-config}/bin/pkg-config"; + }; + +} diff --git a/pkgs/applications/networking/taler/exchange-fix-6665.patch b/pkgs/applications/networking/taler/exchange-fix-6665.patch new file mode 100644 index 00000000000..e648123d269 --- /dev/null +++ b/pkgs/applications/networking/taler/exchange-fix-6665.patch @@ -0,0 +1,48 @@ +commit 9911b327ac299ec7eeae81b98cb520f4153071f2 +Author: Christian Grothoff +Date: Wed Dec 9 07:25:26 2020 +0100 + + fix #6665 + +diff --git a/src/testing/testing_api_cmd_rewind.c b/src/testing/testing_api_cmd_rewind.c +index e1b17fa9..979607cd 100644 +--- a/src/testing/testing_api_cmd_rewind.c ++++ b/src/testing/testing_api_cmd_rewind.c +@@ -24,7 +24,6 @@ + */ + #include "platform.h" + #include "taler_exchange_service.h" +-#include "taler/taler_testing_lib.h" + #include "taler_testing_lib.h" + + +diff --git a/src/testing/testing_api_cmd_twister_exec_client.c b/src/testing/testing_api_cmd_twister_exec_client.c +index 2cb92a8f..b3903f29 100644 +--- a/src/testing/testing_api_cmd_twister_exec_client.c ++++ b/src/testing/testing_api_cmd_twister_exec_client.c +@@ -26,7 +26,7 @@ + */ + + #include "platform.h" +-#include ++#include "taler_testing_lib.h" + #include "taler_twister_testing_lib.h" + + +diff --git a/src/testing/testing_api_trait_uuid.c b/src/testing/testing_api_trait_uuid.c +index c9b73a5b..4d5003ec 100644 +--- a/src/testing/testing_api_trait_uuid.c ++++ b/src/testing/testing_api_trait_uuid.c +@@ -22,9 +22,9 @@ + * @author Jonathan Buchanan + */ + #include "platform.h" +-#include +-#include +-#include ++#include "taler_signatures.h" ++#include "taler_exchange_service.h" ++#include "taler_testing_lib.h" + + + #define TALER_TESTING_TRAIT_UUID "uuid" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f5c2551fae..f2a6953067e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8889,6 +8889,9 @@ in inherit (darwin.apple_sdk.frameworks) IOKit; }; + inherit (callPackages ../applications/networking/taler { }) + taler-exchange taler-merchant; + tangram = callPackage ../applications/networking/instant-messengers/tangram { }; t1utils = callPackage ../tools/misc/t1utils { };