From 2dfa311e56326adc43da0d70baad9b5adf73d8e3 Mon Sep 17 00:00:00 2001 From: Serval Date: Sun, 2 May 2021 19:19:34 +0800 Subject: [PATCH 001/249] v2ray: 4.37.3 -> 4.38.3 --- nixos/tests/v2ray.nix | 2 +- pkgs/tools/networking/v2ray/default.nix | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/tests/v2ray.nix b/nixos/tests/v2ray.nix index f1b2570cc86..4808e149d31 100644 --- a/nixos/tests/v2ray.nix +++ b/nixos/tests/v2ray.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: let v2rayUser = { # A random UUID. id = "a6a46834-2150-45f8-8364-0f6f6ab32384"; - alterId = 4; + alterId = 0; # Non-zero support will be disabled in the future. }; # 1080 [http proxy] -> 1081 [vmess] -> direct diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index b525f78c424..89e2f0f320d 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -3,22 +3,22 @@ }: let - version = "4.37.3"; + version = "4.38.3"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - sha256 = "0gbkjlrx4ddaxb5f21m3sxbb55ilvm5kqlrys6ckrx0xyz9hj38y"; + sha256 = "1vsq98h6zbm3wz1mgphl7dqlabgfg53fhkyn47vfbhhkbx6nwl7c"; }; - vendorSha256 = "sha256-hPzIAXImAEJux1VRqCgslgn8giTf9BgZBcEZyF4Ut9Y="; + vendorSha256 = "sha256-jXpGlJ30xBttysbUekMdw8fH0KVfPufWq0t7AXZrDEQ="; assets = { # MIT licensed "geoip.dat" = let - geoipRev = "202104150006"; - geoipSha256 = "0ppm5r4bycjm7q0vnxj62q8639kp06sfkkkrkk5gibyrwisr4vrp"; + geoipRev = "202104300531"; + geoipSha256 = "0srskpp0pmw4fzp4lgachjjvig4fy96523r7aj2bwig0ipfgr401"; in fetchurl { url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat"; sha256 = geoipSha256; @@ -26,8 +26,8 @@ let # MIT licensed "geosite.dat" = let - geositeRev = "20210415054336"; - geositeSha256 = "0vs9fjbw45ipi7minh0r8zgh3pbwxqlrhwahpwyc6s0hyxgdi40w"; + geositeRev = "20210430100800"; + geositeSha256 = "0wp111iip3lhkgpbrzzivl5flj44vj7slx9w7k307sls6hmjzlcb"; in fetchurl { url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat"; sha256 = geositeSha256; From c36517d632551adc6e0fc2d3fea90a9c6549875c Mon Sep 17 00:00:00 2001 From: Hyzual Date: Sun, 2 May 2021 19:53:03 +0200 Subject: [PATCH 002/249] maintainers: add Joris Masson --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 60c6f093f3b..4c6fcb02798 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4121,6 +4121,12 @@ githubId = 12491746; name = "Masato Yonekawa"; }; + hyzual = { + email = "hyzual@gmail.com"; + github = "Hyzual"; + githubId = 2051507; + name = "Joris Masson"; + }; hzeller = { email = "h.zeller@acm.org"; github = "hzeller"; From e5ce087e60fab40b5da2dbc5427fceaf2c7fa446 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Tue, 4 May 2021 08:43:51 +0200 Subject: [PATCH 003/249] protoc-gen-twirp: 7.2.0 -> 8.0.0 --- pkgs/development/tools/protoc-gen-twirp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/protoc-gen-twirp/default.nix b/pkgs/development/tools/protoc-gen-twirp/default.nix index 6ca016f8e6b..5db843e6f61 100644 --- a/pkgs/development/tools/protoc-gen-twirp/default.nix +++ b/pkgs/development/tools/protoc-gen-twirp/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "protoc-gen-twirp"; - version = "7.2.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "twitchtv"; repo = "twirp"; rev = "v${version}"; - sha256 = "sha256-W7t36F1St0YLPowHaZSboVNnvX7E2Lg5tPWeyeUSabA="; + sha256 = "sha256-lwozRwH96nh4Zlf6ggOF+FuUEfxkN38wxygg5HXw/M0="; }; goPackagePath = "github.com/twitchtv/twirp"; From 5f8c6525e52be55c24d6078981755a6f90214262 Mon Sep 17 00:00:00 2001 From: Yannick Markus Date: Tue, 4 May 2021 09:09:06 +0200 Subject: [PATCH 004/249] mullvad-vpn: 2021.2 -> 2021.3 --- pkgs/applications/networking/mullvad-vpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index b27598c40e4..68a9362b87f 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -42,11 +42,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2021.2"; + version = "2021.3"; src = fetchurl { url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb"; - sha256 = "sha256-nNZK11MckiQ+z8NDgDc7aJ6yrXWI1hPOvMZkrGwDDgU="; + sha256 = "sha256-f7ZCDZ/RN+Z0Szmnx8mbzhKZiRPjqXTsgClfWViFYzo="; }; nativeBuildInputs = [ From 4400ee83ecf2408489fba37fa5aa6d42804ee4b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 8 May 2021 18:04:01 +0200 Subject: [PATCH 005/249] nixos/znc: harden systemd unit --- .../services/networking/znc/default.nix | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/nixos/modules/services/networking/znc/default.nix b/nixos/modules/services/networking/znc/default.nix index a7315896c50..83b9b85e0c6 100644 --- a/nixos/modules/services/networking/znc/default.nix +++ b/nixos/modules/services/networking/znc/default.nix @@ -258,6 +258,34 @@ in ExecStart = "${pkgs.znc}/bin/znc --foreground --datadir ${cfg.dataDir} ${escapeShellArgs cfg.extraFlags}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID"; + # Hardening + CapabilityBoundingSet = [ "" ]; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + ReadWritePaths = [ cfg.dataDir ]; + RemoveIPC = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ]; + UMask = "0027"; }; preStart = '' mkdir -p ${cfg.dataDir}/configs From 5986f233a6e712f19306a809d3ceda3ad18d6429 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 8 May 2021 22:36:30 +0200 Subject: [PATCH 006/249] nixos/znc: remove trailing slash from dataDir --- nixos/modules/services/networking/znc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/znc/default.nix b/nixos/modules/services/networking/znc/default.nix index 83b9b85e0c6..938d217c94d 100644 --- a/nixos/modules/services/networking/znc/default.nix +++ b/nixos/modules/services/networking/znc/default.nix @@ -103,8 +103,8 @@ in }; dataDir = mkOption { - default = "/var/lib/znc/"; - example = "/home/john/.znc/"; + default = "/var/lib/znc"; + example = "/home/john/.znc"; type = types.path; description = '' The state directory for ZNC. The config and the modules will be linked From 314a64a026a6129f46eff294af0b70cd61e07b8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 8 May 2021 22:37:32 +0200 Subject: [PATCH 007/249] nixos/znc: fix example --- nixos/modules/services/networking/znc/options.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/znc/options.nix b/nixos/modules/services/networking/znc/options.nix index 048dbd73863..7a43b45fabb 100644 --- a/nixos/modules/services/networking/znc/options.nix +++ b/nixos/modules/services/networking/znc/options.nix @@ -44,7 +44,7 @@ let modules = mkOption { type = types.listOf types.str; default = [ "simple_away" ]; - example = literalExample "[ simple_away sasl ]"; + example = literalExample ''[ "simple_away" "sasl" ]''; description = '' ZNC network modules to load. ''; From cad7a9793d9acbec0c102e948fd443140af91846 Mon Sep 17 00:00:00 2001 From: Hyzual Date: Sun, 2 May 2021 19:53:38 +0200 Subject: [PATCH 008/249] goss: init at 0.3.16 Co-authored-by: j-k --- pkgs/tools/misc/goss/default.nix | 34 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/misc/goss/default.nix diff --git a/pkgs/tools/misc/goss/default.nix b/pkgs/tools/misc/goss/default.nix new file mode 100644 index 00000000000..bbe947ecd12 --- /dev/null +++ b/pkgs/tools/misc/goss/default.nix @@ -0,0 +1,34 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "goss"; + version = "0.3.16"; + + src = fetchFromGitHub { + owner = "aelsabbahy"; + repo = pname; + rev = "v${version}"; + sha256 = "1m5w5vwmc9knvaihk61848rlq7qgdyylzpcwi64z84rkw8qdnj6p"; + }; + + vendorSha256 = "1lyqjkwj8hybj5swyrv6357hs8sxmf4wim0c8yhfb9mv7fsxhrv7"; + + CGO_ENABLED = 0; + preBuild = '' + buildFlagsArray+=("-ldflags" "-s -w -X main.version=v${version}") + ''; + + meta = with lib; { + homepage = "https://github.com/aelsabbahy/goss/"; + changelog = "https://github.com/aelsabbahy/goss/releases/tag/v${version}"; + description = "Quick and easy server validation"; + longDescription = '' + Goss is a YAML based serverspec alternative tool for validating a server’s configuration. + It eases the process of writing tests by allowing the user to generate tests from the current system state. + Once the test suite is written they can be executed, waited-on, or served as a health endpoint. + ''; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ hyzual jk ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c22045dcac..8efc8f0f584 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2634,6 +2634,8 @@ in godu = callPackage ../tools/misc/godu { }; + goss = callPackage ../tools/misc/goss { }; + gosu = callPackage ../tools/misc/gosu { }; gotify-cli = callPackage ../tools/misc/gotify-cli { }; From d9a4bb19b26c07d2135923c546185805876f18ff Mon Sep 17 00:00:00 2001 From: David Wood Date: Tue, 11 May 2021 10:38:26 +0100 Subject: [PATCH 009/249] rustup-toolchain-install-master: init at 1.7.3 Signed-off-by: David Wood --- .../0001-dynamically-patchelf-binaries.patch | 61 +++++++++++++++++++ .../default.nix | 56 +++++++++++++++++ pkgs/top-level/all-packages.nix | 3 + 3 files changed, 120 insertions(+) create mode 100644 pkgs/development/tools/rust/rustup-toolchain-install-master/0001-dynamically-patchelf-binaries.patch create mode 100644 pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix diff --git a/pkgs/development/tools/rust/rustup-toolchain-install-master/0001-dynamically-patchelf-binaries.patch b/pkgs/development/tools/rust/rustup-toolchain-install-master/0001-dynamically-patchelf-binaries.patch new file mode 100644 index 00000000000..1754ce11c4d --- /dev/null +++ b/pkgs/development/tools/rust/rustup-toolchain-install-master/0001-dynamically-patchelf-binaries.patch @@ -0,0 +1,61 @@ +diff --git a/src/main.rs b/src/main.rs +index 3cb6896..7f070e0 100644 +--- a/src/main.rs ++++ b/src/main.rs +@@ -275,7 +275,9 @@ fn install_single_toolchain( + + // install + if maybe_dry_client.is_some() { +- rename(&toolchain.dest, toolchain_path)?; ++ rename(&toolchain.dest, toolchain_path.clone())?; ++ nix_patchelf(toolchain_path) ++ .expect("failed to patch toolchain for NixOS"); + eprintln!( + "toolchain `{}` is successfully installed!", + toolchain.dest.display() +@@ -291,6 +293,45 @@ fn install_single_toolchain( + Ok(()) + } + ++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(()) ++} ++ + fn fetch_master_commit(client: &Client, github_token: Option<&str>) -> Result { + eprintln!("fetching master commit hash... "); + fetch_master_commit_via_git() diff --git a/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix b/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix new file mode 100644 index 00000000000..cae5453fa66 --- /dev/null +++ b/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix @@ -0,0 +1,56 @@ +{ stdenv +, lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, openssl +, runCommand +, patchelf +, zlib +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "rustup-toolchain-install-master"; + version = "1.7.3"; + + src = fetchFromGitHub { + owner = "kennytm"; + repo = pname; + rev = "v${version}"; + hash = "sha256-J25ER/g8Kylw/oTIEl4Gl8i1xmhR+4JM5M5EHpl1ras="; + }; + + 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 = "n7t8Ap9hdhrjmtKjfdyozf26J7yhu57pedm19CunLF4="; + + meta = with lib; { + description = "Install a rustc master toolchain usable from rustup"; + homepage = "https://github.com/kennytm/rustup-toolchain-install-master"; + license = licenses.mit; + maintainers = with maintainers; [ davidtwco ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7b52b65724..1d17c86a27c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11585,6 +11585,9 @@ in rustup = callPackage ../development/tools/rust/rustup { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; + rustup-toolchain-install-master = callPackage ../development/tools/rust/rustup-toolchain-install-master { + inherit (darwin.apple_sdk.frameworks) Security; + }; sagittarius-scheme = callPackage ../development/compilers/sagittarius-scheme {}; From 8ad5d65d0907fe77421d0997281988dcde395550 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 29 Apr 2020 01:25:58 -0400 Subject: [PATCH 010/249] nixos/gnome: add user docs Co-Authored-By: Jan Tojnar --- .../services/x11/desktop-managers/gnome.nix | 1 + .../services/x11/desktop-managers/gnome.xml | 276 ++++++++++++++++++ 2 files changed, 277 insertions(+) create mode 100644 nixos/modules/services/x11/desktop-managers/gnome.xml diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index d61d6ce50da..035d9bd76b1 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -64,6 +64,7 @@ in { meta = { + doc = ./gnome.xml; maintainers = teams.gnome.members; }; diff --git a/nixos/modules/services/x11/desktop-managers/gnome.xml b/nixos/modules/services/x11/desktop-managers/gnome.xml new file mode 100644 index 00000000000..624d5c894e7 --- /dev/null +++ b/nixos/modules/services/x11/desktop-managers/gnome.xml @@ -0,0 +1,276 @@ + + GNOME Desktop + + GNOME provides a simple, yet full-featured desktop environment with a focus on productivity. Its Mutter compositor supports both Wayland and X server, and the GNOME Shell user interface is fully customizable by extensions. + + +
+ Enabling GNOME + + + All of the core apps, optional apps, games, and core developer tools from GNOME are available. + + + + To enable the GNOME desktop use: + + + + = true; + = true; + + + + + While it is not strictly necessary to use GDM as the display manager with GNOME, it is recommended, as some features such as screen lock might not work without it. + + + + + The default applications used in NixOS are very minimal, inspired by the defaults used in gnome-build-meta. + + +
+ GNOME without the apps + + + If you’d like to only use the GNOME desktop and not the apps, you can disable them with: + + + + = false; + + + + and none of them will be installed. + + + + If you’d only like to omit a subset of the core utilities, you can use . + Note that this mechanism can only exclude core utilities, games and core developer tools. + +
+ +
+ Disabling GNOME services + + + It is also possible to disable many of the core services. For example, if you do not need indexing files, you can disable Tracker with: + + + + = false; + = false; + + + + Note, however, that doing so is not supported and might break some applications. Notably, GNOME Music cannot work without Tracker. + +
+ +
+ GNOME games + + + You can install all of the GNOME games with: + + + + = true; + +
+ +
+ GNOME core developer tools + + + You can install GNOME core developer tools with: + + + + = true; + +
+
+ +
+ Enabling GNOME Flashback + + + GNOME Flashback provides a desktop environment based on the classic GNOME 2 architecture. You can enable the default GNOME Flashback session, which uses the Metacity window manager, with: + + + + = true; + + + + It is also possible to create custom sessions that replace Metacity with a different window manager using . + + + + The following example uses xmonad window manager: + + + + = [ + { + wmName = "xmonad"; + wmLabel = "XMonad"; + wmCommand = "${pkgs.haskellPackages.xmonad}/bin/xmonad"; + } +]; + + +
+
+ GDM + + + If you want to use GNOME Wayland session on Nvidia hardware, you need to enable: + + + + = true; + + + + as the default configuration will forbid this. + +
+ +
+ Icons and GTK Themes + + + Icon themes and GTK themes don’t require any special option to install in NixOS. + + + + You can add them to and switch to them with GNOME Tweaks. + If you’d like to do this manually in dconf, change the values of the following keys: + + + +/org/gnome/desktop/interface/gtk-theme +/org/gnome/desktop/interface/icon-theme + + + + in dconf-editor + +
+ +
+ Shell Extensions + + + Most Shell extensions are packaged under the gnomeExtensions attribute. + Some packages that include Shell extensions, like gnome.gpaste, don’t have their extension decoupled under this attribute. + + + + You can install them like any other package: + + + + = [ + gnomeExtensions.dash-to-dock + gnomeExtensions.gsconnect + gnomeExtensions.mpris-indicator-button +]; + + + + Unfortunately, we lack a way for these to be managed in a completely declarative way. + So you have to enable them manually with an Extensions application. + It is possible to use a GSettings override for this on org.gnome.shell.enabled-extensions, but that will only influence the default value. + +
+ +
+ GSettings Overrides + + + Majority of software building on the GNOME platform use GLib’s GSettings system to manage runtime configuration. For our purposes, the system consists of XML schemas describing the individual configuration options, stored in the package, and a settings backend, where the values of the settings are stored. On NixOS, like on most Linux distributions, dconf database is used as the backend. + + + + GSettings vendor overrides can be used to adjust the default values for settings of the GNOME desktop and apps by replacing the default values specified in the XML schemas. Using overrides will allow you to pre-seed user settings before you even start the session. + + + + + Overrides really only change the default values for GSettings keys so if you or an application changes the setting value, the value set by the override will be ignored. Until NixOS’s dconf module implements changing values, you will either need to keep that in mind and clear the setting from the backend using dconf reset command when that happens, or use the module from home-manager. + + + + + You can override the default GSettings values using the option. + + + + Take note that whatever packages you want to override GSettings for, you need to add them to + . + + + + You can use dconf-editor tool to explore which GSettings you can set. + + +
+ Example + + +services.xserver.desktopManager.gnome = { + extraGSettingsOverrides = '' + # Change default background + [org.gnome.desktop.background] + picture-uri='file://${pkgs.nixos-artwork.wallpapers.mosaic-blue.gnomeFilePath}' + + # Favorite apps in gnome-shell + [org.gnome.shell] + favorite-apps=['org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop'] + ''; + + extraGSettingsOverridePackages = [ + pkgs.gsettings-desktop-schemas # for org.gnome.desktop + pkgs.gnome.gnome-shell # for org.gnome.shell + ]; +}; + +
+
+ +
+ Frequently Asked Questions + +
+ Can I use LightDM with GNOME? + + + Yes you can, and any other display-manager in NixOS. + + + + However, it doesn’t work correctly for the Wayland session of GNOME Shell yet, and + won’t be able to lock your screen. + + + + See this issue. + +
+ +
+ Why does <literal>nixos-rebuild switch</literal> sometimes kill my session? + + + This is a known issue without any workarounds. + If you are doing a fairly large upgrade, it is probably safer to use nixos-rebuild boot. + +
+
+
From 8380ceb766364ea28d7c2ed5ed7b9b6e8f814a46 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 11 May 2021 18:11:01 +0200 Subject: [PATCH 011/249] nixos/gnome: Allow disabling sysprof --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 035d9bd76b1..5964bd1a52c 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -554,7 +554,7 @@ in /* gnome-boxes */ ] config.environment.gnome.excludePackages); - services.sysprof.enable = true; + services.sysprof.enable = notExcluded pkgs.sysprof; }) ]; From 907d3482f8b25b276dc706bc579a63e3649751e4 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Wed, 12 May 2021 19:32:00 +0200 Subject: [PATCH 012/249] modemmanager: 1.14.10 -> 1.14.12 --- pkgs/tools/networking/modem-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix index 06102ac2d90..71ea50ea172 100644 --- a/pkgs/tools/networking/modem-manager/default.nix +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "modem-manager"; - version = "1.14.10"; + version = "1.14.12"; package = "ModemManager"; src = fetchurl { url = "https://www.freedesktop.org/software/${package}/${package}-${version}.tar.xz"; - sha256 = "sha256-TqYLN1p2HhfnuwlbyolFee0OjjOyc9xpi1y+A5R/NX8="; + sha256 = "sha256-0QqXEZndwl3N8VbFasCOkWEsCVOdVlIueu1G1G5IO7E="; }; nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ]; From d099e7558e8d93f4ff5bf3ee01820779a9e6bc79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 12 May 2021 21:32:40 +0200 Subject: [PATCH 013/249] mono: 5 -> 6 --- .../science/robotics/mission-planner/default.nix | 6 +++--- pkgs/development/tools/omnisharp-roslyn/default.nix | 4 ++-- .../vscode-extensions/ms-dotnettools-csharp/default.nix | 6 ++---- pkgs/tools/graphics/snapdragon-profiler/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 8 ++++---- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/science/robotics/mission-planner/default.nix b/pkgs/applications/science/robotics/mission-planner/default.nix index a299a66704d..3dbb1a4bf5a 100644 --- a/pkgs/applications/science/robotics/mission-planner/default.nix +++ b/pkgs/applications/science/robotics/mission-planner/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip, mono6 }: +{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip, mono }: let pname = "mission-planner"; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { sha256 = "1cgpmsmmnbzw1lwsdafp8yklk1rwc61yf12vc1ahcc6bl7q2385x"; }; - nativeBuildInputs = [ makeWrapper mono6 unzip ]; + nativeBuildInputs = [ makeWrapper mono unzip ]; sourceRoot = "."; AOT_FILES = [ "MissionPlanner.exe" "MissionPlanner.*.dll" ]; @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { install -m 444 -D mpdesktop150.png $out/share/icons/mission-planner.png cp -r ${desktopItem}/share/applications $out/share/ mv * $out/opt/mission-planner - makeWrapper ${mono6}/bin/mono $out/bin/mission-planner \ + makeWrapper ${mono}/bin/mono $out/bin/mission-planner \ --add-flags $out/opt/mission-planner/MissionPlanner.exe runHook postInstall ''; diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index 51f731c9431..e0710079b62 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, mono6 +, mono , msbuild , dotnet-sdk , makeWrapper @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { chmod -R u+w $out/src mv $out/src/.msbuild/Current/{bin,Bin} - makeWrapper ${mono6}/bin/mono $out/bin/omnisharp \ + makeWrapper ${mono}/bin/mono $out/bin/omnisharp \ --add-flags "$out/src/OmniSharp.exe" ''; diff --git a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix index a7b0e17ecbf..77372411b88 100644 --- a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix +++ b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix @@ -7,14 +7,12 @@ , icu , stdenv , openssl -, mono6 +, mono }: let # Get as close as possible as the `package.json` required version. # This is what drives omnisharp. - mono = mono6; - rtDepsSrcsFromJson = builtins.fromJSON (builtins.readFile ./rt-deps-bin-srcs.json); rtDepsBinSrcs = builtins.mapAttrs (k: v: @@ -114,7 +112,7 @@ vscode-utils.buildVscodeMarketplaceExtension { declare omnisharp_dir="$PWD/${omnisharp.installPath}" unzip_to "${omnisharp.bin-src}" "$omnisharp_dir" rm "$omnisharp_dir/bin/mono" - ln -s -T "${mono6}/bin/mono" "$omnisharp_dir/bin/mono" + ln -s -T "${mono}/bin/mono" "$omnisharp_dir/bin/mono" chmod a+x "$omnisharp_dir/run" touch "$omnisharp_dir/install.Lock" diff --git a/pkgs/tools/graphics/snapdragon-profiler/default.nix b/pkgs/tools/graphics/snapdragon-profiler/default.nix index 96fada91093..02a96184812 100644 --- a/pkgs/tools/graphics/snapdragon-profiler/default.nix +++ b/pkgs/tools/graphics/snapdragon-profiler/default.nix @@ -4,7 +4,7 @@ , makeDesktopItem , copyDesktopItems , icoutils -, mono6 +, mono , jre , androidenv , gtk-sharp-2_0 @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - mono6 + mono gtk-sharp-2_0 gtk2 libcxx @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { mv *.so $out/lib cp -r * $out/lib/snapdragon-profiler - makeWrapper "${mono6}/bin/mono" $out/bin/snapdragon-profiler \ + makeWrapper "${mono}/bin/mono" $out/bin/snapdragon-profiler \ --add-flags "$out/lib/snapdragon-profiler/SnapdragonProfiler.exe" \ --suffix PATH : ${lib.makeBinPath [ jre androidenv.androidPkgs_9_0.platform-tools coreutils ]} \ --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67d5cd2f475..3307d677780 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10820,7 +10820,7 @@ in fsharp = callPackage ../development/compilers/fsharp { }; - fsharp41 = callPackage ../development/compilers/fsharp41 { mono = mono6; }; + fsharp41 = callPackage ../development/compilers/fsharp41 { }; fstar = callPackage ../development/compilers/fstar { ocamlPackages = ocaml-ng.ocamlPackages_4_07; @@ -11273,7 +11273,7 @@ in mlton = mlton20180207; - mono = mono5; + mono = mono6; mono4 = lowPrio (callPackage ../development/compilers/mono/4.nix { inherit (darwin) libobjc; @@ -11292,9 +11292,9 @@ in monoDLLFixer = callPackage ../build-support/mono-dll-fixer { }; - roslyn = callPackage ../development/compilers/roslyn { mono = mono6; }; + roslyn = callPackage ../development/compilers/roslyn { }; - msbuild = callPackage ../development/tools/build-managers/msbuild { mono = mono6; }; + msbuild = callPackage ../development/tools/build-managers/msbuild { }; mosml = callPackage ../development/compilers/mosml { }; From 4b0dd792f8bd510593f73bef9c28721099eb57d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 12 May 2021 21:33:40 +0200 Subject: [PATCH 014/249] vscode-exts/ms-dotnettools-csharp: add meta.homepage --- pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix index 77372411b88..6f4bbfb7e92 100644 --- a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix +++ b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix @@ -134,6 +134,7 @@ vscode-utils.buildVscodeMarketplaceExtension { meta = with lib; { description = "C# for Visual Studio Code (powered by OmniSharp)"; + homepage = "https://github.com/OmniSharp/omnisharp-vscode"; license = licenses.mit; maintainers = [ maintainers.jraygauthier ]; platforms = [ "x86_64-linux" ]; From 371257d8986591a0b90fbfb7155325fdd2035fc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 12 May 2021 23:17:13 +0200 Subject: [PATCH 015/249] pythonPackages.slimit: drop Upstream looks abandoned and it's not used in Nixpkgs anymore. --- .../python-modules/slimit/default.nix | 36 ------------------- pkgs/top-level/python-packages.nix | 2 -- 2 files changed, 38 deletions(-) delete mode 100644 pkgs/development/python-modules/slimit/default.nix diff --git a/pkgs/development/python-modules/slimit/default.nix b/pkgs/development/python-modules/slimit/default.nix deleted file mode 100644 index 30654bd03f6..00000000000 --- a/pkgs/development/python-modules/slimit/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, fetchpatch, python, ply }: - -buildPythonPackage rec { - pname = "slimit"; - version = "0.8.1"; - - src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "f433dcef899f166b207b67d91d3f7344659cb33b8259818f084167244e17720b"; - }; - - # Some patches from https://github.com/rspivak/slimit/pull/65 - patches = lib.optionals isPy3k [ - (fetchpatch { - url = "https://github.com/lelit/slimit/commit/a61e12d88cc123c4b7af2abef21d06fd182e561a.patch"; - sha256 = "0lbhvkgn4l8g9fwvb81rfwjx7hsaq2pid8a5gczdk1ba65wfvdq5"; - }) - (fetchpatch { - url = "https://github.com/lelit/slimit/commit/e8331659fb89e8a4613c5e4e338c877fead9c551.patch"; - sha256 = "1hv4ysn09c9bfd5bxhhrp51hsi81hdidmx0y7zcrjjiich9ayrni"; - }) - ]; - - propagatedBuildInputs = [ ply ]; - - checkPhase = '' - ${python.interpreter} -m unittest discover -s src/slimit - ''; - - meta = with lib; { - description = "JavaScript minifier"; - homepage = "https://slimit.readthedocs.org/"; - license = licenses.mit; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 54feeb8001f..22a903098fb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7564,8 +7564,6 @@ in { slicerator = callPackage ../development/python-modules/slicerator { }; - slimit = callPackage ../development/python-modules/slimit { }; - slither-analyzer = callPackage ../development/python-modules/slither-analyzer { }; slixmpp = callPackage ../development/python-modules/slixmpp { From 368ef57d31122c88e838e6d1e558245194f45965 Mon Sep 17 00:00:00 2001 From: Mauricio Scheffer Date: Sat, 10 Apr 2021 17:54:43 +0100 Subject: [PATCH 016/249] telepresence2: init at 2.2.1 --- .../networking/telepresence2/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/networking/telepresence2/default.nix diff --git a/pkgs/tools/networking/telepresence2/default.nix b/pkgs/tools/networking/telepresence2/default.nix new file mode 100644 index 00000000000..97c758e19b4 --- /dev/null +++ b/pkgs/tools/networking/telepresence2/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "telepresence2"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "telepresenceio"; + repo = "telepresence"; + rev = "v${version}"; + sha256 = "0pr6vm68jr5ld7hy2b4dwmjziir59vg137c74rdn1wlhq3n8vr41"; + }; + + vendorSha256 = "0d0p879zchhrzrf6f5zc3vdcd5zi1ind7ibvb46y6wx6lp0f1nrp"; + + buildFlagsArray = '' + -ldflags=-s -w -X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev} + ''; + + subPackages = [ "cmd/telepresence" ]; + + meta = with lib; { + description = "Local development against a remote Kubernetes or OpenShift cluster"; + homepage = "https://www.getambassador.io/docs/telepresence/2.1/quick-start/"; + license = licenses.asl20; + maintainers = with maintainers; [ mausch ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb7290c3bec..96d49af144e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8855,6 +8855,8 @@ in pythonPackages = python3Packages; }; + telepresence2 = callPackage ../tools/networking/telepresence2 { }; + teler = callPackage ../tools/security/teler { }; termius = callPackage ../applications/networking/termius { }; From 7e943b6a465e7efc049dfec304d9d427e4049b38 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 12 May 2021 20:27:58 +0200 Subject: [PATCH 017/249] clipgrab: use ffmpeg4 See migrate away from ffmpeg_3 #120705. --- pkgs/applications/video/clipgrab/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index b24ff43ac67..5d331d1b4a6 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, makeDesktopItem, ffmpeg_3 +{ lib, fetchurl, makeDesktopItem, ffmpeg , qmake, qttools, mkDerivation , qtbase, qtdeclarative, qtlocation, qtquickcontrols2, qtwebchannel, qtwebengine }: @@ -13,19 +13,17 @@ mkDerivation rec { url = "https://download.clipgrab.org/${pname}-${version}.tar.gz"; }; - buildInputs = [ ffmpeg_3 qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ]; + buildInputs = [ ffmpeg qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ]; nativeBuildInputs = [ qmake qttools ]; - postPatch = lib.optionalString (ffmpeg_3 != null) '' + postPatch = lib.optionalString (ffmpeg != null) '' substituteInPlace converter_ffmpeg.cpp \ - --replace '"ffmpeg"' '"${ffmpeg_3.bin}/bin/ffmpeg"' \ - --replace '"ffmpeg ' '"${ffmpeg_3.bin}/bin/ffmpeg ' + --replace '"ffmpeg"' '"${ffmpeg.bin}/bin/ffmpeg"' \ + --replace '"ffmpeg ' '"${ffmpeg.bin}/bin/ffmpeg ' ''; qmakeFlags = [ "clipgrab.pro" ]; - enableParallelBuilding = true; - desktopItem = makeDesktopItem rec { name = "clipgrab"; exec = name; @@ -37,9 +35,11 @@ mkDerivation rec { }; installPhase = '' + runHook preInstall install -Dm755 clipgrab $out/bin/clipgrab install -Dm644 icon.png $out/share/pixmaps/clipgrab.png cp -r ${desktopItem}/share/applications $out/share + runHook postInstall ''; meta = with lib; { From ed482358c93149c4e31be56e645bbf6485d4afff Mon Sep 17 00:00:00 2001 From: Victor Roest Date: Thu, 13 May 2021 10:53:31 +0000 Subject: [PATCH 018/249] maintainers: add nullx76 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2da788a56af..d848d4f3850 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7335,6 +7335,12 @@ githubId = 1839979; name = "Niklas Thörne"; }; + nullx76 = { + email = "nix@xirion.net"; + github = "NULLx76"; + githubId = 1809198; + name = "Victor Roest"; + }; numinit = { email = "me@numin.it"; github = "numinit"; From e2b86ad1e749562063f2ab528de016408891aba6 Mon Sep 17 00:00:00 2001 From: Atemu Date: Thu, 13 May 2021 17:31:54 +0200 Subject: [PATCH 019/249] anki-bin: 2.1.43 -> 2.1.44 --- pkgs/games/anki/bin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index 54e1646fcae..09f92b0f848 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -3,14 +3,14 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "2.1.43"; + version = "2.1.44"; unpacked = stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux.tar.bz2"; - sha256 = "0kadv3fxi76h7xxmb4lckkgcwiv0b7cn630l62dxa2abxibans29"; + sha256 = "01d5ll3vsd4v0ikxgamv47bkwmag15vnmsgpda5wivc3dyawc9j9"; }; installPhase = '' @@ -49,7 +49,7 @@ if stdenv.isLinux then buildFHSUserEnv (appimageTools.defaultFhsEnvArgs // { src = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac.dmg"; - sha256 = "0vvgiybq1ygq7cly1r4ircgzg2cpprindr7nnlbnrmandjy2kw49"; + sha256 = "1zrdih4rjsq30480sf200pw59r42p3nq2md56kj2l641kbc7ljka"; }; nativeBuildInputs = [ undmg ]; From 75d16dd3ab753af8d3d53800dfe309e02c617220 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 13 May 2021 21:54:16 +0100 Subject: [PATCH 020/249] trivy: 0.18.0 -> 0.18.1 --- pkgs/tools/admin/trivy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index f9f34311653..cbb4b875d59 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "trivy"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-D4oqLyH5JU8AycRZuA0isQmE3UP/0WmBmKW3xvSzk2M="; + sha256 = "sha256-Ocoz+sYzbTQ31ZWSrW6UVHI7PGog0BrVhO0y0N8T1Zo="; }; vendorSha256 = "sha256-R50alGFyb2ZR7PT1jIsYWMIO45CPet+A5wq+clC1NIY="; From 4091ac31939f1c040f631bdcccc3f9f23b0d1c5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 13 May 2021 22:56:59 +0200 Subject: [PATCH 021/249] sc-im: 0.8.1 -> 0.8.2 https://github.com/andmarti1424/sc-im/releases/tag/v0.8.2 --- pkgs/applications/misc/sc-im/default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index cc7d4c3771b..e299ec2ac86 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , makeWrapper , pkg-config , which @@ -16,29 +15,17 @@ stdenv.mkDerivation rec { pname = "sc-im"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "andmarti1424"; repo = "sc-im"; rev = "v${version}"; - sha256 = "sha256-AIYa3d1ml1f5GNLKijeFPX+UabgEqzdXiP60BGvBPsQ="; + sha256 = "sha256-H+GQUpouiXc/w6GWdkSVvTXZ/Dtb7sUmBLGcpxG3Mts="; }; sourceRoot = "${src.name}/src"; - patches = [ - # libxls and libxlsxwriter are not found without the patch - # https://github.com/andmarti1424/sc-im/pull/542 - (fetchpatch { - name = "use-pkg-config-for-libxls-and-libxlsxwriter.patch"; - url = "https://github.com/andmarti1424/sc-im/commit/b62dc25eb808e18a8ab7ee7d8eb290e34efeb075.patch"; - sha256 = "1yn32ps74ngzg3rbkqf8dn0g19jv4xhxrfgx9agnywf0x8gbwjh3"; - }) - ]; - - patchFlags = [ "-p2" ]; - nativeBuildInputs = [ makeWrapper pkg-config From 940dfa99401c04c78bc530c72ecba6f6ccee62e8 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 14 May 2021 02:23:56 +0200 Subject: [PATCH 022/249] signal-desktop: Fix the database encryption by preloading SQLCipher AFAIK this is the only reliable way for us to ensure SQLCipher will be loaded instead of SQLite. It feels like a hack/workaround but according to the SQLCipher developers [0] "this issue can and should be handled downstream at the application level: 1. While it may feel like a workaround, using LD_PRELOAD is a legitimate approach here because it will substitute the system SQLite with SQLCipher which is the intended usage model;". This fixes #108772 for NixOS 20.09 users who upgrade to NixOS 21.05 and replaces #117555. For nixos-unstable users this will unfortunately break everything again so we should add a script to ease the transition (in a separate commit so that we can revert it for NixOS 21.05). [0]: https://github.com/sqlcipher/sqlcipher/issues/385#issuecomment-802874340 --- nixos/tests/signal-desktop.nix | 9 ++++----- .../instant-messengers/signal-desktop/default.nix | 6 ++++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/nixos/tests/signal-desktop.nix b/nixos/tests/signal-desktop.nix index deddb9d0834..42485cd0da7 100644 --- a/nixos/tests/signal-desktop.nix +++ b/nixos/tests/signal-desktop.nix @@ -44,12 +44,11 @@ import ./make-test-python.nix ({ pkgs, ...} : # - https://github.com/NixOS/nixpkgs/issues/108772 # - https://github.com/NixOS/nixpkgs/pull/117555 print(machine.succeed("su - alice -c 'file ~/.config/Signal/sql/db.sqlite'")) - # TODO: The DB should be encrypted and the following should be machine.fail - # instead of machine.succeed but the DB is currently unencrypted and we - # want to notice if this isn't the case anymore as the transition to a - # encrypted DB can cause data loss!: machine.succeed( - "su - alice -c 'file ~/.config/Signal/sql/db.sqlite' | grep -i sqlite" + "su - alice -c 'file ~/.config/Signal/sql/db.sqlite' | grep 'db.sqlite: data'" + ) + machine.fail( + "su - alice -c 'file ~/.config/Signal/sql/db.sqlite' | grep -e SQLite -e database" ) ''; }) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 50161f1be14..38d52b26bff 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -117,9 +117,15 @@ in stdenv.mkDerivation rec { runHook postInstall ''; + # Required for $SQLCIPHER_LIB which contains "/build/" inside the path: + noAuditTmpdir = true; + preFixup = '' + export SQLCIPHER_LIB="$out/lib/Signal/resources/app.asar.unpacked/node_modules/better-sqlite3/build/Release/better_sqlite3.node" + test -x "$SQLCIPHER_LIB" # To ensure the location hasn't changed gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" + --prefix LD_PRELOAD : "$SQLCIPHER_LIB" ${customLanguageWrapperArgs} ) From bf5cc9ff7c5a6681915820f72affc09dea27ec54 Mon Sep 17 00:00:00 2001 From: Andrei Lapshin Date: Wed, 5 May 2021 08:44:35 +0300 Subject: [PATCH 023/249] androidStudioPackages.stable: 4.1.3.0 -> 4.2.1.0 --- pkgs/applications/editors/android-studio/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 466dfb2516e..eab0a7a6f7f 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -9,14 +9,14 @@ let inherit buildFHSUserEnv; }; stableVersion = { - version = "4.1.3.0"; # "Android Studio 4.1.3" - build = "201.7199119"; - sha256Hash = "06xwgk7bwcmljka8xa56cfwwg858r0bl0xp2jb9hdnkwljf796gm"; + version = "4.2.1.0"; # "Android Studio 4.2.1" + build = "202.7351085"; + sha256Hash = "074y6i0h8zamjgvvs882im44clds3g6aq8rssl7sq1wx6hrn5q36"; }; betaVersion = { - version = "4.2.0.22"; # "Android Studio 4.2 Beta 6" - build = "202.7188722"; - sha256Hash = "0mzwkx1csx194wzg7dc1cii3c16wbmlbq1jdv9ly4nmdxlvc2rxb"; + version = "4.2.0.24"; # "Android Studio 4.2.0" + build = "202.7322048"; + sha256Hash = "1ii1zf8mv7xyql56wwkcdj5l4g3zaprdszv6r9md9r5zh78k4ccz"; }; latestVersion = { # canary & dev version = "2020.3.1.10"; # "Android Studio Arctic Fox (2020.3.1) Canary 10" From 9a025431e95067146f7d1393887ac7107629285e Mon Sep 17 00:00:00 2001 From: Andrei Lapshin Date: Wed, 5 May 2021 08:45:26 +0300 Subject: [PATCH 024/249] androidStudioPackages.{canary,dev}: 2020.3.1.10 -> 2020.3.1.15 --- pkgs/applications/editors/android-studio/common.nix | 2 +- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 678d6a0a353..6d9182b9d61 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -145,7 +145,7 @@ let ]}" # AS launches LLDBFrontend with a custom LD_LIBRARY_PATH - wrapProgram $out/bin/lldb/bin/LLDBFrontend --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ + wrapProgram $(find $out -name LLDBFrontend) --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ ncurses5 zlib ]}" diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index eab0a7a6f7f..e68e95ba542 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -19,8 +19,8 @@ let sha256Hash = "1ii1zf8mv7xyql56wwkcdj5l4g3zaprdszv6r9md9r5zh78k4ccz"; }; latestVersion = { # canary & dev - version = "2020.3.1.10"; # "Android Studio Arctic Fox (2020.3.1) Canary 10" - sha256Hash = "15xxyjjjy5pnimc66dcwnqb7z4lq7ll4fl401a3br5ca4d1hpgsj"; + version = "2020.3.1.15"; # "Android Studio Arctic Fox (2020.3.1) Canary 15" + sha256Hash = "0k66ibflqwdlgapir5w2v1d4zjwn6464yk2hvlmif9lsfdvd0ivv"; }; in { # Attributes are named by their corresponding release channels From 1fe7bef84e16055de89356e20a1a94d323776f13 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 14 May 2021 01:59:07 +0200 Subject: [PATCH 025/249] gnomeExtensions.caffeine: 37 -> 38 --- pkgs/desktops/gnome/extensions/caffeine/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/caffeine/default.nix b/pkgs/desktops/gnome/extensions/caffeine/default.nix index 3085a4461e7..8b2d538f4fe 100644 --- a/pkgs/desktops/gnome/extensions/caffeine/default.nix +++ b/pkgs/desktops/gnome/extensions/caffeine/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, glib, gettext, bash, gnome }: +{ lib, stdenv, fetchFromGitHub, glib, gettext, bash }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-caffeine"; - version = "37"; + version = "38"; src = fetchFromGitHub { owner = "eonpatapon"; repo = "gnome-shell-extension-caffeine"; rev = "v${version}"; - sha256 = "1mpa0fbpmv3pblb20dxj8iykn4ayvx89qffpcs67bzlq597zsbkb"; + sha256 = "0dyagnjmk91h96xr98mc177c473bqpxcv86qf6g3kyh3arwa9shs"; }; uuid = "caffeine@patapon.info"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fill the cup to inhibit auto suspend and screensaver"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ eperuffo ]; homepage = "https://github.com/eonpatapon/gnome-shell-extension-caffeine"; }; From 11104d664f7084811cc43c031691cde65457b0a1 Mon Sep 17 00:00:00 2001 From: "Yann Esposito (Yogsototh)" Date: Fri, 14 May 2021 10:05:58 +0200 Subject: [PATCH 026/249] leiningen: 2.9.5 -> 2.9.6 --- pkgs/development/tools/build-managers/leiningen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 51b97b242d5..90b17ed9bba 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -3,17 +3,17 @@ stdenv.mkDerivation rec { pname = "leiningen"; - version = "2.9.5"; + version = "2.9.6"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "12kv3286a2vkm3qpm2msiks87mkspxddgl7bwiacdias9dfda09n"; + sha256 = "0a8lq0yalar8szw155cxa8kywnk6yvakwi3xmxm1ahivn7i5hjq9"; }; jarsrc = fetchurl { # NOTE: This is actually a .jar, Github has issues url = "https://github.com/technomancy/leiningen/releases/download/${version}/${pname}-${version}-standalone.zip"; - sha256 = "1shyvg1471sc3bv4h3ax51626xw8a8w05f43bny6gmp8pyc0qjfz"; + sha256 = "1f3hb57rqp9qkh5n2wf65dvxraf21y15s3g643f2fhzc7vvl7ia1"; }; JARNAME = "${pname}-${version}-standalone.jar"; From e2dc2b859674411f5ed5b81781926afc7fde5260 Mon Sep 17 00:00:00 2001 From: nixbitcoin Date: Tue, 4 May 2021 11:03:13 +0000 Subject: [PATCH 027/249] btcpayserver: 1.0.7.2 -> 1.1.1 --- .../blockchains/btcpayserver/default.nix | 4 +- .../blockchains/btcpayserver/deps.nix | 153 ++++++++++++++++-- 2 files changed, 141 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 6952d9c0072..7b6e3918da5 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "btcpayserver"; - version = "1.0.7.2"; + version = "1.1.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1hxpbzc4l1zxrcvmdm93vvphhksfwd0mw2dv6h8vi4451p77dhd9"; + sha256 = "sha256-cCm4CZdVtjO2nj69CgRCrcwO0lAbiQVD6KocOj4CSdY="; }; nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index b579fc8f7f8..20b97972107 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -94,6 +94,21 @@ version = "0.6.3"; sha256 = "1vb7ahafcd3lcbiiz552aisilwm1yq3j600gkf1wik8vhvsk02fs"; }) + (fetchNuGet { + name = "Fido2.AspNet"; + version = "2.0.1"; + sha256 = "1d6bjyck3mlhb9b4c75xhzr2pcs47vdqg2ayi5wnjh1aszyam3nq"; + }) + (fetchNuGet { + name = "Fido2.Models"; + version = "2.0.1"; + sha256 = "0llpzkik82n5gpgjawx181j85d2lizimkbdkxj1wyrjvxb2xbg3q"; + }) + (fetchNuGet { + name = "Fido2"; + version = "2.0.1"; + sha256 = "1s829n970lxngbhac9lvarwa9n9hqxr79kwv8i12amnmg6ir8ny5"; + }) (fetchNuGet { name = "Google.Api.Gax.Rest"; version = "2.5.0"; @@ -149,6 +164,11 @@ version = "5.0.372"; sha256 = "1gllp58vdbql2ybwf05i2178x7p4g8zyyk64317d1pyss5217g7r"; }) + (fetchNuGet { + name = "libsodium"; + version = "1.0.18"; + sha256 = "15qzl5k31yaaapqlijr336lh4lzz1qqxlimgxy8fdyig8jdmgszn"; + }) (fetchNuGet { name = "McMaster.NETCore.Plugins.Mvc"; version = "1.3.1"; @@ -359,6 +379,11 @@ version = "3.1.4"; sha256 = "11w63yp7fk9qwmnq3lmpf1h30mlbzfx4zpm89vrs0lprj86g0742"; }) + (fetchNuGet { + name = "Microsoft.Extensions.Caching.Abstractions"; + version = "2.2.0"; + sha256 = "0hhxc5dp52faha1bdqw0k426zicsv6x1kfqi30m9agr0b2hixj52"; + }) (fetchNuGet { name = "Microsoft.Extensions.Caching.Abstractions"; version = "3.1.4"; @@ -389,6 +414,11 @@ version = "3.1.4"; sha256 = "0r33m68y1vgpmqams4sgciizl0w6y97qkp93m0hyn0nlkxqf72l6"; }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Abstractions"; + version = "3.1.5"; + sha256 = "03jwqjrfyx11ax19bq84c28qzaiyj4whrx7vayy4hr7sv0p28h8k"; + }) (fetchNuGet { name = "Microsoft.Extensions.Configuration.Binder"; version = "2.0.0"; @@ -399,6 +429,11 @@ version = "3.1.4"; sha256 = "1bnf213zlrh0m3sbhsv601yx21l5xp254jiy2g4hm7zpm8vsz1hz"; }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Binder"; + version = "3.1.5"; + sha256 = "0310pvrwbbqak7k4s32syryqxlkwli8w8bwlpnqmz42svh2302wv"; + }) (fetchNuGet { name = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "2.1.0"; @@ -429,6 +464,11 @@ version = "3.1.4"; sha256 = "0npc18pjl86d06czb0fy6ln3prfpwfb16p6709xx2jrsl96dp9bp"; }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration"; + version = "3.1.5"; + sha256 = "1i7zm8ghgxwp655anyfm910qm7rcpvrz48fxjyzw9w63hj4sv6bk"; + }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; @@ -444,6 +484,11 @@ version = "3.1.4"; sha256 = "03ys96pqca93zwxvh0vprzms09i9y0lmq32w98m6klbizq01fc06"; }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "3.1.5"; + sha256 = "1wkf8ajh4pj6g3wwd18g3hjc3lqqny8052rl373ddcardxrs2gvn"; + }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection"; version = "2.0.0"; @@ -539,6 +584,11 @@ version = "3.1.4"; sha256 = "1rkl0yqmi5vfivn641866v2mdsgdy8amym546y6lzbab39g24b5n"; }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "3.1.5"; + sha256 = "0lr22hlf52csrna9ly2lbz3y1agfgdlg7rvsqjg7ik488dhkmhji"; + }) (fetchNuGet { name = "Microsoft.Extensions.Logging.Filter"; version = "1.1.2"; @@ -559,6 +609,11 @@ version = "2.0.0"; sha256 = "1isc3rjbzz60f7wbmgcwslx5d10hm5hisnk7v54vfi2bz7132gll"; }) + (fetchNuGet { + name = "Microsoft.Extensions.Options.ConfigurationExtensions"; + version = "3.1.5"; + sha256 = "10w78fj2jpmghvprz6b046xcr68zzp6x550a7m1iivn0h7a3l7pi"; + }) (fetchNuGet { name = "Microsoft.Extensions.Options"; version = "2.0.0"; @@ -569,6 +624,11 @@ version = "3.1.4"; sha256 = "0jphncx82l7jm5xi49dfxhbh24wv86sy44022chd7bkizllsypp4"; }) + (fetchNuGet { + name = "Microsoft.Extensions.Options"; + version = "3.1.5"; + sha256 = "0rhqyqa7vhlmz2g0250zhypaayvckx4dv89micdg521cpvr5arpr"; + }) (fetchNuGet { name = "Microsoft.Extensions.PlatformAbstractions"; version = "1.1.0"; @@ -589,11 +649,36 @@ version = "2.1.0"; sha256 = "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb"; }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "2.2.0"; + sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; + }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "3.1.4"; sha256 = "12xvysk024aghrcwzv4525vznnk8lqmknl2vqqxhq4k5hjxpsysp"; }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "3.1.5"; + sha256 = "0n2pk1sy8ikd29282sx4ps9r1wnhzgg4nwmkka9ypjizd8lkkk2m"; + }) + (fetchNuGet { + name = "Microsoft.IdentityModel.JsonWebTokens"; + version = "6.6.0"; + sha256 = "06z5a1jpqpdd1pix85is7kkpn4v0l4an909skji2p8gm09p5sfyv"; + }) + (fetchNuGet { + name = "Microsoft.IdentityModel.Logging"; + version = "6.6.0"; + sha256 = "1mpkx544cbxws1a22zwxbp3lqqamcc3x915l23spsxqvgr02jjrq"; + }) + (fetchNuGet { + name = "Microsoft.IdentityModel.Tokens"; + version = "6.6.0"; + sha256 = "0h5vbsd5x9cf7nqyrwn7d7y1axhf1zz0jr9prvi4xpxawa3kajyj"; + }) (fetchNuGet { name = "Microsoft.NET.Test.Sdk"; version = "16.6.1"; @@ -671,8 +756,8 @@ }) (fetchNuGet { name = "NBitcoin.Altcoins"; - version = "2.0.28"; - sha256 = "1zfirfmhgigp733km9rqkgz560h5wg88bpba499x49h5j650cnn4"; + version = "2.0.31"; + sha256 = "13gcfsxpfq8slmsvgzf6iv581x7n535zq0p9c88bqs5p88r6lygm"; }) (fetchNuGet { name = "NBitcoin"; @@ -694,6 +779,11 @@ version = "5.0.73"; sha256 = "0vqgcb0ws5fnkrdzqfkyh78041c6q4l22b93rr0006dd4bmqrmg1"; }) + (fetchNuGet { + name = "NBitcoin"; + version = "5.0.77"; + sha256 = "0ykz4ii6lh6gdlz6z264wnib5pfnmq9q617qqbg0f04mq654jygb"; + }) (fetchNuGet { name = "NBitpayClient"; version = "1.0.0.39"; @@ -701,8 +791,8 @@ }) (fetchNuGet { name = "NBXplorer.Client"; - version = "3.0.20"; - sha256 = "1mwa6ncmg5r6q7yn6skm9dgqm631c7r7nadcg9mvbw81113h0xxy"; + version = "3.0.21"; + sha256 = "1asri2wsjq3ljf2p4r4x52ba9cirh8ccc5ysxpnv4cvladkdazbi"; }) (fetchNuGet { name = "NETStandard.Library"; @@ -784,6 +874,11 @@ version = "4.1.3.1"; sha256 = "0qk3hb8s521c2gy4k3m1i6fhpr133mnw9w85cwsy9j7ghxyca1nv"; }) + (fetchNuGet { + name = "NSec.Cryptography"; + version = "20.2.0"; + sha256 = "19slji51v8s8i4836nqqg7qb3i3p4ahqahz0fbb3gwpp67pn6izx"; + }) (fetchNuGet { name = "NuGet.Frameworks"; version = "5.0.0"; @@ -794,6 +889,21 @@ version = "1.5.12"; sha256 = "0f4gs31z8dwfvd246nrv3m0qkxzav37hxynx2maykza017khynyf"; }) + (fetchNuGet { + name = "PeterO.Cbor"; + version = "4.1.3"; + sha256 = "0882i3bhhx2yag2m4lbdsgngjwaj9ff4v0ab9zb839i4r77aq1yn"; + }) + (fetchNuGet { + name = "PeterO.Numbers"; + version = "1.6.0"; + sha256 = "04kfdkfr600h69g67g6izbn57bxqjamvaadyw3p9gjsc0wrivi98"; + }) + (fetchNuGet { + name = "PeterO.URIUtility"; + version = "1.0.0"; + sha256 = "04ihfbk2lf0smznwfb62h57qknls5jyxirdz72g5wn9h1dcgkdac"; + }) (fetchNuGet { name = "Pomelo.EntityFrameworkCore.MySql"; version = "3.1.1"; @@ -804,11 +914,6 @@ version = "2.2.1"; sha256 = "1w6s9wjbsyvq8cnqknkdzm9chnv0g5gcsrq5i94zp6br9vg7c627"; }) - (fetchNuGet { - name = "Portable.BouncyCastle"; - version = "1.8.1.3"; - sha256 = "1lv1ljaz8df835jgmp3ny1xgqqjf1s9f25baw7bf8d24qlf25i2g"; - }) (fetchNuGet { name = "QRCoder"; version = "1.4.1"; @@ -1164,6 +1269,11 @@ version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { + name = "System.IdentityModel.Tokens.Jwt"; + version = "6.6.0"; + sha256 = "17i6a43g1fksq9xy77dgsz54klz71pz062pb58lqx8h06p1818h1"; + }) (fetchNuGet { name = "System.Interactive.Async"; version = "3.1.1"; @@ -1239,11 +1349,21 @@ version = "4.5.0"; sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; }) + (fetchNuGet { + name = "System.Memory"; + version = "4.5.1"; + sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; + }) (fetchNuGet { name = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) + (fetchNuGet { + name = "System.Memory"; + version = "4.5.4"; + sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; + }) (fetchNuGet { name = "System.Net.Http"; version = "4.3.0"; @@ -1409,6 +1529,11 @@ version = "4.5.0"; sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.5.1"; + sha256 = "1xcrjx5fwg284qdnxyi2d0lzdm5q4frlpkp0nf6vvkx1kdz2prrf"; + }) (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; @@ -1529,6 +1654,11 @@ version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) + (fetchNuGet { + name = "System.Security.Cryptography.Cng"; + version = "4.7.0"; + sha256 = "00797sqbba8lys486ifxblz9j52m29kidclvmqpk531820k55x9j"; + }) (fetchNuGet { name = "System.Security.Cryptography.Csp"; version = "4.3.0"; @@ -1789,11 +1919,6 @@ version = "2.12.1"; sha256 = "0m41dxzc3hh0f4j1k4q915pvcq6zr0hv1pj6b3sayrn8vjhk64qb"; }) - (fetchNuGet { - name = "U2F.Core"; - version = "1.0.4"; - sha256 = "0mk32yyihigp9njs54z411fswgzr6x3kw134c7ylwy2d2wmq2n9b"; - }) (fetchNuGet { name = "WindowsAzure.Storage"; version = "9.3.3"; From 074b608d01e60fbef9bffe0ac7e25e72d20f4866 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Tue, 4 May 2021 15:04:35 +0200 Subject: [PATCH 028/249] nbxplorer: 2.1.49 -> 2.1.51 --- .../blockchains/nbxplorer/default.nix | 4 ++-- .../applications/blockchains/nbxplorer/deps.nix | 17 +++++++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix index ffa061edc72..7e279b22696 100644 --- a/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/pkgs/applications/blockchains/nbxplorer/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "nbxplorer"; - version = "2.1.49"; + version = "2.1.51"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "0xg5gbq6rbzgsbgwf94qcy2b0m5kdspi6hc5a64smaj9i7i0136l"; + sha256 = "sha256-tvuuoDZCSDFa8gAVyH+EP1DLtdPfbkr+w5lSxZkzZXg="; }; nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; diff --git a/pkgs/applications/blockchains/nbxplorer/deps.nix b/pkgs/applications/blockchains/nbxplorer/deps.nix index b0bf85f623f..de75ad228d3 100644 --- a/pkgs/applications/blockchains/nbxplorer/deps.nix +++ b/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -181,18 +181,23 @@ }) (fetchNuGet { name = "NBitcoin.Altcoins"; - version = "2.0.28"; - sha256 = "1zfirfmhgigp733km9rqkgz560h5wg88bpba499x49h5j650cnn4"; + version = "2.0.31"; + sha256 = "13gcfsxpfq8slmsvgzf6iv581x7n535zq0p9c88bqs5p88r6lygm"; }) (fetchNuGet { name = "NBitcoin.TestFramework"; - version = "2.0.21"; - sha256 = "1k26fkss6d7x2yqlid31z5i04b5dmlbbbwijg9c8i3d996i1z7sq"; + version = "2.0.22"; + sha256 = "1zwhjy6xppl01jhkgl7lqjsmi8crny4qq22ml20cz8l437j1zi4n"; }) (fetchNuGet { name = "NBitcoin"; - version = "5.0.73"; - sha256 = "0vqgcb0ws5fnkrdzqfkyh78041c6q4l22b93rr0006dd4bmqrmg1"; + version = "5.0.76"; + sha256 = "0q3ilmsrw9ip1s38qmfs4qi02xvccmy1naafffn5yxj08q0n1p79"; + }) + (fetchNuGet { + name = "NBitcoin"; + version = "5.0.77"; + sha256 = "0ykz4ii6lh6gdlz6z264wnib5pfnmq9q617qqbg0f04mq654jygb"; }) (fetchNuGet { name = "NETStandard.Library"; From 60c6153ab12229fa3d067460614131da5e67f6da Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Tue, 4 May 2021 15:04:36 +0200 Subject: [PATCH 029/249] btcpayserver/update.sh: auto-update nbxplorer It's now sufficient to run a single script (btcpayserver/update.sh) to update btcpayserver. This simplifies maintenance. nbxplorer is a strict dependency of btcpayserver. --- pkgs/applications/blockchains/btcpayserver/update.sh | 7 ++++++- .../applications/blockchains/nbxplorer/util/create-deps.sh | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/btcpayserver/update.sh b/pkgs/applications/blockchains/btcpayserver/update.sh index 1f7dbedd020..9debe6780f2 100755 --- a/pkgs/applications/blockchains/btcpayserver/update.sh +++ b/pkgs/applications/blockchains/btcpayserver/update.sh @@ -2,5 +2,10 @@ set -euo pipefail scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) +cd "$scriptDir" -"$scriptDir"/../nbxplorer/util/update-common.sh btcpayserver "$scriptDir"/deps.nix +echo "Updating nbxplorer" +../nbxplorer/update.sh +echo +echo "Updating btcpayserver" +../nbxplorer/util/update-common.sh btcpayserver deps.nix diff --git a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh b/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh index 1402d1cd1eb..14b1687dfff 100755 --- a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh +++ b/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh @@ -6,7 +6,7 @@ set -euo pipefail # Expects $pkgSrc to contain a single .sln file. pkgSrc=$1 -depsFile=$2 +depsFile=$(realpath "$2") sln=$(cd "$pkgSrc"; find * -maxdepth 0 -name '*.sln' | head -1) [[ $sln ]] || { echo "No .sln file in $pkgSrc" ; exit 1; } From 1608efae17a36cc6206d929801cf2bd887d157b2 Mon Sep 17 00:00:00 2001 From: nixbitcoin Date: Wed, 5 May 2021 13:59:37 +0200 Subject: [PATCH 030/249] btcpayserver, nbxplorer: gpg verify upstream sources --- .../nbxplorer/util/update-common.sh | 61 +++++++++++++------ 1 file changed, 42 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh index c69168ccbbb..7a9262bf483 100755 --- a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh +++ b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh @@ -1,16 +1,16 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p coreutils curl jq common-updater-scripts dotnet-sdk_3 +#!nix-shell -i bash -p coreutils curl jq common-updater-scripts dotnet-sdk_3 git gnupg set -euo pipefail # This script uses the following env vars: # getVersionFromTags -# onlyCreateDeps +# refetch pkgName=$1 depsFile=$2 : ${getVersionFromTags:=} -: ${onlyCreateDeps:=} +: ${refetch:=} scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) nixpkgs=$(realpath "$scriptDir"/../../../../..) @@ -29,23 +29,46 @@ getLatestVersionTag() { | sort -V | tail -1 | sed 's|^v||' } -if [[ ! $onlyCreateDeps ]]; then - oldVersion=$(evalNixpkgs "$pkgName.version") - if [[ $getVersionFromTags ]]; then - newVersion=$(getLatestVersionTag) - else - newVersion=$(curl -s "https://api.github.com/repos/$(getRepo)/releases" | jq -r '.[0].name') - fi - - if [[ $newVersion == $oldVersion ]]; then - echo "nixpkgs already has the latest version $newVersion" - echo "Run this script with env var onlyCreateDeps=1 to recreate "$(basename "$depsFile") - exit 0 - else - echo "Updating $pkgName: $oldVersion -> $newVersion" - (cd "$nixpkgs" && update-source-version "$pkgName" "$newVersion") - fi +oldVersion=$(evalNixpkgs "$pkgName.version") +if [[ $getVersionFromTags ]]; then + newVersion=$(getLatestVersionTag) +else + newVersion=$(curl -s "https://api.github.com/repos/$(getRepo)/releases" | jq -r '.[0].name') fi +if [[ $newVersion == $oldVersion && ! $refetch ]]; then + echo "nixpkgs already has the latest version $newVersion" + echo "Run this script with env var refetch=1 to re-verify the content hash via GPG" + echo "and to recreate $(basename "$depsFile"). This is useful for reviewing a version update." + exit 0 +fi + +# Fetch release and GPG-verify the content hash +tmpdir=$(mktemp -d /tmp/$pkgName-verify-gpg.XXX) +repo=$tmpdir/repo +trap "rm -rf $tmpdir" EXIT +git clone --depth 1 --branch v${newVersion} -c advice.detachedHead=false https://github.com/$(getRepo) $repo +export GNUPGHOME=$tmpdir +# Fetch Nicolas Dorier's key (64-bit key ID: 6618763EF09186FE) +gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys AB4CFA9895ACA0DBE27F6B346618763EF09186FE 2> /dev/null +echo +echo "Verifying commit" +git -C $repo verify-commit HEAD +rm -rf $repo/.git +newHash=$(nix hash-path $repo) +rm -rf $tmpdir +echo + +# Update pkg version and hash +echo "Updating $pkgName: $oldVersion -> $newVersion" +if [[ $newVersion == $oldVersion ]]; then + # Temporarily set a source version that doesn't equal $newVersion so that $newHash + # is always updated in the next call to update-source-version. + (cd "$nixpkgs" && update-source-version "$pkgName" "0" "0000000000000000000000000000000000000000000000000000") +fi +(cd "$nixpkgs" && update-source-version "$pkgName" "$newVersion" "$newHash") +echo + +# Create deps file storeSrc="$(nix-build "$nixpkgs" -A $pkgName.src --no-out-link)" . "$scriptDir"/create-deps.sh "$storeSrc" "$depsFile" From 6c9b24191b92af433393784d9c93128e41a0aa45 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 May 2021 12:27:13 +0200 Subject: [PATCH 031/249] ipinfo: init at 1.1.2 --- pkgs/tools/networking/ipinfo/default.nix | 25 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/networking/ipinfo/default.nix diff --git a/pkgs/tools/networking/ipinfo/default.nix b/pkgs/tools/networking/ipinfo/default.nix new file mode 100644 index 00000000000..84dc5707cfa --- /dev/null +++ b/pkgs/tools/networking/ipinfo/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "ipinfo"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = pname; + repo = "cli"; + rev = "${pname}-${version}"; + sha256 = "0hcv0fyrrybasxk2j1la4jmpi161apkg6d4nlsjw6548li6c6a9n"; + }; + + vendorSha256 = null; + + meta = with lib; { + description = "Command Line Interface for the IPinfo API"; + homepage = "https://github.com/ipinfo/cli"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02bf98e1b32..ed86c421cd9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5750,6 +5750,8 @@ in netifd = callPackage ../tools/networking/netifd {}; + ipinfo = callPackage ../tools/networking/ipinfo {}; + ipscan = callPackage ../tools/security/ipscan { }; ipv6calc = callPackage ../tools/networking/ipv6calc {}; From 96002e32bf61172dc5bbbf8e7ee3e69fa027af52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Fri, 14 May 2021 12:44:38 +0200 Subject: [PATCH 032/249] ruffle: nightly-2021-04-02 -> nightly-2021-05-14 --- pkgs/misc/emulators/ruffle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/ruffle/default.nix b/pkgs/misc/emulators/ruffle/default.nix index affbf0af15a..11be67b6d9e 100644 --- a/pkgs/misc/emulators/ruffle/default.nix +++ b/pkgs/misc/emulators/ruffle/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "ruffle"; - version = "nightly-2021-04-02"; + version = "nightly-2021-05-14"; src = fetchFromGitHub { owner = "ruffle-rs"; repo = pname; rev = version; - sha256 = "1diz94y53hvii28894zz65aya12v8yw1864lqpkrdbj67yc6ykdj"; + sha256 = "15azv8y7a4sgxvvhl7z45jyxj91b4nn681vband5726c7znskhwl"; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/ruffle_desktop --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib ''; - cargoSha256 = "0pnp5kmij4dwwvmgdv81mqcawcjcgg5gd6cpyf0xalyfjgj8i732"; + cargoSha256 = "0ihy4rgw9b4yqlqs87rx700h3a8wm02wpahhg7inic1lcag4bxif"; meta = with lib; { description = "An Adobe Flash Player emulator written in the Rust programming language."; From 86634bbff3d698d1c02162c282f74da049a5b0f4 Mon Sep 17 00:00:00 2001 From: David Terry Date: Fri, 14 May 2021 13:06:05 +0200 Subject: [PATCH 033/249] turbo-geth: 2021.05.01 -> 2021.05.2 --- pkgs/applications/blockchains/turbo-geth.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/turbo-geth.nix b/pkgs/applications/blockchains/turbo-geth.nix index 1c3b816750e..b1548212a69 100644 --- a/pkgs/applications/blockchains/turbo-geth.nix +++ b/pkgs/applications/blockchains/turbo-geth.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "turbo-geth"; - version = "2021.05.01"; + version = "2021.05.02"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zvxtBK0/6fShxAZfU4gTV0XiP6TzhKFNsADSZA9gv0Y="; + sha256 = "sha256-7sTRAAlKZOdwi/LRbIEDKWpBe1ol8pZfEf2KIC4s0xk="; }; - vendorSha256 = "0c8p6djs0zcci8sh4zgzky89155mr4cfqlax025618x8vngrsxf2"; + vendorSha256 = "1d0ahdb2b5v8nxq3kdxw151phnyv6habb8kr8qjaq3kyhcnyk6ng"; runVend = true; subPackages = [ From e10ce7ef01a1bd6846bf4982c97b8b2d2a57ae82 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 14 May 2021 09:21:00 +0100 Subject: [PATCH 034/249] waypoint: 0.3.1 -> 0.3.2 Disable check phase to avoid error log Add completion --- .../networking/cluster/waypoint/default.nix | 30 +++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/waypoint/default.nix b/pkgs/applications/networking/cluster/waypoint/default.nix index d21219f4386..2a534c2fb89 100644 --- a/pkgs/applications/networking/cluster/waypoint/default.nix +++ b/pkgs/applications/networking/cluster/waypoint/default.nix @@ -1,20 +1,20 @@ -{ lib, buildGoModule, fetchFromGitHub, go-bindata }: +{ lib, buildGoModule, fetchFromGitHub, go-bindata, installShellFiles }: buildGoModule rec { pname = "waypoint"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WzKUVfc7oGMh0TamL5b6gsm/BAfSCZ6EB3Hg4Tg/3Hw="; + sha256 = "sha256-57DHImPYVFK+MXWGeArvc5fwHmqa3zodLytfDoAxglo="; }; deleteVendor = true; - vendorSha256 = "sha256-VxKUYD92DssoSjWxR+1gZLq34vCVM/4U2ju5felLWzI="; + vendorSha256 = "sha256-HxrY35SqfUbT6VCCXkLUjAsxgtMzpOeoicAGLwD2OyA="; - nativeBuildInputs = [ go-bindata ]; + nativeBuildInputs = [ go-bindata installShellFiles ]; # GIT_{COMMIT,DIRTY} filled in blank to prevent trying to run git and ending up blank anyway buildPhase = '' @@ -23,9 +23,29 @@ buildGoModule rec { runHook postBuild ''; + doCheck = false; + installPhase = '' runHook preInstall + + local INSTALL="$out/bin/waypoint" install -D waypoint $out/bin/waypoint + + # Write to a file as it doesn't like EOF within <() + cat > waypoint.fish < Date: Fri, 14 May 2021 12:57:25 +0200 Subject: [PATCH 035/249] libxlsxwriter: 1.0.4 -> 1.0.5 https://github.com/jmcnamara/libxlsxwriter/releases/tag/RELEASE_1.0.5 --- pkgs/development/libraries/libxlsxwriter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxlsxwriter/default.nix b/pkgs/development/libraries/libxlsxwriter/default.nix index 7f1b583284b..d323c2d962e 100644 --- a/pkgs/development/libraries/libxlsxwriter/default.nix +++ b/pkgs/development/libraries/libxlsxwriter/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libxlsxwriter"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "jmcnamara"; repo = "libxlsxwriter"; rev = "RELEASE_${version}"; - sha256 = "0k0km5d4xs6z98nqczvdkqwhhc5izqs82ciifx2l5wcbcdxb4r0k"; + sha256 = "1jjmwg1mk7pvf36q30rng42qphgz6qdjvn96agrym2q0hhwxc99v"; }; nativeBuildInputs = [ From b85094e0e9717f22116d2f860059e199c426d827 Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Fri, 26 Mar 2021 16:08:20 -0400 Subject: [PATCH 036/249] gradm: 3.1-202012071814 -> 3.1-202102241600 --- pkgs/os-specific/linux/gradm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix index 7d2660ad26e..cd99dfa5db8 100644 --- a/pkgs/os-specific/linux/gradm/default.nix +++ b/pkgs/os-specific/linux/gradm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gradm"; - version = "3.1-202012071814"; + version = "3.1-202102241600"; src = fetchurl { - url = "http://grsecurity.net/stable/${pname}-${version}.tar.gz"; - sha256 = "sha256-ghl9P2IYsSHcJsVxJbFwfFS1CTZ2xLxdvyhdk/1OZG4="; + url = "https://grsecurity.net/stable/${pname}-${version}.tar.gz"; + sha256 = "02ni34hpggv00140p9gvh0lqi173zdddd2qhfi96hyr1axd5pl50"; }; nativeBuildInputs = [ bison flex ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "grsecurity RBAC administration and policy analysis utility"; homepage = "https://grsecurity.net"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice joachifm ]; }; From b3ae02c0cf9258847935561790199a41a79d8276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 14 May 2021 15:58:03 +0200 Subject: [PATCH 037/249] pybind11: drop Instead, pythonPackages.pybind11 for the appropriate version of Python should be used. --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b8a804f9aaa..08e18bbc3c1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -616,6 +616,7 @@ mapAliases ({ phonon-backend-gstreamer = throw "phonon-backend-gstreamer: Please use libsForQt5.phonon-backend-gstreamer, as Qt4 support in this package has been removed."; # added 2019-11-22 phonon-backend-vlc = throw "phonon-backend-vlc: Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed."; # added 2019-11-22 phonon = throw "phonon: Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22 + pybind11 = throw "pybind11 was removed because pythonPackages.pybind11 for the appropriate version of Python should be used"; # added 2021-05-14 pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd."; # added 2020-10-24 python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead."; # added 2021-03-08 quagga = throw "quagga is no longer maintained upstream"; # added 2021-04-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd951f15f51..aed4c9d6106 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17262,8 +17262,6 @@ in pugixml = callPackage ../development/libraries/pugixml { }; - pybind11 = pythonPackages.pybind11; - pylode = callPackage ../misc/pylode {}; python-qt = callPackage ../development/libraries/python-qt { From c5a08f8a62eb58593e51886304b4e6ddfc9fae1e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 14 May 2021 18:58:10 +0200 Subject: [PATCH 038/249] waybox: 2020-05-01 -> 2021-04-07 --- pkgs/applications/window-managers/waybox/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/window-managers/waybox/default.nix b/pkgs/applications/window-managers/waybox/default.nix index 007e4dcc568..f6530aae8d0 100644 --- a/pkgs/applications/window-managers/waybox/default.nix +++ b/pkgs/applications/window-managers/waybox/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "waybox"; - version = "unstable-2020-05-01"; + version = "unstable-2021-04-07"; src = fetchFromGitHub { owner = "wizbright"; repo = pname; - rev = "93811898f0eea3035145f593938d49d5af759b46"; - sha256 = "IOdKOqAQD87Rs3td8NVEgMnRF6kQSuQ64UVqeVqMBSM="; + rev = "309ccd2faf08079e698104b19eff32b3a255b947"; + sha256 = "0kzss266jf1kgwnhk42vaakbmn269nphlq9xjsapp6mhccd9qz8v"; }; nativeBuildInputs = [ pkg-config meson ninja ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ae283aa6b3..9db4aa5f934 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24045,9 +24045,7 @@ in i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { }; - waybox = callPackage ../applications/window-managers/waybox { - wlroots = wlroots_0_12; - }; + waybox = callPackage ../applications/window-managers/waybox { }; workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { }; From 45bd7b39a444c904986324b5f7c46ba867612575 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 14 May 2021 21:59:39 +0200 Subject: [PATCH 039/249] signal-desktop: Add a Python wrapper to re-encrypt DBs This is super hacky... :o But then again it should at least prevent data loss. Note: At least this isn't required for NixOS 21.05. --- .../signal-desktop/db-reencryption-wrapper.py | 92 +++++++++++++++++++ .../signal-desktop/default.nix | 15 ++- 2 files changed, 106 insertions(+), 1 deletion(-) create mode 100755 pkgs/applications/networking/instant-messengers/signal-desktop/db-reencryption-wrapper.py diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/db-reencryption-wrapper.py b/pkgs/applications/networking/instant-messengers/signal-desktop/db-reencryption-wrapper.py new file mode 100755 index 00000000000..8556ee1e4d7 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/db-reencryption-wrapper.py @@ -0,0 +1,92 @@ +#!@PYTHON@ + +import json +import os +import re +import shlex +import sqlite3 +import subprocess +import sys + + +DB_PATH = os.path.join(os.environ['HOME'], '.config/Signal/sql/db.sqlite') +DB_COPY = os.path.join(os.environ['HOME'], '.config/Signal/sql/db.tmp') +CONFIG_PATH = os.path.join(os.environ['HOME'], '.config/Signal/config.json') + + +def zenity_askyesno(title, text): + args = [ + '@ZENITY@', + '--question', + '--title', + shlex.quote(title), + '--text', + shlex.quote(text) + ] + return subprocess.run(args).returncode == 0 + + +def start_signal(): + os.execvp('@SIGNAL-DESKTOP@', ['@SIGNAL-DESKTOP@'] + sys.argv[1:]) + + +def copy_pragma(name): + result = subprocess.run([ + '@SQLCIPHER@', + DB_PATH, + f"PRAGMA {name};" + ], check=True, capture_output=True).stdout + result = re.search(r'[0-9]+', result.decode()).group(0) + subprocess.run([ + '@SQLCIPHER@', + DB_COPY, + f"PRAGMA key = \"x'{key}'\"; PRAGMA {name} = {result};" + ], check=True, capture_output=True) + + +try: + # Test if DB is encrypted: + con = sqlite3.connect(f'file:{DB_PATH}?mode=ro', uri=True) + cursor = con.cursor() + cursor.execute("SELECT name FROM sqlite_master WHERE type='table';") + con.close() +except: + # DB is encrypted, everything ok: + start_signal() + + +# DB is unencrypted! +answer = zenity_askyesno( + "Error: Signal-Desktop database is not encrypted", + "Should we try to fix this automatically?" + + "You likely want to backup ~/.config/Signal/ first." +) +if not answer: + answer = zenity_askyesno( + "Launch Signal-Desktop", + "DB is unencrypted, should we still launch Signal-Desktop?" + + "Warning: This could result in data loss!" + ) + if not answer: + print('Aborted') + sys.exit(0) + start_signal() + +# Re-encrypt the DB: +with open(CONFIG_PATH) as json_file: + key = json.load(json_file)['key'] +result = subprocess.run([ + '@SQLCIPHER@', + DB_PATH, + f" ATTACH DATABASE '{DB_COPY}' AS signal_db KEY \"x'{key}'\";" + + " SELECT sqlcipher_export('signal_db');" + + " DETACH DATABASE signal_db;" +]).returncode +if result != 0: + print('DB encryption failed') + sys.exit(1) +# Need to copy user_version and schema_version manually: +copy_pragma('user_version') +copy_pragma('schema_version') +os.rename(DB_COPY, DB_PATH) +start_signal() diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 38d52b26bff..e1ba5884de7 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -10,6 +10,9 @@ , hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" # For a full list of available languages: # $ cat pkgs/development/libraries/hunspell/dictionaries.nix | grep "dictFileName =" | awk '{ print $3 }' +, python3 +, gnome +, sqlcipher }: let @@ -112,7 +115,7 @@ in stdenv.mkDerivation rec { # Symlink to bin mkdir -p $out/bin - ln -s $out/lib/Signal/signal-desktop $out/bin/signal-desktop + ln -s $out/lib/Signal/signal-desktop $out/bin/signal-desktop-unwrapped runHook postInstall ''; @@ -137,6 +140,16 @@ in stdenv.mkDerivation rec { patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/Signal/resources/app.asar.unpacked/node_modules/ringrtc/build/linux/libringrtc.node ''; + postFixup = '' + # This hack is temporarily required to avoid data-loss for users: + cp ${./db-reencryption-wrapper.py} $out/bin/signal-desktop + substituteInPlace $out/bin/signal-desktop \ + --replace '@PYTHON@' '${python3}/bin/python3' \ + --replace '@ZENITY@' '${gnome.zenity}/bin/zenity' \ + --replace '@SQLCIPHER@' '${sqlcipher}/bin/sqlcipher' \ + --replace '@SIGNAL-DESKTOP@' "$out/bin/signal-desktop-unwrapped" + ''; + # Tests if the application launches and waits for "Link your phone to Signal Desktop": passthru.tests.application-launch = nixosTests.signal-desktop; From f0479309926fcc459f3d37b83315aea67479596c Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 14 May 2021 18:18:14 -0300 Subject: [PATCH 040/249] babashka: 0.4.0 -> 0.4.1 --- pkgs/development/interpreters/clojure/babashka.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 233a4282a5a..543f443a796 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "babashka"; - version = "0.4.0"; + version = "0.4.1"; reflectionJson = fetchurl { name = "reflection.json"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-NY78gkKJd9ATdu7Ja1AvWkaPv0PuDIKWDZBeYGMJufU="; + sha256 = "sha256-tKMxi0umMmM99NusSSE9tT95TBcfXm1lfo95fQRUBrs="; }; dontUnpack = true; From d4e5bd979df44e3b4cc98e78b0f49f6e4fa8f19a Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 14 May 2021 18:15:03 -0300 Subject: [PATCH 041/249] opentabletdriver: 0.5.1 -> 0.5.3.1 --- pkgs/tools/X11/opentabletdriver/default.nix | 6 +++--- pkgs/tools/X11/opentabletdriver/deps.nix | 8 ++++---- pkgs/tools/X11/opentabletdriver/update.sh | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/X11/opentabletdriver/default.nix b/pkgs/tools/X11/opentabletdriver/default.nix index 0ab7be8374c..5128e4d30ca 100644 --- a/pkgs/tools/X11/opentabletdriver/default.nix +++ b/pkgs/tools/X11/opentabletdriver/default.nix @@ -23,18 +23,18 @@ stdenv.mkDerivation rec { pname = "OpenTabletDriver"; - version = "0.5.1"; + version = "0.5.3.1"; src = fetchFromGitHub { owner = "InfinityGhost"; repo = "OpenTabletDriver"; rev = "v${version}"; - sha256 = "1if2mkj193yzf5si9pwaynrm6wkhqy7ihk4k1lklzcryk5675w36"; + sha256 = "OT8/c+6wNpZyq/q7uMxIqmyJKNAq0B4ynEAqFF0GWyo="; }; debPkg = fetchurl { url = "https://github.com/InfinityGhost/OpenTabletDriver/releases/download/v${version}/OpenTabletDriver.deb"; - sha256 = "16a1rr0yxra1dhwysbbfgsxpigh2jhjlsl7r28dgp8qcxncck7wg"; + sha256 = "0nm0v1xhphl6g6rz3li4rbdp7408g6sf9l4nh3mbbif5042xa0qh"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/X11/opentabletdriver/deps.nix b/pkgs/tools/X11/opentabletdriver/deps.nix index ccb7097153b..041795596b1 100644 --- a/pkgs/tools/X11/opentabletdriver/deps.nix +++ b/pkgs/tools/X11/opentabletdriver/deps.nix @@ -41,8 +41,8 @@ }) (fetchNuGet { name = "HidSharpCore"; - version = "1.2.1"; - sha256 = "0vcw38skr9g691gxbzv3cf6y9rk11vh5pvcyjshdgii2z1z8a4g2"; + version = "1.2.1.1"; + sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll"; }) (fetchNuGet { name = "MessagePack.Annotations"; @@ -121,8 +121,8 @@ }) (fetchNuGet { name = "Octokit"; - version = "0.48.0"; - sha256 = "17ria1shx04rb6knbaswpqndmwam6v3r3lsfsd486q584798ccn8"; + version = "0.50.0"; + sha256 = "1ignj5i6a1c19qqrw00wlr9fdjmwrxkxz7gdxj0x653w84gbv7qq"; }) (fetchNuGet { name = "PangoSharp"; diff --git a/pkgs/tools/X11/opentabletdriver/update.sh b/pkgs/tools/X11/opentabletdriver/update.sh index 715857cf8f4..9944bb0b6de 100755 --- a/pkgs/tools/X11/opentabletdriver/update.sh +++ b/pkgs/tools/X11/opentabletdriver/update.sh @@ -7,7 +7,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")" deps_file="$(realpath "./deps.nix")" -new_version="$(curl -s "https://api.github.com/repos/InfinityGhost/OpenTabletDriver/releases" | jq -r '.[0].tag_name' | sed 's|[^0-9.]||g')" +new_version="$(curl -s "https://api.github.com/repos/OpenTabletDriver/OpenTabletDriver/releases" | jq -r '.[0].tag_name' | sed 's|[^0-9.]||g')" old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" if [[ "$new_version" == "$old_version" ]]; then echo "Up to date" @@ -15,8 +15,8 @@ if [[ "$new_version" == "$old_version" ]]; then fi # Updating the hash of deb package manually since there seems to be no way to do it automatically -oldDebPkgUrl="https://github.com/InfinityGhost/OpenTabletDriver/releases/download/v${old_version}/OpenTabletDriver.deb"; -newDebPkgUrl="https://github.com/InfinityGhost/OpenTabletDriver/releases/download/v${new_version}/OpenTabletDriver.deb"; +oldDebPkgUrl="https://github.com/OpenTabletDriver/OpenTabletDriver/releases/download/v${old_version}/OpenTabletDriver.deb"; +newDebPkgUrl="https://github.com/OpenTabletDriver/OpenTabletDriver/releases/download/v${new_version}/OpenTabletDriver.deb"; oldDebSha256=$(nix-prefetch-url "$oldDebPkgUrl") newDebSha256=$(nix-prefetch-url "$newDebPkgUrl") echo "oldDebSha256: $oldDebSha256 newDebSha256: $newDebSha256" From 4e157ee75790001a8cd690d0c194bfae25520da5 Mon Sep 17 00:00:00 2001 From: vulpes2 Date: Sat, 15 May 2021 04:24:57 -0400 Subject: [PATCH 042/249] mmc-utils: 2019-10-04 -> 2021-05-11 --- pkgs/os-specific/linux/mmc-utils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index aff847c20ff..7430182e5d2 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "mmc-utils"; - version = "2019-10-04"; + version = "2021-05-11"; src = fetchgit { url = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git"; - rev = "73d6c59af8d1bcedf5de4aa1f5d5b7f765f545f5"; - sha256 = "18a7qm86gavg15gv4h6xfnapgq24v4dyvhwfp53lkssxyhjbli0z"; + rev = "43282e80e174cc73b09b81a4d17cb3a7b4dc5cfc"; + sha256 = "0l06ahmprqshh75pkdpagb8fgnp2bwn8q8hwp1yl3laww2ghm8i5"; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; From 8c1a2e26dd52f62e9155687a539338a2b6bc2af3 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 15 May 2021 10:40:04 +0200 Subject: [PATCH 043/249] jumanpp: 2.0.0-rc2 -> 2.0.0-rc3 Fixes build failure via https://github.com/ku-nlp/jumanpp/pull/101 --- pkgs/tools/text/jumanpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/tools/text/jumanpp/default.nix index f002e228ac5..b670bcaec28 100644 --- a/pkgs/tools/text/jumanpp/default.nix +++ b/pkgs/tools/text/jumanpp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jumanpp"; - version = "2.0.0-rc2"; + version = "2.0.0-rc3"; src = fetchurl { url = "https://github.com/ku-nlp/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "17fzmd0f5m9ayfhsr0mg7hjp3pg1mhbgknhgyd8v87x46g8bg6qp"; + sha256 = "sha256-ASdr6qbkSe71M7QmuuwidCa4xQhDVoXBJ2XqvSY53pQ="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ protobuf ]; From e76b0c73fb00a987cf543ad7d207917475cd98d1 Mon Sep 17 00:00:00 2001 From: Emmanuel Rosa Date: Sat, 15 May 2021 15:44:29 +0700 Subject: [PATCH 044/249] pharo-cog32: add missing dependency libnsl This change adds the missing dependency libnsl. See https://hydra.nixos.org/build/142615153 ZHF: #122042 --- pkgs/development/pharo/vm/build-vm-legacy.nix | 3 ++- pkgs/development/pharo/vm/vms.nix | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/pharo/vm/build-vm-legacy.nix b/pkgs/development/pharo/vm/build-vm-legacy.nix index bd5d1e91602..c00c92a6c33 100644 --- a/pkgs/development/pharo/vm/build-vm-legacy.nix +++ b/pkgs/development/pharo/vm/build-vm-legacy.nix @@ -13,6 +13,7 @@ , alsaLib , cairo , libuuid +, libnsl , makeWrapper , ... }: @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip cmake gcc makeWrapper ]; buildInputs = [ bash glibc openssl libGLU libGL freetype - xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ]; + xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share libnsl ]; LD_LIBRARY_PATH = lib.makeLibraryPath [ cairo libGLU libGL freetype openssl libuuid alsaLib diff --git a/pkgs/development/pharo/vm/vms.nix b/pkgs/development/pharo/vm/vms.nix index 77bc5b0682f..a8e3236a3a0 100644 --- a/pkgs/development/pharo/vm/vms.nix +++ b/pkgs/development/pharo/vm/vms.nix @@ -19,6 +19,7 @@ , fetchFromGitHub , makeWrapper , runtimeShell +, libnsl } @args: let From 56b13f1e9dc04fc909bc0d73a69897e0aee85136 Mon Sep 17 00:00:00 2001 From: Louis Tim Larsen Date: Sat, 15 May 2021 11:33:33 +0200 Subject: [PATCH 045/249] libhdhomerun: 20200907 -> 20210224 --- pkgs/development/libraries/libhdhomerun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libhdhomerun/default.nix b/pkgs/development/libraries/libhdhomerun/default.nix index ab0ad6fab23..f8db7075ca7 100644 --- a/pkgs/development/libraries/libhdhomerun/default.nix +++ b/pkgs/development/libraries/libhdhomerun/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "libhdhomerun"; - version = "20200907"; + version = "20210224"; src = fetchurl { url = "https://download.silicondust.com/hdhomerun/libhdhomerun_${version}.tgz"; - sha256 = "1v80jk056ii2iv2w7sq24i3prjrbhxql5vqhafs7vq54qmwvgbnb"; + sha256 = "sha256:1y1kwv34qg8nayfkbrxkw8163l46krsfqx8yvkcsc97ilsd3i5mr"; }; patchPhase = lib.optionalString stdenv.isDarwin '' From d707979a73daac7e46260c6baa285a41f3cc490b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Sat, 15 May 2021 12:10:05 +0200 Subject: [PATCH 046/249] est-sfs: fix darwin build --- pkgs/applications/science/biology/est-sfs/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/science/biology/est-sfs/default.nix b/pkgs/applications/science/biology/est-sfs/default.nix index 814baa45d8c..fe4a3e49930 100644 --- a/pkgs/applications/science/biology/est-sfs/default.nix +++ b/pkgs/applications/science/biology/est-sfs/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { buildInputs = [ gsl ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; + installPhase = '' mkdir -p $out/bin mkdir -p $out/share/doc/${pname} From 5153e0e49110d18c33b3926f23102220fd839e30 Mon Sep 17 00:00:00 2001 From: Sergei Dolgov Date: Sat, 15 May 2021 12:09:44 +0200 Subject: [PATCH 047/249] hplipWithPlugin: correct arch name for the plugin file on aarch64 Without this change, building hplipWithPlugin on aarch64 fails with: cp: cannot stat 'lj-aarch64.so': No such file or directory builder for '/nix/store/p0x02ppv0n1xj46wvik3p3cn4jikmr1q-hplip-3.20.11.drv' failed with exit code 1 This is because the corresponding file in the archive is actually called lj-arm64.so. hplipPlatforms exists to convert between the different names; this commit only changes the value to a correct one. --- pkgs/misc/drivers/hplip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 6a7eb35ae52..040c52aacb6 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -36,13 +36,13 @@ let x86_64-linux = "x86_64"; armv6l-linux = "arm32"; armv7l-linux = "arm32"; - aarch64-linux = "aarch64"; + aarch64-linux = "arm64"; }; hplipArch = hplipPlatforms.${stdenv.hostPlatform.system} or (throw "HPLIP not supported on ${stdenv.hostPlatform.system}"); - pluginArches = [ "x86_32" "x86_64" "arm32" "aarch64" ]; + pluginArches = [ "x86_32" "x86_64" "arm32" "arm64" ]; in From de19ea1c4df1c3a999863604a24c29c234c74114 Mon Sep 17 00:00:00 2001 From: Leonardo Romor Date: Thu, 13 May 2021 12:08:32 +0200 Subject: [PATCH 048/249] maintainers: add lromor --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2da788a56af..495af46f9d8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5886,6 +5886,12 @@ githubId = 10626; name = "Andreas Wagner"; }; + lromor = { + email = "leonardo.romor@gmail.com"; + github = "lromor"; + githubId = 1597330; + name = "Leonardo Romor"; + }; lrworth = { email = "luke@worth.id.au"; name = "Luke Worth"; From eb88a2fb423b9af521581e4a2bac9b27e73b89ab Mon Sep 17 00:00:00 2001 From: Leonardo Romor Date: Thu, 13 May 2021 14:44:38 +0200 Subject: [PATCH 049/249] openslide: init at v3.4.1 OpenSlide is a C library that provides a simple interface to read whole-slide images (also known as virtual slides). https://openslide.org Apply suggestions from code review Co-authored-by: Sandro --- .../libraries/openslide/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/openslide/default.nix diff --git a/pkgs/development/libraries/openslide/default.nix b/pkgs/development/libraries/openslide/default.nix new file mode 100644 index 00000000000..71c2017f9e5 --- /dev/null +++ b/pkgs/development/libraries/openslide/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook +, pkg-config, cairo, glib, gdk-pixbuf, libjpeg +, libpng, libtiff, libxml2, openjpeg, sqlite, zlib +}: + +stdenv.mkDerivation rec { + pname = "openslide"; + version = "3.4.1"; + + src = fetchFromGitHub { + owner = "openslide"; + repo = "openslide"; + rev = "v${version}"; + sha256 = "1g4hhjr4cbx754cwi9wl84k33bkg232w8ajic7aqhzm8x182hszp"; + }; + + buildInputs = [ cairo glib gdk-pixbuf libjpeg libpng libtiff libxml2 openjpeg sqlite zlib ]; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + meta = with lib; { + homepage = "https://openslide.org"; + description = "A C library that provides a simple interface to read whole-slide images."; + license = licenses.lgpl21; + platforms = platforms.unix; + maintainers = with maintainers; [ lromor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11d313fc0ed..c85692cb422 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17084,6 +17084,8 @@ in inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Foundation; }; + openslide = callPackage ../development/libraries/openslide { }; + openslp = callPackage ../development/libraries/openslp {}; openvdb = callPackage ../development/libraries/openvdb {}; From 0c6dd4164a86ff8ba41e84c2ce70ea14be0c7bd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sat, 15 May 2021 09:11:53 -0300 Subject: [PATCH 050/249] smartgithg: 19.1.1 -> 20.2.5 --- pkgs/applications/version-management/smartgithg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 14e1173d406..3c0e540d228 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "smartgithg"; - version = "19.1.1"; + version = "20.2.5"; src = fetchurl { url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.gz"; - sha256 = "0i0dvyy9d63f4hk8czlyk83ai0ywhqp7wbdkq3s87l7irwgs42jy"; + sha256 = "05f3yhzf6mvr6c5v6qvjrx97pzrrnkh9mp444zlkbnpgnrsmdc6v"; }; nativeBuildInputs = [ wrapGAppsHook ]; From e20a3b4326fe4a5fa090a1d658a27ef5bb748346 Mon Sep 17 00:00:00 2001 From: Subhrajyoti Sen Date: Sat, 15 May 2021 19:46:17 +0530 Subject: [PATCH 051/249] kotlin: 1.4.32 -> 1.5.0 --- pkgs/development/compilers/kotlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 8a34c6166fa..5fdf58e56f5 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.4.32"; + version = "1.5.0"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - hash = "sha256-3+8ju4a9XzYWbU7BJnyN5Ts4J8RG1U6CMixrbarTWUw="; + sha256 = "1dyiis96skflhlsmc8byp5j8j3vsicmlslwyrkn1pv4gc8gzqhq3"; }; propagatedBuildInputs = [ jre ] ; From cba07da6b19827c244fa8c02e8484356e7553b07 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 14 May 2021 23:31:53 -0400 Subject: [PATCH 052/249] octomap: init at 1.9.6 --- .../development/libraries/octomap/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/octomap/default.nix diff --git a/pkgs/development/libraries/octomap/default.nix b/pkgs/development/libraries/octomap/default.nix new file mode 100644 index 00000000000..7e82842c0b9 --- /dev/null +++ b/pkgs/development/libraries/octomap/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "octomap"; + version = "1.9.6"; + + src = fetchFromGitHub { + owner = "OctoMap"; + repo = pname; + rev = "v${version}"; + sha256 = "03v341dffa0pfzmf2431xb5nq50zq9zlhgl6k2aa3fsza5xmbb70"; + }; + sourceRoot = "source/octomap"; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "A probabilistic, flexible, and compact 3D mapping library for robotic systems"; + homepage = "https://octomap.github.io/"; + license = licenses.bsd3; + maintainers = with maintainers; [ lopsided98 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d695650e354..e89fe6c61de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20815,6 +20815,8 @@ in nss_ldap = callPackage ../os-specific/linux/nss_ldap { }; + octomap = callPackage ../development/libraries/octomap { }; + odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { }; odroid-xu3-bootloader = callPackage ../tools/misc/odroid-xu3-bootloader { }; From 4e0d914db7b3c858b8f2f272e013f1e3b3658f8f Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 14 May 2021 23:47:45 -0400 Subject: [PATCH 053/249] libccd: init at 2.1 --- pkgs/development/libraries/libccd/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/libccd/default.nix diff --git a/pkgs/development/libraries/libccd/default.nix b/pkgs/development/libraries/libccd/default.nix new file mode 100644 index 00000000000..a9e0c2b3feb --- /dev/null +++ b/pkgs/development/libraries/libccd/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "libccd"; + version = "2.1"; + + src = fetchFromGitHub { + owner = "danfis"; + repo = pname; + rev = "v${version}"; + sha256 = "0sfmn5pd7k5kyhbxnd689xmsa5v843r7sska96dlysqpljd691jc"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Library for collision detection between two convex shapes"; + homepage = "https://github.com/danfis/libccd"; + license = licenses.bsd3; + maintainers = with maintainers; [ lopsided98 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e89fe6c61de..4fa50e4b972 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15522,6 +15522,8 @@ in libcbor = callPackage ../development/libraries/libcbor { }; + libccd = callPackage ../development/libraries/libccd { }; + libcec = callPackage ../development/libraries/libcec { libraspberrypi = null; }; From f3c7a6c56a1ea1fe8d488fa23d73f7c5e7e3ad64 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 14 May 2021 23:54:15 -0400 Subject: [PATCH 054/249] fcl: init at 0.6.1 --- pkgs/development/libraries/fcl/default.nix | 30 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/libraries/fcl/default.nix diff --git a/pkgs/development/libraries/fcl/default.nix b/pkgs/development/libraries/fcl/default.nix new file mode 100644 index 00000000000..21e6b9cac89 --- /dev/null +++ b/pkgs/development/libraries/fcl/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub, cmake, eigen, libccd, octomap }: + +stdenv.mkDerivation rec { + pname = "fcl"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "flexible-collision-library"; + repo = pname; + rev = version; + sha256 = "1i1sd0fsvk5d529aw8aw29bsmymqgcmj3ci35sz58nzp2wjn0l5d"; + }; + + nativeBuildInputs = [ cmake ]; + propagatedBuildInputs = [ eigen libccd octomap ]; + + outputs = [ "out" "dev" ]; + + meta = with lib; { + description = "Flexible Collision Library"; + longDescription = '' + FCL is a library for performing three types of proximity queries on a + pair of geometric models composed of triangles. + ''; + homepage = "https://github.com/flexible-collision-library/fcl"; + license = licenses.bsd3; + maintainers = with maintainers; [ lopsided98 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4fa50e4b972..99f036a9687 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14442,6 +14442,8 @@ in fcgi = callPackage ../development/libraries/fcgi { }; + fcl = callPackage ../development/libraries/fcl { }; + ffcast = callPackage ../tools/X11/ffcast { }; fflas-ffpack = callPackage ../development/libraries/fflas-ffpack { }; From e7ac3946b4836c11914594f6be2db463f9433758 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 15 May 2021 11:23:25 -0400 Subject: [PATCH 055/249] fcl: add upstream patches to fix build on ARM Previously, SSE was unconditionally enabled, which can't work on ARM. --- pkgs/development/libraries/fcl/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/fcl/default.nix b/pkgs/development/libraries/fcl/default.nix index 21e6b9cac89..33a60080584 100644 --- a/pkgs/development/libraries/fcl/default.nix +++ b/pkgs/development/libraries/fcl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, eigen, libccd, octomap }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, eigen, libccd, octomap }: stdenv.mkDerivation rec { pname = "fcl"; @@ -11,6 +11,21 @@ stdenv.mkDerivation rec { sha256 = "1i1sd0fsvk5d529aw8aw29bsmymqgcmj3ci35sz58nzp2wjn0l5d"; }; + patches = [ + # Disable SSE on Emscripten (required for the next patch to apply cleanly) + # https://github.com/flexible-collision-library/fcl/pull/470 + (fetchpatch { + url = "https://github.com/flexible-collision-library/fcl/commit/83a1af61ba4efa81ec0b552b3121100044a8cf46.patch"; + sha256 = "0bbkv4xpkl3c0i8qdlkghj6qkybrrd491c8rd2cqnxfgspcd40p0"; + }) + # Detect SSE support to fix building on ARM + # https://github.com/flexible-collision-library/fcl/pull/506 + (fetchpatch { + url = "https://github.com/flexible-collision-library/fcl/commit/cbfe1e9405aa68138ed1a8f33736429b85500dea.patch"; + sha256 = "18qip8gwhm3fvbz1cvzf625rh5msq8m4669ld1m60fv6z50clr9h"; + }) + ]; + nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ eigen libccd octomap ]; From f944147dbb9b4b96f8320c499c68ea319eef06a7 Mon Sep 17 00:00:00 2001 From: devhell Date: Sun, 2 May 2021 20:44:57 +0100 Subject: [PATCH 056/249] sheesy-cli: init at 4.0.11 --- pkgs/tools/security/sheesy-cli/default.nix | 37 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/tools/security/sheesy-cli/default.nix diff --git a/pkgs/tools/security/sheesy-cli/default.nix b/pkgs/tools/security/sheesy-cli/default.nix new file mode 100644 index 00000000000..3929dbc8ad1 --- /dev/null +++ b/pkgs/tools/security/sheesy-cli/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, rustPlatform, fetchCrate, installShellFiles +, libgpgerror, gpgme, gettext, openssl, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "sheesy-cli"; + version = "4.0.11"; + + src = fetchCrate { + inherit version pname; + sha256 = "1l21ji9zqy8x1g2gvqwdhya505max07ibx1hh88s36k0jbvdb7xc"; + }; + + cargoSha256 = "159a5ph1gxwcgahyr8885lq3c1w76nxzfrfdpyqixqrr7jzx2rd3"; + cargoDepsName = pname; + + cargoBuildFlags = [ "--bin sy" "--features" "vault,extract,completions,substitute,process" ]; + + nativeBuildInputs = [ libgpgerror gpgme gettext installShellFiles ]; + + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + + postInstall = '' + installShellCompletion --cmd sy \ + --bash <($out/bin/sy completions bash) \ + --fish <($out/bin/sy completions fish) \ + --zsh <($out/bin/sy completions zsh) + ''; + + meta = with lib; { + description = "The 'share-secrets-safely' CLI to interact with GPG/pass-like vaults"; + homepage = "https://share-secrets-safely.github.io/cli/"; + changelog = "https://github.com/share-secrets-safely/cli/releases/tag/${version}"; + license = with licenses; [ lgpl21Only ]; + maintainers = with maintainers; [ devhell ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11d313fc0ed..2fb37e3f49f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3039,6 +3039,10 @@ in shellhub-agent = callPackage ../applications/networking/shellhub-agent { }; + sheesy-cli = callPackage ../tools/security/sheesy-cli { + inherit (darwin.apple_sdk.frameworks) Security; + }; + simdjson = callPackage ../development/libraries/simdjson { }; shipyard = callPackage ../tools/virtualization/shipyard { }; From c2ad296ebd85b0ec03de32949a419f6cd2458deb Mon Sep 17 00:00:00 2001 From: Victor Roest Date: Thu, 13 May 2021 11:16:40 +0000 Subject: [PATCH 057/249] unpackerr: init at 0.9.4 --- pkgs/servers/unpackerr/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/servers/unpackerr/default.nix diff --git a/pkgs/servers/unpackerr/default.nix b/pkgs/servers/unpackerr/default.nix new file mode 100644 index 00000000000..2429e36f2ca --- /dev/null +++ b/pkgs/servers/unpackerr/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "unpackerr"; + version = "0.9.4"; + + src = fetchFromGitHub { + owner = "davidnewhall"; + repo = "unpackerr"; + rev = "v${version}"; + sha256 = "0ss12i8bclz1q9jgr54shvs8zgcs6jrwdm1vj9gvycyd5sx4717s"; + }; + + vendorSha256 = "1j79vmf0mkwkqrg5j6fm2b8y3a23y039kbiqkiwb56724bmd27dd"; + + meta = with lib; { + description = "Extracts downloads for Radarr, Sonarr, Lidarr - Deletes extracted files after import"; + homepage = "https://github.com/davidnewhall/unpackerr"; + maintainers = with maintainers; [ nullx76 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d695650e354..fb2d91a4480 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19578,6 +19578,8 @@ in unifi6; unifi = unifi6; + unpackerr = callPackage ../servers/unpackerr { }; + urserver = callPackage ../servers/urserver { }; victoriametrics = callPackage ../servers/nosql/victoriametrics { }; From 588e04562905cea0226dd79be3b1139c7aff12a4 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 15 May 2021 22:24:01 +0200 Subject: [PATCH 058/249] tup: 0.7.10 -> 0.7.11 --- .../development/tools/build-managers/tup/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix index 85bf919f778..403adaff89e 100644 --- a/pkgs/development/tools/build-managers/tup/default.nix +++ b/pkgs/development/tools/build-managers/tup/default.nix @@ -4,37 +4,41 @@ let fuse = if stdenv.isDarwin then macfuse-stubs else fuse3; in stdenv.mkDerivation rec { pname = "tup"; - version = "0.7.10"; + version = "0.7.11"; outputs = [ "bin" "man" "out" ]; src = fetchFromGitHub { owner = "gittup"; repo = "tup"; rev = "v${version}"; - sha256 = "1qd07h4wi0743l7z2vybfvhwp61g2p2pc5qhl40672ryl24nvd1d"; + hash = "sha256-Q2Y5ErcfhLChi9Wezn8+7eNXYX2UXW1fBOqEclmgzOo="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse pcre ]; configurePhase = '' - sed -i 's/`git describe`/v${version}/g' src/tup/link.sh - sed -i 's/pcre-confg/pkg-config pcre/g' Tupfile Tuprules.tup + substituteInPlace src/tup/link.sh --replace '`git describe' '`echo ${version}' + substituteInPlace Tuprules.tup --replace 'pcre-config' 'pkg-config libpcre' ''; # Regular tup builds require fusermount to have suid, which nix cannot # currently provide in a build environment, so we bootstrap and use 'tup # generate' instead buildPhase = '' + runHook preBuild ./build.sh ./build/tup init ./build/tup generate script.sh ./script.sh + runHook postBuild ''; installPhase = '' + runHook preInstall install -D tup -t $bin/bin/ install -D tup.1 -t $man/share/man/man1/ + runHook postInstall ''; setupHook = ./setup-hook.sh; From d5998fd272ab93fb84bb4280397b270b67d0230f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 May 2021 23:33:29 +0200 Subject: [PATCH 059/249] python3Packages.pyobihai: init at 1.3.1 --- .../python-modules/pyobihai/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/pyobihai/default.nix diff --git a/pkgs/development/python-modules/pyobihai/default.nix b/pkgs/development/python-modules/pyobihai/default.nix new file mode 100644 index 00000000000..79d8363372b --- /dev/null +++ b/pkgs/development/python-modules/pyobihai/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "pyobihai"; + version = "1.3.1"; + disabled = pythonOlder "3.6"; + + # GitHub release, https://github.com/dshokouhi/pyobihai/issues/10 + src = fetchPypi { + inherit pname version; + sha256 = "1vvf5if57dfd091a7fb5rvx63hvf0isrx28j72nj2aav1as460qp"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "pyobihai" ]; + + meta = with lib; { + description = "Python package to interact with Obihai devices"; + homepage = "https://github.com/dshokouhi/pyobihai"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ecf4494ff4..7542cc9ccdb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5911,6 +5911,8 @@ in { pynzb = callPackage ../development/python-modules/pynzb { }; + pyobihai = callPackage ../development/python-modules/pyobihai { }; + pyocr = callPackage ../development/python-modules/pyocr { tesseract = pkgs.tesseract4; }; From 03809fde5c422a5002d8c17b14acdcb27154ba1b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 May 2021 23:34:02 +0200 Subject: [PATCH 060/249] 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 844ea8976d7..297a8f19f49 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -582,7 +582,7 @@ "nx584" = ps: with ps; [ pynx584 ]; "nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi "oasa_telematics" = ps: with ps; [ ]; # missing inputs: oasatelematics - "obihai" = ps: with ps; [ ]; # missing inputs: pyobihai + "obihai" = ps: with ps; [ pyobihai ]; "octoprint" = ps: with ps; [ aiohttp-cors netdisco pyroute2 zeroconf ]; "oem" = ps: with ps; [ ]; # missing inputs: oemthermostat "ohmconnect" = ps: with ps; [ defusedxml ]; From 00df27fb041f211586b0ddd50187ffb01aadb4b7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 May 2021 00:25:16 +0200 Subject: [PATCH 061/249] python3Packages.pydelijn: init at 0.6.1 --- .../python-modules/pydelijn/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/pydelijn/default.nix diff --git a/pkgs/development/python-modules/pydelijn/default.nix b/pkgs/development/python-modules/pydelijn/default.nix new file mode 100644 index 00000000000..08a3bf82361 --- /dev/null +++ b/pkgs/development/python-modules/pydelijn/default.nix @@ -0,0 +1,37 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytz +}: + +buildPythonPackage rec { + pname = "pydelijn"; + version = "0.6.1"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1lwd2f043hy7gf1ly9zpaq1yg947bqw2af8vhwssf48zpisfgc81"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + pytz + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "pydelijn" ]; + + meta = with lib; { + description = "Python package to retrieve realtime data of passages at stops of De Lijn"; + homepage = "https://github.com/bollewolle/pydelijn"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ecf4494ff4..efba9f6def4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5505,6 +5505,8 @@ in { pydeconz = callPackage ../development/python-modules/pydeconz { }; + pydelijn = callPackage ../development/python-modules/pydelijn { }; + pydenticon = callPackage ../development/python-modules/pydenticon { }; pydexcom = callPackage ../development/python-modules/pydexcom { }; From 0b6798421c6698799f617691849716ab9b5f26bc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 May 2021 00:28:38 +0200 Subject: [PATCH 062/249] 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 844ea8976d7..6c3dd47df8b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -157,7 +157,7 @@ "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi "default_config" = ps: with ps; [ pynacl aiodiscover aiohttp-cors async-upnp-client defusedxml distro emoji hass-nabucasa netdisco pillow pyroute2 scapy sqlalchemy zeroconf ]; - "delijn" = ps: with ps; [ ]; # missing inputs: pydelijn + "delijn" = ps: with ps; [ pydelijn ]; "deluge" = ps: with ps; [ deluge-client ]; "demo" = ps: with ps; [ aiohttp-cors ]; "denon" = ps: with ps; [ ]; From 3210c41ee3efd0b2867b7d424220ef4e652754d3 Mon Sep 17 00:00:00 2001 From: Maxim Schuwalow Date: Sun, 16 May 2021 00:43:18 +0200 Subject: [PATCH 063/249] gnomeExtensions.clipboard-indicator: 37 -> 38 --- .../clipboard-indicator/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/clipboard-indicator/default.nix b/pkgs/desktops/gnome/extensions/clipboard-indicator/default.nix index ee64fc5113d..efdcab6a463 100644 --- a/pkgs/desktops/gnome/extensions/clipboard-indicator/default.nix +++ b/pkgs/desktops/gnome/extensions/clipboard-indicator/default.nix @@ -1,24 +1,26 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, gettext, glib }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-clipboard-indicator"; - version = "37"; + version = "38"; src = fetchFromGitHub { owner = "Tudmotu"; repo = "gnome-shell-extension-clipboard-indicator"; rev = "v${version}"; - sha256 = "0npxhaam2ra2b9zh2gk2q0n5snlhx6glz86m3jf8hz037w920k41"; + sha256 = "FNrh3b6la2BuWCsriYP5gG0/KNbkFPuq/YTXTj0aJAI="; }; uuid = "clipboard-indicator@tudmotu.com"; - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp -r * $out/share/gnome-shell/extensions/${uuid} - runHook postInstall - ''; + nativeBuildInputs = [ + gettext + glib + ]; + + makeFlags = [ + "INSTALLPATH=${placeholder "out"}/share/gnome-shell/extensions/${uuid}/" + ]; meta = with lib; { description = "Adds a clipboard indicator to the top panel and saves clipboard history"; From 11ac60daa8b7abf0b8d11273107ae1d419e5a032 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 May 2021 00:51:13 +0200 Subject: [PATCH 064/249] python3Packages.py-canary: init 0.5.1 --- .../python-modules/py-canary/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/py-canary/default.nix diff --git a/pkgs/development/python-modules/py-canary/default.nix b/pkgs/development/python-modules/py-canary/default.nix new file mode 100644 index 00000000000..531624781b4 --- /dev/null +++ b/pkgs/development/python-modules/py-canary/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, pytestCheckHook +, pythonOlder +, requests +, requests-mock +}: + +buildPythonPackage rec { + pname = "py-canary"; + version = "0.5.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "snjoetw"; + repo = pname; + rev = version; + sha256 = "0j743cc0wv7im3anx1vvdm79zyvw67swhc3zwwc1r8626dgnmxjr"; + }; + + propagatedBuildInputs = [ + requests + ]; + + checkInputs = [ + mock + pytestCheckHook + requests-mock + ]; + + pythonImportsCheck = [ "canary" ]; + + meta = with lib; { + description = "Python package for Canary Security Camera"; + homepage = "https://github.com/snjoetw/py-canary"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ecf4494ff4..0c04f193394 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5468,6 +5468,8 @@ in { pycparser = callPackage ../development/python-modules/pycparser { }; + py-canary = callPackage ../development/python-modules/py-canary { }; + py-cid = callPackage ../development/python-modules/py-cid { }; py-cpuinfo = callPackage ../development/python-modules/py-cpuinfo { }; From 8ccd1189aea46fe777a9a23d146139b3dc68b211 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 May 2021 00:53:24 +0200 Subject: [PATCH 065/249] 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 844ea8976d7..0055dedacc9 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -109,7 +109,7 @@ "caldav" = ps: with ps; [ caldav ]; "calendar" = ps: with ps; [ aiohttp-cors ]; "camera" = ps: with ps; [ aiohttp-cors ]; - "canary" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: py-canary + "canary" = ps: with ps; [ ha-ffmpeg py-canary ]; "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa mutagen plexapi plexauth plexwebsocket PyChromecast pyroute2 zeroconf ]; "cert_expiry" = ps: with ps; [ ]; "channels" = ps: with ps; [ pychannels ]; From 8ddf12114ee66913ff8c0d0dae63891ac8267c00 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 May 2021 00:53:40 +0200 Subject: [PATCH 066/249] home-assistant: enable canary 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 7616dc0ee87..abf9ceffafe 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -214,6 +214,7 @@ in with py.pkgs; buildPythonApplication rec { "caldav" "calendar" "camera" + "canary" "cast" "climacell" "climate" From 808caa6de48e35088f95e4bcc7b6559093bdeece Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 May 2021 01:09:13 +0200 Subject: [PATCH 067/249] python3Packages.ovoenergy: init at 1.1.12 --- .../python-modules/ovoenergy/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/ovoenergy/default.nix diff --git a/pkgs/development/python-modules/ovoenergy/default.nix b/pkgs/development/python-modules/ovoenergy/default.nix new file mode 100644 index 00000000000..42615fa664d --- /dev/null +++ b/pkgs/development/python-modules/ovoenergy/default.nix @@ -0,0 +1,37 @@ +{ lib +, aiohttp +, buildPythonPackage +, click +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "ovoenergy"; + version = "1.1.12"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "timmo001"; + repo = pname; + rev = "v${version}"; + sha256 = "1430k699gblxwspsbgxnha8afk6npqharhz2jyjw5gir9pi6g9cz"; + }; + + propagatedBuildInputs = [ + aiohttp + click + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "ovoenergy" ]; + + meta = with lib; { + description = "Python client for getting data from OVO's API"; + homepage = "https://github.com/timmo001/ovoenergy"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ecf4494ff4..6d5248c0572 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4755,6 +4755,8 @@ in { ovh = callPackage ../development/python-modules/ovh { }; + ovoenergy = callPackage ../development/python-modules/ovoenergy { }; + owslib = callPackage ../development/python-modules/owslib { }; oyaml = callPackage ../development/python-modules/oyaml { }; From ea2ab251edede61eec1f35309e57dd606ba4cbce Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 May 2021 01:03:44 +0200 Subject: [PATCH 068/249] 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 844ea8976d7..8d4da207d97 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -614,7 +614,7 @@ "orvibo" = ps: with ps; [ orvibo ]; "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify "otp" = ps: with ps; [ pyotp ]; - "ovo_energy" = ps: with ps; [ ]; # missing inputs: ovoenergy + "ovo_energy" = ps: with ps; [ ovoenergy ]; "owntracks" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa paho-mqtt ]; "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt python-openzwave-mqtt ]; "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta From 9b6fa65134326d542d0b41e8e00cc8294bd21a04 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 May 2021 01:04:59 +0200 Subject: [PATCH 069/249] home-assistant: enable ovo_energy 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 7616dc0ee87..97f625c6968 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -328,6 +328,7 @@ in with py.pkgs; buildPythonApplication rec { "ondilo_ico" "openerz" "opentherm_gw" + "ovo_energy" "ozw" "panel_custom" "panel_iframe" From 3771fed9b965bac61ab43a7f684509280736efeb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 May 2021 01:56:16 +0200 Subject: [PATCH 070/249] python3Packages.ha-philipsjs: init at 2.7.4 --- .../python-modules/ha-philipsjs/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/ha-philipsjs/default.nix diff --git a/pkgs/development/python-modules/ha-philipsjs/default.nix b/pkgs/development/python-modules/ha-philipsjs/default.nix new file mode 100644 index 00000000000..c6de997a1da --- /dev/null +++ b/pkgs/development/python-modules/ha-philipsjs/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, cryptography +, fetchFromGitHub +, httpx +, pytest-aiohttp +, pytest-mock +, pytestCheckHook +, pythonOlder +, respx +}: + +buildPythonPackage rec { + pname = "ha-philipsjs"; + version = "2.7.4"; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "danielperna84"; + repo = pname; + rev = version; + sha256 = "08fjdb1q02dwxq8s15ddd00gps64xplblkn8dx5yivldskiy8i1n"; + }; + + propagatedBuildInputs = [ + cryptography + httpx + ]; + + checkInputs = [ + pytest-aiohttp + pytest-mock + pytestCheckHook + respx + ]; + + pythonImportsCheck = [ "haphilipsjs" ]; + + meta = with lib; { + description = "Python library to interact with Philips TVs with jointSPACE API"; + homepage = "https://github.com/danielperna84/ha-philipsjs"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ecf4494ff4..338833d0413 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3015,6 +3015,8 @@ in { ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { }; + ha-philipsjs = callPackage ../development/python-modules/ha-philipsjs{ }; + halo = callPackage ../development/python-modules/halo { }; handout = callPackage ../development/python-modules/handout { }; From a377888aebddfec54b18732eb4c654374b4caf1e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 May 2021 01:57:15 +0200 Subject: [PATCH 071/249] 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 844ea8976d7..31eb8a73311 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -626,7 +626,7 @@ "pencom" = ps: with ps; [ ]; # missing inputs: pencompy "persistent_notification" = ps: with ps; [ ]; "person" = ps: with ps; [ aiohttp-cors pillow ]; - "philips_js" = ps: with ps; [ ]; # missing inputs: ha-philipsjs + "philips_js" = ps: with ps; [ ha-philipsjs ]; "pi4ioe5v9xxxx" = ps: with ps; [ ]; # missing inputs: pi4ioe5v9xxxx "pi_hole" = ps: with ps; [ hole ]; "picnic" = ps: with ps; [ python-picnic-api ]; From 32aaf7c6f2ab244819ef4aa71a96080c8db24235 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 May 2021 01:58:57 +0200 Subject: [PATCH 072/249] home-assistant: enable philips_js 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 7616dc0ee87..d4237c5e448 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -333,6 +333,7 @@ in with py.pkgs; buildPythonApplication rec { "panel_iframe" "persistent_notification" "person" + "philips_js" "plaato" "plugwise" "prometheus" From 10a5d3f6933ec9b07aba4fbf2d09f697fe7598b9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 May 2021 13:08:10 +0200 Subject: [PATCH 073/249] python3Packages.watchdog: 2.1.0 -> 2.1.1 --- pkgs/development/python-modules/watchdog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 7d7603d3eb0..9d96977088b 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "watchdog"; - version = "2.1.0"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-VTFu+rUvZZuLe1lzBoC/snrAA1IvJMRPa81gxONzbM0="; + sha256 = "sha256-KJREC06pWm70xdFS3u2+JwyuRgkmgnELcCigTWppgPY="; }; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; From 2703a7999adeee8e3c880fa539bdede43c0c22a4 Mon Sep 17 00:00:00 2001 From: Paul Schyska Date: Fri, 14 May 2021 02:07:17 +0200 Subject: [PATCH 074/249] netatop: package netatop.service --- pkgs/os-specific/linux/netatop/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix index fb0a4eb7188..242fcbf681e 100644 --- a/pkgs/os-specific/linux/netatop/default.nix +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, kernel, zlib }: +{ lib, stdenv, fetchurl, kernel, kmod, zlib }: let version = "3.1"; @@ -12,10 +12,11 @@ stdenv.mkDerivation { sha256 = "0qjw8glfdmngfvbn1w63q128vxdz2jlabw13y140ga9i5ibl6vvk"; }; - buildInputs = [ zlib ]; + buildInputs = [ kmod zlib ]; hardeningDisable = [ "pic" ]; + patches = [ ./netatop.service.patch ]; preConfigure = '' patchShebangs mkversion sed -i -e 's,^KERNDIR.*,KERNDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build,' \ @@ -24,12 +25,14 @@ stdenv.mkDerivation { -e s,/usr,$out, \ -e /init.d/d \ -e /depmod/d \ - -e /netatop.service/d \ + -e s,/lib/systemd,$out/lib/systemd, \ Makefile + + kmod=${kmod} substituteAllInPlace netatop.service ''; preInstall = '' - mkdir -p $out/bin $out/sbin $out/share/man/man{4,8} + mkdir -p $out/lib/systemd/system $out/bin $out/sbin $out/share/man/man{4,8} mkdir -p $out/lib/modules/${kernel.modDirVersion}/extra ''; @@ -38,6 +41,6 @@ stdenv.mkDerivation { homepage = "https://www.atoptool.nl/downloadnetatop.php"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [viric]; + maintainers = with lib.maintainers; [ viric ]; }; } From 327dcea4ccc8e5e2562c277bd35198751ecc4930 Mon Sep 17 00:00:00 2001 From: Paul Schyska Date: Fri, 14 May 2021 02:08:41 +0200 Subject: [PATCH 075/249] atop: fix packaging .service files, add option to build with atopgpu --- pkgs/os-specific/linux/atop/atop-pm.sh.patch | 13 ++++ .../linux/atop/atop-rotate.service.patch | 7 +++ .../os-specific/linux/atop/atop.service.patch | 14 +++++ .../linux/atop/atopacct.service.patch | 11 ++++ .../linux/atop/atopgpu.service.patch | 9 +++ pkgs/os-specific/linux/atop/default.nix | 59 ++++++++++++++----- .../linux/netatop/netatop.service.patch | 14 +++++ 7 files changed, 113 insertions(+), 14 deletions(-) create mode 100644 pkgs/os-specific/linux/atop/atop-pm.sh.patch create mode 100644 pkgs/os-specific/linux/atop/atop-rotate.service.patch create mode 100644 pkgs/os-specific/linux/atop/atop.service.patch create mode 100644 pkgs/os-specific/linux/atop/atopacct.service.patch create mode 100644 pkgs/os-specific/linux/atop/atopgpu.service.patch create mode 100644 pkgs/os-specific/linux/netatop/netatop.service.patch diff --git a/pkgs/os-specific/linux/atop/atop-pm.sh.patch b/pkgs/os-specific/linux/atop/atop-pm.sh.patch new file mode 100644 index 00000000000..9b66b260992 --- /dev/null +++ b/pkgs/os-specific/linux/atop/atop-pm.sh.patch @@ -0,0 +1,13 @@ +--- a/atop-pm.sh ++++ b/atop-pm.sh +@@ -2,8 +2,8 @@ + + case "$1" in +- pre) /usr/bin/systemctl stop atop ++ pre) @systemd@/bin/systemctl stop atop + exit 0 + ;; +- post) /usr/bin/systemctl start atop ++ post) @systemd@/bin/systemctl start atop + exit 0 + ;; diff --git a/pkgs/os-specific/linux/atop/atop-rotate.service.patch b/pkgs/os-specific/linux/atop/atop-rotate.service.patch new file mode 100644 index 00000000000..951a3c8c837 --- /dev/null +++ b/pkgs/os-specific/linux/atop/atop-rotate.service.patch @@ -0,0 +1,7 @@ +--- a/atop-rotate.service ++++ b/atop-rotate.service +@@ -4,3 +4,3 @@ + [Service] + Type=oneshot +-ExecStart=/usr/bin/systemctl try-restart atop.service ++ExecStart=@systemd@/bin/systemctl try-restart atop.service diff --git a/pkgs/os-specific/linux/atop/atop.service.patch b/pkgs/os-specific/linux/atop/atop.service.patch new file mode 100644 index 00000000000..5467b512229 --- /dev/null +++ b/pkgs/os-specific/linux/atop/atop.service.patch @@ -0,0 +1,14 @@ +--- a/atop.service ++++ b/atop.service +@@ -9,7 +9,8 @@ + Environment=LOGPATH=/var/log/atop +-EnvironmentFile=/etc/default/atop ++EnvironmentFile=-/etc/default/atop + ExecStartPre=/bin/sh -c 'test -n "$LOGINTERVAL" -a "$LOGINTERVAL" -eq "$LOGINTERVAL"' + ExecStartPre=/bin/sh -c 'test -n "$LOGGENERATIONS" -a "$LOGGENERATIONS" -eq "$LOGGENERATIONS"' +-ExecStart=/bin/sh -c 'exec /usr/bin/atop ${LOGOPTS} -w "${LOGPATH}/atop_$(date +%%Y%%m%%d)" ${LOGINTERVAL}' +-ExecStartPost=/usr/bin/find "${LOGPATH}" -name "atop_*" -mtime +${LOGGENERATIONS} -exec rm -v {} \; ++ExecStartPre=/bin/sh -c 'mkdir -p "${LOGPATH}"' ++ExecStart=/bin/sh -c 'exec @out@/bin/atop ${LOGOPTS} -w "${LOGPATH}/atop_$(date +%%Y%%m%%d)" ${LOGINTERVAL}' ++ExecStartPost=@findutils@/bin/find "${LOGPATH}" -name "atop_*" -mtime +${LOGGENERATIONS} -exec rm -v {} \; + KillSignal=SIGUSR2 diff --git a/pkgs/os-specific/linux/atop/atopacct.service.patch b/pkgs/os-specific/linux/atop/atopacct.service.patch new file mode 100644 index 00000000000..cbecbef90ec --- /dev/null +++ b/pkgs/os-specific/linux/atop/atopacct.service.patch @@ -0,0 +1,11 @@ +--- a/atopacct.service ++++ b/atopacct.service +@@ -8,6 +8,6 @@ + [Service] + Type=forking +-PIDFile=/var/run/atopacctd.pid +-ExecStart=/usr/sbin/atopacctd ++PIDFile=/run/atopacctd.pid ++ExecStart=@out@/bin/atopacctd + + [Install] diff --git a/pkgs/os-specific/linux/atop/atopgpu.service.patch b/pkgs/os-specific/linux/atop/atopgpu.service.patch new file mode 100644 index 00000000000..30c38b67cad --- /dev/null +++ b/pkgs/os-specific/linux/atop/atopgpu.service.patch @@ -0,0 +1,9 @@ +--- a/atopgpu.service ++++ b/atopgpu.service +@@ -6,5 +6,5 @@ + + [Service] +-ExecStart=/usr/sbin/atopgpud ++ExecStart=@out@/bin/atopgpud + Type=oneshot + RemainAfterExit=yes diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix index e1b64c0a4b5..00510c91a74 100644 --- a/pkgs/os-specific/linux/atop/default.nix +++ b/pkgs/os-specific/linux/atop/default.nix @@ -1,4 +1,14 @@ -{lib, stdenv, fetchurl, zlib, ncurses}: +{ lib +, stdenv +, fetchurl +, zlib +, ncurses +, findutils +, systemd +, python3 + # makes the package unfree via pynvml +, withAtopgpu ? false +}: stdenv.mkDerivation rec { pname = "atop"; @@ -9,31 +19,52 @@ stdenv.mkDerivation rec { sha256 = "nsLKOlcWkvfvqglfmaUQZDK8txzCLNbElZfvBIEFj3I="; }; - buildInputs = [zlib ncurses]; + nativeBuildInputs = if withAtopgpu then [ python3.pkgs.wrapPython ] else [ ]; + buildInputs = [ zlib ncurses ] ++ (if withAtopgpu then [ python3 ] else [ ]); + pythonPath = if withAtopgpu then [ python3.pkgs.pynvml ] else [ ]; makeFlags = [ - "SCRPATH=$out/etc/atop" - "LOGPATH=/var/log/atop" - "INIPATH=$out/etc/rc.d/init.d" - "SYSDPATH=$out/lib/systemd/system" - "CRNPATH=$out/etc/cron.d" - "DEFPATH=$out/etc/default" - "ROTPATH=$out/etc/logrotate.d" + "DESTDIR=$(out)" + "BINPATH=/bin" + "SBINPATH=/bin" + "MAN1PATH=/share/man/man1" + "MAN5PATH=/share/man/man5" + "MAN8PATH=/share/man/man8" + "SYSDPATH=/lib/systemd/system" + "PMPATHD=/lib/systemd/system-sleep" ]; + patches = [ + ./atop-pm.sh.patch + ./atop-rotate.service.patch + ./atop.service.patch + ./atopacct.service.patch + ] ++ (if withAtopgpu then [ ./atopgpu.service.patch ] else [ ]); + preConfigure = '' - sed -e "s@/usr/@$out/@g" -i $(find . -type f ) - sed -e "/mkdir.*LOGPATH/s@mkdir@echo missing dir @" -i Makefile - sed -e "/touch.*LOGPATH/s@touch@echo should have created @" -i Makefile + for f in *.{sh,service}; do + findutils=${findutils} systemd=${systemd} substituteAllInPlace "$f" + done + sed -e 's/chown/true/g' -i Makefile - sed -e '/chkconfig/d' -i Makefile sed -e 's/chmod 04711/chmod 0711/g' -i Makefile ''; installTargets = [ "systemdinstall" ]; preInstall = '' - mkdir -p "$out"/{bin,sbin} + mkdir -p $out/bin ''; + postInstall = '' + # remove extra files we don't need + rm -rf $out/{var,etc} + rm -rf $out/bin/atop{sar,}-${version} + '' + (if withAtopgpu then '' + wrapPythonPrograms + '' else '' + rm $out/lib/systemd/system/atopgpu.service + rm $out/bin/atopgpud + rm $out/share/man/man8/atopgpud.8 + ''); meta = with lib; { platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/netatop/netatop.service.patch b/pkgs/os-specific/linux/netatop/netatop.service.patch new file mode 100644 index 00000000000..b7fae336be9 --- /dev/null +++ b/pkgs/os-specific/linux/netatop/netatop.service.patch @@ -0,0 +1,14 @@ +--- a/netatop.service ++++ b/netatop.service +@@ -7,8 +7,8 @@ + [Service] + Type=oneshot +-ExecStartPre=/sbin/modprobe netatop +-ExecStart=/usr/sbin/netatopd +-ExecStopPost=/sbin/rmmod netatop +-PIDFile=/var/run/netatop.pid ++ExecStartPre=@kmod@/bin/modprobe netatop ++ExecStart=@out@/bin/netatopd ++ExecStopPost=@kmod@/bin/rmmod netatop ++PIDFile=/run/netatop.pid + RemainAfterExit=yes From 8f3d2e5c3b10ca459a71a59176be9be16d75276f Mon Sep 17 00:00:00 2001 From: Paul Schyska Date: Fri, 14 May 2021 02:11:05 +0200 Subject: [PATCH 076/249] nixos/atop: Add configuration for atop services, allow to enable netatop, gpuatop, allow setuid wrapper --- nixos/modules/programs/atop.nix | 126 ++++++++++++++++++++++++++++-- nixos/tests/all-tests.nix | 1 + nixos/tests/atop.nix | 132 ++++++++++++++++++++++++++++++++ 3 files changed, 251 insertions(+), 8 deletions(-) create mode 100644 nixos/tests/atop.nix diff --git a/nixos/modules/programs/atop.nix b/nixos/modules/programs/atop.nix index 7ef8d687ca1..d1577b32adf 100644 --- a/nixos/modules/programs/atop.nix +++ b/nixos/modules/programs/atop.nix @@ -1,6 +1,6 @@ # Global configuration for atop. -{ config, lib, ... }: +{ config, lib, pkgs, ... }: with lib; @@ -12,11 +12,82 @@ in options = { - programs.atop = { + programs.atop = rec { + enable = mkEnableOption "Atop"; + + package = mkOption { + type = types.package; + default = pkgs.atop; + description = '' + Which package to use for Atop. + ''; + }; + + netatop = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to install and enable the netatop kernel module. + ''; + }; + package = mkOption { + type = types.package; + default = config.boot.kernelPackages.netatop; + description = '' + Which package to use for netatop. + ''; + }; + }; + + atopgpu.enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to install and enable the atopgpud daemon to get information about + NVIDIA gpus. + ''; + }; + + setuidWrapper.enable = mkOption { + type = types.bool; + default = cfg.netatop.enable || cfg.atopgpu.enable; + description = '' + Whether to install a setuid wrapper for Atop. This is required to use some of + the features as non-root user (e.g.: ipc information, netatop, atopgpu). + Atop tries to drop the root privileges shortly after starting. + ''; + }; + + atopsvc.enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable the atop service responsible for storing statistics for + long-term analysis. + ''; + }; + atopRotate.enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable the atop-rotate timer, which restarts the atop service + daily to make sure the data files are rotate. + ''; + }; + atopacct.enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable the atopacct service which manages process accounting. + This allows Atop to gather data about processes that disappeared in between + two refresh intervals. + ''; + }; settings = mkOption { type = types.attrs; - default = {}; + default = { }; example = { flags = "a1f"; interval = 5; @@ -25,12 +96,51 @@ in Parameters to be written to /etc/atoprc. ''; }; - }; }; - config = mkIf (cfg.settings != {}) { - environment.etc.atoprc.text = - concatStrings (mapAttrsToList (n: v: "${n} ${toString v}\n") cfg.settings); - }; + config = mkIf cfg.enable ( + let + atop = + if cfg.atopgpu.enable then + (cfg.package.override { withAtopgpu = true; }) + else + cfg.package; + packages = [ atop (lib.mkIf cfg.netatop.enable cfg.netatop.package) ]; + in + { + environment.etc = mkIf (cfg.settings != { }) { + atoprc.text = concatStrings + (mapAttrsToList + (n: v: '' + ${n} ${toString v} + '') + cfg.settings); + }; + environment.systemPackages = packages; + boot.extraModulePackages = [ (lib.mkIf cfg.netatop.enable cfg.netatop.package) ]; + systemd = + let + mkSystemd = type: cond: name: { + ${name} = lib.mkIf cond { + restartTriggers = packages; + wantedBy = [ (if type == "services" then "multi-user.target" else if type == "timers" then "timers.target" else null) ]; + }; + }; + mkService = mkSystemd "services"; + mkTimer = mkSystemd "timers"; + in + { + inherit packages; + services = + mkService cfg.atopsvc.enable "atop" + // mkService cfg.atopacct.enable "atopacct" + // mkService cfg.netatop.enable "netatop" + // mkService cfg.atopgpu.enable "atopgpu"; + timers = mkTimer cfg.atopRotate.enable "atop-rotate"; + }; + security.wrappers = + lib.mkIf cfg.setuidWrapper.enable { atop = { source = "${atop}/bin/atop"; }; }; + } + ); } diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 232d89052d4..e468c0da64c 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -28,6 +28,7 @@ in amazon-init-shell = handleTest ./amazon-init-shell.nix {}; ammonite = handleTest ./ammonite.nix {}; atd = handleTest ./atd.nix {}; + atop = handleTest ./atop.nix {}; avahi = handleTest ./avahi.nix {}; avahi-with-resolved = handleTest ./avahi.nix { networkd = true; }; awscli = handleTest ./awscli.nix { }; diff --git a/nixos/tests/atop.nix b/nixos/tests/atop.nix new file mode 100644 index 00000000000..8cecf02d28f --- /dev/null +++ b/nixos/tests/atop.nix @@ -0,0 +1,132 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "atop"; + + nodes = { + defaults = { ... }: { + programs.atop = { + enable = true; + }; + }; + minimal = { ... }: { + programs.atop = { + enable = true; + atopsvc.enable = false; + atopRotate.enable = false; + atopacct.enable = false; + }; + }; + minimal_with_setuid = { ... }: { + programs.atop = { + enable = true; + atopsvc.enable = false; + atopRotate.enable = false; + atopacct.enable = false; + setuidWrapper.enable = true; + }; + }; + + atoprc_and_netatop = { ... }: { + programs.atop = { + enable = true; + netatop.enable = true; + settings = { + flags = "faf1"; + interval = 2; + }; + }; + }; + + atopgpu = { lib, ... }: { + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "cudatoolkit" + ]; + programs.atop = { + enable = true; + atopgpu.enable = true; + }; + }; + }; + + testScript = '' + def a_version(m): + v = m.succeed("atop -V") + pkgver = "${pkgs.atop.version}" + assert v.startswith("Version: {}".format(pkgver)), "Version is {}, expected `{}`".format(v, pkgver) + + def __exp_path(m, prg, expected): + p = m.succeed("type -p \"{}\" | head -c -1".format(prg)) + assert p == expected, "{} is `{}`, expected `{}`".format(prg, p, expected) + + def a_setuid(m, present=True): + if present: + __exp_path(m, "atop", "/run/wrappers/bin/atop") + stat = m.succeed("stat --printf '%a %u' /run/wrappers/bin/atop") + assert stat == "4511 0", "Wrapper stat is {}, expected `4511 0`".format(stat) + else: + __exp_path(m, "atop", "/run/current-system/sw/bin/atop") + + def assert_no_netatop(m): + m.require_unit_state("netatop.service", "inactive") + m.fail("modprobe -n -v netatop") + + def a_netatop(m, present=True): + m.require_unit_state("netatop.service", "active" if present else "inactive") + if present: + out = m.succeed("modprobe -n -v netatop") + assert out == "", "Module should be loaded, but modprobe would have done `{}`.".format(out) + else: + m.fail("modprobe -n -v netatop") + + def a_atopgpu(m, present=True): + m.require_unit_state("atopgpu.service", "active" if present else "inactive") + if present: + __exp_path(m, "atopgpud", "/run/current-system/sw/bin/atopgpud") + + # atop.service should log some data to /var/log/atop + def a_atopsvc(m, present=True): + m.require_unit_state("atop.service", "active" if present else "inactive") + if present: + files = int(m.succeed("ls -1 /var/log/atop | wc -l")) + assert files >= 1, "Expected at least 1 data file" + # def check_files(_): + # files = int(m.succeed("ls -1 /var/log/atop | wc -l")) + # return files >= 1 + # retry(check_files) + + def a_atoprotate(m, present=True): + m.require_unit_state("atop-rotate.timer", "active" if present else "inactive") + + # atopacct.service should make kernel write to /run/pacct_source and make dir + # /run/pacct_shadow.d + def a_atopacct(m, present=True): + m.require_unit_state("atopacct.service", "active" if present else "inactive") + if present: + m.succeed("test -f /run/pacct_source") + files = int(m.succeed("ls -1 /run/pacct_shadow.d | wc -l")) + assert files >= 1, "Expected at least 1 pacct_shadow.d file" + + def a_atoprc(m, contents): + if contents: + f = m.succeed("cat /etc/atoprc") + assert f == contents, "/etc/atoprc contents: `{}`, expected `{}`".format(f, contents) + else: + m.succeed("test ! -e /etc/atoprc") + + def assert_all(m, setuid, atopsvc, atoprotate, atopacct, netatop, atopgpu, atoprc): + a_version(m) + a_setuid(m, setuid) + a_atopsvc(m, atopsvc) + a_atoprotate(m, atoprotate) + a_atopacct(m, atopacct) + a_netatop(m, netatop) + a_atopgpu(m, atopgpu) + a_atoprc(m, atoprc) + + assert_all(defaults, False, True, True, True, False, False, False) + assert_all(minimal, False, False, False, False, False, False, False) + assert_all(minimal_with_setuid, True, False, False, False, False, False, False) + assert_all(atoprc_and_netatop, False, True, True, True, True, False, + "flags faf1\ninterval 2\n") + assert_all(atopgpu, False, True, True, True, False, True, False) + ''; +}) From b87c36604642669d05381f06ac94af1b21f1ce30 Mon Sep 17 00:00:00 2001 From: Paul Schyska Date: Sun, 16 May 2021 18:19:27 +0200 Subject: [PATCH 077/249] nixos/atop: Never enable setuidWrapper by default, rename service/timer enabling options --- nixos/modules/programs/atop.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/modules/programs/atop.nix b/nixos/modules/programs/atop.nix index d1577b32adf..3e69e882eae 100644 --- a/nixos/modules/programs/atop.nix +++ b/nixos/modules/programs/atop.nix @@ -52,7 +52,7 @@ in setuidWrapper.enable = mkOption { type = types.bool; - default = cfg.netatop.enable || cfg.atopgpu.enable; + default = false; description = '' Whether to install a setuid wrapper for Atop. This is required to use some of the features as non-root user (e.g.: ipc information, netatop, atopgpu). @@ -60,7 +60,7 @@ in ''; }; - atopsvc.enable = mkOption { + atopService.enable = mkOption { type = types.bool; default = true; description = '' @@ -68,7 +68,7 @@ in long-term analysis. ''; }; - atopRotate.enable = mkOption { + atopRotateTimer.enable = mkOption { type = types.bool; default = true; description = '' @@ -76,7 +76,7 @@ in daily to make sure the data files are rotate. ''; }; - atopacct.enable = mkOption { + atopacctService.enable = mkOption { type = types.bool; default = true; description = '' @@ -133,11 +133,11 @@ in { inherit packages; services = - mkService cfg.atopsvc.enable "atop" - // mkService cfg.atopacct.enable "atopacct" + mkService cfg.atopService.enable "atop" + // mkService cfg.atopacctService.enable "atopacct" // mkService cfg.netatop.enable "netatop" // mkService cfg.atopgpu.enable "atopgpu"; - timers = mkTimer cfg.atopRotate.enable "atop-rotate"; + timers = mkTimer cfg.atopRotateTimer.enable "atop-rotate"; }; security.wrappers = lib.mkIf cfg.setuidWrapper.enable { atop = { source = "${atop}/bin/atop"; }; }; From fb90a9c552fa422020ea649ddcc8a9132fb2ee7e Mon Sep 17 00:00:00 2001 From: Paul Schyska Date: Sun, 16 May 2021 18:20:03 +0200 Subject: [PATCH 078/249] nixos/atop: Rework the test - use "with subtest" everywhere - do more in nix and less in python - use makeTest directly to define multiple tests instead of one with multiple nodes -> this enables them to run in parallel --- nixos/tests/atop.nix | 297 +++++++++++++++++++++++++++---------------- 1 file changed, 189 insertions(+), 108 deletions(-) diff --git a/nixos/tests/atop.nix b/nixos/tests/atop.nix index 8cecf02d28f..a2565e610ae 100644 --- a/nixos/tests/atop.nix +++ b/nixos/tests/atop.nix @@ -1,132 +1,213 @@ -import ./make-test-python.nix ({ pkgs, ... }: { +{ system ? builtins.currentSystem +, config ? { } +, pkgs ? import ../.. { inherit system config; } +}: + +with import ../lib/testing-python.nix { inherit system pkgs; }; +with pkgs.lib; + +let assertions = rec { + path = program: path: '' + with subtest("The path of ${program} should be ${path}"): + p = machine.succeed("type -p \"${program}\" | head -c -1") + assert p == "${path}", f"${program} is {p}, expected ${path}" + ''; + unit = name: state: '' + with subtest("Unit ${name} should be ${state}"): + machine.require_unit_state("${name}", "${state}") + ''; + version = '' + import re + + with subtest("binary should report the correct version"): + pkgver = "${pkgs.atop.version}" + ver = re.sub(r'(?s)^Version: (\d\.\d\.\d).*', r'\1', machine.succeed("atop -V")) + assert ver == pkgver, f"Version is `{ver}`, expected `{pkgver}`" + ''; + atoprc = contents: + if builtins.stringLength contents > 0 then '' + with subtest("/etc/atoprc should have the correct contents"): + f = machine.succeed("cat /etc/atoprc") + assert f == "${contents}", f"/etc/atoprc contents: '{f}', expected '${contents}'" + '' else '' + with subtest("/etc/atoprc should not be present"): + machine.succeed("test ! -e /etc/atoprc") + ''; + wrapper = present: + if present then path "atop" "/run/wrappers/bin/atop" + '' + with subtest("Wrapper should be setuid root"): + stat = machine.succeed("stat --printf '%a %u' /run/wrappers/bin/atop") + assert stat == "4511 0", f"Wrapper stat is {stat}, expected '4511 0'" + '' + else path "atop" "/run/current-system/sw/bin/atop"; + atopService = present: + 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" + '' else unit "atop.service" "inactive"; + atopRotateTimer = present: + unit "atop-rotate.timer" (if present then "active" else "inactive"); + atopacctService = present: + if present then + unit "atopacct.service" "active" + + '' + with subtest("atopacct.service should enable process accounting"): + machine.succeed("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" + '' else unit "atopacct.service" "inactive"; + netatop = present: + if present then + unit "netatop.service" "active" + + '' + with subtest("The netatop kernel module should be loaded"): + out = machine.succeed("modprobe -n -v netatop") + assert out == "", f"Module should be loaded already, but modprobe would have done {out}." + '' else '' + with subtest("The netatop kernel module should be absent"): + machine.fail("modprobe -n -v netatop") + ''; + atopgpu = present: + if present then + (unit "atopgpu.service" "active") + (path "atopgpud" "/run/current-system/sw/bin/atopgpud") + else (unit "atopgpu.service" "inactive") + '' + with subtest("atopgpud should not be present"): + machine.fail("type -p atopgpud") + ''; +}; +in +{ name = "atop"; - nodes = { - defaults = { ... }: { + justThePackage = makeTest { + name = "atop-justThePackage"; + machine = { + environment.systemPackages = [ pkgs.atop ]; + }; + testScript = with assertions; builtins.concatStringsSep "\n" [ + version + (atoprc "") + (wrapper false) + (atopService false) + (atopRotateTimer false) + (atopacctService false) + (netatop false) + (atopgpu false) + ]; + }; + defaults = makeTest { + name = "atop-defaults"; + machine = { programs.atop = { enable = true; }; }; - minimal = { ... }: { + testScript = with assertions; builtins.concatStringsSep "\n" [ + version + (atoprc "") + (wrapper false) + (atopService true) + (atopRotateTimer true) + (atopacctService true) + (netatop false) + (atopgpu false) + ]; + }; + minimal = makeTest { + name = "atop-minimal"; + machine = { programs.atop = { enable = true; - atopsvc.enable = false; - atopRotate.enable = false; - atopacct.enable = false; + atopService.enable = false; + atopRotateTimer.enable = false; + atopacctService.enable = false; }; }; - minimal_with_setuid = { ... }: { - programs.atop = { - enable = true; - atopsvc.enable = false; - atopRotate.enable = false; - atopacct.enable = false; - setuidWrapper.enable = true; - }; - }; - - atoprc_and_netatop = { ... }: { + testScript = with assertions; builtins.concatStringsSep "\n" [ + version + (atoprc "") + (wrapper false) + (atopService false) + (atopRotateTimer false) + (atopacctService false) + (netatop false) + (atopgpu false) + ]; + }; + netatop = makeTest { + name = "atop-netatop"; + machine = { programs.atop = { enable = true; netatop.enable = true; - settings = { - flags = "faf1"; - interval = 2; - }; }; }; - - atopgpu = { lib, ... }: { - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + testScript = with assertions; builtins.concatStringsSep "\n" [ + version + (atoprc "") + (wrapper false) + (atopService true) + (atopRotateTimer true) + (atopacctService true) + (netatop true) + (atopgpu false) + ]; + }; + atopgpu = makeTest { + name = "atop-atopgpu"; + machine = { + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (getName pkg) [ "cudatoolkit" ]; + programs.atop = { enable = true; atopgpu.enable = true; }; }; + testScript = with assertions; builtins.concatStringsSep "\n" [ + version + (atoprc "") + (wrapper false) + (atopService true) + (atopRotateTimer true) + (atopacctService true) + (netatop false) + (atopgpu true) + ]; }; + everything = makeTest { + name = "atop-everthing"; + machine = { + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (getName pkg) [ + "cudatoolkit" + ]; - testScript = '' - def a_version(m): - v = m.succeed("atop -V") - pkgver = "${pkgs.atop.version}" - assert v.startswith("Version: {}".format(pkgver)), "Version is {}, expected `{}`".format(v, pkgver) - - def __exp_path(m, prg, expected): - p = m.succeed("type -p \"{}\" | head -c -1".format(prg)) - assert p == expected, "{} is `{}`, expected `{}`".format(prg, p, expected) - - def a_setuid(m, present=True): - if present: - __exp_path(m, "atop", "/run/wrappers/bin/atop") - stat = m.succeed("stat --printf '%a %u' /run/wrappers/bin/atop") - assert stat == "4511 0", "Wrapper stat is {}, expected `4511 0`".format(stat) - else: - __exp_path(m, "atop", "/run/current-system/sw/bin/atop") - - def assert_no_netatop(m): - m.require_unit_state("netatop.service", "inactive") - m.fail("modprobe -n -v netatop") - - def a_netatop(m, present=True): - m.require_unit_state("netatop.service", "active" if present else "inactive") - if present: - out = m.succeed("modprobe -n -v netatop") - assert out == "", "Module should be loaded, but modprobe would have done `{}`.".format(out) - else: - m.fail("modprobe -n -v netatop") - - def a_atopgpu(m, present=True): - m.require_unit_state("atopgpu.service", "active" if present else "inactive") - if present: - __exp_path(m, "atopgpud", "/run/current-system/sw/bin/atopgpud") - - # atop.service should log some data to /var/log/atop - def a_atopsvc(m, present=True): - m.require_unit_state("atop.service", "active" if present else "inactive") - if present: - files = int(m.succeed("ls -1 /var/log/atop | wc -l")) - assert files >= 1, "Expected at least 1 data file" - # def check_files(_): - # files = int(m.succeed("ls -1 /var/log/atop | wc -l")) - # return files >= 1 - # retry(check_files) - - def a_atoprotate(m, present=True): - m.require_unit_state("atop-rotate.timer", "active" if present else "inactive") - - # atopacct.service should make kernel write to /run/pacct_source and make dir - # /run/pacct_shadow.d - def a_atopacct(m, present=True): - m.require_unit_state("atopacct.service", "active" if present else "inactive") - if present: - m.succeed("test -f /run/pacct_source") - files = int(m.succeed("ls -1 /run/pacct_shadow.d | wc -l")) - assert files >= 1, "Expected at least 1 pacct_shadow.d file" - - def a_atoprc(m, contents): - if contents: - f = m.succeed("cat /etc/atoprc") - assert f == contents, "/etc/atoprc contents: `{}`, expected `{}`".format(f, contents) - else: - m.succeed("test ! -e /etc/atoprc") - - def assert_all(m, setuid, atopsvc, atoprotate, atopacct, netatop, atopgpu, atoprc): - a_version(m) - a_setuid(m, setuid) - a_atopsvc(m, atopsvc) - a_atoprotate(m, atoprotate) - a_atopacct(m, atopacct) - a_netatop(m, netatop) - a_atopgpu(m, atopgpu) - a_atoprc(m, atoprc) - - assert_all(defaults, False, True, True, True, False, False, False) - assert_all(minimal, False, False, False, False, False, False, False) - assert_all(minimal_with_setuid, True, False, False, False, False, False, False) - assert_all(atoprc_and_netatop, False, True, True, True, True, False, - "flags faf1\ninterval 2\n") - assert_all(atopgpu, False, True, True, True, False, True, False) - ''; -}) + programs.atop = { + enable = true; + settings = { + flags = "faf1"; + interval = 2; + }; + setuidWrapper.enable = true; + netatop.enable = true; + atopgpu.enable = true; + }; + }; + testScript = with assertions; builtins.concatStringsSep "\n" [ + version + (atoprc "flags faf1\\ninterval 2\\n") + (wrapper true) + (atopService true) + (atopRotateTimer true) + (atopacctService true) + (netatop true) + (atopgpu true) + ]; + }; +} From 526bc6a4d59d87b5fd90984f0aee607620036962 Mon Sep 17 00:00:00 2001 From: Paul Schyska Date: Sun, 16 May 2021 21:43:20 +0200 Subject: [PATCH 079/249] nixos/atop: Add a note about netatop tainting the kernel --- nixos/modules/programs/atop.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/programs/atop.nix b/nixos/modules/programs/atop.nix index 3e69e882eae..2010254a35d 100644 --- a/nixos/modules/programs/atop.nix +++ b/nixos/modules/programs/atop.nix @@ -30,6 +30,7 @@ in default = false; description = '' Whether to install and enable the netatop kernel module. + Note: this sets the kernel taint flag "O" for loading out-of-tree modules. ''; }; package = mkOption { From 563ba07543cb900eee5681a65259dd6c3533248b Mon Sep 17 00:00:00 2001 From: Paul Schyska Date: Sun, 16 May 2021 22:00:24 +0200 Subject: [PATCH 080/249] nixos/atop: Split up restart triggers between atop and netatop --- nixos/modules/programs/atop.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/nixos/modules/programs/atop.nix b/nixos/modules/programs/atop.nix index 2010254a35d..47597a0a4d4 100644 --- a/nixos/modules/programs/atop.nix +++ b/nixos/modules/programs/atop.nix @@ -107,7 +107,6 @@ in (cfg.package.override { withAtopgpu = true; }) else cfg.package; - packages = [ atop (lib.mkIf cfg.netatop.enable cfg.netatop.package) ]; in { environment.etc = mkIf (cfg.settings != { }) { @@ -118,13 +117,13 @@ in '') cfg.settings); }; - environment.systemPackages = packages; + environment.systemPackages = [ atop (lib.mkIf cfg.netatop.enable cfg.netatop.package) ]; boot.extraModulePackages = [ (lib.mkIf cfg.netatop.enable cfg.netatop.package) ]; systemd = let - mkSystemd = type: cond: name: { + mkSystemd = type: cond: name: restartTriggers: { ${name} = lib.mkIf cond { - restartTriggers = packages; + inherit restartTriggers; wantedBy = [ (if type == "services" then "multi-user.target" else if type == "timers" then "timers.target" else null) ]; }; }; @@ -132,13 +131,13 @@ in mkTimer = mkSystemd "timers"; in { - inherit packages; + packages = [ atop (lib.mkIf cfg.netatop.enable cfg.netatop.package) ]; services = - mkService cfg.atopService.enable "atop" - // mkService cfg.atopacctService.enable "atopacct" - // mkService cfg.netatop.enable "netatop" - // mkService cfg.atopgpu.enable "atopgpu"; - timers = mkTimer cfg.atopRotateTimer.enable "atop-rotate"; + mkService cfg.atopService.enable "atop" [ atop ] + // mkService cfg.atopacctService.enable "atopacct" [ atop ] + // mkService cfg.netatop.enable "netatop" [ cfg.netatop.package ] + // mkService cfg.atopgpu.enable "atopgpu" [ atop ]; + timers = mkTimer cfg.atopRotateTimer.enable "atop-rotate" [ atop ]; }; security.wrappers = lib.mkIf cfg.setuidWrapper.enable { atop = { source = "${atop}/bin/atop"; }; }; From 27d323d2813bf44473cb7a4f2d5e0f4acc84c5ff Mon Sep 17 00:00:00 2001 From: Paul Schyska Date: Sun, 16 May 2021 22:07:24 +0200 Subject: [PATCH 081/249] netatop: Split out path fixing and PIDFile changes to separate patches and comment --- pkgs/os-specific/linux/netatop/default.nix | 7 ++++++- pkgs/os-specific/linux/netatop/fix-paths.patch | 11 +++++++++++ pkgs/os-specific/linux/netatop/netatop.service.patch | 11 ++--------- 3 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 pkgs/os-specific/linux/netatop/fix-paths.patch diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix index 242fcbf681e..28f989929a4 100644 --- a/pkgs/os-specific/linux/netatop/default.nix +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -16,7 +16,12 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; - patches = [ ./netatop.service.patch ]; + patches = [ + # fix paths in netatop.service + ./fix-paths.patch + # Specify PIDFile in /run, not /var/run to silence systemd warning + ./netatop.service.patch + ]; preConfigure = '' patchShebangs mkversion sed -i -e 's,^KERNDIR.*,KERNDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build,' \ diff --git a/pkgs/os-specific/linux/netatop/fix-paths.patch b/pkgs/os-specific/linux/netatop/fix-paths.patch new file mode 100644 index 00000000000..0e71c4efdd3 --- /dev/null +++ b/pkgs/os-specific/linux/netatop/fix-paths.patch @@ -0,0 +1,11 @@ +--- a/netatop.service ++++ b/netatop.service +@@ -8,5 +8,5 @@ + Type=oneshot +-ExecStartPre=/sbin/modprobe netatop +-ExecStart=/usr/sbin/netatopd +-ExecStopPost=/sbin/rmmod netatop ++ExecStartPre=@kmod@/bin/modprobe netatop ++ExecStart=@out@/bin/netatopd ++ExecStopPost=@kmod@/bin/rmmod netatop + PIDFile=/var/run/netatop.pid diff --git a/pkgs/os-specific/linux/netatop/netatop.service.patch b/pkgs/os-specific/linux/netatop/netatop.service.patch index b7fae336be9..c7c798ee06b 100644 --- a/pkgs/os-specific/linux/netatop/netatop.service.patch +++ b/pkgs/os-specific/linux/netatop/netatop.service.patch @@ -1,14 +1,7 @@ --- a/netatop.service +++ b/netatop.service -@@ -7,8 +7,8 @@ - [Service] - Type=oneshot --ExecStartPre=/sbin/modprobe netatop --ExecStart=/usr/sbin/netatopd --ExecStopPost=/sbin/rmmod netatop +@@ -11,3 +11,3 @@ + ExecStopPost=@kmod@/bin/rmmod netatop -PIDFile=/var/run/netatop.pid -+ExecStartPre=@kmod@/bin/modprobe netatop -+ExecStart=@out@/bin/netatopd -+ExecStopPost=@kmod@/bin/rmmod netatop +PIDFile=/run/netatop.pid RemainAfterExit=yes From 76554beed86e6935fefee25cdd8c78bf524aac4c Mon Sep 17 00:00:00 2001 From: Paul Schyska Date: Sun, 16 May 2021 22:08:05 +0200 Subject: [PATCH 082/249] atop: Merge all path-fixing to a single patch, comment the remaining patches --- pkgs/os-specific/linux/atop/atop-pm.sh.patch | 13 ----- .../linux/atop/atop-rotate.service.patch | 7 --- .../os-specific/linux/atop/atop.service.patch | 8 +--- .../linux/atop/atopacct.service.patch | 8 +--- .../linux/atop/atopgpu.service.patch | 9 ---- pkgs/os-specific/linux/atop/default.nix | 9 ++-- pkgs/os-specific/linux/atop/fix-paths.patch | 48 +++++++++++++++++++ 7 files changed, 58 insertions(+), 44 deletions(-) delete mode 100644 pkgs/os-specific/linux/atop/atop-pm.sh.patch delete mode 100644 pkgs/os-specific/linux/atop/atop-rotate.service.patch delete mode 100644 pkgs/os-specific/linux/atop/atopgpu.service.patch create mode 100644 pkgs/os-specific/linux/atop/fix-paths.patch diff --git a/pkgs/os-specific/linux/atop/atop-pm.sh.patch b/pkgs/os-specific/linux/atop/atop-pm.sh.patch deleted file mode 100644 index 9b66b260992..00000000000 --- a/pkgs/os-specific/linux/atop/atop-pm.sh.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/atop-pm.sh -+++ b/atop-pm.sh -@@ -2,8 +2,8 @@ - - case "$1" in -- pre) /usr/bin/systemctl stop atop -+ pre) @systemd@/bin/systemctl stop atop - exit 0 - ;; -- post) /usr/bin/systemctl start atop -+ post) @systemd@/bin/systemctl start atop - exit 0 - ;; diff --git a/pkgs/os-specific/linux/atop/atop-rotate.service.patch b/pkgs/os-specific/linux/atop/atop-rotate.service.patch deleted file mode 100644 index 951a3c8c837..00000000000 --- a/pkgs/os-specific/linux/atop/atop-rotate.service.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- a/atop-rotate.service -+++ b/atop-rotate.service -@@ -4,3 +4,3 @@ - [Service] - Type=oneshot --ExecStart=/usr/bin/systemctl try-restart atop.service -+ExecStart=@systemd@/bin/systemctl try-restart atop.service diff --git a/pkgs/os-specific/linux/atop/atop.service.patch b/pkgs/os-specific/linux/atop/atop.service.patch index 5467b512229..3ef59e60cbc 100644 --- a/pkgs/os-specific/linux/atop/atop.service.patch +++ b/pkgs/os-specific/linux/atop/atop.service.patch @@ -1,14 +1,10 @@ --- a/atop.service +++ b/atop.service -@@ -9,7 +9,8 @@ +@@ -9,5 +9,6 @@ Environment=LOGPATH=/var/log/atop -EnvironmentFile=/etc/default/atop +EnvironmentFile=-/etc/default/atop ExecStartPre=/bin/sh -c 'test -n "$LOGINTERVAL" -a "$LOGINTERVAL" -eq "$LOGINTERVAL"' ExecStartPre=/bin/sh -c 'test -n "$LOGGENERATIONS" -a "$LOGGENERATIONS" -eq "$LOGGENERATIONS"' --ExecStart=/bin/sh -c 'exec /usr/bin/atop ${LOGOPTS} -w "${LOGPATH}/atop_$(date +%%Y%%m%%d)" ${LOGINTERVAL}' --ExecStartPost=/usr/bin/find "${LOGPATH}" -name "atop_*" -mtime +${LOGGENERATIONS} -exec rm -v {} \; +ExecStartPre=/bin/sh -c 'mkdir -p "${LOGPATH}"' -+ExecStart=/bin/sh -c 'exec @out@/bin/atop ${LOGOPTS} -w "${LOGPATH}/atop_$(date +%%Y%%m%%d)" ${LOGINTERVAL}' -+ExecStartPost=@findutils@/bin/find "${LOGPATH}" -name "atop_*" -mtime +${LOGGENERATIONS} -exec rm -v {} \; - KillSignal=SIGUSR2 + ExecStart=/bin/sh -c 'exec @out@/bin/atop ${LOGOPTS} -w "${LOGPATH}/atop_$(date +%%Y%%m%%d)" ${LOGINTERVAL}' diff --git a/pkgs/os-specific/linux/atop/atopacct.service.patch b/pkgs/os-specific/linux/atop/atopacct.service.patch index cbecbef90ec..9f2cd8f2e9c 100644 --- a/pkgs/os-specific/linux/atop/atopacct.service.patch +++ b/pkgs/os-specific/linux/atop/atopacct.service.patch @@ -1,11 +1,7 @@ --- a/atopacct.service +++ b/atopacct.service -@@ -8,6 +8,6 @@ - [Service] +@@ -9,3 +9,3 @@ Type=forking -PIDFile=/var/run/atopacctd.pid --ExecStart=/usr/sbin/atopacctd +PIDFile=/run/atopacctd.pid -+ExecStart=@out@/bin/atopacctd - - [Install] + ExecStart=@out@/bin/atopacctd diff --git a/pkgs/os-specific/linux/atop/atopgpu.service.patch b/pkgs/os-specific/linux/atop/atopgpu.service.patch deleted file mode 100644 index 30c38b67cad..00000000000 --- a/pkgs/os-specific/linux/atop/atopgpu.service.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/atopgpu.service -+++ b/atopgpu.service -@@ -6,5 +6,5 @@ - - [Service] --ExecStart=/usr/sbin/atopgpud -+ExecStart=@out@/bin/atopgpud - Type=oneshot - RemainAfterExit=yes diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix index 00510c91a74..61a76a50586 100644 --- a/pkgs/os-specific/linux/atop/default.nix +++ b/pkgs/os-specific/linux/atop/default.nix @@ -35,11 +35,14 @@ stdenv.mkDerivation rec { ]; patches = [ - ./atop-pm.sh.patch - ./atop-rotate.service.patch + # Fix paths in atop.service, atop-rotate.service, atopgpu.service, atopacct.service, + # and atop-pm.sh + ./fix-paths.patch + # Don't fail on missing /etc/default/atop, make sure /var/log/atop exists pre-start ./atop.service.patch + # Specify PIDFile in /run, not /var/run to silence systemd warning ./atopacct.service.patch - ] ++ (if withAtopgpu then [ ./atopgpu.service.patch ] else [ ]); + ]; preConfigure = '' for f in *.{sh,service}; do diff --git a/pkgs/os-specific/linux/atop/fix-paths.patch b/pkgs/os-specific/linux/atop/fix-paths.patch new file mode 100644 index 00000000000..e6cd631d3c1 --- /dev/null +++ b/pkgs/os-specific/linux/atop/fix-paths.patch @@ -0,0 +1,48 @@ +--- a/atop.service ++++ b/atop.service +@@ -12,4 +12,4 @@ + ExecStartPre=/bin/sh -c 'test -n "$LOGGENERATIONS" -a "$LOGGENERATIONS" -eq "$LOGGENERATIONS"' +-ExecStart=/bin/sh -c 'exec /usr/bin/atop ${LOGOPTS} -w "${LOGPATH}/atop_$(date +%%Y%%m%%d)" ${LOGINTERVAL}' +-ExecStartPost=/usr/bin/find "${LOGPATH}" -name "atop_*" -mtime +${LOGGENERATIONS} -exec rm -v {} \; ++ExecStart=/bin/sh -c 'exec @out@/bin/atop ${LOGOPTS} -w "${LOGPATH}/atop_$(date +%%Y%%m%%d)" ${LOGINTERVAL}' ++ExecStartPost=@findutils@/bin/find "${LOGPATH}" -name "atop_*" -mtime +${LOGGENERATIONS} -exec rm -v {} \; + KillSignal=SIGUSR2 + +--- a/atop-rotate.service ++++ b/atop-rotate.service +@@ -4,3 +4,3 @@ + [Service] + Type=oneshot +-ExecStart=/usr/bin/systemctl try-restart atop.service ++ExecStart=@systemd@/bin/systemctl try-restart atop.service + +--- a/atopgpu.service ++++ b/atopgpu.service +@@ -6,5 +6,5 @@ + + [Service] +-ExecStart=/usr/sbin/atopgpud ++ExecStart=@out@/bin/atopgpud + Type=oneshot + RemainAfterExit=yes + +--- a/atopacct.service ++++ b/atopacct.service +@@ -10,3 +10,3 @@ + PIDFile=/var/run/atopacctd.pid +-ExecStart=/usr/sbin/atopacctd ++ExecStart=@out@/bin/atopacctd + +--- a/atop-pm.sh ++++ b/atop-pm.sh +@@ -2,8 +2,8 @@ + + case "$1" in +- pre) /usr/bin/systemctl stop atop ++ pre) @systemd@/bin/systemctl stop atop + exit 0 + ;; +- post) /usr/bin/systemctl start atop ++ post) @systemd@/bin/systemctl start atop + exit 0 + ;; From 3b0bc541316bb581f94c549f8ed2ac132e1b594f Mon Sep 17 00:00:00 2001 From: Paul Schyska Date: Mon, 17 May 2021 01:26:22 +0200 Subject: [PATCH 083/249] atop:, nixos/atop: Apply style suggestions Co-authored-by: Sandro --- pkgs/os-specific/linux/atop/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix index 61a76a50586..84a5870833a 100644 --- a/pkgs/os-specific/linux/atop/default.nix +++ b/pkgs/os-specific/linux/atop/default.nix @@ -6,7 +6,7 @@ , findutils , systemd , python3 - # makes the package unfree via pynvml +# makes the package unfree via pynvml , withAtopgpu ? false }: @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { sha256 = "nsLKOlcWkvfvqglfmaUQZDK8txzCLNbElZfvBIEFj3I="; }; - nativeBuildInputs = if withAtopgpu then [ python3.pkgs.wrapPython ] else [ ]; - buildInputs = [ zlib ncurses ] ++ (if withAtopgpu then [ python3 ] else [ ]); - pythonPath = if withAtopgpu then [ python3.pkgs.pynvml ] else [ ]; + nativeBuildInputs = lib.optionals withAtopgpu [ python3.pkgs.wrapPython ]; + buildInputs = [ zlib ncurses ] ++ lib.optionals withAtopgpu [ python3 ]; + pythonPath = lib.optionals withAtopgpu [ python3.pkgs.pynvml ]; makeFlags = [ "DESTDIR=$(out)" @@ -59,14 +59,11 @@ stdenv.mkDerivation rec { ''; postInstall = '' # remove extra files we don't need - rm -rf $out/{var,etc} - rm -rf $out/bin/atop{sar,}-${version} + rm -r $out/{var,etc} $out/bin/atop{sar,}-${version} '' + (if withAtopgpu then '' wrapPythonPrograms '' else '' - rm $out/lib/systemd/system/atopgpu.service - rm $out/bin/atopgpud - rm $out/share/man/man8/atopgpud.8 + rm $out/lib/systemd/system/atopgpu.service $out/bin/atopgpud $out/share/man/man8/atopgpud.8 ''); meta = with lib; { From 23469e4c26d777bfe93c633c11306455b54ad393 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Mon, 17 May 2021 10:39:35 +0800 Subject: [PATCH 084/249] river: build for baseline arch, cleanup --- .../window-managers/river/default.nix | 47 ++++++++++++++----- 1 file changed, 35 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index b8b53027219..5c02484236c 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -1,7 +1,19 @@ -{ lib, stdenv ,fetchFromGitHub -, zig, wayland, pkg-config, scdoc -, xwayland, wayland-protocols, wlroots -, libxkbcommon, pixman, udev, libevdev, libX11, libGL +{ lib +, stdenv +, fetchFromGitHub +, zig +, wayland +, pkg-config +, scdoc +, xwayland +, wayland-protocols +, wlroots +, libxkbcommon +, pixman +, udev +, libevdev +, libX11 +, libGL }: stdenv.mkDerivation rec { @@ -16,8 +28,18 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - buildInputs = [ wayland-protocols wlroots pixman - libxkbcommon pixman udev libevdev libX11 libGL + nativeBuildInputs = [ zig wayland xwayland scdoc pkg-config ]; + + buildInputs = [ + wayland-protocols + wlroots + pixman + libxkbcommon + pixman + udev + libevdev + libX11 + libGL ]; dontConfigure = true; @@ -25,17 +47,18 @@ stdenv.mkDerivation rec { preBuild = '' export HOME=$TMPDIR ''; + installPhase = '' runHook preInstall - zig build -Drelease-safe -Dxwayland -Dman-pages --prefix $out install + zig build -Drelease-safe -Dtarget=${stdenv.hostPlatform.parsed.cpu.name}-native -Dxwayland -Dman-pages --prefix $out install runHook postInstall ''; - nativeBuildInputs = [ zig wayland xwayland scdoc pkg-config ]; - - # Builder patch install dir into river to get default config - # When installFlags is removed, river becomes half broken - # see https://github.com/ifreund/river/blob/7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d/river/main.zig#L56 + /* + Builder patch install dir into river to get default config + When installFlags is removed, river becomes half broken. + See https://github.com/ifreund/river/blob/7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d/river/main.zig#L56 + */ installFlags = [ "DESTDIR=$(out)" ]; meta = with lib; { From 536b5f81655e9ee9ce4c10172364192631570a73 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 14 May 2021 23:57:49 +0300 Subject: [PATCH 085/249] reproxy: init at 0.5.1 --- pkgs/servers/reproxy/default.nix | 36 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/servers/reproxy/default.nix diff --git a/pkgs/servers/reproxy/default.nix b/pkgs/servers/reproxy/default.nix new file mode 100644 index 00000000000..29a2f485abd --- /dev/null +++ b/pkgs/servers/reproxy/default.nix @@ -0,0 +1,36 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "reproxy"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "umputun"; + repo = pname; + rev = "v${version}"; + hash = "sha256-RB3+IU6halnk/2REh2CLDpQN7djn4Y1QuL8y8xppnQw="; + }; + + postPatch = '' + # Requires network access + substituteInPlace app/main_test.go \ + --replace "Test_Main" "Skip_Main" + ''; + + vendorSha256 = null; + + buildFlagsArray = [ + "-ldflags=-s -w -X main.revision=${version}" + ]; + + installPhase = '' + install -Dm755 $GOPATH/bin/app $out/bin/reproxy + ''; + + meta = with lib; { + description = "Simple edge server / reverse proxy"; + homepage = "https://reproxy.io/"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ae283aa6b3..00dad5e8033 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19420,6 +19420,8 @@ in redstore = callPackage ../servers/http/redstore { }; + reproxy = callPackage ../servers/reproxy { }; + restic = callPackage ../tools/backup/restic { }; restic-rest-server = callPackage ../tools/backup/restic/rest-server.nix { }; From 48d510f14b17d6f158d80bb0101775263c86bb53 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Mon, 17 May 2021 12:00:54 +0800 Subject: [PATCH 086/249] discocss: 0.1.0 -> 0.1.1 --- pkgs/tools/misc/discocss/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/discocss/default.nix b/pkgs/tools/misc/discocss/default.nix index 43214c86630..2e0506bf420 100644 --- a/pkgs/tools/misc/discocss/default.nix +++ b/pkgs/tools/misc/discocss/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "discocss"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "mlvzk"; repo = pname; rev = "v${version}"; - sha256 = "1818jca3sw2ngw1n488q82w5rakx4cxgknnkmsaa0sz4h8gldfy8"; + sha256 = "sha256-EdkcTVDFQppBeAoyM5hMMIK0d4B87JyVlmCW7zlGfDs="; }; dontBuild = true; @@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec { description = "A tiny Discord css-injector"; homepage = "https://github.com/mlvzk/discocss"; license = licenses.mpl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ mlvzk ]; }; } From ab6a8437f5aa01d833d5786e0cab8ccf09d9b72c Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Sun, 16 May 2021 03:10:28 +0200 Subject: [PATCH 087/249] gnomeExtensions.dynamic-panel-transparency: 35 -> unstable-2021-03-04 --- .../gnome/extensions/dynamic-panel-transparency/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix b/pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix index f31e170b975..aee636d4534 100644 --- a/pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix +++ b/pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-dynamic-panel-transparency"; - version = "35"; + version = "unstable-2021-03-04"; src = fetchFromGitHub { owner = "ewlsh"; repo = "dynamic-panel-transparency"; - rev = "0800c0a921bb25f51f6a5ca2e6981b1669a69aec"; - sha256 = "0200mx861mlsi9lf7h108yam02jfqqw55r521chkgmk4fy6z99pq"; + rev = "f9e720e98e40c7a2d87928d09a7313c9ef2e832c"; + sha256 = "0njykxjiwlcmk0q8bsgqaznsryaw43fspfs6rzsjjz5p0xaq04nw"; }; uuid = "dynamic-panel-transparency@rockon999.github.io"; From f4bfc1173e33abc752ae1e1b25c7d143d5b82365 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 May 2021 04:19:09 +0000 Subject: [PATCH 088/249] dbeaver: 21.0.4 -> 21.0.5 --- pkgs/applications/misc/dbeaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 33501d1c667..3227598e8cf 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "dbeaver"; - version = "21.0.4"; # When updating also update fetchedMavenDeps.sha256 + version = "21.0.5"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "sha256-jV7Pe4MsLQnIrkDnlI2SrPzSjiDHM59GbMy4G7oeQK8="; + sha256 = "sha256-WMXhGXGHNjMJqob6A5S4+t9MDdJydAjdoY0u7T3ANbw="; }; fetchedMavenDeps = stdenv.mkDerivation { From 1729fe4d81c104dda74adcc622425e42885d4bf5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 May 2021 20:42:37 +0200 Subject: [PATCH 089/249] python3Packages.prayer-times-calculator: init at 0.0.4 --- .../prayer-times-calculator/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/prayer-times-calculator/default.nix diff --git a/pkgs/development/python-modules/prayer-times-calculator/default.nix b/pkgs/development/python-modules/prayer-times-calculator/default.nix new file mode 100644 index 00000000000..758c52f1d4b --- /dev/null +++ b/pkgs/development/python-modules/prayer-times-calculator/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "prayer-times-calculator"; + version = "0.0.4"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "uchagani"; + repo = pname; + rev = version; + sha256 = "053wa0zzfflaxlllh6sxgnrqqx8qyv4jcj85fsiv6n608kw202d5"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "prayer_times_calculator" ]; + + meta = with lib; { + description = "Python client for the Prayer Times API"; + homepage = "https://github.com/uchagani/prayer-times-calculator"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 21eacfb16c2..75741ec01b7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5189,6 +5189,8 @@ in { praw = callPackage ../development/python-modules/praw { }; + prayer-times-calculator = callPackage ../development/python-modules/prayer-times-calculator { }; + precis-i18n = callPackage ../development/python-modules/precis-i18n { }; pre-commit = callPackage ../development/python-modules/pre-commit { }; From c96787585e29f79ca730a1dbd2d040c4998b409f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 May 2021 20:44:00 +0200 Subject: [PATCH 090/249] 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 e97bbae7f74..f60317fe048 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -407,7 +407,7 @@ "ipp" = ps: with ps; [ pyipp ]; "iqvia" = ps: with ps; [ numpy pyiqvia ]; "irish_rail_transport" = ps: with ps; [ ]; # missing inputs: pyirishrail - "islamic_prayer_times" = ps: with ps; [ ]; # missing inputs: prayer_times_calculator + "islamic_prayer_times" = ps: with ps; [ prayer-times-calculator ]; "iss" = ps: with ps; [ ]; # missing inputs: pyiss "isy994" = ps: with ps; [ ]; # missing inputs: pyisy "itach" = ps: with ps; [ ]; # missing inputs: pyitachip2ir From 468fda7daafe9b4395e13d08e738c8da07710497 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 May 2021 20:47:36 +0200 Subject: [PATCH 091/249] home-assistant: enable islamic_prayer_times 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 3a8948f8982..021e723d9e8 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -286,6 +286,7 @@ in with py.pkgs; buildPythonApplication rec { "intent" "intent_script" "ipp" + "islamic_prayer_times" "jewish_calendar" "kmtronic" "knx" From 74bb06a51ad56ffd79753877bdcf902d9621d6b9 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 17 May 2021 09:25:08 +0300 Subject: [PATCH 092/249] =?UTF-8?q?yle-dl:=2020210212=20=E2=86=92=20202105?= =?UTF-8?q?02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/misc/yle-dl/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index 68218592bbb..cd04e2020b1 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "yle-dl"; - version = "20210212"; + version = "20210502"; src = fetchFromGitHub { owner = "aajanki"; repo = "yle-dl"; rev = version; - sha256 = "sha256-0JnigYmslQ/7KsQAFg3AaWPAU/tD1lS7lF6OCcv/ze4="; + sha256 = "sha256-HkhyxsiOMOfTHTj+qmY8l2z2sMtO4eMZmJUU/WvV4wY="; }; propagatedBuildInputs = with python3Packages; [ @@ -22,6 +22,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Downloads videos from Yle (Finnish Broadcasting Company) servers"; homepage = "https://aajanki.github.io/yle-dl/"; + changelog = "https://github.com/aajanki/yle-dl/blob/${version}/ChangeLog"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dezgeg SuperSandro2000 ]; platforms = platforms.unix; From 9f6de2029204d2c380f503d76f4c96fe5f3fcdbd Mon Sep 17 00:00:00 2001 From: Evils Date: Mon, 17 May 2021 09:38:56 +0200 Subject: [PATCH 093/249] kicad: correctly handle share/metainfo and appdata fixes issue 123299 blindly linking unstable's metainfo resulted in a dangling symlink this is still share/appdata in the stable package so i linked that --- pkgs/applications/science/electronics/kicad/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 79a044a800c..770b73c7124 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -257,9 +257,12 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/share ln -s ${base}/share/applications $out/share/applications - ln -s ${base}/share/metainfo $out/share/metainfo ln -s ${base}/share/icons $out/share/icons ln -s ${base}/share/mime $out/share/mime + '' + optionalString (stable) '' + ln -s ${base}/share/appdata $out/share/appdata + '' + optionalString (!stable) '' + ln -s ${base}/share/metainfo $out/share/metainfo ''; # can't run this for each pname From bed2e8ef2867841f77e52e5a4fee4d000b08fc2e Mon Sep 17 00:00:00 2001 From: Evils Date: Mon, 17 May 2021 09:37:46 +0200 Subject: [PATCH 094/249] kicad-unstable: 2021-05-13 -> 2021-05-16 --- pkgs/applications/science/electronics/kicad/versions.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 5fa9aba64b0..c30c074a5de 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -27,14 +27,14 @@ }; "kicad-unstable" = { kicadVersion = { - version = "2021-05-13"; + version = "2021-05-16"; src = { - rev = "8513ca974c28d76d9f74a7dc96601d98e66e87fd"; - sha256 = "1xlj6jwzwxsa14djqhj0csziii21mr9czvdj6fxqp6px84cifjsh"; + rev = "c33b2cfa8d16072b9d1bce558e443c4afa889d06"; + sha256 = "1fvbxjpf880ikjqjhzj8wlxj0845gzrj1yv35rk7akbg4vl9ph72"; }; }; libVersion = { - version = "2021-05-13"; + version = "2021-05-16"; libSources = { i18n.rev = "e89d9a89bec59199c1ade56ee2556591412ab7b0"; i18n.sha256 = "04zaqyhj3qr4ymyd3k5vjpcna64j8klpsygcgjcv29s3rdi8glfl"; From 042b130505a6285bf890e0be01b6978c27325982 Mon Sep 17 00:00:00 2001 From: illustris Date: Mon, 17 May 2021 13:46:35 +0530 Subject: [PATCH 095/249] hadoop: fix failing builds Co-authored-by: itihas --- .../networking/cluster/hadoop/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 659e8ee4170..ef93b5cbdb0 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, pkg-config, which, maven, cmake, jre, jdk8, bash -, coreutils, glibc, protobuf2_5, fuse, snappy, zlib, bzip2, openssl, openssl_1_0_2 +, coreutils, glibc, protobuf2_5, fuse, snappy, zlib, bzip2, openssl, openssl_1_0_2, fetchpatch, libtirpc }: let @@ -38,8 +38,19 @@ let }; nativeBuildInputs = [ maven cmake pkg-config ]; - buildInputs = [ fuse snappy zlib bzip2 opensslPkg protobuf2_5 ]; + buildInputs = [ fuse snappy zlib bzip2 opensslPkg protobuf2_5 libtirpc ]; + NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + NIX_LDFLAGS = [ "-ltirpc" ]; + # most of the hardcoded pathes are fixed in 2.9.x and 3.0.0, this list of patched files might be reduced when 2.7.x and 2.8.x will be deprecated + + patches = [ + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/apache/hadoop/pull/2886.patch"; + sha256 = "1fim1d8va050za5i8a6slphmx015fzvhxkc2wi4rwg7kbj31sv0r"; + }) + ]; + postPatch = '' for file in hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HardLink.java \ hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java \ From 0061117c6fd5e7243f182eb86c46669ced186689 Mon Sep 17 00:00:00 2001 From: Konstantin Alekseev Date: Mon, 17 May 2021 11:26:15 +0300 Subject: [PATCH 096/249] postgresqlPackages.postgis: fix darwin build --- pkgs/servers/sql/postgresql/packages.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index e2d655bdb37..0c8f0e642a6 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -6,12 +6,7 @@ self: super: { periods = super.callPackage ./ext/periods.nix { }; - postgis = super.callPackage ./ext/postgis.nix { - gdal = self.gdal.override { - postgresql = self.postgresql; - poppler = self.poppler_0_61; - }; - }; + postgis = super.callPackage ./ext/postgis.nix { }; pg_auto_failover = super.callPackage ./ext/pg_auto_failover.nix { }; From 3b86c99835ce992a1d9b51b8e642ad22343e6120 Mon Sep 17 00:00:00 2001 From: Konstantin Alekseev Date: Mon, 17 May 2021 11:27:18 +0300 Subject: [PATCH 097/249] postgresqlPackages.pipelinedb: fix darwin build --- pkgs/servers/sql/postgresql/ext/pipelinedb.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pipelinedb.nix b/pkgs/servers/sql/postgresql/ext/pipelinedb.nix index d909761cb5e..06c36a4ff6c 100644 --- a/pkgs/servers/sql/postgresql/ext/pipelinedb.nix +++ b/pkgs/servers/sql/postgresql/ext/pipelinedb.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, zeromq, openssl }: +{ lib, stdenv, fetchFromGitHub, postgresql, zeromq, openssl, libsodium, libkrb5 }: stdenv.mkDerivation rec { pname = "pipelinedb"; @@ -11,10 +11,12 @@ stdenv.mkDerivation rec { sha256 = "1mnqpvx6g1r2n4kjrrx01vbdx7kvndfsbmm7zbzizjnjlyixz75f"; }; - buildInputs = [ postgresql openssl zeromq ]; + buildInputs = [ postgresql openssl zeromq libsodium libkrb5 ]; makeFlags = [ "USE_PGXS=1" ]; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lsodium"; + preConfigure = '' substituteInPlace Makefile \ --replace "/usr/lib/libzmq.a" "${zeromq}/lib/libzmq.a" From 6bb490cfdeb033d32c15e9751d71c0409b3ed9c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 17 May 2021 11:44:00 +0200 Subject: [PATCH 098/249] vivaldi: use ffmpeg instead of ffmpeg_3 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 2ff0d2d5df0..dabe0fd373e 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon, libxshmfence , libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr -, alsaLib, dbus, cups, libexif, ffmpeg_3, systemd +, alsaLib, dbus, cups, libexif, ffmpeg, systemd , freetype, fontconfig, libXft, libXrender, libxcb, expat , libuuid , libxml2 @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libxkbcommon libxshmfence libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr - atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk-pixbuf libexif ffmpeg_3 systemd + atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk-pixbuf libexif ffmpeg systemd freetype fontconfig libXrender libuuid expat glib nss nspr libxml2 pango cairo gnome2.GConf libdrm mesa From 3d92fac40e57c675dbed5256e62929824703b14d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 17 May 2021 11:47:43 +0200 Subject: [PATCH 099/249] zoneminder: use ffmpeg instead of ffmpeg_3 --- pkgs/servers/zoneminder/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index c4e9e915381..2ea162b0d60 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchurl, fetchpatch, substituteAll, cmake, makeWrapper, pkg-config -, curl, ffmpeg_3, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mariadb, pcre, perl, perlPackages +, curl, ffmpeg, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mariadb, pcre, perl, perlPackages , polkit, util-linuxMinimal, x264, zlib , coreutils, procps, psmisc, nixosTests }: @@ -138,7 +138,7 @@ in stdenv.mkDerivation rec { for f in includes/Event.php views/image.php ; do substituteInPlace web/$f \ - --replace "'ffmpeg " "'${ffmpeg_3}/bin/ffmpeg " + --replace "'ffmpeg " "'${ffmpeg}/bin/ffmpeg " done substituteInPlace web/includes/functions.php \ @@ -147,7 +147,7 @@ in stdenv.mkDerivation rec { ''; buildInputs = [ - curl ffmpeg_3 glib libjpeg libselinux libsepol mp4v2 libmysqlclient mariadb.client pcre perl polkit x264 zlib + curl ffmpeg glib libjpeg libselinux libsepol mp4v2 libmysqlclient mariadb.client pcre perl polkit x264 zlib util-linuxMinimal # for libmount ] ++ (with perlPackages; [ # build-time dependencies From 64ecd834adbfa34b10a54deac2a4db2899930540 Mon Sep 17 00:00:00 2001 From: oxalica Date: Mon, 17 May 2021 18:02:44 +0800 Subject: [PATCH 100/249] rust-analyzer: 2021-05-10 -> 2021-05-17 --- pkgs/development/tools/rust/rust-analyzer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 8d4ae0ac369..a038e9d65d2 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -6,14 +6,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2021-05-10"; - cargoSha256 = "sha256-PUecBFdYIJFZa5IwwNnuXOkuxtyrzWhxy3C+2jv/hvU="; + version = "2021-05-17"; + cargoSha256 = "sha256-uSBukInJ3FEMmMpG9DN3XeXm+hzUFqCrZORb4NIEJhw="; src = fetchFromGitHub { owner = "rust-analyzer"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-oz6FqRMEUUTS4X2XhpWjp2JIgl1A6wQv2OU8auwUoVM="; + sha256 = "sha256-BsabpY4LArfsDPAMsggxKu1+OQZmqRe//+a5uBcuFps="; }; patches = [ From b4fc303dd173dbb697aca35a389a15572ae55f81 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 17 May 2021 12:10:40 +0200 Subject: [PATCH 101/249] Update pkgs/applications/window-managers/waybox/default.nix Co-authored-by: Anderson Torres --- pkgs/applications/window-managers/waybox/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/waybox/default.nix b/pkgs/applications/window-managers/waybox/default.nix index f6530aae8d0..ad3028b4ac0 100644 --- a/pkgs/applications/window-managers/waybox/default.nix +++ b/pkgs/applications/window-managers/waybox/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "wizbright"; repo = pname; rev = "309ccd2faf08079e698104b19eff32b3a255b947"; - sha256 = "0kzss266jf1kgwnhk42vaakbmn269nphlq9xjsapp6mhccd9qz8v"; + hash = "sha256-G32cGmOwmnuVlj1hCq9NRti6plJbkAktfzM4aYzQ+k8="; }; nativeBuildInputs = [ pkg-config meson ninja ]; From 033cdffa9ba0a609e2511471b50b27de13ac8b64 Mon Sep 17 00:00:00 2001 From: Paul Schyska Date: Mon, 17 May 2021 13:46:55 +0200 Subject: [PATCH 102/249] atop: use substituteInPlace instead of sed --- pkgs/os-specific/linux/atop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix index 84a5870833a..50a3e3e6316 100644 --- a/pkgs/os-specific/linux/atop/default.nix +++ b/pkgs/os-specific/linux/atop/default.nix @@ -49,8 +49,8 @@ stdenv.mkDerivation rec { findutils=${findutils} systemd=${systemd} substituteAllInPlace "$f" done - sed -e 's/chown/true/g' -i Makefile - sed -e 's/chmod 04711/chmod 0711/g' -i Makefile + substituteInPlace Makefile --replace 'chown' 'true' + substituteInPlace Makefile --replace 'chmod 04711' 'chmod 0711' ''; installTargets = [ "systemdinstall" ]; From add85d7ee7c683c9014ac94ad5b36299940bfa8c Mon Sep 17 00:00:00 2001 From: Florian Beeres Date: Fri, 14 May 2021 21:27:11 +0200 Subject: [PATCH 103/249] vimPlugin: update --- pkgs/misc/vim-plugins/generated.nix | 118 ++++++++++++------------- pkgs/misc/vim-plugins/vim-plugin-names | 2 +- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 0ea2c26a322..962bebe650a 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -401,12 +401,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-05-16"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "544df784d1cba98a50e985f2c766b21321c9788c"; - sha256 = "027ss037if1p0a4s4x93p8ydkm77m1gsra38j2j0cgz0qmw6rpf0"; + rev = "3e74c75ddb096e8128d573439a779527288ac685"; + sha256 = "0mkmla4y6g53nil6296irpb4zxa807cxj2jdr0fr2d4hp0y4xjci"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -545,12 +545,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-05-14"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "33f02db3161500185cd25734d6861605281bef06"; - sha256 = "1qv04l5hli7hq38sfdgx3pfiw38fgpw4my55vrs7bx7ipk7xk4w2"; + rev = "7cfbd335ceefc0103ff3cbd39b2b4abf353f70be"; + sha256 = "088ig7pc5z78zpc1l7siffdyvql9zbampx3fcxwch7xpjidas4ba"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -942,12 +942,12 @@ final: prev: denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2021-05-16"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "b78ff508cdb2427c396d66b5fbc24321148f53ab"; - sha256 = "1gbdbclc0kyfdqvy9rz15s0swcv07cpijriwnsbdjskiw7936qpp"; + rev = "fb8174a07c3a19091bfdbfc9439a15466d1649fa"; + sha256 = "041c8hhq76ih0s730zyfx16svfbzqfqyy6pl686aqikixldcz41l"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; @@ -1184,12 +1184,12 @@ final: prev: deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2021-05-14"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "c870a30b18e3250534699420bd770ca60c042d49"; - sha256 = "1kv785jl31hd3gmq8pz76l4w4pw0sndnhw9zpsg1bcz7bwsw2c3h"; + rev = "55e81a95a65ed896670abdb3340888db9a57e300"; + sha256 = "1666wqczwi2xg4ghzdq7jsfsdbb2zrnkdgbhq0xjb3k8rs8921d4"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1232,12 +1232,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview-nvim"; - version = "2021-05-10"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "272a474abf7d1b64d5dcaf21f80d6fdc7b623ead"; - sha256 = "14y9gj9054dr2jiz2d1w9y03jh1mp4r04vyabj6nsjk2fg84dz38"; + rev = "daa7929d1f40485b832461fa919bd734da680e24"; + sha256 = "082mym32hwfyig199pdxw64fzfc8z56f0xfnia472vvb1saspsly"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -1727,12 +1727,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-05-14"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "016ad5a5d7d3f2d824ffd6b5b27f63a382b251ea"; - sha256 = "10gzdvmrmsgf07y8n1b79b8vnr37ijdzxni67ff92wwlhvqz13qg"; + rev = "705d8376423bdf9aa3ef4f3237c25106ec4aa2e6"; + sha256 = "0fa1rw5zn0z6z106iy06wqnr0mksl3r7a3dl8fhwncmsil80dlg6"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2292,12 +2292,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2021-05-11"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "1078dcaff8bab986245b79b26891ef592aeb0cbe"; - sha256 = "032czx26x3118j2bqgcqa4c10nknidg4dzpsk43biw66z7l6x5jf"; + rev = "db069b35c802df228a811b0d0a53cdc2c48e246b"; + sha256 = "09hr453mwlrv1vkdxk62qd03s62c14jzrflc4276vpmmrz78p03m"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -2412,12 +2412,12 @@ final: prev: lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2021-03-21"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "8a712365f9708044667589d9fffd87a4825d29f6"; - sha256 = "1622qd5lizfv65m5iy3r0bl3zy8phh4anyx93kj631p836s8y6cq"; + rev = "d70d69b3418957cdf7c4993e484f8b9d3eb1603c"; + sha256 = "1kd9qna82az80ixrwxx5c7cvjqly7ahi8b1l74fp7iaxbr0p5m8w"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; @@ -2484,12 +2484,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature-nvim"; - version = "2021-05-07"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "de68e0754019f7ff5822f3180b067d89f014943b"; - sha256 = "009lih2s5x9nccx2i2xqb377jkclpxbw25vmznngdq47qr89ws1r"; + rev = "eb08dfbce1b8623faff6bb9a2c5c7aa8ac710c80"; + sha256 = "0bhq25lv40832z80q1fvyqz6p6cxw47miffq6cxacd0hzahw4agx"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -2928,12 +2928,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-05-15"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "5cabfceab77bdba16bcc81d2d8c05d76c8304a57"; - sha256 = "087zzlfvdc1462rdsn1i4x1lypsqcdfh78zgwcicvgbg4ja9zsd3"; + rev = "4fb55d07e6a890d17ef6387ef4a08df112aff1cf"; + sha256 = "1slr7rm94n29i36ny00qa8rnpzgxaswjmsmrkva09gnpsik2haqn"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3084,12 +3084,12 @@ final: prev: nerdtree-git-plugin = buildVimPluginFrom2Nix { pname = "nerdtree-git-plugin"; - version = "2021-04-02"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "Xuyuanp"; repo = "nerdtree-git-plugin"; - rev = "73da0283ead8fa2bbce83d219fcab3ba1e8cf0dd"; - sha256 = "17n79pmpnjnp6nirz4m4wwgfacrg26bdzjn4xj8i6ldkff5n20km"; + rev = "4524fb465b11881409482636ae716b4965011550"; + sha256 = "0cvb33drkv3rrgbniw9bz8xkxyr4cf0lyay9waw3lczpl2wmfwbm"; }; meta.homepage = "https://github.com/Xuyuanp/nerdtree-git-plugin/"; }; @@ -3144,12 +3144,12 @@ final: prev: nnn-vim = buildVimPluginFrom2Nix { pname = "nnn-vim"; - version = "2021-05-16"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "mcchrish"; repo = "nnn.vim"; - rev = "a997a8fc9739d1bf1900c66f056e1b11a9f61443"; - sha256 = "1rdcjnfgk1yi2ick7m7xh07daarfjvxgf3w656hzarbqshpamy2a"; + rev = "c678c7e4e7ec5656c984708ad8823453ec425fa7"; + sha256 = "0kcr51vq0z5c7fhs5pdbbba2qnfqk2hl2ksprdkjf6l8nln0g8nw"; }; meta.homepage = "https://github.com/mcchrish/nnn.vim/"; }; @@ -3348,12 +3348,12 @@ final: prev: nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-05-16"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "4a5268bff73e43792f2d216a52ae19507da5c866"; - sha256 = "1p6rryac1caw97smkvg4cskd8zr01m3kvrg3ir6zsa7gg1l0npx6"; + rev = "1f7904ed99fa94ad9009fa5ece431fb2416558ce"; + sha256 = "1wdg6cbjzvfgxp5cn2pb10bkf34fxi5682x3kbk6hmlmrcipqlnv"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -3492,12 +3492,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-05-16"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "71247a4a658a7678328fa6224ede103dcf1268fc"; - sha256 = "05f90s36nzk13s2rdyrzalwv4psz9pjccw89ihxbik1ndg8iwz18"; + rev = "4dcc3fb4b38d4a29d175fda69a0bf35b2aa675c5"; + sha256 = "08aigjgwlkxx8x4g6pr8mc04liax0mq0bw7b6781fsfsxgf17g6q"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3540,12 +3540,12 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-05-12"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "6478cb17624d2509e4c3d78a7f8c50db634d7c0b"; - sha256 = "0lqxiy73jr340sl264acscc67dfcavmiz7d1abnijwjp9h1ms159"; + rev = "5ef9c414cef1419b8576c62f1079b22315c72a04"; + sha256 = "1lxg9prli5zvy5f9ld83y1fjbm7y4ifkyvq16naxjr3grhp0lg76"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -4225,12 +4225,12 @@ final: prev: sideways-vim = buildVimPluginFrom2Nix { pname = "sideways-vim"; - version = "2021-05-03"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "925dcf5e9e91551d98323da98ae25d5aeaedf2c9"; - sha256 = "1ncx7qxvdi8cfqq41wg3sk99b4g5rihz1lzvj8fy0yv7p9dkri6k"; + rev = "8097848380b5aedb487bc20879bcb2ab3220a8bc"; + sha256 = "1cl25p3cpb5k36vpk11cr092i1hkhbd781xbfawvr42jfkx2170p"; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; }; @@ -4574,12 +4574,12 @@ final: prev: tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2021-05-15"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "bafd7c51e0c921f403cb1c76835cd6652d1dd78a"; - sha256 = "176h1pz7kmyqyx91q36ynqncx6lx15f48i1d4jz8838wky1g2jpf"; + rev = "fd4bc0f0e4e3a3bb09d48e7176e992b0613a4c68"; + sha256 = "0p3cd9qywx5xgas7mvn0a7qvsnmmpf8gpn8yix8r3vyhcg7ah5y6"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -5346,12 +5346,12 @@ final: prev: pname = "vim-autoformat"; version = "2021-05-07"; src = fetchFromGitHub { - owner = "Chiel92"; + owner = "vim-autoformat"; repo = "vim-autoformat"; rev = "58bbc3c8751ba48d1c0ecba040ce43699272d800"; sha256 = "0ylb8jljin1g5big1lfjrfww576fcb1wakz5shial8xgpw9w1hx1"; }; - meta.homepage = "https://github.com/Chiel92/vim-autoformat/"; + meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; vim-automkdir = buildVimPluginFrom2Nix { @@ -6400,12 +6400,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-05-16"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "daf75a94f458a157c6649f21410a12b823a16ff9"; - sha256 = "16bzig83mx3ynn74py7l52qzs8ddmn0qrs5dvgl1mmw5p82mwgf0"; + rev = "8c883d7f30c220d572177e8ff1d3945f618b492a"; + sha256 = "1sjxrkbx4hba7nyysp3jpw3hlxz9vfkxj7bn0xzmgdr7s598mxxn"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -9225,12 +9225,12 @@ final: prev: which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key-nvim"; - version = "2021-05-15"; + version = "2021-05-17"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "d85ce3627f4060f622e4c0a9657f26c0151829de"; - sha256 = "06fpk200r3h7m3bk3yg1p6h14f19z037g8mw2775s38bhwp3g39a"; + rev = "ec1474bb0c373eb583962deff20860c2af54f932"; + sha256 = "1fp6p7yaws8c737zi9i7fc3vvv8lxkkn5lygfzyrmk6drkhis67h"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index e5d6ac32839..4db386a700e 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -47,7 +47,6 @@ camspiers/lens.vim carlitux/deoplete-ternjs ccarpita/rtorrent-syntax-file cespare/vim-toml -Chiel92/vim-autoformat chikatoike/concealedyank.vim chikatoike/sourcemap.vim chkno/vim-haskell-module-name @@ -703,6 +702,7 @@ vhda/verilog_systemverilog.vim vigoux/LanguageTool.nvim vim-airline/vim-airline vim-airline/vim-airline-themes +vim-autoformat/vim-autoformat vim-erlang/vim-erlang-compiler vim-erlang/vim-erlang-omnicomplete vim-erlang/vim-erlang-runtime From 873f2632e2082d112cc5b2862392dda5cc7cab10 Mon Sep 17 00:00:00 2001 From: Florian Beeres Date: Fri, 14 May 2021 21:28:45 +0200 Subject: [PATCH 104/249] vimPlugins.sad: init at 2019-02-18 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 962bebe650a..250213ac0e1 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -4127,6 +4127,18 @@ final: prev: meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; + sad-vim = buildVimPluginFrom2Nix { + pname = "sad-vim"; + version = "2019-02-18"; + src = fetchFromGitHub { + owner = "hauleth"; + repo = "sad.vim"; + rev = "2f5b33b239a566ffedaa81cee3051bb613482d1e"; + sha256 = "11kxnrp3b6qc2rcp5jdqjb7cxh6lqy09v3yh7dk4kd51jkgxqbn4"; + }; + meta.homepage = "https://github.com/hauleth/sad.vim/"; + }; + salt-vim = buildVimPluginFrom2Nix { pname = "salt-vim"; version = "2017-07-01"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 4db386a700e..196b7c1e12f 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -176,6 +176,7 @@ guns/xterm-color-table.vim hashivim/vim-packer hashivim/vim-terraform hashivim/vim-vagrant +hauleth/sad.vim haya14busa/incsearch-easymotion.vim haya14busa/incsearch.vim haya14busa/is.vim From 537c040cebe877774bce9169001a0978d8db35d7 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 17 May 2021 14:37:17 +0000 Subject: [PATCH 105/249] electron_12: 12.0.6 -> 12.0.7 https://github.com/electron/electron/releases/tag/v12.0.7 --- pkgs/development/tools/electron/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 9b5c286ca08..51445c33e19 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -104,12 +104,12 @@ rec { headers = "10a0nf40crjq14p15g8s3ncj1w0dq1kqhfsm3aq5dppj2gx0k8dn"; }; - electron_12 = mkElectron "12.0.6" { - x86_64-linux = "3c632a25ed6502de00d089ee493475b89dd24c2a85ffa00130a5f06001898f27"; - x86_64-darwin = "416348dad569d64d34396be6590ca15761dce91b77aab8219112464d55d00575"; - i686-linux = "2182f2a7e0564b615db3ef99204df8fd3dbd8b0da2fa2eccc960885d9360f018"; - armv7l-linux = "9482309c023a9c367a9403ad750d44a87d68510179fb767707c161672dcd6ffb"; - aarch64-linux = "3033c5dbfbdb5226f6dc528333d237fcb500c2301b1a547ba8a89e54ebc111ab"; - headers = "1la0bfigy2vq7jxrcddj4z5i2xk3cj974ymy0nmbhfnjbwqr7hg2"; + electron_12 = mkElectron "12.0.7" { + x86_64-linux = "335b77b35361fac4e2df1b7e8de5cf055e0a1a2065759cb2dd4508e8a77949fa"; + x86_64-darwin = "c3238c9962c5ad0f9de23c9314f07e03410d096d7e9f9d91016dab2856606a9e"; + i686-linux = "16023d86b88c7fccafd491c020d064caa2138d6a3493664739714555f72e5b06"; + armv7l-linux = "53cc1250ff62f2353d8dd37552cbd7bdcaaa756106faee8b809303bed00e040a"; + aarch64-linux = "3eddc0c507a43cce4e714bfe509d99218b5ab99f4660dd173aac2a895576dc71"; + headers = "1ji9aj7qr4b27m5kprsgsrl21rjphz5bbnmn6q0n2x84l429nyfb"; }; } From 88772a7a42a7d9bed9b11662b86fdd89e1b4e95d Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 17 May 2021 14:38:05 +0000 Subject: [PATCH 106/249] electron_11: 11.4.5 -> 11.4.6 https://github.com/electron/electron/releases/tag/v11.4.6 --- pkgs/development/tools/electron/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 51445c33e19..d5007989bcb 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -95,13 +95,13 @@ rec { headers = "1kfgww8wha86yw75k5yfq4mxvjlxgf1jmmzxy0p3hyr000kw26pk"; }; - electron_11 = mkElectron "11.4.5" { - x86_64-linux = "6019703cbd37787ba4f0953cb82415c3fac47c8dba3a3af925b00636792d0f89"; - x86_64-darwin = "0f28a1fb4fb6e05f3b602c7e5d8646084344257ba9db977fead9229111a8f599"; - i686-linux = "886a348e1e984b5ea3e4090168fff4ae9f262b1a158e49ff62c544add6d98bec"; - armv7l-linux = "009eeae8463a6e5ad8cdefd4ec645f38604881f7cbbcdd5e5dabb6955ef5d002"; - aarch64-linux = "3cc0f9abb03cd9b9de42a749b38748485d85ba511b205ce8de3e56a903c62211"; - headers = "10a0nf40crjq14p15g8s3ncj1w0dq1kqhfsm3aq5dppj2gx0k8dn"; + electron_11 = mkElectron "11.4.6" { + x86_64-linux = "03932a0b3328a00e7ed49947c70143b7b3455a3c1976defab2f74127cdae43e9"; + x86_64-darwin = "47de03b17ab20213c95d5817af3d7db2b942908989649202efdcd1d566dd24c3"; + i686-linux = "b76e69ad4b654384b4f1647f0cb362e78c1d99be7b814d7d32abc22294639ace"; + armv7l-linux = "cc4be8e0c348bc8db5002cf6c63c1d02fcb594f1f8bfc358168738c930098857"; + aarch64-linux = "75665dd5b2b9938bb4572344d459db65f46c5f7c637a32946c5a822cc23a77dc"; + headers = "0ip1wxgflifs86vk4xpz1555xa7yjy64ygqgd5a2g723148m52rk"; }; electron_12 = mkElectron "12.0.7" { From 25b12b1b0ab469c84797a83efb4c1b68561782f7 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 17 May 2021 14:55:53 +0000 Subject: [PATCH 107/249] element: 1.7.27 -> 1.7.28 https://github.com/vector-im/element-web/blob/v1.7.28/CHANGELOG.md https://github.com/vector-im/element-desktop/blob/v1.7.28/CHANGELOG.md --- .../instant-messengers/element/element-desktop-package.json | 2 +- .../networking/instant-messengers/element/element-desktop.nix | 4 ++-- .../networking/instant-messengers/element/element-web.nix | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 45a03ef1fe5..4c5d21cd9b7 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "src/electron-main.js", - "version": "1.7.27", + "version": "1.7.28", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index ad319fcaede..ea152fc22e6 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -8,12 +8,12 @@ let executableName = "element-desktop"; - version = "1.7.27"; + version = "1.7.28"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; rev = "v${version}"; - sha256 = "0rgsc2cc1v6gjsklwvsjlqq9a8j9j80h9ac0jkvf9lhq33f3c57k"; + sha256 = "0p88gw1y37q35qqf94w3qlb84s2shm41n1pw5fgx0c0ymlzpl636"; }; in mkYarnPackage rec { name = "element-desktop-${version}"; diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 8fcb9bcd2b2..fab1a7f8688 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.27"; + version = "1.7.28"; src = fetchurl { url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; - sha256 = "004b1cjw8fqk0ixm0wnbk4y51cby1i7avsas95sfm2zsbnbwg519"; + sha256 = "1adlpwq37yzmd3fq1pzbi476p4kr5hn5b5kwyd6cr5by0gsgkgyk"; }; installPhase = '' From 6c91f3e4dc569f058cb67d49c0b59b0846781c98 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 May 2021 20:42:44 +0200 Subject: [PATCH 108/249] python3Packages.aioymaps: init at 1.1.0 --- .../python-modules/aioymaps/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/aioymaps/default.nix diff --git a/pkgs/development/python-modules/aioymaps/default.nix b/pkgs/development/python-modules/aioymaps/default.nix new file mode 100644 index 00000000000..4a6d806dee1 --- /dev/null +++ b/pkgs/development/python-modules/aioymaps/default.nix @@ -0,0 +1,33 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aioymaps"; + version = "1.1.0"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1rvgf4flvnpjj0sm14xlnfmmnlmkz6xq5h5mfb14amkfy76za3jm"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "aioymaps" ]; + + meta = with lib; { + description = "Python package fetch data from Yandex maps"; + homepage = "https://github.com/devbis/aioymaps"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 916b7b9ece5..2542a1e07d5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -351,6 +351,8 @@ in { aiowinreg = callPackage ../development/python-modules/aiowinreg { }; + aioymaps = callPackage ../development/python-modules/aioymaps { }; + aiozeroconf = callPackage ../development/python-modules/aiozeroconf { }; airly = callPackage ../development/python-modules/airly { }; From 8355d5cba4325120ff075673cd70b2564bbcf62a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 May 2021 20:45:59 +0200 Subject: [PATCH 109/249] 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 e97bbae7f74..2d17a0305ce 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -972,7 +972,7 @@ "yale_smart_alarm" = ps: with ps; [ yalesmartalarmclient ]; "yamaha" = ps: with ps; [ rxv ]; "yamaha_musiccast" = ps: with ps; [ ]; # missing inputs: pymusiccast - "yandex_transport" = ps: with ps; [ ]; # missing inputs: aioymaps + "yandex_transport" = ps: with ps; [ aioymaps ]; "yandextts" = ps: with ps; [ ]; "yeelight" = ps: with ps; [ yeelight ]; "yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower From f9f076aab0793cf3b7b8ca6769d7ee165177c984 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 May 2021 20:49:31 +0200 Subject: [PATCH 110/249] home-assistant: enable yandex_transport 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 3a8948f8982..7024f09717a 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -407,6 +407,7 @@ in with py.pkgs; buildPythonApplication rec { "workday" "worldclock" "xiaomi_miio" + "yandex_transport" "yeelight" "zeroconf" "zha" From e2cf342ba9b72d93d497d562cf6219fdcc79cb54 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 17 May 2021 17:14:08 +0200 Subject: [PATCH 111/249] nixos/security/apparmor: utillinux -> util-linux --- nixos/modules/security/apparmor.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix index 9bd909aa50b..be1b0362fc1 100644 --- a/nixos/modules/security/apparmor.nix +++ b/nixos/modules/security/apparmor.nix @@ -133,7 +133,7 @@ in parser = ${pkgs.apparmor-parser}/bin/apparmor_parser ldd = ${pkgs.glibc.bin}/bin/ldd - logger = ${pkgs.utillinux}/bin/logger + logger = ${pkgs.util-linux}/bin/logger # customize how file ownership permissions are presented # 0 - off From 35dcb0fe1661bc23e7f449eee936a89b7e5f3274 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 17 May 2021 17:14:43 +0200 Subject: [PATCH 112/249] blockbook: mark as broken Co-authored-by: 1000101 --- pkgs/servers/blockbook/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index 5ab10af18c0..8d75b89d0d8 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -65,5 +65,8 @@ buildGoModule rec { license = licenses.agpl3; maintainers = with maintainers; [ mmahut _1000101 ]; platforms = platforms.unix; + # go dependency tecbot/gorocksdb requires rocksdb 5.x but nixpkgs has only rocksdb 6.x + # issue in upstream can be tracked here: https://github.com/trezor/blockbook/issues/617 + broken = true; }; } From ae6d20c934edd83896b0c1bd771072e327185c73 Mon Sep 17 00:00:00 2001 From: Dave Gallant Date: Wed, 12 May 2021 21:16:15 -0400 Subject: [PATCH 113/249] awscrt: fix darwin build --- pkgs/development/python-modules/awscrt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 2c0180eb4a2..73679eca1e4 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { version = "0.11.13"; buildInputs = lib.optionals stdenv.isDarwin - (with darwin.apple_sdk.frameworks; [ Security ]); + (with darwin.apple_sdk.frameworks; [ CoreFoundation Security ]); # Required to suppress -Werror # https://github.com/NixOS/nixpkgs/issues/39687 From a81163d83b6ede70aa2d5edd8ba60062ed4eec74 Mon Sep 17 00:00:00 2001 From: Dave Gallant Date: Wed, 12 May 2021 21:16:29 -0400 Subject: [PATCH 114/249] awscli2: 2.2.1 -> 2.2.4 --- pkgs/tools/admin/awscli2/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index eeb511cd31c..0824a26855d 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -3,12 +3,12 @@ let py = python3.override { packageOverrides = self: super: { botocore = super.botocore.overridePythonAttrs (oldAttrs: rec { - version = "2.0.0dev109"; + version = "2.0.0dev112"; src = fetchFromGitHub { owner = "boto"; repo = "botocore"; - rev = "b006ff741d12608a9187b873e276abd1fd8eb707"; - sha256 = "sha256-uU3XVQiwtbBt7cdSwAeHkv6NUbL8kK2Ro44h1GYyA1A="; + rev = "221c0aa5dbad42f096e00fed45d2e2071561b1da"; + sha256 = "sha256-uJCP3bUK/xACQVG4kMBDIIP+zPjre+uWbqWEC/gBTD4="; }; }); prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec { @@ -31,13 +31,13 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.2.1"; # N.B: if you change this, change botocore to a matching version too + version = "2.2.4"; # N.B: if you change this, change botocore to a matching version too src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - sha256 = "sha256-TafYBkRlPCqewGBMgTfcX8kLtDhSCdiUYK1xXofKrLk="; + sha256 = "sha256-MctW31X012DXY16qS6AP6nLiaAt/cuA8iMwGm0oXi6M="; }; postPatch = '' From e43880bd35343c577579a18e89ff57bc953f4530 Mon Sep 17 00:00:00 2001 From: misuzu Date: Mon, 10 May 2021 16:09:28 +0300 Subject: [PATCH 115/249] usrsctp: init at 0.9.5.0 --- .../development/libraries/usrsctp/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/usrsctp/default.nix diff --git a/pkgs/development/libraries/usrsctp/default.nix b/pkgs/development/libraries/usrsctp/default.nix new file mode 100644 index 00000000000..64b1debc0ce --- /dev/null +++ b/pkgs/development/libraries/usrsctp/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "usrsctp"; + version = "0.9.5.0"; + + src = fetchFromGitHub { + owner = "sctplab"; + repo = "usrsctp"; + rev = version; + sha256 = "10ndzkip8blgkw572n3dicl6mgjaa7kygwn3vls80liq92vf1sa9"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + homepage = "https://github.com/sctplab/usrsctp"; + description = "A portable SCTP userland stack"; + maintainers = with maintainers; [ misuzu ]; + license = licenses.bsd3; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11d313fc0ed..ba034d3bc4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18004,6 +18004,8 @@ in ustr = callPackage ../development/libraries/ustr { }; + usrsctp = callPackage ../development/libraries/usrsctp { }; + usbredir = callPackage ../development/libraries/usbredir { }; uthash = callPackage ../development/libraries/uthash { }; From 9439bb5316015c6bfa9b957e606ee8f9f4298a94 Mon Sep 17 00:00:00 2001 From: misuzu Date: Mon, 10 May 2021 16:09:46 +0300 Subject: [PATCH 116/249] psi-plus: 1.4.1473 -> 1.5.1520 --- .../instant-messengers/psi-plus/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index 1112a3215c9..50bbd9269e4 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -1,18 +1,19 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake +{ lib, mkDerivation, fetchFromGitHub, cmake , qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine -, libidn, qca-qt5, libsecret, libXScrnSaver, hunspell -, libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c +, libidn, qca-qt5, libXScrnSaver, hunspell +, libsecret, libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c +, usrsctp }: mkDerivation rec { pname = "psi-plus"; - version = "1.4.1473"; + version = "1.5.1520"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; rev = version; - sha256 = "03f28zwbjn6fnsm0fqg8lmc11rpfdfvzjf7k7xydc3lzy8pxbds5"; + sha256 = "0cj811qv0n8xck2qrnps2ybzrpvyjqz7nxkyccpaivq6zxj6mc12"; }; cmakeFlags = [ @@ -23,12 +24,13 @@ mkDerivation rec { buildInputs = [ qtbase qtmultimedia qtx11extras qtwebengine - libidn qca-qt5 libsecret libXScrnSaver hunspell - libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c + libidn qca-qt5 libXScrnSaver hunspell + libsecret libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c + usrsctp ]; meta = with lib; { - homepage = "https://sourceforge.net/projects/psiplus/"; + homepage = "https://psi-plus.com"; description = "XMPP (Jabber) client"; maintainers = with maintainers; [ orivej misuzu ]; license = licenses.gpl2; From ab76abeaf94c3d7e93319d8e6cd73d5c6d3d88e0 Mon Sep 17 00:00:00 2001 From: misuzu Date: Mon, 10 May 2021 17:07:42 +0300 Subject: [PATCH 117/249] psi-plus: update license to gpl2Only --- .../networking/instant-messengers/psi-plus/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index 50bbd9269e4..03f8f7b961a 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -33,7 +33,7 @@ mkDerivation rec { homepage = "https://psi-plus.com"; description = "XMPP (Jabber) client"; maintainers = with maintainers; [ orivej misuzu ]; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; }; } From 9db029e405c1f2af503f9b916340f609c2459be3 Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Thu, 13 May 2021 16:50:34 +0200 Subject: [PATCH 118/249] yafetch: init at unstable-2021-05-13 --- pkgs/tools/misc/yafetch/default.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/misc/yafetch/default.nix diff --git a/pkgs/tools/misc/yafetch/default.nix b/pkgs/tools/misc/yafetch/default.nix new file mode 100644 index 00000000000..cfdc0219eef --- /dev/null +++ b/pkgs/tools/misc/yafetch/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitLab }: + +stdenv.mkDerivation rec { + pname = "yafetch"; + version = "unstable-2021-05-13"; + + src = fetchFromGitLab { + owner = "cyberkitty"; + repo = pname; + rev = "627465e6bf0192a9bc10f9c9385cde544766486f"; + sha256 = "1r8jnzfyjs5ardq697crwysclfm3k8aiqvfbsyhsl251a08yls5c"; + }; + + # Use the provided NixOS logo automatically + prePatch = '' + echo "#include \"ascii/nixos.h\"" > config.h + ''; + + # Fixes installation path + DESTDIR = placeholder "out"; + + meta = with lib; { + homepage = "https://gitlab.com/cyberkitty/yafetch"; + description = "Yet another fetch clone written in C++"; + license = licenses.gpl2Only; + maintainers = [ maintainers.ivar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3fd58e1adac..88dd60e4512 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -818,6 +818,10 @@ in wine = wineWowPackages.staging; }; + yafetch = callPackage ../tools/misc/yafetch { + stdenv = clangStdenv; + }; + ### APPLICATIONS/TERMINAL-EMULATORS alacritty = callPackage ../applications/terminal-emulators/alacritty { From 04e409b150f07e3adc8371463ac243c22ef3e9d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Mon, 17 May 2021 18:10:42 +0200 Subject: [PATCH 119/249] ebook2cw: fix darwin build (#122801) --- pkgs/applications/radio/ebook2cw/Makefile.patch | 12 ------------ pkgs/applications/radio/ebook2cw/default.nix | 16 +++++++++++----- 2 files changed, 11 insertions(+), 17 deletions(-) delete mode 100644 pkgs/applications/radio/ebook2cw/Makefile.patch diff --git a/pkgs/applications/radio/ebook2cw/Makefile.patch b/pkgs/applications/radio/ebook2cw/Makefile.patch deleted file mode 100644 index be6c32e4147..00000000000 --- a/pkgs/applications/radio/ebook2cw/Makefile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Makefile b/Makefile -index 005d60d..f69c7fe 100644 ---- a/Makefile -+++ b/Makefile -@@ -41,6 +41,7 @@ install: - install -d -v $(DESTDIR)/bin/ - install -d -v $(DESTDIR)/share/doc/ebook2cw/ - install -d -v $(DESTDIR)/share/doc/ebook2cw/examples/ -+ install -d -v $(DESTDIR)/share/locale/de/LC_MESSAGES/ - install -s -m 0755 ebook2cw $(DESTDIR)/bin/ - install -m 0644 ebook2cw.1 $(DESTDIR)/share/man/man1/ - install -m 0644 README $(DESTDIR)/share/doc/ebook2cw/ diff --git a/pkgs/applications/radio/ebook2cw/default.nix b/pkgs/applications/radio/ebook2cw/default.nix index 4c8cd53ebd4..6c3fbc16c40 100644 --- a/pkgs/applications/radio/ebook2cw/default.nix +++ b/pkgs/applications/radio/ebook2cw/default.nix @@ -1,18 +1,24 @@ -{ lib, stdenv, fetchgit, lame, libvorbis, gettext }: +{ lib, stdenv, fetchgit, fetchpatch, lame, libvorbis, gettext }: stdenv.mkDerivation rec { pname = "ebook2cw"; - version = "0.8.3"; + version = "0.8.4"; src = fetchgit { url = "https://git.fkurz.net/dj1yfk/ebook2cw.git"; rev = "${pname}-${version}"; - sha256 = "0jqmnjblv3wzr0ppqzndzd8wg02nlkvzg1fqw14vyyp76sdjsh46"; + sha256 = "0h7lg59m3dcydzkc8szipnwzag8fqwwvppa9fspn5xqd4blpcjd5"; }; - buildInputs = [ lame libvorbis gettext ]; + patches = [ + # Fixes non-GCC compilers and a missing directory in the install phase. + (fetchpatch { + url = "https://git.fkurz.net/dj1yfk/ebook2cw/commit/eb5742e70b042cf98a04440395c34390b171c035.patch"; + sha256 = "1m5f819cj3fj1piss0a5ciib3jqrqdc14lp3i3dszw4bg9v1pgyd"; + }) + ]; - patches = [ ./Makefile.patch ]; + buildInputs = [ lame libvorbis gettext ]; makeFlags = [ "DESTDIR=$(out)" ]; From faeb9e3233e102ae86acb2c85a7c3f7f94d473a3 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Mon, 17 May 2021 18:30:37 +0200 Subject: [PATCH 120/249] nixos/networkd: add missing [DHCPServer] options `systemd.network.networks.*.dhcpServerConfig` did not accept all of the options which are valid for networkd's [DHCPServer] section. See systemd.network(5) of systemd 247 for details. --- nixos/modules/system/boot/networkd.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index bbdd5a40706..1de58b3d2c4 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -716,10 +716,17 @@ let "NTP" "EmitSIP" "SIP" + "EmitPOP3" + "POP3" + "EmitSMTP" + "SMTP" + "EmitLPR" + "LPR" "EmitRouter" "EmitTimezone" "Timezone" "SendOption" + "SendVendorOption" ]) (assertInt "PoolOffset") (assertMinimum "PoolOffset" 0) @@ -728,6 +735,9 @@ let (assertValueOneOf "EmitDNS" boolValues) (assertValueOneOf "EmitNTP" boolValues) (assertValueOneOf "EmitSIP" boolValues) + (assertValueOneOf "EmitPOP3" boolValues) + (assertValueOneOf "EmitSMTP" boolValues) + (assertValueOneOf "EmitLPR" boolValues) (assertValueOneOf "EmitRouter" boolValues) (assertValueOneOf "EmitTimezone" boolValues) ]; From 81b2ce96c6f41d794dd9d27c11590b339aaf1f35 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 14 May 2021 16:11:13 +0200 Subject: [PATCH 121/249] nixos/tests/cagebreak: Fix the test Starting Cagebreak as X11 client doesn't work anymore as wlroots 0.13 started to require the DRI3 extension which isn't supported by LLVMpipe: machine # [ 13.508284] xsession[938]: 00:00:00.003 [ERROR] [backend/x11/backend.c:433] X11 does not support DRI3 extension machine # [ 13.666989] show_signal_msg: 62 callbacks suppressed machine # [ 13.666993] .cagebreak-wrap[938]: segfault at 8 ip 0000000000408574 sp 00007ffef76f2440 error 4 in .cagebreak-wrapped[407000+d000] machine # [ 13.670483] Code: f4 ff ff 4c 8b 84 24 70 01 00 00 8d 45 01 48 89 c5 49 8b 3c c0 48 85 ff 75 e4 4c 89 c7 e8 84 f4 ff ff 48 8b bc 24 18 01 00 00 <48> 8b 47 08 4c 8d 6f d8 48 8d 68 d8 48 39 df 75 0e eb 36 66 0f 1f machine # [ 13.518274] xsession[938]: 00:00:00.006 [ERROR] [../cagebreak.c:313] Unable to create the wlroots backend The test broke after updating Cagebreak in #121652 (bf8679ba948). XWayland still fails for unknown reasons: Modifiers specified, but DRI is too old libEGL warning: DRI2: failed to create dri screen libEGL warning: NEEDS EXTENSION: falling back to kms_swrast glamor: No eglstream capable devices found glamor: 'wl_drm' not supported Missing Wayland requirements for glamor GBM backend Missing Wayland requirements for glamor EGLStream backend Failed to initialize glamor, falling back to sw 00:00:03.534 [ERROR] [xwayland/server.c:252] waitpid for Xwayland fork failed: No child processes (EE) failed to write to XWayland fd: Broken pipe /nix/store/kcm3x8695fgycf31grzl9fy5gggwpram-xterm-367/bin/xterm: Xt error: Can't open display: :0 The fallback to software rendering is to be expected but it looks like XWayland is crashing with "failed to write to XWayland fd: Broken pipe". --- nixos/tests/cagebreak.nix | 51 +++++++++++++-------------------------- 1 file changed, 17 insertions(+), 34 deletions(-) diff --git a/nixos/tests/cagebreak.nix b/nixos/tests/cagebreak.nix index 87f43cc3c32..72b706de9a3 100644 --- a/nixos/tests/cagebreak.nix +++ b/nixos/tests/cagebreak.nix @@ -17,25 +17,13 @@ in let alice = config.users.users.alice; in { + # Automatically login on tty1 as a normal user: imports = [ ./common/user-account.nix ]; + services.getty.autologinUser = "alice"; + hardware.opengl.enable = true; + programs.xwayland.enable = true; environment.systemPackages = [ pkgs.cagebreak pkgs.wallutils ]; - services.xserver = { - enable = true; - displayManager.autoLogin = { - enable = true; - user = alice.name; - }; - }; - services.xserver.windowManager.session = lib.singleton { - manage = "desktop"; - name = "cagebreak"; - start = '' - export XDG_RUNTIME_DIR="/run/user/${toString alice.uid}" - ${pkgs.cagebreak}/bin/cagebreak & - waitPID=$! - ''; - }; systemd.services.setupCagebreakConfig = { wantedBy = [ "multi-user.target" ]; @@ -56,17 +44,9 @@ in ''; }; - # Copied from cage: - # this needs a fairly recent kernel, otherwise: - # [backend/drm/util.c:215] Unable to add DRM framebuffer: No such file or directory - # [backend/drm/legacy.c:15] Virtual-1: Failed to set CRTC: No such file or directory - # [backend/drm/util.c:215] Unable to add DRM framebuffer: No such file or directory - # [backend/drm/legacy.c:15] Virtual-1: Failed to set CRTC: No such file or directory - # [backend/drm/drm.c:618] Failed to initialize renderer on connector 'Virtual-1': initial page-flip failed - # [backend/drm/drm.c:701] Failed to initialize renderer for plane - boot.kernelPackages = pkgs.linuxPackages_latest; - virtualisation.memorySize = 1024; + # Need to switch to a different VGA card / GPU driver than the default one (std) so that Cagebreak can launch: + virtualisation.qemu.options = [ "-vga virtio" ]; }; enableOCR = true; @@ -77,17 +57,20 @@ in in '' start_all() machine.wait_for_unit("multi-user.target") + machine.wait_until_tty_matches(1, "alice\@machine") + machine.send_chars("cagebreak\n") machine.wait_for_file("${XDG_RUNTIME_DIR}/wayland-0") with subtest("ensure wayland works with wayinfo from wallutils"): - machine.succeed("env XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR} wayinfo") + print(machine.succeed("env XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR} wayinfo")) - with subtest("ensure xwayland works with xterm"): - machine.send_key("ctrl-t") - machine.send_key("t") - machine.wait_until_succeeds("pgrep xterm") - machine.wait_for_text("${user.name}@machine") - machine.screenshot("screen") - machine.send_key("ctrl-d") + # TODO: Fix the XWayland test (log the cagebreak output to debug): + # with subtest("ensure xwayland works with xterm"): + # machine.send_key("ctrl-t") + # machine.send_key("t") + # machine.wait_until_succeeds("pgrep xterm") + # machine.wait_for_text("${user.name}@machine") + # machine.screenshot("screen") + # machine.send_key("ctrl-d") ''; }) From f691e6c074dabf48f8ecce86d00828636709efb7 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 15 May 2021 16:37:32 +0200 Subject: [PATCH 122/249] nixos/tests/cagebreak: Simplify the startup --- nixos/tests/cagebreak.nix | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/nixos/tests/cagebreak.nix b/nixos/tests/cagebreak.nix index 72b706de9a3..7b2c72bcafc 100644 --- a/nixos/tests/cagebreak.nix +++ b/nixos/tests/cagebreak.nix @@ -20,30 +20,21 @@ in # Automatically login on tty1 as a normal user: imports = [ ./common/user-account.nix ]; services.getty.autologinUser = "alice"; + programs.bash.loginShellInit = '' + if [ "$(tty)" = "/dev/tty1" ]; then + set -e + + mkdir -p ~/.config/cagebreak + cp -f ${cagebreakConfigfile} ~/.config/cagebreak/config + + cagebreak + fi + ''; hardware.opengl.enable = true; programs.xwayland.enable = true; environment.systemPackages = [ pkgs.cagebreak pkgs.wallutils ]; - systemd.services.setupCagebreakConfig = { - wantedBy = [ "multi-user.target" ]; - before = [ "multi-user.target" ]; - environment = { - HOME = alice.home; - }; - unitConfig = { - type = "oneshot"; - RemainAfterExit = true; - user = alice.name; - }; - script = '' - cd $HOME - CONFFILE=$HOME/.config/cagebreak/config - mkdir -p $(dirname $CONFFILE) - cp ${cagebreakConfigfile} $CONFFILE - ''; - }; - virtualisation.memorySize = 1024; # Need to switch to a different VGA card / GPU driver than the default one (std) so that Cagebreak can launch: virtualisation.qemu.options = [ "-vga virtio" ]; @@ -57,8 +48,6 @@ in in '' start_all() machine.wait_for_unit("multi-user.target") - machine.wait_until_tty_matches(1, "alice\@machine") - machine.send_chars("cagebreak\n") machine.wait_for_file("${XDG_RUNTIME_DIR}/wayland-0") with subtest("ensure wayland works with wayinfo from wallutils"): From 7eadb03c59560d69d4e478d7689e9b39a1d5ec5e Mon Sep 17 00:00:00 2001 From: Bill Sun Date: Mon, 17 May 2021 10:12:24 -0700 Subject: [PATCH 123/249] chrysalis: 0.7.9 -> 0.8.4 (#121753) --- pkgs/applications/misc/chrysalis/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/chrysalis/default.nix b/pkgs/applications/misc/chrysalis/default.nix index e79d989e22d..4d6a6943cde 100644 --- a/pkgs/applications/misc/chrysalis/default.nix +++ b/pkgs/applications/misc/chrysalis/default.nix @@ -1,16 +1,20 @@ -{ lib, appimageTools, fetchurl }: +{ lib, appimageTools, fetchurl, gtk3, gsettings-desktop-schemas }: let pname = "chrysalis"; - version = "0.7.9"; + version = "0.8.4"; in appimageTools.wrapType2 rec { name = "${pname}-${version}-binary"; src = fetchurl { - url = "https://github.com/keyboardio/${pname}/releases/download/${pname}-${version}/${pname}-${version}.AppImage"; - sha256 = "12w4vv7dwfpvxpc8kpfas90y7yy8mb8dj2096z3vw1bli5lrn3zi"; + url = "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; + sha256 = "b41f3e23dac855b1588cff141e3d317f96baff929a0543c79fccee0c6f095bc7"; }; + profile = '' + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + multiPkgs = null; extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.glib From 5b143ccc91a63f19aee15fcb133c484d54bdca5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20B=C3=A4ckman?= <46724898+erikbackman@users.noreply.github.com> Date: Mon, 17 May 2021 19:16:51 +0200 Subject: [PATCH 124/249] numworks-epsilon: 15.3.2 -> 15.5.0 (#122760) Co-authored-by: erikbackman --- .../0001-ion-linux-makerules.patch | 12 ++++++++++++ .../science/math/numworks-epsilon/default.nix | 16 +++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/science/math/numworks-epsilon/0001-ion-linux-makerules.patch diff --git a/pkgs/applications/science/math/numworks-epsilon/0001-ion-linux-makerules.patch b/pkgs/applications/science/math/numworks-epsilon/0001-ion-linux-makerules.patch new file mode 100644 index 00000000000..0bc29b9aab5 --- /dev/null +++ b/pkgs/applications/science/math/numworks-epsilon/0001-ion-linux-makerules.patch @@ -0,0 +1,12 @@ +diff --git a/ion/src/simulator/linux/Makefile b/ion/src/simulator/linux/Makefile +index ca7da03fa..b05bba115 100644 +--- a/ion/src/simulator/linux/Makefile ++++ b/ion/src/simulator/linux/Makefile +@@ -28,7 +28,6 @@ ion_src += $(addprefix ion/src/simulator/shared/, \ + collect_registers.cpp \ + haptics.cpp \ + journal.cpp \ +- platform_action_modifier_ctrl.cpp \ + state_file.cpp \ + ) + diff --git a/pkgs/applications/science/math/numworks-epsilon/default.nix b/pkgs/applications/science/math/numworks-epsilon/default.nix index 9ec41386da5..a90ebc67b65 100644 --- a/pkgs/applications/science/math/numworks-epsilon/default.nix +++ b/pkgs/applications/science/math/numworks-epsilon/default.nix @@ -2,6 +2,8 @@ , lib , fetchFromGitHub , libpng +, libjpeg +, freetype , xorg , python3 , imagemagick @@ -11,18 +13,20 @@ stdenv.mkDerivation rec { pname = "numworks-epsilon"; - version = "15.3.2"; + version = "15.5.0"; src = fetchFromGitHub { owner = "numworks"; repo = "epsilon"; rev = version; - sha256 = "1q34dilyypiggjs16486jm122yf20wcigqxvspc77ig9albaxgh5"; + sha256 = "fPBO3FzZ4k5OxG+Ifc6R/au4Te974HNKAEdHz+aFdSg="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpng + libjpeg + freetype xorg.libXext python3 imagemagick @@ -33,6 +37,12 @@ stdenv.mkDerivation rec { "PLATFORM=simulator" ]; + patches = [ + # Remove make rule Introduced in cba596dde7 + # which causes it to not build with nix + ./0001-ion-linux-makerules.patch + ]; + installPhase = '' runHook preInstall @@ -44,7 +54,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Emulator for Epsilon, a High-performance graphing calculator operating system"; + description = "Simulator for Epsilon, a High-performance graphing calculator operating system"; homepage = "https://numworks.com/"; license = licenses.cc-by-nc-sa-40; maintainers = with maintainers; [ erikbackman ]; From f7d1b76d33efbea80a63139aff36ae677f6f4bc7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 May 2021 04:13:43 +0000 Subject: [PATCH 125/249] glab: 1.16.0 -> 1.17.0 --- .../version-management/git-and-tools/glab/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/glab/default.nix b/pkgs/applications/version-management/git-and-tools/glab/default.nix index 8e7e739e610..c810598d7cf 100644 --- a/pkgs/applications/version-management/git-and-tools/glab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/glab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glab"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "profclems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KkkP/qkIrwJUxmZTY8zxJKMbOiaGl8XqJhHAU7oejGs="; + sha256 = "sha256-UW6KYqqeDnswPSHrjprbClnIwpX5zA+ePq7kwlsWEfA="; }; - vendorSha256 = "sha256-DO8eH0DAitxX0NOYQBs4/ME9TFQYfXedwbld1DnBWXk="; + vendorSha256 = "sha256-5hVIwEG70r9EDyapQ/OBlHfA1Zw5y4KxEysX415t3xk="; runVend = true; # Tests are trying to access /homeless-shelter From 427276572b3484a43c06110d0764f9b61cc43a47 Mon Sep 17 00:00:00 2001 From: Yevhen Shymotiuk Date: Mon, 17 May 2021 20:43:15 +0300 Subject: [PATCH 126/249] python3Packages.userpath: 1.4.1 -> 1.5.0 --- pkgs/development/python-modules/userpath/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/userpath/default.nix b/pkgs/development/python-modules/userpath/default.nix index 8366a56158d..237293370aa 100644 --- a/pkgs/development/python-modules/userpath/default.nix +++ b/pkgs/development/python-modules/userpath/default.nix @@ -2,19 +2,18 @@ , buildPythonPackage , fetchPypi , click -, distro }: buildPythonPackage rec { pname = "userpath"; - version = "1.4.1"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256="0mfjmvx286z1dmnrc7bm65x8gj8qrmkcyagl0vf5ywfq0bm48591"; + sha256="0fj2lj9vcns5sxv72v3ggrszcl7j1jd9a6ycnsl00218nycliy31"; }; - propagatedBuildInputs = [ click distro ]; + propagatedBuildInputs = [ click ]; # test suite is difficult to emulate in sandbox due to shell manipulation doCheck = false; From 426d247687d61f2ca94bf903da3672108c25b863 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 May 2021 04:25:33 +0000 Subject: [PATCH 127/249] golangci-lint: 1.40.0 -> 1.40.1 --- pkgs/development/tools/golangci-lint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 647e8b58490..2019c7cb3e2 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.40.0"; + version = "1.40.1"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "sha256-/AKDwX4W9MCPXNy2izSGTugLV8DVX4A2djZla8bqDCs="; + sha256 = "sha256-5OtXfDPpdwVMnI5Pttr+XQPgJXI7YexPtBhIDeS1CXk="; }; - vendorSha256 = "sha256-HkVt0Nkq7+gvn5VNeROAmuhlCFGYx2niWb1NwJfLtRc="; + vendorSha256 = "sha256-8SPUOQ88RkU0dkyNccf+POKitXHlCRaxrIugV91gDZQ="; doCheck = false; From 9409e275c8b7f170d47833191db76067af4d8b91 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 May 2021 05:16:22 +0000 Subject: [PATCH 128/249] lsscsi: 0.31 -> 0.32 --- pkgs/os-specific/linux/lsscsi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/lsscsi/default.nix b/pkgs/os-specific/linux/lsscsi/default.nix index 90c0361bce3..6286735b758 100644 --- a/pkgs/os-specific/linux/lsscsi/default.nix +++ b/pkgs/os-specific/linux/lsscsi/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation { - name = "lsscsi-0.31"; + name = "lsscsi-0.32"; src = fetchurl { - url = "http://sg.danny.cz/scsi/lsscsi-0.31.tgz"; - sha256 = "1jpk15y9vqjb1lcj4pdzygpg0jf0lja7azjldpywc0s805rikgqj"; + url = "http://sg.danny.cz/scsi/lsscsi-0.32.tgz"; + sha256 = "sha256-CoAOnpTcoqtwLWXXJ3eujK4Hjj100Ly+1kughJ6AKaE="; }; preConfigure = '' From a4e12cf6d16acad612851b72515b1376cf4f4e03 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 May 2021 00:25:04 +0000 Subject: [PATCH 129/249] insomnia: 2021.1.1 -> 2021.3.0 --- pkgs/development/web/insomnia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 24b65e4e8af..1c854368df7 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -16,12 +16,12 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "2021.1.1"; + version = "2021.3.0"; src = fetchurl { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb"; - sha256 = "sha256-GPOeLSbKiaJR5ppzyJMllzM+2gSddZN7+P5ttkocuDg="; + sha256 = "sha256-RtEkWi0J3nYzT+IhdyBlGeUE2SCmhlnfw0L6sOvE4WI="; }; nativeBuildInputs = From b9efe88a98ddeaf3480d8a57ee78b68d553bb8a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Mon, 17 May 2021 20:00:50 +0200 Subject: [PATCH 130/249] libsForQt5.qca-qt5: fix darwin build --- pkgs/development/libraries/qca-qt5/default.nix | 4 ---- .../libraries/qca-qt5/move-project.patch | 17 ----------------- 2 files changed, 21 deletions(-) delete mode 100644 pkgs/development/libraries/qca-qt5/move-project.patch diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index e53404557fb..f8159417378 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -14,10 +14,6 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; - # Without this patch cmake fails with a "No known features for CXX compiler" - # error on darwin - patches = lib.optional stdenv.isDarwin ./move-project.patch ; - # tells CMake to use this CA bundle file if it is accessible preConfigure = "export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt"; diff --git a/pkgs/development/libraries/qca-qt5/move-project.patch b/pkgs/development/libraries/qca-qt5/move-project.patch deleted file mode 100644 index dcecb83d7db..00000000000 --- a/pkgs/development/libraries/qca-qt5/move-project.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2f2b5d0..971dee3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,10 +6,11 @@ if(NOT CMAKE_INSTALL_PREFIX) - unset(CMAKE_INSTALL_PREFIX CACHE) - endif(NOT CMAKE_INSTALL_PREFIX) - --project(qca) - - cmake_minimum_required(VERSION 3.4) - -+project(qca) -+ - set(QCA_LIB_MAJOR_VERSION "2") - set(QCA_LIB_MINOR_VERSION "2") - set(QCA_LIB_PATCH_VERSION "1") From 6d014005c9cc60eb72ca3aaa5f61df39f397d3e8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 May 2021 06:23:12 +0000 Subject: [PATCH 131/249] lldpd: 1.0.10 -> 1.0.11 --- pkgs/tools/networking/lldpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix index f2641235a19..a4e5d565756 100644 --- a/pkgs/tools/networking/lldpd/default.nix +++ b/pkgs/tools/networking/lldpd/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "lldpd"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz"; - sha256 = "sha256-RFstdgN+8+vQPUDh/B8p7wgQL6o6Cf6Ea5Unl8i8dyI="; + sha256 = "sha256-tR0VcA+678t/uFw1BrSdMxc6DxXXAPkz7wRAZ7QtRuQ="; }; configureFlags = [ From 2d67b889b8706481a8c2d62408259bd5c0d1df8a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 May 2021 05:12:51 +0000 Subject: [PATCH 132/249] liquibase: 4.3.4 -> 4.3.5 --- pkgs/development/tools/database/liquibase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index ebd6064ee91..c4393821b7d 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "4.3.4"; + version = "4.3.5"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-tWk4AW2F1v+5C7Gj9I6c4JVfaQDXEVMdPoaKafa7OgE="; + sha256 = "sha256-XOYq+p76XFt7j4oxMClZox5wsaXuV5ovcB6kZJhMBlU="; }; nativeBuildInputs = [ makeWrapper ]; From bd017d34f4c914fc1842b9fd5b4fc6ca85ab61de Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 May 2021 21:03:08 +0000 Subject: [PATCH 133/249] gnome.pomodoro: 0.18.0 -> 0.19.1 --- pkgs/desktops/gnome/misc/pomodoro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/misc/pomodoro/default.nix b/pkgs/desktops/gnome/misc/pomodoro/default.nix index 830900ed8c9..2881cc7e50f 100644 --- a/pkgs/desktops/gnome/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome/misc/pomodoro/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-pomodoro"; - version = "0.18.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "codito"; repo = "gnome-pomodoro"; rev = version; - sha256 = "0990m8ydryd77kv25nfqli1n209i0h5dkjg9gkyww8bfrjhw47mc"; + sha256 = "sha256-im66QUzz6PcX0vkf4cN57ttRLB4KKPFky1pwUa4V7kQ="; }; nativeBuildInputs = [ From 056af90d7ea2b9f567b9da0c771002c485c9b818 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 May 2021 20:46:52 +0000 Subject: [PATCH 134/249] homebank: 5.5.1 -> 5.5.2 --- pkgs/applications/office/homebank/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index b7da8c777a9..c77c52774be 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , libsoup, gnome }: stdenv.mkDerivation rec { - name = "homebank-5.5.1"; + name = "homebank-5.5.2"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "sha256-m7OeqtPExo0ry+IeL2xKUnTjo/OFr7Ky/3OuX9mY2gg="; + sha256 = "sha256-mJ7zeOTJ+CNLYruT1qSxS9TJjciJUZg426H0TxLFHtI="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; From 489cfcf8c527e237d874ce64e12c388136fb32aa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 May 2021 21:19:20 +0000 Subject: [PATCH 135/249] highlight: 4.0 -> 4.1 --- pkgs/tools/text/highlight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 657dc548f86..f44ddc9d0e9 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -5,13 +5,13 @@ with lib; let self = stdenv.mkDerivation rec { pname = "highlight"; - version = "4.0"; + version = "4.1"; src = fetchFromGitLab { owner = "saalen"; repo = "highlight"; rev = "v${version}"; - sha256 = "sha256-WWbT0CfrbHgpU5HQycRhU7Ymey1LKd/ruoF91F3mHdE="; + sha256 = "sha256-KktwbnL13Tcc2iWAjgqQSMSenUN6nYBEGbFrpB1kkr0="; }; enableParallelBuilding = true; From d051dab8d1a7fd951ebee0e753f755dabd4ad7da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Mon, 17 May 2021 19:49:38 +0200 Subject: [PATCH 136/249] libow: fix darwin build --- pkgs/development/libraries/libow/default.nix | 43 ++++++++++---------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/pkgs/development/libraries/libow/default.nix b/pkgs/development/libraries/libow/default.nix index e4a8d95f4b0..5340caeff0a 100644 --- a/pkgs/development/libraries/libow/default.nix +++ b/pkgs/development/libraries/libow/default.nix @@ -11,7 +11,28 @@ stdenv.mkDerivation rec { sha256 = "0dln1ar7bxwhpi36sccmpwapy7iz4j097rbf02mgn42lw5vrcg3s"; }; - nativeBuildInputs = [ autoconf automake pkg-config ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; + + preConfigure = '' + # Tries to use glibtoolize on Darwin, but it shouldn't for Nix. + sed -i -e 's/glibtoolize/libtoolize/g' bootstrap + ./bootstrap + ''; + + configureFlags = [ + "--disable-owtcl" + "--disable-owphp" + "--disable-owpython" + "--disable-zero" + "--disable-owshell" + "--disable-owhttpd" + "--disable-owftpd" + "--disable-owserver" + "--disable-owperl" + "--disable-owtap" + "--disable-owmon" + "--disable-owexternal" + ]; meta = with lib; { description = "1-Wire File System full library"; @@ -20,24 +41,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ disserman ]; platforms = platforms.unix; }; - - buildInputs = [ libtool ]; - - preConfigure = "./bootstrap"; - - configureFlags = [ - "--disable-owtcl" - "--disable-owphp" - "--disable-owpython" - "--disable-zero" - "--disable-owshell" - "--disable-owhttpd" - "--disable-owftpd" - "--disable-owserver" - "--disable-owperl" - "--disable-owtcl" - "--disable-owtap" - "--disable-owmon" - "--disable-owexternal" - ]; } From 977a70d25ba10cfdaf736ee956388d04ea2c9f54 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 May 2021 07:27:26 +0000 Subject: [PATCH 137/249] libchardet: 1.0.5 -> 1.0.6 --- pkgs/development/libraries/libchardet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libchardet/default.nix b/pkgs/development/libraries/libchardet/default.nix index 260c332f7ef..47ce911a695 100644 --- a/pkgs/development/libraries/libchardet/default.nix +++ b/pkgs/development/libraries/libchardet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libchardet"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "Joungkyun"; repo = "libchardet"; rev = version; - sha256 = "0c1k5hf3ssh3cm72w2zpy5k73vhy1gyq5s9rqdawqqa4al8syyvn"; + sha256 = "sha256-JhEiWM3q8X+eEBHxv8k9yYOaTGoJOzI+/iFYC0gZJJs="; }; nativeBuildInputs = [ perl ]; From ea5ad2b8e0f1b2503be88b409de43cee4230113e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 May 2021 15:35:36 +0000 Subject: [PATCH 138/249] gwyddion: 2.57 -> 2.58 --- pkgs/applications/science/chemistry/gwyddion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index 74a6b495587..ca80262eb76 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -35,10 +35,10 @@ in stdenv.mkDerivation rec { pname = "gwyddion"; - version = "2.57"; + version = "2.58"; src = fetchurl { url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz"; - sha256 = "sha256-kx/WqtNDaJQyVehxZ3weddXyaM1knX+fCuv47A9GaH0="; + sha256 = "sha256-0xNnzYkuW3nEsO2o+0WEA+Z71XWoq6FYXm342OWO9Sw="; }; nativeBuildInputs = [ pkg-config file ]; From 1f79b3e79b167ef8fff4fc88c4bcee0bd8099b94 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 May 2021 09:10:38 +0000 Subject: [PATCH 139/249] avocode: 4.12.0 -> 4.14.0 --- pkgs/applications/graphics/avocode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 02e5c7c0345..2693f03972c 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "4.12.0"; + version = "4.14.0"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "sha256-qbG0Ii3Xmj1UGGS+n+LdiNPAHBkpQZMGEzrDvOcaUNA="; + sha256 = "sha256-BDW87UVN1Jub0sJFvtkZr5ssz835Yf2CNn5kHCn70cE="; }; libPath = lib.makeLibraryPath (with xorg; [ From 6a1792ab05fd3c21a19541d38a3efafe2f568724 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 May 2021 06:07:34 +0000 Subject: [PATCH 140/249] libamqpcpp: 4.3.11 -> 4.3.12 --- pkgs/development/libraries/libamqpcpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix index 67404f9e5cf..ee34afad4f7 100644 --- a/pkgs/development/libraries/libamqpcpp/default.nix +++ b/pkgs/development/libraries/libamqpcpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libamqpcpp"; - version = "4.3.11"; + version = "4.3.12"; src = fetchFromGitHub { owner = "CopernicaMarketingSoftware"; repo = "AMQP-CPP"; rev = "v${version}"; - sha256 = "sha256-ZEvzZ++0f7Kf3iVbf3vQbyE8yd/dasU+dSxDDUu8Xug="; + sha256 = "sha256-veiD2RrJ08HYZ1Jy8EUe6ct2qh7a2xZCn3TTM+Hvu+0="; }; buildInputs = [ openssl ]; From a3fd8cbc1cc829f73712098cb445e547ddd493e3 Mon Sep 17 00:00:00 2001 From: wearemnr Date: Mon, 17 May 2021 18:48:37 +0300 Subject: [PATCH 141/249] vscodium: 1.56.1 -> 1.56.2 --- pkgs/applications/editors/vscode/vscodium.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index decd4b10042..da29daa6359 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1p68fvlr2fwrwr61gfrna3hjzgyazacr373hldbc4fxca3fdij76"; - x86_64-darwin = "0wyihr2yfzjaypsa682zdklfxn3m7zca81brkzdvrndw24hdcl8m"; - aarch64-linux = "0iw471n1fl8m2x06n2rdbkiwzhlc7lhk99vyql3z4fi0zyjy3pbn"; - armv7l-linux = "0dx1icp245cfx3hkkpzzgfg9y8sv45llx35s03w1zzga2h2vhm3a"; + x86_64-linux = "1gw2273ab0gdyav6mz7wk7d6g6cwcdvx0xaghvm610m1pvkbvxkz"; + x86_64-darwin = "1zfzsr8gybmpmxc3jlfj6sx3m6ny6hc3dxvpgffni7k5zgv651df"; + aarch64-linux = "079bp48h0qfpsbyir2qg3w1f43dc68ngmxqdqb3jnkx721affjzs"; + armv7l-linux = "1d9243hk07xawv44909lk6y6bnvy0wjhy8xl13n3a11pg3djn5bm"; }.${system}; sourceRoot = { @@ -33,7 +33,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.56.1"; + version = "1.56.2"; pname = "vscodium"; executableName = "codium"; From 5a73259a3bffc1590123844bb659d536d7ab706e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Mon, 17 May 2021 22:19:29 +0200 Subject: [PATCH 142/249] monolith: fix darwin build --- pkgs/tools/backup/monolith/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix index 01722fa9070..ff27054164b 100644 --- a/pkgs/tools/backup/monolith/default.nix +++ b/pkgs/tools/backup/monolith/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pkg-config , openssl +, libiconv , Security }: @@ -21,7 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; checkFlagsArray = [ "--skip=tests::cli" ]; From d748820d87c8629a82e5e63a0a359a162db0434d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 May 2021 02:45:10 +0000 Subject: [PATCH 143/249] containerd: 1.5.0 -> 1.5.1 --- pkgs/applications/virtualization/containerd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 657588e5eaf..fa504511513 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -10,13 +10,13 @@ buildGoPackage rec { pname = "containerd"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-dUn9lvDLoljq5JPFvUdJ8te0VHkCs9Y9Em2mcq5mHvY="; + sha256 = "sha256-1u+H/gJaQhltf/pq7uaAPEUlQ5R6ZByall2neNkon8s="; }; goPackagePath = "github.com/containerd/containerd"; From 91bad1d2226dbdb342494d29d3e4227588528c6a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 13 May 2021 08:06:22 +0000 Subject: [PATCH 144/249] asterisk-module-sccp: 4.3.2-epsilon -> 4.3.4 --- pkgs/servers/asterisk/sccp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/asterisk/sccp/default.nix b/pkgs/servers/asterisk/sccp/default.nix index 10b238f8877..756699e5adb 100644 --- a/pkgs/servers/asterisk/sccp/default.nix +++ b/pkgs/servers/asterisk/sccp/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, binutils-unwrapped, patchelf, asterisk }: stdenv.mkDerivation rec { pname = "asterisk-module-sccp"; - version = "4.3.2-epsilon"; + version = "4.3.4"; src = fetchFromGitHub { owner = "chan-sccp"; repo = "chan-sccp"; rev = "v${version}"; - sha256 = "0sp74xvb35m32flsrib0983yn1dyz3qk69vp0gqbx620ycbz19gd"; + sha256 = "sha256-YGHK4A03Ba/tnVTnu9VuhIy/xQ5C/7ZX8h9mxqKsnZI="; }; nativeBuildInputs = [ patchelf ]; From 2c4bd55048212cfef4d6b4e1fb7a4069aea6055e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 13 May 2021 12:42:01 +0000 Subject: [PATCH 145/249] kubecfg: 0.19.1 -> 0.20.0 --- pkgs/applications/networking/cluster/kubecfg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index 16b7796dc64..7c04f6e9eb9 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -1,6 +1,6 @@ { lib, buildGoPackage, fetchFromGitHub, ... }: -let version = "0.19.1"; in +let version = "0.20.0"; in buildGoPackage { pname = "kubecfg"; @@ -10,7 +10,7 @@ buildGoPackage { owner = "bitnami"; repo = "kubecfg"; rev = "v${version}"; - sha256 = "sha256-makRYWBtOjvuv7dAY1vNh1Nxv+nETVlaFh1C3oiojUo="; + sha256 = "sha256-7lBIqaozVBoiYYOTqAxq9h2N+Y3JFwLaunCykILOmPU="; }; goPackagePath = "github.com/bitnami/kubecfg"; From 78c183ce6ddf485b39c71c3b0198ca737e75cbe0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 May 2021 13:24:02 +0000 Subject: [PATCH 146/249] etcher: 1.5.117 -> 1.5.120 --- pkgs/tools/misc/etcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/etcher/default.nix b/pkgs/tools/misc/etcher/default.nix index a94dbae9a25..9bda86db9bf 100644 --- a/pkgs/tools/misc/etcher/default.nix +++ b/pkgs/tools/misc/etcher/default.nix @@ -10,7 +10,7 @@ let sha256 = { - "x86_64-linux" = "03nxcafg405vcs4sb5qhpm5aqaai87d9ksqkl37mmzf6g0n4qbih"; + "x86_64-linux" = "sha256-nGIUOS4LzfeXamcT0uigbQsVkULH2R3bli0DDEpg3ns="; "i686-linux" = "0z6y45sz086njpywg7f0jn6n02qynb1qbi889g2kcgwbfjvmcpm1"; }."${stdenv.system}"; @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { pname = "etcher"; - version = "1.5.117"; + version = "1.5.120"; src = fetchurl { url = "https://github.com/balena-io/etcher/releases/download/v${version}/balena-etcher-electron_${version}_${arch}.deb"; From 42d285b631fc385eb6ece5f076ad249ca024ec12 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 May 2021 05:10:10 +0000 Subject: [PATCH 147/249] libdivecomputer: 0.6.0 -> 0.7.0 --- pkgs/development/libraries/libdivecomputer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdivecomputer/default.nix b/pkgs/development/libraries/libdivecomputer/default.nix index 0f65a5cee5c..4a9a4b0980e 100644 --- a/pkgs/development/libraries/libdivecomputer/default.nix +++ b/pkgs/development/libraries/libdivecomputer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libdivecomputer"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { url = "https://www.libdivecomputer.org/releases/${pname}-${version}.tar.gz"; - sha256 = "0nm1mcscpxb9dv4p0lidd6rf5xg4vmcbigj6zqxvgn7pwnvpbzm0"; + sha256 = "sha256-gNnxlOokUCA535hZhILgr8aw4zPeeds0wpstaJNNJbk="; }; enableParallelBuilding = true; From 2bca73cc65df542c385c8b07d9355eedc246e811 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 13 May 2021 01:15:14 +0000 Subject: [PATCH 148/249] html-xml-utils: 7.9 -> 8.0 --- pkgs/tools/text/xml/html-xml-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index 5dab3d642a3..96aa01abe6d 100644 --- a/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "html-xml-utils"; - version = "7.9"; + version = "8.0"; src = fetchurl { url = "https://www.w3.org/Tools/HTML-XML-utils/${pname}-${version}.tar.gz"; - sha256 = "0gs3xvdbzhk5k12i95p5d4fgkkaldnlv45sch7pnncb0lrpcjsnq"; + sha256 = "sha256-dJBZkGwzHCx/us7uAkZiRaI3uRvUCN/485bQc0oGCuI="; }; buildInputs = [curl libiconv]; From cf09d3039b6f3c10503818e43d4c3dfbcbecbbbe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 13 May 2021 17:34:06 +0000 Subject: [PATCH 149/249] createrepo_c: 0.17.1 -> 0.17.2 --- pkgs/tools/package-management/createrepo_c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/createrepo_c/default.nix b/pkgs/tools/package-management/createrepo_c/default.nix index 92696a8d75f..fc0628e0908 100644 --- a/pkgs/tools/package-management/createrepo_c/default.nix +++ b/pkgs/tools/package-management/createrepo_c/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "createrepo_c"; - version = "0.17.1"; + version = "0.17.2"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = "createrepo_c"; rev = version; - sha256 = "G2xioH9XWntHFmUfTN2s2mdtIqgTTLKr5jZflwpaC8Q="; + sha256 = "sha256-rcrJjcWj+cTAE3k11Ynr7CQCOWD+rb60lcar0G2w06A="; }; patches = [ From a483bae7cdd71693398e1b08b77e0c86feb069f4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 May 2021 19:08:58 +0000 Subject: [PATCH 150/249] curaengine: 4.9.0 -> 4.9.1 --- pkgs/applications/misc/curaengine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index 76947c1ed94..05f63c54803 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "curaengine"; - version = "4.9.0"; + version = "4.9.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "0b82hwn7pb73h1azaandq93bkzlzskhgk71pwf4yws0j9bm6z084"; + sha256 = "sha256-1hCjtnI1EnfyQ0QfU8qZoSLIjE5pyDYpu8H4J91cWYM="; }; nativeBuildInputs = [ cmake ]; From 8ead9feb90d5dca324e33eac2350dd973a01934b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 13 May 2021 09:07:22 +0000 Subject: [PATCH 151/249] cpp-utilities: 5.10.2 -> 5.10.3 --- pkgs/development/libraries/cpp-utilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 1d666d4d984..fab52fc159f 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.10.2"; + version = "5.10.3"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hPcmO2nzXCuhU2GjE0B1Bz9OkJ4mY2txFr+cWGaw1bo="; + sha256 = "sha256-bEdDRvm5W12wJnW4xC+AcRLevZ0H7C625eknKzNrLLU="; }; nativeBuildInputs = [ cmake ]; From 8b33abc6debbe50cf0fe90a4e0d35e17084c22b4 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 14 May 2021 08:42:34 +0300 Subject: [PATCH 152/249] cpp-utilities: address common issues in the derivation --- pkgs/development/libraries/cpp-utilities/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index fab52fc159f..14e2c8878fd 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , cmake , cppunit }: @@ -20,13 +19,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; checkInputs = [ cppunit ]; # Otherwise, tests fail since the resulting shared object libc++utilities.so is only available in PWD of the make files - checkFlagsArray = [ "LD_LIBRARY_PATH=$(PWD)" ]; + preCheck = '' + checkFlagsArray+=( + "LD_LIBRARY_PATH=$PWD" + ) + ''; doCheck = true; meta = with lib; { homepage = "https://github.com/Martchus/cpp-utilities"; description = "Common C++ classes and routines used by @Martchus' applications featuring argument parser, IO and conversion utilities"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ doronbehar ]; platforms = platforms.linux; }; From 1d3090775031551197a3ad6be23f40c85d1959bd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 13 May 2021 14:52:54 +0000 Subject: [PATCH 153/249] belle-sip: 4.5.3 -> 4.5.14 --- pkgs/development/libraries/belle-sip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 76a3b96533c..4032734416e 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "belle-sip"; - version = "4.5.3"; + version = "4.5.14"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-N5hcQUuqtngo5R6iUvq8X6KebfkvxUSy0WDRtCVwPDQ="; + sha256 = "sha256-L6dhgBJrzYgBuMNd2eMZJCqB/GIZjKipfn1SffxBFWw="; }; nativeBuildInputs = [ antlr3_4 cmake ]; From 0f8ae03814848aec8cce710d93303db2684d8090 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 May 2021 05:31:49 +0000 Subject: [PATCH 154/249] jftui: 0.5.0 -> 0.5.1 --- pkgs/applications/video/jftui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/jftui/default.nix b/pkgs/applications/video/jftui/default.nix index 3411b2d5c33..baffc789488 100644 --- a/pkgs/applications/video/jftui/default.nix +++ b/pkgs/applications/video/jftui/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "jftui"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "Aanok"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KyiLZuzQ0kCReUEPBf0YbmdXhw9nBfghBBsXiy9+N0E="; + sha256 = "sha256-/QVSywS0O+HZpwY9W3le3RK3OhCkmdLYMCGTyyBdsFw="; }; nativeBuildInputs = [ From f4ae47ccf9acae671a5fcccbad6cbe13265612ff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 May 2021 04:56:04 +0000 Subject: [PATCH 155/249] helmsman: 3.6.7 -> 3.6.10 --- pkgs/applications/networking/cluster/helmsman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index dc777ad0298..b223621d134 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helmsman"; - version = "3.6.7"; + version = "3.6.10"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-6w2CV6Uj1b8b3vwB933eNHPe1rK+TRyUL++Vy38cKqo="; + sha256 = "sha256-0Epff1NYfZXza27/5RBuICIj2455K31BGFr6PMLkNVE="; }; vendorSha256 = "sha256-icX8mOc8g+DhfAjD1pzneLWTXY17lXyAjdPOWAxkHwI="; From a3815cb24eecf45e78df046e942b4a5dfe4acea8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 May 2021 04:52:09 +0000 Subject: [PATCH 156/249] helmfile: 0.139.0 -> 0.139.3 --- pkgs/applications/networking/cluster/helmfile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 53b04123438..4c6040c028b 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.139.0"; + version = "0.139.3"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-bwhiua+KQdt9fyvM4TeS6Mm7EQB9K2L04FPhGS380xI="; + sha256 = "sha256-Cg4FFTowrWMDfpaMJwrOSs3ykZxH378OMR+1+vJt5e8="; }; - vendorSha256 = "sha256-Qpou4e1My/obIHL/4/IEUml0F82atIwPGZX5+vpvk0k="; + vendorSha256 = "sha256-Hs09CT/KSwYL2AKLseOjWB5Xvvr5TvbzwDywsGQ9kMw="; doCheck = false; From b544d313007f112026f0253e70f104b910b6d729 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 May 2021 03:34:13 +0000 Subject: [PATCH 157/249] flyctl: 0.0.212 -> 0.0.217 --- pkgs/development/web/flyctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index a8ae0c31ee8..e1a519369d0 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.212"; + version = "0.0.217"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-4BL+IhwmKiPN5G/5ut0RJcCXWy4IKPichx2dD3/TRic="; + sha256 = "sha256-7WfN+fNmr6lUvKKMwCM6QL0rClsb1uX3qk+ZQZna6kc="; }; preBuild = '' From 9e6d18dfb98f7fd554e48e21952e932cfcb606e6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 May 2021 05:02:34 +0000 Subject: [PATCH 158/249] libgig: 4.2.0 -> 4.3.0 --- pkgs/development/libraries/libgig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix index f78a51db5de..26e3b46d551 100644 --- a/pkgs/development/libraries/libgig/default.nix +++ b/pkgs/development/libraries/libgig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libgig"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2"; - sha256 = "1zs5yy124bymfyapsnljr6rv2lnn5inwchm0xnwiw44b2d39l8hn"; + sha256 = "sha256-oG0Jh4eAxsGd2NucM1RNU6kzV/niexSpg6qrpo//p5Q="; }; nativeBuildInputs = [ autoconf automake libtool pkg-config ]; From 5546f01b5a086e6db068aa2a004cf2389e915861 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 May 2021 01:02:22 +0000 Subject: [PATCH 159/249] groonga: 11.0.1 -> 11.0.2 --- pkgs/servers/search/groonga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 6ba221f8baf..07ea1960a7b 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "groonga"; - version = "11.0.1"; + version = "11.0.2"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "sha256-Ap5DdOf3PVctMAYCP0Xr4VjqO5yEWqrKX6FbId8/FMQ="; + sha256 = "sha256-3inLVkjjwphz00N0fWJqXvyzAjV9x72C3E33duLeVYw="; }; buildInputs = with lib; From a558f4b2184e82682d600ad2a972f32985799a78 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 May 2021 03:30:09 +0000 Subject: [PATCH 160/249] fluxcd: 0.13.3 -> 0.13.4 --- pkgs/applications/networking/cluster/fluxcd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 0bb4c57e089..d7cf0a933df 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.13.3"; + version = "0.13.4"; manifests = fetchzip { url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; @@ -19,10 +19,10 @@ buildGoModule rec { owner = "fluxcd"; repo = "flux2"; rev = "v${version}"; - sha256 = "sha256-RaQOefVqDPHvTF1qMtgAFNpA1Gx7Vo2JKiwteePsGyo="; + sha256 = "sha256-edyqxVl8oIwKp/eqFIbu+qn9zhYEnKJKwUbYZ7uxx0I="; }; - vendorSha256 = "sha256-GR40BgNMHi3TXVQVN1FaPNVi0HXYVm3vbg4NTXfYBes="; + vendorSha256 = "sha256-keIzuqaLppu6+XK3MFiU0en+SVxWVLpfkKEKOAVOz7k="; nativeBuildInputs = [ installShellFiles ]; From 0d66d837d3d130c2e9dfb80e6b0cb0a29f85f2f7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 May 2021 06:57:28 +0000 Subject: [PATCH 161/249] kubetail: 1.6.12 -> 1.6.13 --- pkgs/applications/networking/cluster/kubetail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix index 7e6a66eea50..e0ced9e2a8f 100644 --- a/pkgs/applications/networking/cluster/kubetail/default.nix +++ b/pkgs/applications/networking/cluster/kubetail/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kubetail"; - version = "1.6.12"; + version = "1.6.13"; src = fetchFromGitHub { owner = "johanhaleby"; repo = "kubetail"; rev = version; - sha256 = "0hayfd7yvdhd2klfmhvl04hfqk0nfsimjyg3kbq8c5dbgbpz05nd"; + sha256 = "sha256-EkOewNInzEEEgMOffYoRaKwhgYuBXgHaCkVgWg2mIDE="; }; installPhase = '' From aef59d88560e7985bb04be8f48efcc4653d5eea8 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 10 May 2021 19:30:25 +0200 Subject: [PATCH 162/249] buildRebar3: use `rebar3 bare compile` --- .../development/beam-modules/build-rebar3.nix | 23 +- .../tools/build-managers/rebar3/default.nix | 4 +- .../rebar3/rebar3-nix-bootstrap | 228 ------------------ 3 files changed, 6 insertions(+), 249 deletions(-) delete mode 100755 pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap diff --git a/pkgs/development/beam-modules/build-rebar3.nix b/pkgs/development/beam-modules/build-rebar3.nix index 651c024db09..dc882a13318 100644 --- a/pkgs/development/beam-modules/build-rebar3.nix +++ b/pkgs/development/beam-modules/build-rebar3.nix @@ -1,12 +1,10 @@ -{ stdenv, writeText, erlang, rebar3WithPlugins, openssl, libyaml, - pc, lib }: +{ stdenv, writeText, erlang, rebar3WithPlugins, openssl, libyaml, lib }: { name, version , src , setupHook ? null , buildInputs ? [], beamDeps ? [], buildPlugins ? [] , postPatch ? "" -, compilePorts ? false , installPhase ? null , buildPhase ? null , configurePhase ? null @@ -21,7 +19,6 @@ let rebar3 = rebar3WithPlugins { plugins = buildPlugins; - globalPlugins = (if compilePorts then [pc] else []); }; shell = drv: stdenv.mkDerivation { @@ -52,18 +49,9 @@ let rm -f rebar rebar3 '' + postPatch; - configurePhase = '' - runHook preConfigure - ${erlang}/bin/escript ${rebar3.bootstrapper} ${debugInfoFlag} - runHook postConfigure - ''; - buildPhase = '' runHook preBuild - HOME=. rebar3 compile - ${if compilePorts then '' - HOME=. rebar3 pc compile - '' else ""} + HOME=. rebar3 bare compile -path "" runHook postBuild ''; @@ -71,10 +59,9 @@ let runHook preInstall mkdir -p "$out/lib/erlang/lib/${name}-${version}" for reldir in src ebin priv include; do - fd="_build/default/lib/${name}/$reldir" - [ -d "$fd" ] || continue - cp -Hrt "$out/lib/erlang/lib/${name}-${version}" "$fd" - success=1 + [ -d "$reldir" ] || continue + # $out/lib/erlang/lib is a convention used in nixpkgs for compiled BEAM packages + cp -Hrt "$out/lib/erlang/lib/${name}-${version}" "$reldir" done runHook postInstall ''; diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index 95ffc0c957c..5867db0b573 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -19,8 +19,6 @@ let sha256 = "1pcy5m79g0l9l3d8lkbx6cq1w87z1g3sa6wwvgbgraj2v3wkyy5g"; }; - bootstrapper = ./rebar3-nix-bootstrap; - buildInputs = [ erlang ]; postPatch = '' @@ -106,7 +104,7 @@ let })); in stdenv.mkDerivation { pname = "rebar3-with-plugins"; - inherit (rebar3) version bootstrapper; + inherit (rebar3) version; nativeBuildInputs = [ erlang makeWrapper ]; unpackPhase = "true"; diff --git a/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap b/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap deleted file mode 100755 index 8bfbb8fb685..00000000000 --- a/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap +++ /dev/null @@ -1,228 +0,0 @@ -#!/usr/bin/env escript -%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*- -%%! -smp enable -%%% --------------------------------------------------------------------------- -%%% @doc -%%% The purpose of this command is to prepare a rebar3 project so that -%%% rebar3 understands that the dependencies are all already -%%% installed. If you want a hygienic build on nix then you must run -%%% this command before running rebar3. I suggest that you add a -%%% `Makefile` to your project and have the bootstrap command be a -%%% dependency of the build commands. See the nix documentation for -%%% more information. -%%% -%%% This command designed to have as few dependencies as possible so -%%% that it can be a dependency of root level packages like rebar3. To -%%% that end it does many things in a fairly simplistic way. That is -%%% by design. -%%% -%%% ### Assumptions -%%% -%%% This command makes the following assumptions: -%%% -%%% * It is run in a nix-shell or nix-build environment -%%% * that all dependencies have been added to the ERL_LIBS -%%% Environment Variable - --record(data, {version - , debug_info = false - , erl_libs - , root - , name}). - --define(HEX_REGISTRY_PATH, ".cache/rebar3/hex/default/registry"). - -main(Args) -> - {ok, ArgData} = parse_args(Args), - {ok, RequiredData} = gather_required_data_from_the_environment(ArgData), - do_the_bootstrap(RequiredData). - --spec do_the_bootstrap(#data{}) -> ok. -do_the_bootstrap(RequiredData) -> - ok = bootstrap_configs(RequiredData), - ok = bootstrap_libs(RequiredData). - -%% @doc -%% Argument parsing is super simple only because we want to keep the -%% dependencies minimal. For now there can be one entry on the -%% command line: "debug-info" --spec parse_args([string()]) -> #data{}. -parse_args(Args0) -> - PossibleArgs = sets:from_list(["debug-info"]), - Args1 = sets:from_list(Args0), - Result = sets:subtract(Args1, PossibleArgs), - case sets:to_list(Result) of - [] -> - {ok, #data{debug_info = sets:is_element("debug-info", Args1)}}; - UnknownArgs -> - io:format("Unexpected command line arguments passed in: ~p~n", - [UnknownArgs]), - erlang:halt(120) - end. - - --spec bootstrap_configs(#data{}) -> ok. -bootstrap_configs(RequiredData)-> - io:format("Boostrapping app and rebar configurations~n"), - ok = if_single_app_project_update_app_src_version(RequiredData), - ok = if_debug_info_add(RequiredData). - --spec bootstrap_libs(#data{}) -> ok. -bootstrap_libs(#data{erl_libs = ErlLibs}) -> - io:format("Bootstrapping dependent libraries~n"), - Target = "_build/default/lib/", - Paths = string:tokens(ErlLibs, ":"), - CopiableFiles = - lists:foldl(fun(Path, Acc) -> - gather_directory_contents(Path) ++ Acc - end, [], Paths), - lists:foreach(fun (Path) -> - ok = link_app(Path, Target) - end, CopiableFiles). - --spec gather_dependency(string()) -> [{string(), string()}]. -gather_dependency(Path) -> - FullLibrary = filename:join(Path, "lib/erlang/lib/"), - case filelib:is_dir(FullLibrary) of - true -> - gather_directory_contents(FullLibrary); - false -> - [raw_hex(Path)] - end. - --spec raw_hex(string()) -> {string(), string()}. -raw_hex(Path) -> - [_, Name] = re:split(Path, "-hex-source-"), - {Path, erlang:binary_to_list(Name)}. - --spec gather_directory_contents(string()) -> [{string(), string()}]. -gather_directory_contents(Path) -> - {ok, Names} = file:list_dir(Path), - lists:map(fun(AppName) -> - {filename:join(Path, AppName), fixup_app_name(AppName)} - end, Names). - -%% @doc -%% Makes a symlink from the directory pointed at by Path to a -%% directory of the same name in Target. So if we had a Path of -%% {`foo/bar/baz/bash`, `baz`} and a Target of `faz/foo/foos`, the symlink -%% would be `faz/foo/foos/baz`. --spec link_app({string(), string()}, string()) -> ok. -link_app({Path, TargetFile}, TargetDir) -> - Target = filename:join(TargetDir, TargetFile), - make_symlink(Path, Target). - --spec make_symlink(string(), string()) -> ok. -make_symlink(Path, TargetFile) -> - file:delete(TargetFile), - ok = filelib:ensure_dir(TargetFile), - io:format("Making symlink from ~s to ~s~n", [Path, TargetFile]), - ok = file:make_symlink(Path, TargetFile). - -%% @doc -%% This takes an app name in the standard OTP - format -%% and returns just the app name. Why? Because rebar doesn't -%% respect OTP conventions in some cases. --spec fixup_app_name(string()) -> string(). -fixup_app_name(FileName) -> - case string:tokens(FileName, "-") of - [Name] -> Name; - [Name, _Version] -> Name; - [Name, _Version, _Tag] -> Name - end. - --spec gather_required_data_from_the_environment(#data{}) -> {ok, #data{}}. -gather_required_data_from_the_environment(ArgData) -> - {ok, ArgData#data{ version = guard_env("version") - , erl_libs = get_env("ERL_LIBS", []) - , root = code:root_dir() - , name = guard_env("name") - }}. - --spec nix2bool(any()) -> boolean(). -nix2bool("1") -> - true; -nix2bool("") -> - false. - -get_env(Name) -> - os:getenv(Name). -get_env(Name, Def) -> - case get_env(Name) of - false -> Def; - Val -> Val - end. - --spec guard_env(string()) -> string(). -guard_env(Name) -> - case get_env(Name) of - false -> - stderr("Expected Environment variable ~s! Are you sure you are " - "running in a Nix environment? Either a nix-build, " - "nix-shell, etc?~n", [Name]), - erlang:halt(1); - Variable -> - Variable - end. - -%% @doc -%% If debug info is set we need to add debug info to the list of compile options -%% --spec if_debug_info_add(#data{}) -> ok. -if_debug_info_add(#data{debug_info = true}) -> - ConfigTerms = add_debug_info(read_rebar_config()), - Text = lists:map(fun(Term) -> io_lib:format("~tp.~n", [Term]) end, - ConfigTerms), - file:write_file("rebar.config", Text); -if_debug_info_add(_) -> - ok. - --spec add_debug_info([term()]) -> [term()]. -add_debug_info(Config) -> - ExistingOpts = case lists:keysearch(erl_opts, 1, Config) of - {value, {erl_opts, ExistingOptsList}} -> ExistingOptsList; - _ -> [] - end, - case lists:member(debug_info, ExistingOpts) of - true -> - Config; - false -> - lists:keystore(erl_opts, 1, Config, - {erl_opts, [debug_info | ExistingOpts]}) - end. - --spec read_rebar_config() -> [term()]. -read_rebar_config() -> - case file:consult("rebar.config") of - {ok, Terms} -> - Terms; - _ -> - stderr("Unable to read rebar config!", []), - erlang:halt(1) - end. - - --spec if_single_app_project_update_app_src_version(#data{}) -> ok. -if_single_app_project_update_app_src_version(#data{name = Name, - version = Version}) -> - SrcFile = filename:join("src", - lists:concat([Name, ".app.src"])), - - case filelib:is_file(SrcFile) of - true -> - update_app_src_with_version(SrcFile, Version); - false -> - ok - end. - --spec update_app_src_with_version(string(), string()) -> ok. -update_app_src_with_version(SrcFile, Version) -> - {ok, [{application, Name, Details}]} = file:consult(SrcFile), - NewDetails = lists:keyreplace(vsn, 1, Details, {vsn, Version}), - ok = file:write_file(SrcFile, io_lib:fwrite("~p.\n", [{application, Name, NewDetails}])). - -%% @doc -%% Write the result of the format string out to stderr. --spec stderr(string(), [term()]) -> ok. -stderr(FormatStr, Args) -> - io:put_chars(standard_error, io_lib:format(FormatStr, Args)). From ec749d81e554fa9275541c279fd6a89042d501e5 Mon Sep 17 00:00:00 2001 From: David Date: Wed, 12 May 2021 18:21:21 +0200 Subject: [PATCH 163/249] pc: 0.6.0 => 1.12.0 --- pkgs/development/beam-modules/pc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/beam-modules/pc/default.nix b/pkgs/development/beam-modules/pc/default.nix index a6d7c1c44de..2896a325e0e 100644 --- a/pkgs/development/beam-modules/pc/default.nix +++ b/pkgs/development/beam-modules/pc/default.nix @@ -2,8 +2,8 @@ buildHex { name = "pc"; - version = "1.6.0"; - sha256 = "0xq411ig5ny3iilkkkqa4vm3w3dgjc9cfzkqwk8pm13dw9mcm8h0"; + version = "1.12.0"; + sha256 = "1gdvixy4j560qjdiv5qjgnl5wl3rrn231dv1m4vdq4b9l4g4p27x"; meta = { description = "a rebar3 port compiler for native code"; From 9f4878daca087b60e8b5cdff2000042299d33ca0 Mon Sep 17 00:00:00 2001 From: David Date: Wed, 12 May 2021 21:47:29 +0200 Subject: [PATCH 164/249] fix lfe --- .../interpreters/lfe/fix-rebar-config.patch | 29 +++++++++++++++++++ .../interpreters/lfe/generic-builder.nix | 2 +- .../interpreters/lfe/no-test-deps.patch | 13 --------- 3 files changed, 30 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/interpreters/lfe/fix-rebar-config.patch delete mode 100644 pkgs/development/interpreters/lfe/no-test-deps.patch diff --git a/pkgs/development/interpreters/lfe/fix-rebar-config.patch b/pkgs/development/interpreters/lfe/fix-rebar-config.patch new file mode 100644 index 00000000000..ac385351b1c --- /dev/null +++ b/pkgs/development/interpreters/lfe/fix-rebar-config.patch @@ -0,0 +1,29 @@ +diff --git a/rebar.config b/rebar.config +index 1d5a68e..a86ee39 100644 +--- a/rebar.config ++++ b/rebar.config +@@ -2,20 +2,20 @@ + + {erl_opts, [debug_info]}. + +-{profiles, [{test, [{deps, [proper]}]}]}. ++%%{profiles, [{test, [{deps, [proper]}]}]}. + + {pre_hooks, [{"(linux|darwin|solaris|freebsd|netbsd|openbsd)", ct, + "bin/lfe bin/lfec" +- " -o $REBAR_DEPS_DIR/lfe/test" ++ " -o test" + " test/*_SUITE.lfe"}, + {"(linux|darwin|solaris|freebsd|netbsd|openbsd)", eunit, + "bin/lfe bin/lfec" +- " -o $REBAR_DEPS_DIR/lfe/ebin" ++ " -o ebin" + " test/clj-tests.lfe"}, + %% TODO: Test this on a win32 box + %% {"win32", ct, + %% "bin/lfe bin/lfec -o $REBAR_DEPS_DIR/lfe/test test/*_SUITE.lfe"} + {"(linux|darwin|solaris|freebsd|netbsd|openbsd)", app_compile, +- "bin/lfe bin/lfec -o $REBAR_DEPS_DIR/lfe/ebin src/*.lfe"} ++ "bin/lfe bin/lfec -o ebin src/*.lfe"} + %% TODO: equivalent win32 hook + ]}. diff --git a/pkgs/development/interpreters/lfe/generic-builder.nix b/pkgs/development/interpreters/lfe/generic-builder.nix index 397be81e7c8..62056896745 100644 --- a/pkgs/development/interpreters/lfe/generic-builder.nix +++ b/pkgs/development/interpreters/lfe/generic-builder.nix @@ -39,7 +39,7 @@ buildRebar3 { buildInputs = [ erlang makeWrapper ]; beamDeps = [ proper ]; - patches = [ ./no-test-deps.patch ./dedup-ebins.patch ] ++ patches; + patches = [ ./fix-rebar-config.patch ./dedup-ebins.patch ] ++ patches; doCheck = true; checkTarget = "travis"; diff --git a/pkgs/development/interpreters/lfe/no-test-deps.patch b/pkgs/development/interpreters/lfe/no-test-deps.patch deleted file mode 100644 index 8c3faf1ff40..00000000000 --- a/pkgs/development/interpreters/lfe/no-test-deps.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/rebar.config b/rebar.config -index 1d5a68e..ca33be7 100644 ---- a/rebar.config -+++ b/rebar.config -@@ -2,7 +2,7 @@ - - {erl_opts, [debug_info]}. - --{profiles, [{test, [{deps, [proper]}]}]}. -+%% {profiles, [{test, [{deps, [proper]}]}]}. - - {pre_hooks, [{"(linux|darwin|solaris|freebsd|netbsd|openbsd)", ct, - "bin/lfe bin/lfec" From 0bae4a3992056daa839a3da819e4f8b4cf2da7d7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 May 2021 02:40:40 +0000 Subject: [PATCH 165/249] dpt-rp1-py: 0.1.12 -> 0.1.13 --- pkgs/tools/misc/dpt-rp1-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/dpt-rp1-py/default.nix b/pkgs/tools/misc/dpt-rp1-py/default.nix index d4ad2dffd82..52038c8efa9 100644 --- a/pkgs/tools/misc/dpt-rp1-py/default.nix +++ b/pkgs/tools/misc/dpt-rp1-py/default.nix @@ -1,13 +1,13 @@ { lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "dpt-rp1-py"; - version = "0.1.12"; + version = "0.1.13"; src = fetchFromGitHub { owner = "janten"; repo = pname; rev = "v${version}"; - sha256 = "0xw853s5bx2lr57w6ldfjzi1ppc6px66zd7hzk8y2kg82q6bnasq"; + sha256 = "1jgkfn5kfnx98xs0dmym1h9mv1mrzlglk7x0fzs2jlc56c18w9dk"; }; doCheck = false; From 1c563249ea79e8ec35450d8805f187edefeb4bfa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 May 2021 11:38:28 +0000 Subject: [PATCH 166/249] linuxPackages.bpftrace: 0.12.0 -> 0.12.1 --- pkgs/os-specific/linux/bpftrace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index 3a18202c6c0..650e85df517 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "bpftrace"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "iovisor"; repo = "bpftrace"; rev = "v${version}"; - sha256 = "0njbixkrpdl9gjnkzg0ybmqsva0ydfda5vms66v8ij7xida2qy07"; + sha256 = "sha256-DZO47AH506DBVH/AuvOF3JfpRxv/D/lmzVg8WOH9Dqo="; }; buildInputs = with llvmPackages; From 1dd189caea399cca5620da1e7a813ab37bce11ed Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 May 2021 12:31:46 +0000 Subject: [PATCH 167/249] dnsdist: 1.5.1 -> 1.5.2 --- pkgs/servers/dns/dnsdist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix index a6a365c13da..0424880c08e 100644 --- a/pkgs/servers/dns/dnsdist/default.nix +++ b/pkgs/servers/dns/dnsdist/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "dnsdist"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { url = "https://downloads.powerdns.com/releases/dnsdist-${version}.tar.bz2"; - sha256 = "1wgv19b6y4fp5x1z54psaaialji2rckl5vdh156kyw47k9r5krya"; + sha256 = "sha256-K9e1M9Lae7RWY8amLkftDS8Zigd/WNxzDEY7eXNjZ0k="; }; nativeBuildInputs = [ pkg-config protobuf ]; From f1d2aad2987c47b302eadd7e4c5807c1c7654bf3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 May 2021 02:28:01 +0000 Subject: [PATCH 168/249] code-minimap: 0.5.1 -> 0.6.0 --- pkgs/tools/misc/code-minimap/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/code-minimap/default.nix b/pkgs/tools/misc/code-minimap/default.nix index cd0be4fa99b..560ad460471 100644 --- a/pkgs/tools/misc/code-minimap/default.nix +++ b/pkgs/tools/misc/code-minimap/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "code-minimap"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5YNY0MRlKKX6u32Id6J7bIPSHRi44TISoKqpAS9T8ow="; + sha256 = "sha256-nWfvRrKkUrr2owv9sLgORVPYp68/Ibdu/P1VddMb61s="; }; - cargoSha256 = "sha256-87aRZC4OE3UTVToHi5XDBxVqEH4oFeFR4REf69OBkIw="; + cargoSha256 = "sha256-OmWn6Z/r/gXMD4gp/TDo0Hokliq8Qgb354q8ZFpVG2s="; buildInputs = lib.optional stdenv.isDarwin libiconv; From af7e2ffec4c9e8d5545353c43b44ddb91cc74fc6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 May 2021 01:57:41 +0000 Subject: [PATCH 169/249] codeql: 2.5.3 -> 2.5.4 --- pkgs/development/tools/analysis/codeql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index fb0cf4217ab..687d928fce3 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.5.3"; + version = "2.5.4"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-+bVbl6cuWrG+75AN5a1SUI8AXJq8ThnOpITPf6S2uEI="; + sha256 = "sha256-UYiyF0Ij6zWjJUs7GZtUVTZbFQmN21/O/64X4JV5+O4="; }; nativeBuildInputs = [ From de56376315586c629a6e5e65430129503cc7ebe7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 May 2021 12:15:36 +0000 Subject: [PATCH 170/249] eksctl: 0.47.0 -> 0.48.0 --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index ecfa1675a4e..57bc14ba900 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.47.0"; + version = "0.48.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-fJL6Fs2rt3Q26cUww0Ca/FZnRN7/KHtp9mHUrpwTLuY="; + sha256 = "sha256-jhf+FIhKkROyNUYh96zFrzxE5hVFnxF6xrTwvivj9B8="; }; - vendorSha256 = "sha256-SeO5RNpGrA28xOKr7EoRtMtyOlAPFYEAFtodhIbe1Zk="; + vendorSha256 = "sha256-U5NAhhum+VsSlhB3pHMmnkaqjWvZJw4BDHVIo4YIkrY="; doCheck = false; From b0b023a94095fbb4b067ba5b6727d02eb23a57db Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 May 2021 03:58:23 +0000 Subject: [PATCH 171/249] emulsion: 8.0 -> 9.0 --- pkgs/applications/graphics/emulsion/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/emulsion/default.nix b/pkgs/applications/graphics/emulsion/default.nix index 465e78e434c..3012250b9ce 100644 --- a/pkgs/applications/graphics/emulsion/default.nix +++ b/pkgs/applications/graphics/emulsion/default.nix @@ -37,16 +37,16 @@ let in rustPlatform.buildRustPackage rec { pname = "emulsion"; - version = "8.0"; + version = "9.0"; src = fetchFromGitHub { owner = "ArturKovacs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xv3q59HobunrFyc+CPLztpsQd20Eu4+JI+iYhlGI0bc="; + sha256 = "sha256-Cdi+PQDHxMQG7t7iwDi6UWfDwQjjA2yiOf9p/ahBlOw="; }; - cargoSha256 = "sha256-37xtdFbtbfGUqaSpzlxDQfe1+0ESHz/rgO1iTPBEBLc="; + cargoSha256 = "sha256-2wiLamnGqACx1r4WJbWPCN3tvhww/rRWz8fcvAbjYE0="; nativeBuildInputs = [ installShellFiles From e529976fbc78f800788a94843c56a9b8782d5dc6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 May 2021 09:18:53 +0000 Subject: [PATCH 172/249] twitterBootstrap: 4.6.0 -> 5.0.0 --- pkgs/development/web/twitter-bootstrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/development/web/twitter-bootstrap/default.nix index b8a9f94a23f..b8a7e6a4b8f 100644 --- a/pkgs/development/web/twitter-bootstrap/default.nix +++ b/pkgs/development/web/twitter-bootstrap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bootstrap"; - version = "4.6.0"; + version = "5.0.0"; src = fetchurl { url = "https://github.com/twbs/bootstrap/releases/download/v${version}/${pname}-${version}-dist.zip"; - sha256 = "sha256-CiEUUa0mCrUSp+XCoWNs8plJxhWHZZD+K+UBJSDu1CM="; + sha256 = "sha256-CsPvq8exUL2k/b/QK9c2S68DIsDDR8qxho0WgDJ3/Vs="; }; nativeBuildInputs = [ unzip ]; From 23d1505f890e5a8473375da75d31890e4e5c288f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 10 May 2021 10:13:31 +0200 Subject: [PATCH 173/249] libjcat: 0.1.6 -> 0.1.7 --- pkgs/development/libraries/libjcat/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix index 2e75894eb83..f027fbe3cb8 100644 --- a/pkgs/development/libraries/libjcat/default.nix +++ b/pkgs/development/libraries/libjcat/default.nix @@ -8,7 +8,6 @@ , gpgme , gobject-introspection , vala -, help2man , gtk-doc , meson , ninja @@ -19,7 +18,7 @@ stdenv.mkDerivation rec { pname = "libjcat"; - version = "0.1.6"; + version = "0.1.7"; outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ]; @@ -27,7 +26,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libjcat"; rev = version; - sha256 = "sha256-X+mFl0YZpnt6zzvVTGZN7PROVUaQ8ZmU3T0EgyoZX6g="; + sha256 = "sha256-WYCYRFjjy9nr1p1SqzBGCBZ5vkhFybddXpHUcwdEDIQ="; }; patches = [ @@ -43,7 +42,6 @@ stdenv.mkDerivation rec { docbook-xsl-nons gobject-introspection vala - help2man gtk-doc (python3.withPackages (pkgs: with pkgs; [ setuptools From 69ce7c4987ed2aa0c9bb4d365f290e42c3c566e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Mon, 17 May 2021 22:30:35 +0200 Subject: [PATCH 174/249] muso: fix darwin build --- pkgs/applications/audio/muso/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/muso/default.nix b/pkgs/applications/audio/muso/default.nix index 436afac7df2..67569ccfb99 100644 --- a/pkgs/applications/audio/muso/default.nix +++ b/pkgs/applications/audio/muso/default.nix @@ -1,5 +1,5 @@ -{ lib, fetchFromGitHub, rustPlatform -, pkg-config, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, rustPlatform +, pkg-config, wrapGAppsHook, CoreServices }: rustPlatform.buildRustPackage rec { @@ -14,6 +14,7 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + buildInputs = lib.optional stdenv.isDarwin CoreServices; preConfigure = '' substituteInPlace lib/utils.rs \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7916e7d3211..9ef39a1c7b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25271,7 +25271,9 @@ in mupdf = callPackage ../applications/misc/mupdf { }; mupdf_1_17 = callPackage ../applications/misc/mupdf/1.17.nix { }; - muso = callPackage ../applications/audio/muso { }; + muso = callPackage ../applications/audio/muso { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; mystem = callPackage ../applications/misc/mystem { }; From 161b02937d93ee3dca80a05ff83a991615409b45 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 May 2021 15:51:36 +0000 Subject: [PATCH 175/249] gtkwave: 3.3.108 -> 3.3.109 --- pkgs/applications/science/electronics/gtkwave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 3a3994d9ad6..af5441f07e2 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gtkwave"; - version = "3.3.108"; + version = "3.3.109"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz"; - sha256 = "sha256-LtlexZKih+Si/pH3oQpWdpzfZ6j+41Otgfx7nLMfFSQ="; + sha256 = "sha256-NUYezNm4tEcMqnirmo8U7Ky8ye/2MDPY3OWAk+eG3rc="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; From 728bdf71db65e324a1b869fd28d2e2e00fa7aa37 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 May 2021 01:34:54 +0000 Subject: [PATCH 176/249] cargo-udeps: 0.1.20 -> 0.1.21 --- pkgs/development/tools/rust/cargo-udeps/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index 9fadea3f31c..968a6ce457f 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.20"; + version = "0.1.21"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1gAkc8x9rl80xkFWR2iKYOjkHplWUPWQZDbE8U5gkOM="; + sha256 = "sha256-Voei7j3WRDu70NkcJvjqPJ4ikOUupOhvFNEHHRyF6/Q="; }; - cargoSha256 = "sha256-APUQYqC0MYNeeuehkQvxQsjOnXBgvEMNBqfoUy2KH0U="; + cargoSha256 = "sha256-zMya7bEehNKIfwQtJ252sflg06P4Ra8/lgBjn4UUqRg="; nativeBuildInputs = [ pkg-config ]; From b09fc82382220229be3f13176a9bc292ad18dda5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 17 May 2021 22:49:45 +0200 Subject: [PATCH 177/249] nixos/release-combined: fix a test name Broken by 513143fe4 and breaking evaluation of trunk-combined jobset. --- nixos/release-combined.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 9358d223c01..34183c0ba9f 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -90,7 +90,7 @@ in rec { (onFullSupported "nixos.tests.keymap.azerty") (onFullSupported "nixos.tests.keymap.colemak") (onFullSupported "nixos.tests.keymap.dvorak") - (onFullSupported "nixos.tests.keymap.dvp") + (onFullSupported "nixos.tests.keymap.dvorak-programmer") (onFullSupported "nixos.tests.keymap.neo") (onFullSupported "nixos.tests.keymap.qwertz") (onFullSupported "nixos.tests.latestKernel.login") From 50fbc6b6b329569eefb34e100321ba4500b55672 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 May 2021 16:02:57 +0000 Subject: [PATCH 178/249] git-secret: 0.3.3 -> 0.4.0 --- .../version-management/git-and-tools/git-secret/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix index 3143d7ef9c3..e3845af8926 100644 --- a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg, gawk }: let - version = "0.3.3"; + version = "0.4.0"; repo = "git-secret"; in stdenv.mkDerivation { @@ -11,7 +11,7 @@ in stdenv.mkDerivation { inherit repo; owner = "sobolevn"; rev = "v${version}"; - sha256 = "0hc7yavcp8jmn6b7wngjqhy8kl7f4191sfpik8ycvqghkvvimxj4"; + sha256 = "sha256-Mtuj+e/yCDr4XkmYkWUFJB3cqOT5yOMOq9P/QJV1S80="; }; nativeBuildInputs = [ makeWrapper ]; From 73c7f50dc15f31720d509e1303a57121e1a7a4b5 Mon Sep 17 00:00:00 2001 From: Konstantin Alekseev Date: Mon, 17 May 2021 12:21:44 +0300 Subject: [PATCH 179/249] postgresqlPackages.timescaledb: fix darwin build --- pkgs/servers/sql/postgresql/ext/timescaledb.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index ccaf103adef..7d90bdbcc72 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, postgresql, openssl }: +{ lib, stdenv, fetchFromGitHub, cmake, postgresql, openssl, libkrb5 }: # # To enable on NixOS: # config.services.postgresql = { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "2.2.1"; nativeBuildInputs = [ cmake ]; - buildInputs = [ postgresql openssl ]; + buildInputs = [ postgresql openssl libkrb5 ]; src = fetchFromGitHub { owner = "timescale"; From dd60bd342290e9d91d0b635a61ab80e5be8a4c56 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 May 2021 16:08:46 +0000 Subject: [PATCH 180/249] gnustep.make: 2.8.0 -> 2.9.0 --- pkgs/desktops/gnustep/make/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnustep/make/default.nix b/pkgs/desktops/gnustep/make/default.nix index f571a3c4862..f96eb7388b3 100644 --- a/pkgs/desktops/gnustep/make/default.nix +++ b/pkgs/desktops/gnustep/make/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, clang, which, libobjc }: let - version = "2.8.0"; + version = "2.9.0"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${version}.tar.gz"; - sha256 = "0pfaylrr3xgn5026anmja4rv4l7nzzaqsrkxycyi0p4lvm12kklz"; + sha256 = "sha256-oLBmwRJXh5x8hTEd6mnGf23HQe8znbZRT4W2SZLEDSo="; }; configureFlags = [ From 546e892ebc9b321afc0ca8ffd2ba33eeadd3ee53 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 3 May 2021 00:34:43 +0000 Subject: [PATCH 181/249] android-udev-rules: 20210425 -> 20210501 --- pkgs/os-specific/linux/android-udev-rules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index d41c3e2dc33..fbe02d69f1a 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "android-udev-rules"; - version = "20210425"; + version = "20210501"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "sha256-crNK6mZCCqD/Lm3rNtfH/4F48RuQCqHWP+qsTNVLOGY="; + sha256 = "sha256-rlTulWclPqMl9LdHdcAtLARXGItiSeF3RX+neZrjgV4="; }; installPhase = '' From 1d5d237cf923579f55ba79adfc048c4e04494821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Mon, 17 May 2021 22:01:05 +0200 Subject: [PATCH 182/249] l-smash: fix darwin build --- pkgs/development/libraries/l-smash/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/l-smash/default.nix b/pkgs/development/libraries/l-smash/default.nix index b1b5fd01206..40eb4bd10d3 100644 --- a/pkgs/development/libraries/l-smash/default.nix +++ b/pkgs/development/libraries/l-smash/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which ]; + configureFlags = [ + "--cc=cc" + "--cross-prefix=${stdenv.cc.targetPrefix}" + ]; + meta = with lib; { homepage = "http://l-smash.github.io/l-smash/"; description = "MP4 container utilities"; From 29fe52f3bd63018527cd0bb1aa659346375dbf7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Mon, 17 May 2021 22:14:49 +0200 Subject: [PATCH 183/249] microsoft_gsl: fix darwin build --- pkgs/development/libraries/microsoft_gsl/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/microsoft_gsl/default.nix b/pkgs/development/libraries/microsoft_gsl/default.nix index af1c1c91a94..5a5257168eb 100644 --- a/pkgs/development/libraries/microsoft_gsl/default.nix +++ b/pkgs/development/libraries/microsoft_gsl/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { buildPhase = if nativeBuild then "make" else "true"; # https://github.com/microsoft/GSL/issues/806 - cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-Wno-catch-value" ]; + cmakeFlags = lib.optionals stdenv.cc.isGNU + [ "-DCMAKE_CXX_FLAGS=-Wno-catch-value" ]; installPhase = '' mkdir -p $out/include From 6207e75a0041d9cef890b9d710fc49e462e64a1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Mon, 17 May 2021 22:10:21 +0200 Subject: [PATCH 184/249] macchina: fix darwin build --- pkgs/tools/misc/macchina/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/macchina/default.nix b/pkgs/tools/misc/macchina/default.nix index 42a83f91df6..8d40200a9a7 100644 --- a/pkgs/tools/misc/macchina/default.nix +++ b/pkgs/tools/misc/macchina/default.nix @@ -1,4 +1,5 @@ -{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles +, libiconv, Foundation }: rustPlatform.buildRustPackage rec { pname = "macchina"; @@ -14,6 +15,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-OfOh0YXeLT/kBuR9SOV7pHa8Z4b6+JvtVwqqwd1hCJY="; nativeBuildInputs = [ installShellFiles ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; postInstall = '' installShellCompletion target/completions/*.{bash,fish} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ef39a1c7b2..0b3c35c18b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6575,7 +6575,9 @@ in macchanger = callPackage ../os-specific/linux/macchanger { }; - macchina = callPackage ../tools/misc/macchina { }; + macchina = callPackage ../tools/misc/macchina { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; madlang = haskell.lib.justStaticExecutables haskellPackages.madlang; From db2815a9da3aa820c3aaefd4e991233b37dc972e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 May 2021 02:56:31 +0000 Subject: [PATCH 185/249] ddccontrol-db: 20201221 -> 20210505 --- pkgs/data/misc/ddccontrol-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index 2212b158c8a..d79fc73d61b 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol-db"; - version = "20201221"; + version = "20210505"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol-db"; rev = version; - sha256 = "1sryyjjad835mwc7a2avbij6myln8b824kjdr78gc9hh3p16929b"; + sha256 = "sha256-k0Bcf1I/g2sFnX3y4qyWG7Z3W7K6YeZ9trUFSJ4NhSo="; }; preConfigure = '' From 45e19f23d35f199ef252957c1bb7d010115accd0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 May 2021 03:47:34 +0000 Subject: [PATCH 186/249] fluent-bit: 1.7.4 -> 1.7.5 --- pkgs/tools/misc/fluent-bit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index d51676f4a5a..89435e76989 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "sha256-xOrEPZ+AUihVVaxrqCCeO6n3XFkVahCzHOuX947LRFs="; + sha256 = "sha256-n7X6VlNZVsL+Tn9t3L4mTblVjPTKgTMmcRdkDGPXI8U="; }; nativeBuildInputs = [ cmake flex bison ]; From aba67c5de5c625d6d5ffa2916c6da43cdf0d2c6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Mon, 17 May 2021 21:05:00 +0200 Subject: [PATCH 187/249] logtop: fix darwin build --- pkgs/tools/misc/logtop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/logtop/default.nix b/pkgs/tools/misc/logtop/default.nix index 855a85f53aa..2113da9976f 100644 --- a/pkgs/tools/misc/logtop/default.nix +++ b/pkgs/tools/misc/logtop/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses uthash ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installFlags = [ "DESTDIR=$(out)" ]; postConfigure = '' From 0776eae5ae9456923903b42a2804984fd627d14b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Mon, 17 May 2021 20:52:30 +0200 Subject: [PATCH 188/249] libvncserver: fix darwin build --- pkgs/development/libraries/libvncserver/default.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix index 7c8d4a76fc9..01a079a2051 100644 --- a/pkgs/development/libraries/libvncserver/default.nix +++ b/pkgs/development/libraries/libvncserver/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchzip, fetchpatch, cmake , libjpeg, openssl, zlib, libgcrypt, libpng -, systemd +, systemd, Carbon }: let @@ -19,10 +19,11 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ - libjpeg openssl libgcrypt libpng - ] ++ lib.optional stdenv.isLinux systemd; + buildInputs = [ libjpeg openssl libgcrypt libpng ] + ++ lib.optional stdenv.isLinux systemd + ++ lib.optional stdenv.isDarwin Carbon; propagatedBuildInputs = [ zlib ]; + meta = { inherit (s) version; description = "VNC server library"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b3c35c18b1..5f7376fc183 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16589,7 +16589,9 @@ in libvmaf = callPackage ../development/libraries/libvmaf { }; - libvncserver = callPackage ../development/libraries/libvncserver {}; + libvncserver = callPackage ../development/libraries/libvncserver { + inherit (darwin.apple_sdk.frameworks) Carbon; + }; libviper = callPackage ../development/libraries/libviper { }; From a975c80f9109d7dba883cdcab212bd7456480cfd Mon Sep 17 00:00:00 2001 From: Uri Baghin Date: Fri, 7 May 2021 12:48:49 +1000 Subject: [PATCH 189/249] bazel-remote: 1.0.0 -> 2.0.1 --- .../bazel/bazel-remote/default.nix | 78 ++----------------- 1 file changed, 7 insertions(+), 71 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index 1dfe784ec25..711b971c2d8 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -1,85 +1,22 @@ -{ buildBazelPackage -, cacert +{ buildGoModule , fetchFromGitHub -, git -, go , lib -, stdenv }: -buildBazelPackage rec { +buildGoModule rec { pname = "bazel-remote"; - version = "1.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "buchgr"; - repo = "bazel-remote"; + repo = pname; rev = "v${version}"; - sha256 = "1fpdw139d5q1377qnqbgkahmdr4mdaa17d2m10wkyvyvijwm4r2m"; + sha256 = "193amcx4nk7mr51jcawym46gizqmfkvksjxm64pf7s3wraf00v01"; }; - nativeBuildInputs = [ go git ]; + vendorSha256 = "1sxv9mya8plkn3hpjgfpzgwlh4m3cbhpywqv86brj2h9i4ad0gl5"; - bazelTarget = "//:bazel-remote"; - - removeRulesCC = false; - - # this is to work around `test -f` failing when called by gazelle - # https://github.com/bazelbuild/bazel-gazelle/blob/v0.19.1/internal/go_repository.bzl#L135 - patches = [ ./disable_build_file_generation.patch ]; - - fetchAttrs = { - preBuild = '' - patchShebangs . - - # tell rules_go to use the Go binary found in the PATH - sed -e 's:go_register_toolchains():go_register_toolchains(go_version = "host"):g' -i WORKSPACE - - # tell rules_go to invoke GIT with custom CAINFO path - export GIT_SSL_CAINFO="${cacert}/etc/ssl/certs/ca-bundle.crt" - - # force gazelle to use the nix go cache rather than its own - # export GO_REPOSITORY_USE_HOST_CACHE=1 - ''; - - preInstall = '' - # Remove the go_sdk (it's just a copy of the go derivation) and all - # references to it from the marker files. Bazel does not need to download - # this sdk because we have patched the WORKSPACE file to point to the one - # currently present in PATH. Without removing the go_sdk from the marker - # file, the hash of it will change anytime the Go derivation changes and - # that would lead to impurities in the marker files which would result in - # a different sha256 for the fetch phase. - rm -rf $bazelOut/external/{go_sdk,\@go_sdk.marker} - sed -e '/^FILE:@go_sdk.*/d' -i $bazelOut/external/\@*.marker - - # Remove the gazelle repository cache as it contains built binaries - chmod -R u+w $bazelOut/external/bazel_gazelle_go_repository_cache - rm -rf $bazelOut/external/{bazel_gazelle_go_repository_cache,\@bazel_gazelle_go_repository_cache.marker} - sed -e '/^FILE:@bazel_gazelle_go_repository_cache.*/d' -i $bazelOut/external/\@*.marker - - # Remove the gazelle tools, they contain go binaries that are built - # non-deterministically. As long as the gazelle version matches the tools - # should be equivalent. - rm -rf $bazelOut/external/{bazel_gazelle_go_repository_tools,\@bazel_gazelle_go_repository_tools.marker} - sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker - ''; - - sha256 = "1vijh3nl30n8k6xlx6in92pzs70x15akbqiqalk8apgvphvdz8vy"; - }; - - buildAttrs = { - preBuild = '' - patchShebangs . - - # tell rules_go to use the Go binary found in the PATH - sed -e 's:go_register_toolchains():go_register_toolchains(go_version = "host"):g' -i WORKSPACE - ''; - - installPhase = '' - install -Dm755 bazel-bin/*_pure_stripped/bazel-remote $out/bin/bazel-remote - ''; - }; + doCheck = false; meta = with lib; { homepage = "https://github.com/buchgr/bazel-remote"; @@ -87,6 +24,5 @@ buildBazelPackage rec { license = licenses.asl20; maintainers = [ maintainers.uri-canva ]; platforms = platforms.darwin ++ platforms.linux; - broken = stdenv.isDarwin; }; } From 3528c4151ee7c124f5a5cb1d01cb8d6a2dd8d62d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 5 May 2021 16:53:44 +0000 Subject: [PATCH 190/249] hivex: 1.3.19 -> 1.3.20 --- pkgs/development/libraries/hivex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index fb77e08ca6b..b151db07df3 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "hivex"; - version = "1.3.19"; + version = "1.3.20"; src = fetchurl { url = "https://libguestfs.org/download/hivex/${pname}-${version}.tar.gz"; - sha256 = "0qppahpf7jq950nf8ial47h90nyqgnsffsj3zgdjjwkn958wq0ji"; + sha256 = "sha256-9SPDe7BkpLq321IkkCw07uT5+rLZuBz2FbMsC4UJ0y0="; }; patches = [ ./hivex-syms.patch ]; From fd47f56b1da741e0312e1721c95f270fab850fde Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Mon, 17 May 2021 11:33:28 -0400 Subject: [PATCH 191/249] python3Packages.aplpy: fix with latest matplotlib --- .../python-modules/aplpy/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aplpy/default.nix b/pkgs/development/python-modules/aplpy/default.nix index e253c610c21..682ef6e17fd 100644 --- a/pkgs/development/python-modules/aplpy/default.nix +++ b/pkgs/development/python-modules/aplpy/default.nix @@ -27,13 +27,26 @@ buildPythonPackage rec { sha256 = "239f3d83635ca4251536aeb577df7c60df77fc4d658097b92094719739aec3f3"; }; - patches = [ (fetchpatch { - # Can be removed in next release after 2.0.3 + patches = [ + # Fixes compatibility with astropy-helpers. This patch has been merged into + # the master branch as of May 2020, and should be part of the next + # upstream release (v2.0.3 was tagged in Feb. 2019). + (fetchpatch { url = "https://github.com/aplpy/aplpy/pull/448.patch"; sha256 = "1pnzh7ykjc8hwahzbzyryrzv5a8fddgd1bmzbhagkrn6lmvhhpvq"; excludes = [ "tox.ini" "azure-pipelines.yml" ".circleci/config.yml" "MANIFEST.in" ".gitignore" "setup.cfg" "appveyor.yml" "readthedocs.yml" "CHANGES.rst" ".gitmodules" ".travis.yml" "astropy_helpers" ]; }) + # Fix for matplotlib >= 3.4 (https://github.com/aplpy/aplpy/pull/466) + # Note: because of a security thing, github will refuse to serve this patch from the + # "normal" location + # (https://github.com/aplpy/aplpy/commit/56c1cc694fdea69e7da8506d3212c4495adb0ca5.patch) + # due to the fact that it contains the PDF magic bytes, but it will serve it from + # this githubusercontent domain. + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/aplpy/aplpy/pull/466/commit/56c1cc694fdea69e7da8506d3212c4495adb0ca5.patch"; + sha256 = "0jna2n1cgfzr0a27m5z94wwph7qg25hs7lycrdb2dp3943rb35g4"; + }) ]; propagatedBuildInputs = [ From c007fb402681460a57a05f314f4c659d409d2f45 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 17 May 2021 23:47:27 +0200 Subject: [PATCH 192/249] gimpPlugins.pluginDerivation: Fix name The name should not contain the gimp version, otherwise parseDrvName will consider it the gimp package. Fixes: https://github.com/NixOS/nixpkgs/issues/114995 --- pkgs/applications/graphics/gimp/plugins/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 307866c377a..2b8dbbc4d28 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -38,7 +38,7 @@ let } // attrs // { - name = "${gimp.name}-plugin-${name}"; + name = "${gimp.pname}-plugin-${name}"; buildInputs = [ gimp gimp.gtk From 9fd18aaad21178ff6263d72b8b791369ccb1c54f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 17 May 2021 07:13:03 -0700 Subject: [PATCH 193/249] makeself: fix tests --- pkgs/applications/misc/makeself/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix index 205d526ed94..e60e110087f 100644 --- a/pkgs/applications/misc/makeself/default.nix +++ b/pkgs/applications/misc/makeself/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, which }: +{ lib, stdenv, fetchFromGitHub, which, zstd, pbzip2 }: stdenv.mkDerivation rec { version = "2.4.2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - checkInputs = [ which ]; + checkInputs = [ which zstd pbzip2 ]; installPhase = '' mkdir -p $out/{bin,share/{${pname}-${version},man/man1}} From a8c374380d39879c1d7fb14849cebfb69680052e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Mon, 17 May 2021 20:49:01 +0200 Subject: [PATCH 194/249] libspnav: fix darwin build --- pkgs/development/libraries/libspnav/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libspnav/default.nix b/pkgs/development/libraries/libspnav/default.nix index fb2a2744d6a..b7136144768 100644 --- a/pkgs/development/libraries/libspnav/default.nix +++ b/pkgs/development/libraries/libspnav/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 ]; configureFlags = [ "--disable-debug"]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; preInstall = '' mkdir -p $out/{lib,include} From 3e7a2aded3793b96305e590f62c308a738e1e7bf Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Mon, 17 May 2021 17:51:55 -0400 Subject: [PATCH 195/249] =?UTF-8?q?texlab:=202.2.2=20=E2=86=92=203.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also removes unused dylib build of html2md dependency, fixing #95568. --- pkgs/development/tools/misc/texlab/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 480c7cfd556..39d64cb74c6 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -8,16 +8,18 @@ rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "2.2.2"; + version = "3.0.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; rev = "v${version}"; - sha256 = "06x7j4ppgw24xbsnyj1icaksngqbvq6mk8wfcqikzmvmifjspx9m"; + hash = "sha256-jOxneMqeyvMQWKPNha59H6qWSFmx+Z71SU2+M5VWMsA="; }; - cargoSha256 = "0gzxylpn2hps0kxczd6wwcqhnvm6ir971bfvpgjr6rxi12hs47ky"; + cargoHash = "sha256-H6czxSTw93RNTaN0OJyv0RfwmGAiFkpDgUtXHCD+jrY="; + + outputs = [ "out" "man" ]; nativeBuildInputs = [ installShellFiles ]; @@ -25,7 +27,14 @@ rustPlatform.buildRustPackage rec { postInstall = '' installManPage texlab.1 - ''; + + # Remove generated dylib of html2md dependency. TexLab statically + # links to the generated rlib and doesn't reference the dylib. I + # couldn't find any way to prevent building this by passing cargo flags. + # See https://gitlab.com/Kanedias/html2md/-/blob/0.2.10/Cargo.toml#L20 + rm "$out/lib/libhtml2md.so" + rmdir "$out/lib" + ''; meta = with lib; { description = "An implementation of the Language Server Protocol for LaTeX"; From 81666e78d107764d4653204515cb275781bcc28d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Apr 2021 20:38:35 +0000 Subject: [PATCH 196/249] openmpt123: 0.5.6 -> 0.5.8 --- pkgs/applications/audio/openmpt123/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index 67b7bd241f3..a5ea91141c3 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -2,14 +2,14 @@ , usePulseAudio ? config.pulseaudio or false, libpulseaudio }: let - version = "0.5.6"; + version = "0.5.8"; in stdenv.mkDerivation { pname = "openmpt123"; inherit version; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "sha256-F96ngrM0wUb0rNlIx8Mf/dKvyJnrNH6+Ab4WBup59Lg="; + sha256 = "sha256-KeLCEXS3P2fyul7naAjWLxgrEw5PcE7i2a6Cg5gtis0="; }; enableParallelBuilding = true; From 2ee5afcf2a527b7a7af89072466f006728d95af1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 May 2021 16:52:21 +0000 Subject: [PATCH 197/249] pantheon.granite: 5.5.0 -> 6.0.0 --- pkgs/desktops/pantheon/granite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix index defb6095a35..3d4dc6bd84a 100644 --- a/pkgs/desktops/pantheon/granite/default.nix +++ b/pkgs/desktops/pantheon/granite/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "granite"; - version = "5.5.0"; + version = "6.0.0"; outputs = [ "out" "dev" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-ytbjuo9RnYyJ9+LqtWE117dGlNErLl+nmTM22xGGDo8="; + sha256 = "sha256-RGukXeFmtnyCfK8pKdvTHL0t8yhEYwAiiPelTy1Xcf0="; }; passthru = { From 2d176b593b731436b4310a74c226775a16d6dee2 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 17 May 2021 23:50:16 +0200 Subject: [PATCH 198/249] gcc*: force building a cross compiler if host and target platform differ gcc's configure system has the nasty habit (for us) of judging for itself if it is building a cross compiler (or cross compiling), but on the limited information of the build, host and target platforms' config which only contains a subset of the information we encode in `stdenv.*Platform`. The practical consequence was that prior to this change building `pkgsLLVM.buildPackages.gcc` actually fails because it refuses to use `--with-headers` with something it believes to not be a cross compiler. As a workaround we force the appropriate variable in the configure script to always be `yes` regardless of its own conditional check. At some point we probably should report this issue in some capacity, so future gcc versions don't force us into workarounds like this and acdc783418538f23cdfb671bc8fd4b1c076979bd. --- pkgs/development/compilers/gcc/10/default.nix | 2 +- pkgs/development/compilers/gcc/11/default.nix | 2 +- pkgs/development/compilers/gcc/4.8/default.nix | 2 +- pkgs/development/compilers/gcc/4.9/default.nix | 2 +- pkgs/development/compilers/gcc/6/default.nix | 2 +- pkgs/development/compilers/gcc/7/default.nix | 2 +- pkgs/development/compilers/gcc/8/default.nix | 2 +- pkgs/development/compilers/gcc/9/default.nix | 2 +- pkgs/development/compilers/gcc/common/pre-configure.nix | 9 ++++++++- 9 files changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 2f7991a9212..aebe7b30f1a 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -186,7 +186,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version hostPlatform gnatboot langAda langGo langJit; + inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit; }; dontDisableStatic = true; diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index 73f3d7b2a97..c9d8663c0c4 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -186,7 +186,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version hostPlatform gnatboot langAda langGo langJit; + inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit; }; dontDisableStatic = true; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 4ed41ba3ca1..86dd9247f5a 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -196,7 +196,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version hostPlatform langJava langGo; + inherit version targetPlatform hostPlatform langJava langGo; }; dontDisableStatic = true; diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 0eb0a85eaff..b7c9e5bcc0a 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -209,7 +209,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version hostPlatform langJava langGo; + inherit version targetPlatform hostPlatform langJava langGo; }; dontDisableStatic = true; diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 32a4ad0dd09..069d9c18a62 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -232,7 +232,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version hostPlatform gnatboot langJava langAda langGo; + inherit version targetPlatform hostPlatform gnatboot langJava langAda langGo; }; dontDisableStatic = true; diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 33edc81ce53..1f153b0fb3a 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -197,7 +197,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version hostPlatform langGo; + inherit version targetPlatform hostPlatform langGo; }; dontDisableStatic = true; diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index dae98afccb9..4d9e216947d 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -183,7 +183,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version hostPlatform langGo; + inherit version targetPlatform hostPlatform langGo; }; dontDisableStatic = true; diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index ebe20e0cba5..09cf7e98db7 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -200,7 +200,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version hostPlatform gnatboot langAda langGo langJit; + inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit; }; dontDisableStatic = true; diff --git a/pkgs/development/compilers/gcc/common/pre-configure.nix b/pkgs/development/compilers/gcc/common/pre-configure.nix index 1c65b4a8ba6..d9977e0ba2f 100644 --- a/pkgs/development/compilers/gcc/common/pre-configure.nix +++ b/pkgs/development/compilers/gcc/common/pre-configure.nix @@ -1,4 +1,4 @@ -{ lib, version, hostPlatform +{ lib, version, hostPlatform, targetPlatform , gnatboot ? null , langAda ? false , langJava ? false @@ -58,3 +58,10 @@ lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' + lib.optionalString (hostPlatform.isDarwin && langJit) '' export STRIP='strip -x' '' + +# HACK: if host and target config are the same, but the platforms are +# actually different we need to convince the configure script that it +# is in fact building a cross compiler although it doesn't believe it. ++ lib.optionalString (targetPlatform.config == hostPlatform.config && targetPlatform != hostPlatform) '' + substituteInPlace configure --replace is_cross_compiler=no is_cross_compiler=yes +'' From a900462807dea6b34b87a0f21f39adcaaa3e6beb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 May 2021 11:40:56 +0000 Subject: [PATCH 199/249] dar: 2.7.0 -> 2.7.1 --- pkgs/tools/backup/dar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index efb81a58adb..067c0136607 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -8,12 +8,12 @@ with lib; stdenv.mkDerivation rec { - version = "2.7.0"; + version = "2.7.1"; pname = "dar"; src = fetchurl { url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz"; - sha256 = "sha256-aJqNi2jZJgQmq0IObbAXZcmK2vvWePvHEUtw8O2nBwo="; + sha256 = "sha256-dtreitvrgX/8eL9ZLIIASHq1ZQI0z1OVOanLxdNGvu8="; }; outputs = [ "out" "dev" ]; From b863a7c8c261b650d2f87479ee30ef8b0fb88135 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 17 May 2021 23:46:07 +0200 Subject: [PATCH 200/249] gccStdenv: actually force gcc if not already used Previously the `cc` of the stdenv wasn't changed if `!stdenv.cc.isGNU` which meant that gccStdenv didn't actually use gcc -- in contrast to all the versioned `gcc*Stdenv`s. --- pkgs/top-level/all-packages.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f7376fc183..45ab94f46e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10402,12 +10402,16 @@ in }; }) else ccWrapper; - gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override { - allowedRequisites = null; - # Remove libcxx/libcxxabi, and add clang for AS if on darwin (it uses - # clang's internal assembler). - extraBuildInputs = lib.optional stdenv.hostPlatform.isDarwin clang.cc; - }; + gccStdenv = + if stdenv.cc.isGNU + then stdenv + else stdenv.override { + cc = buildPackages.gcc; + allowedRequisites = null; + # Remove libcxx/libcxxabi, and add clang for AS if on darwin (it uses + # clang's internal assembler). + extraBuildInputs = lib.optional stdenv.hostPlatform.isDarwin clang.cc; + }; gcc49Stdenv = overrideCC gccStdenv buildPackages.gcc49; gcc6Stdenv = overrideCC gccStdenv buildPackages.gcc6; From e33d2878107b7801735e24255158877e123b1000 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 May 2021 03:39:33 +0000 Subject: [PATCH 201/249] embree: 3.12.2 -> 3.13.0 --- pkgs/development/libraries/embree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix index b5baab5972a..3350c046a51 100644 --- a/pkgs/development/libraries/embree/default.nix +++ b/pkgs/development/libraries/embree/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "embree"; - version = "3.12.2"; + version = "3.13.0"; src = fetchFromGitHub { owner = "embree"; repo = "embree"; rev = "v${version}"; - sha256 = "sha256-aIZAkpAGvE332HxT4rR+rykww/ZLq2qKGLKiZTWyHCk="; + sha256 = "sha256-w93GYslQRg0rvguMKv/CuT3+JzIis2CRbY9jYUFKWOM="; }; postPatch = '' From 2d3225a6c274b1d79a9b8d762e62f63e6c55c45a Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 18 May 2021 00:29:15 +0200 Subject: [PATCH 202/249] ocamlPackages.bap: fix for multiple outputs llvmPackages 7869d1654517c028aa76fc1dedc9b5ac301a867a split all packages in llvmPackages into multiple outputs. The default output of llvm doesn't contain llvm-config, so we need to explicitly choose llvm.dev here. --- pkgs/development/ocaml-modules/bap/default.nix | 2 +- pkgs/top-level/ocaml-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index 94f254a2edf..c1cb7de2d18 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { substituteInPlace oasis/elf-loader --replace bitstring.ppx ppx_bitstring ''; - configureFlags = [ "--enable-everything ${disableIda}" "--with-llvm-config=${llvm}/bin/llvm-config" ]; + configureFlags = [ "--enable-everything ${disableIda}" "--with-llvm-config=${llvm.dev}/bin/llvm-config" ]; meta = with lib; { description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages."; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index e6815abf43c..b58fe1f4294 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -53,7 +53,7 @@ let base64 = callPackage ../development/ocaml-modules/base64 { }; bap = callPackage ../development/ocaml-modules/bap { - llvm = pkgs.llvm_8; + inherit (pkgs.llvmPackages_8) llvm; }; batteries = callPackage ../development/ocaml-modules/batteries { }; From 03ca96ad56c7a720706e0ceaae86b6718b62139b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 18 May 2021 07:03:57 +1000 Subject: [PATCH 203/249] shfmt: 3.2.4 -> 3.3.0 https://github.com/mvdan/sh/releases/tag/v3.3.0 --- pkgs/tools/text/shfmt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix index c6ab5ff9c73..29a5a157a67 100644 --- a/pkgs/tools/text/shfmt/default.nix +++ b/pkgs/tools/text/shfmt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "shfmt"; - version = "3.2.4"; + version = "3.3.0"; src = fetchFromGitHub { owner = "mvdan"; repo = "sh"; rev = "v${version}"; - sha256 = "sha256-BkvsCIcm3qnfECNhY3DIPnBRih6D7rOHOQu9oc0YDZA="; + sha256 = "sha256-pD1nkbBw5NBCyuhn2DYop2AR+1T8p6/zTa6FeWiya7Q="; }; - vendorSha256 = "1ma7nvyn6ylbi8bd7x900i94pzs877kfy9xh0nf1bbify1vcpd29"; + vendorSha256 = "sha256-euJYStN21xFYosouWYXpHN3MWCKR4NT8z6OSonM0HW8="; subPackages = [ "cmd/shfmt" ]; From 570d58be31275e6a2c35de312ccb962086485596 Mon Sep 17 00:00:00 2001 From: Joachim Breitner Date: Tue, 18 May 2021 02:06:41 +0200 Subject: [PATCH 204/249] rust-bindgen: Update cargoSha256 (#123349) Co-authored-by: fortune --- pkgs/development/tools/rust/bindgen/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 9568d8efefc..598d01a8af5 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-0d8+Rkb4h1DoFUQ7u2/kPR/fUUz0YvI+hNT4iXL3mxY="; }; - cargoSha256 = "sha256-cUDOi3QwjEJaBXGSQZQ76gZ702QLNok8fr6U2q+tVao="; + cargoSha256 = "0r60smhlx1992a1s1k5sxjpdqllb2xsqcimgx3ldp5fdkfphk3cw"; #for substituteAll libclang = llvmPackages.libclang.lib; From 49277166584d2218871e017bf1f077bff41f8681 Mon Sep 17 00:00:00 2001 From: Iosmanthus Teng Date: Tue, 18 May 2021 09:06:56 +0800 Subject: [PATCH 205/249] vscode-extensions: remote-ssh acquires user's home directory from `$HOME` (#122595) --- pkgs/misc/vscode-extensions/remote-ssh/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/vscode-extensions/remote-ssh/default.nix b/pkgs/misc/vscode-extensions/remote-ssh/default.nix index 746bb4608ab..29ca973a0aa 100644 --- a/pkgs/misc/vscode-extensions/remote-ssh/default.nix +++ b/pkgs/misc/vscode-extensions/remote-ssh/default.nix @@ -2,7 +2,7 @@ , vscode-utils , useLocalExtensions ? false}: # Note that useLocalExtensions requires that vscode-server is not running -# on host. If it is, you'll need to remove ~/.vscode-server, +# on host. If it is, you'll need to remove $HOME/.vscode-server, # and redo the install by running "Connect to host" on client let @@ -11,7 +11,7 @@ let # patch runs on remote machine hence use of which # links to local node if version is 12 patch = '' - f="/home/''$USER/.vscode-server/bin/''$COMMIT_ID/node" + f="$HOME/.vscode-server/bin/$COMMIT_ID/node" localNodePath=''$(which node) if [ -x "''$localNodePath" ]; then localNodeVersion=''$(node -v) @@ -23,10 +23,10 @@ let fi ${lib.optionalString useLocalExtensions '' # Use local extensions - if [ -d ~/.vscode/extensions ]; then - if ! test -L "~/.vscode-server/extensions"; then - mkdir -p ~/.vscode-server - ln -s ~/.vscode/extensions ~/.vscode-server/ + if [ -d $HOME/.vscode/extensions ]; then + if ! test -L "$HOME/.vscode-server/extensions"; then + mkdir -p $HOME/.vscode-server + ln -s $HOME/.vscode/extensions $HOME/.vscode-server/ fi fi ''} From 97afad785ca180296104dacf7d5dcc7254eae7d4 Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Mon, 17 May 2021 22:27:54 -0300 Subject: [PATCH 206/249] Zettlr: 1.8.7 -> 1.8.9 --- pkgs/applications/misc/zettlr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix index 3d7f5629123..77ff11b9862 100644 --- a/pkgs/applications/misc/zettlr/default.nix +++ b/pkgs/applications/misc/zettlr/default.nix @@ -10,11 +10,11 @@ # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. let pname = "zettlr"; - version = "1.8.7"; + version = "1.8.9"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; - sha256 = "0zbmlk5qk92b3zycs0bmdwgc8fn4a4dv1yvq9q8q2wxz4ammx6c0"; + sha256 = "sha256-1cU9HdPXrJ4ibSjOitO8iJfMIaGub/jjlb2lssYFfcU="; }; appimageContents = appimageTools.extractType2 { inherit name src; From 9c6a26b73494ba7062812761d536b7348a7e2124 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 18 May 2021 02:22:43 +0000 Subject: [PATCH 207/249] deno: 1.10.1 -> 1.10.2 --- pkgs/development/web/deno/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index d1632ebcf5d..98fb32d8d6a 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -16,15 +16,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aNStR86biNHwyg3dSI+CGib3XFhL5ZJ55d29E2K9qd0="; + sha256 = "sha256-uePCEYcYahsxcgA+GDcloqqo+dr7Y2N/9nps6Y79D58="; }; - cargoSha256 = "sha256-JXjiI+fTB0YlnhKO6QfGl4YOEQNfpuWsza2TsM9fwIk="; + cargoSha256 = "sha256-6fm1RWuTVWCE6nKgkC/SRQYRXGf9SGv7kAXWNqsdQS8="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; From 15254515d00dbf54bd97624e6a93fab703bca07b Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 16 May 2021 17:04:35 +0800 Subject: [PATCH 208/249] cantata: clean up options handling --- pkgs/applications/audio/cantata/default.nix | 58 +++++++++------------ 1 file changed, 25 insertions(+), 33 deletions(-) diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 3d594a896cf..45482c4de00 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -54,12 +54,26 @@ let fstat = x: fn: "-DENABLE_${fn}=${if x then "ON" else "OFF"}"; - fstats = x: - map (fstat x); - withUdisks = (withTaglib && withDevices); - perl' = perl.withPackages (ppkgs: with ppkgs; [ URI ]); + options = [ + { names = [ "CDDB" ]; enable = withCddb; pkgs = [ libcddb ]; } + { names = [ "CDPARANOIA" ]; enable = withCdda; pkgs = [ cdparanoia ]; } + { names = [ "DEVICES_SUPPORT" ]; enable = withDevices; pkgs = [ ]; } + { names = [ "DYNAMIC" ]; enable = withDynamic; pkgs = [ ]; } + { names = [ "FFMPEG" "MPG123" "SPEEXDSP" ]; enable = withReplaygain; pkgs = [ ffmpeg speex mpg123 ]; } + { names = [ "HTTPS_SUPPORT" ]; enable = true; pkgs = [ ]; } + { names = [ "HTTP_SERVER" ]; enable = withHttpServer; pkgs = [ ]; } + { names = [ "HTTP_STREAM_PLAYBACK" ]; enable = withHttpStream; pkgs = [ qtmultimedia ]; } + { names = [ "LAME" ]; enable = withLame; pkgs = [ lame ]; } + { names = [ "LIBVLC" ]; enable = withLibVlc; pkgs = [ libvlc ]; } + { names = [ "MTP" ]; enable = withMtp; pkgs = [ libmtp ]; } + { names = [ "MUSICBRAINZ" ]; enable = withMusicbrainz; pkgs = [ libmusicbrainz5 ]; } + { names = [ "ONLINE_SERVICES" ]; enable = withOnlineServices; pkgs = [ ]; } + { names = [ "STREAMS" ]; enable = withStreams; pkgs = [ ]; } + { names = [ "TAGLIB" "TAGLIB_EXTRAS" ]; enable = withTaglib; pkgs = [ taglib taglib_extras ]; } + { names = [ "UDISKS2" ]; enable = withUdisks; pkgs = [ udisks2 ]; } + ]; in mkDerivation rec { @@ -84,38 +98,16 @@ mkDerivation rec { patchShebangs playlists ''; - buildInputs = [ qtbase qtsvg perl' ] - ++ lib.optionals withTaglib [ taglib taglib_extras ] - ++ lib.optionals withReplaygain [ ffmpeg speex mpg123 ] - ++ lib.optional withHttpStream qtmultimedia - ++ lib.optional withCdda cdparanoia - ++ lib.optional withCddb libcddb - ++ lib.optional withLame lame - ++ lib.optional withMtp libmtp - ++ lib.optional withMusicbrainz libmusicbrainz5 - ++ lib.optional withUdisks udisks2 - ++ lib.optional withLibVlc libvlc; + buildInputs = [ + qtbase + qtsvg + (perl.withPackages (ppkgs: with ppkgs; [ URI ])) + ] + ++ lib.flatten (builtins.catAttrs "pkgs" (builtins.filter (e: e.enable) options)); nativeBuildInputs = [ cmake pkg-config qttools ]; - cmakeFlags = lib.flatten [ - (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) - (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ]) - (fstat withHttpStream "HTTP_STREAM_PLAYBACK") - (fstat withCdda "CDPARANOIA") - (fstat withCddb "CDDB") - (fstat withLame "LAME") - (fstat withMtp "MTP") - (fstat withMusicbrainz "MUSICBRAINZ") - (fstat withOnlineServices "ONLINE_SERVICES") - (fstat withDynamic "DYNAMIC") - (fstat withDevices "DEVICES_SUPPORT") - (fstat withHttpServer "HTTP_SERVER") - (fstat withLibVlc "LIBVLC") - (fstat withStreams "STREAMS") - (fstat withUdisks "UDISKS2") - "-DENABLE_HTTPS_SUPPORT=ON" - ]; + cmakeFlags = lib.flatten (map (e: map (f: fstat e.enable f) e.names) options); meta = with lib; { description = "A graphical client for MPD"; From 9a15638c32152b6e75e042405afb50089b9f9803 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 May 2021 04:59:30 +0200 Subject: [PATCH 209/249] python3Packages.pulsectl: 21.5.0 -> 21.5.17 --- pkgs/development/python-modules/pulsectl/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pulsectl/default.nix b/pkgs/development/python-modules/pulsectl/default.nix index 378e37ec69d..8af58a2565e 100644 --- a/pkgs/development/python-modules/pulsectl/default.nix +++ b/pkgs/development/python-modules/pulsectl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pulsectl"; - version = "21.5.0"; + version = "21.5.17"; src = fetchPypi { inherit pname version; - sha256 = "11dw8hij1vzqawlv5l1ax6i2zw6p4ccn4ww3v6q1kdmrwk46vi7r"; + sha256 = "1826wz4d7qnlwl5csnjds1xh9ainicj2s004hlwv54bdvwx2ny1z"; }; patches = [ @@ -24,7 +24,8 @@ buildPythonPackage rec { checkInputs = [ pulseaudio ]; checkPhase = '' - ${python.interpreter} -m unittest pulsectl.tests.all + export HOME=$TMPDIR + ${python.interpreter} -m unittest discover ''; meta = with lib; { From fc2e0709f03fe1d364a43ebc280ee509c3340217 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 7 May 2021 09:19:32 +0200 Subject: [PATCH 210/249] openxray: 784-october-preview -> 822-december-preview --- pkgs/games/openxray/default.nix | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/games/openxray/default.nix b/pkgs/games/openxray/default.nix index e4a742d821c..58c82aec365 100644 --- a/pkgs/games/openxray/default.nix +++ b/pkgs/games/openxray/default.nix @@ -3,14 +3,14 @@ , pcre, makeWrapper, fetchpatch }: let - version = "784-october-preview"; + version = "822-december-preview"; src = fetchFromGitHub { owner = "OpenXRay"; repo = "xray-16"; rev = version; - sha256 = "0q0h70gbpscdvn45wpxicljj4ji3cd2maijd5b7jhr1695h61q5y"; fetchSubmodules = true; + sha256 = "06f3zjnib7hipyl3hnc6mwcj9f50kbwn522wzdjydz8qgdg60h3m"; }; # https://github.com/OpenXRay/xray-16/issues/518 @@ -20,7 +20,7 @@ let inherit src; - postUnpack = "sourceRoot+=/Externals/cryptopp"; + sourceRoot = "source/Externals/cryptopp"; makeFlags = [ "PREFIX=${placeholder "out"}" ]; enableParallelBuilding = true; @@ -35,25 +35,30 @@ let }; }; in stdenv.mkDerivation rec { - pname = "OpenXRay"; + pname = "openxray"; inherit version src; - hardeningDisable = [ "format" ]; - cmakeFlags = [ "-DCMAKE_INCLUDE_PATH=${cryptopp}/include/cryptopp" ]; - + # TODO https://github.com/OpenXRay/GameSpy/pull/6, check if merged in version > 822 + # Fixes format hardening patches = [ (fetchpatch { - url = "https://github.com/OpenXRay/xray-16/commit/4532cba11e98808c92e56e246188863261ef9201.patch"; - sha256 = "1hrm4rkkg946ai95krzpf3isryzbb2vips63gxf481plv4vlcfc9"; + url = "https://github.com/OpenXRay/GameSpy/pull/6/commits/155af876281f5d94f0142886693314d97deb2d4c.patch"; + sha256 = "1l0vcgvzzx8n56shpblpfdhvpr6c12fcqf35r0mflaiql8q7wn88"; + stripLen = 1; + extraPrefix = "Externals/GameSpy/"; }) ]; + cmakeFlags = [ "-DCMAKE_INCLUDE_PATH=${cryptopp}/include/cryptopp" ]; + buildInputs = [ glew freeimage liblockfile openal cryptopp libtheora SDL2 lzo libjpeg libogg tbb pcre ]; + nativeBuildInputs = [ cmake makeWrapper ]; + # https://github.com/OpenXRay/xray-16/issues/786 preConfigure = '' substituteInPlace src/xrCore/xrCore.cpp \ --replace /usr/share $out/share @@ -71,7 +76,7 @@ in stdenv.mkDerivation rec { license = licenses.unfree // { url = "https://github.com/OpenXRay/xray-16/blob/xd_dev/License.txt"; }; - maintainers = [ ]; + maintainers = with maintainers; [ OPNA2608 ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; } From d06870b3a2208a6afe2417db21d5543ba7da6850 Mon Sep 17 00:00:00 2001 From: David Birks Date: Mon, 17 May 2021 10:57:21 -0400 Subject: [PATCH 211/249] microplane: 0.0.28 -> 0.0.31 --- pkgs/tools/misc/microplane/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/microplane/default.nix b/pkgs/tools/misc/microplane/default.nix index 66717912599..502188ae4d2 100644 --- a/pkgs/tools/misc/microplane/default.nix +++ b/pkgs/tools/misc/microplane/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "microplane"; - version = "0.0.28"; + version = "0.0.31"; src = fetchFromGitHub { owner = "Clever"; repo = "microplane"; rev = "v${version}"; - sha256 = "00ayci0a4lv67sg2bb4fw5wpdlps4pjqiiam595dar82lsjwj63j"; + sha256 = "sha256-PcojOFe3SHhnFy09kcxHhb5kd07TG7Uq+coPUNbJjx4="; }; - vendorSha256 = "0hn2gsm9bgmrm620fn2cx28l2gj1yfgvjix9ds50m7kwkx6q0dga"; + vendorSha256 = "sha256-5HHdxSXg3ZIUyFQALaYgvf4pQwNxG58cF4vnCnMgAuY="; buildFlagsArray = '' - -ldflags="-s -w -X main.version=v${version}" + -ldflags=-s -w -X main.version=${version} ''; postInstall = '' From 841bfbfb956980d993d2fd94d59bcd2a21cfbeaa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 18 May 2021 04:31:29 +0000 Subject: [PATCH 212/249] hcxtools: 6.1.6 -> 6.2.0 --- pkgs/tools/security/hcxtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/hcxtools/default.nix b/pkgs/tools/security/hcxtools/default.nix index 9478844055e..d0fa5782079 100644 --- a/pkgs/tools/security/hcxtools/default.nix +++ b/pkgs/tools/security/hcxtools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hcxtools"; - version = "6.1.6"; + version = "6.2.0"; src = fetchFromGitHub { owner = "ZerBea"; repo = pname; rev = version; - sha256 = "sha256-x6sVFjM2GMGqpoAW7CtCLUoEAYLgulaUKXequQ7DmGQ="; + sha256 = "sha256-4/kqy0oIe2FdKWtVj11PAUbdWPcKmZ1aIxLx/Zw1E2w="; }; nativeBuildInputs = [ pkg-config ]; From 7ceeca96d39957484a230b69435169cbb13c1e09 Mon Sep 17 00:00:00 2001 From: Bryan Gardiner Date: Sun, 16 May 2021 18:12:26 -0700 Subject: [PATCH 213/249] nvd: init at 0.1.1 --- pkgs/tools/package-management/nvd/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/package-management/nvd/default.nix diff --git a/pkgs/tools/package-management/nvd/default.nix b/pkgs/tools/package-management/nvd/default.nix new file mode 100644 index 00000000000..1218ac01f9a --- /dev/null +++ b/pkgs/tools/package-management/nvd/default.nix @@ -0,0 +1,32 @@ +{ fetchFromGitLab, installShellFiles, lib, python3, stdenv }: + +stdenv.mkDerivation rec { + pname = "nvd"; + version = "0.1.1"; + + src = fetchFromGitLab { + owner = "khumba"; + repo = pname; + rev = "v${version}"; + sha256 = "0accq0cw6qsxin1fb2bp2ijgjf9akb9qlivkykpfsgnk5qjafv2n"; + }; + + buildInputs = [ python3 ]; + + nativeBuildInputs = [ installShellFiles ]; + + installPhase = '' + runHook preInstall + install -m555 -Dt $out/bin src/nvd + installManPage src/nvd.1 + runHook postInstall + ''; + + meta = with lib; { + description = "Nix/NixOS package version diff tool"; + homepage = "https://gitlab.com/khumba/nvd"; + license = licenses.asl20; + maintainers = with maintainers; [ khumba ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a6c0d979ce..3e929187a61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30481,6 +30481,8 @@ in nut = callPackage ../applications/misc/nut { }; + nvd = callPackage ../tools/package-management/nvd { }; + solfege = python3Packages.callPackage ../misc/solfege { }; disnix = callPackage ../tools/package-management/disnix { }; From 0f26006423d52b42994bde1c9db8ea51ff643bf7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 May 2021 02:00:16 +0000 Subject: [PATCH 214/249] cookiecutter: 1.7.2 -> 1.7.3 --- pkgs/development/python-modules/cookiecutter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cookiecutter/default.nix b/pkgs/development/python-modules/cookiecutter/default.nix index c5ee4d8617d..b2a13cdbb65 100644 --- a/pkgs/development/python-modules/cookiecutter/default.nix +++ b/pkgs/development/python-modules/cookiecutter/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "cookiecutter"; - version = "1.7.2"; + version = "1.7.3"; # not sure why this is broken disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "efb6b2d4780feda8908a873e38f0e61778c23f6a2ea58215723bcceb5b515dac"; + sha256 = "sha256-a5pNcoguJDvgd6c5fQ8fdv5mzz35HzEV27UzDiFPpFc="; }; checkInputs = [ pytest pytestcov pytest-mock freezegun ]; From 707234bf0dd694c60702748c3510f11a7ee2f848 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 May 2021 07:04:36 +0200 Subject: [PATCH 215/249] steam: add json-glib to fhsenv Fixes the Paradox Launcher for Stellaris. Fixes: #123447 --- pkgs/games/steam/fhsenv.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index de2163d6784..44bee8ff11a 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -105,6 +105,7 @@ in buildFHSUserEnv rec { gst_all_1.gstreamer gst_all_1.gst-plugins-ugly gst_all_1.gst-plugins-base + json-glib # paradox launcher (Stellaris) libdrm libxkbcommon # paradox launcher mono From 3cdff535f7f72e6faaa6d0ce7a67e92dbaaa4ca3 Mon Sep 17 00:00:00 2001 From: sophrosyne97 Date: Mon, 17 May 2021 19:11:34 -0400 Subject: [PATCH 216/249] pmdk: 1.7 -> 1.9.2 --- pkgs/development/libraries/pmdk/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/pmdk/default.nix b/pkgs/development/libraries/pmdk/default.nix index 01392f232d9..6e0b6ab6722 100644 --- a/pkgs/development/libraries/pmdk/default.nix +++ b/pkgs/development/libraries/pmdk/default.nix @@ -1,19 +1,19 @@ { lib, stdenv, fetchFromGitHub -, autoconf, libndctl, pkg-config +, autoconf, libndctl, pkg-config, gnum4, pandoc }: stdenv.mkDerivation rec { pname = "pmdk"; - version = "1.7"; + version = "1.9.2"; src = fetchFromGitHub { owner = "pmem"; repo = "pmdk"; rev = "refs/tags/${version}"; - sha256 = "1833sq0f1msaqwn31dn1fp37a6d5zp995i9gkazanydmppi2qy0i"; + sha256 = "0awmkj6j9y2pbqqmp9ql00s7qa3mnpppa82dfy5324lindq0z8a1"; }; - nativeBuildInputs = [ autoconf pkg-config ]; + nativeBuildInputs = [ autoconf pkg-config gnum4 pandoc ]; buildInputs = [ libndctl ]; enableParallelBuilding = true; From afc534af9fa35e3b0e420e1e5ee04065c355d1ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 16 May 2021 09:02:44 +0200 Subject: [PATCH 217/249] dawg-python: init at 0.7.2 This is a pure Python reader for DAWGs created by dawgdic C++ library or DAWG Python extension. --- .../python-modules/dawg-python/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/dawg-python/default.nix diff --git a/pkgs/development/python-modules/dawg-python/default.nix b/pkgs/development/python-modules/dawg-python/default.nix new file mode 100644 index 00000000000..ba9c298a2e8 --- /dev/null +++ b/pkgs/development/python-modules/dawg-python/default.nix @@ -0,0 +1,24 @@ +{ lib +, fetchPypi +, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "dawg-python"; + version = "0.7.2"; + + src = fetchPypi { + inherit version; + pname = "DAWG-Python"; + hash = "sha256-Sl4yhuYmHMoC8gXP1VFqerEBkPowxRwo00WAj1leNCE="; + }; + + pythonImportsCheck = [ "dawg_python" ]; + + meta = with lib; { + description = "Pure Python reader for DAWGs created by dawgdic C++ library or DAWG Python extension"; + homepage = "https://github.com/pytries/DAWG-Python"; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f4a87554e3b..ffea724ddb2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1729,6 +1729,8 @@ in { datrie = callPackage ../development/python-modules/datrie { }; + dawg-python = callPackage ../development/python-modules/dawg-python { }; + dbf = callPackage ../development/python-modules/dbf { }; dbfread = callPackage ../development/python-modules/dbfread { }; From 131f5f0b80bfad297be4e6900dda0a5cf933c22a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 16 May 2021 09:06:47 +0200 Subject: [PATCH 218/249] python3Packages.pymorphy2-dicts-ru: init at 2.4.417127.4579844 This package provides Russian dictionaries for pymorphy2. --- .../python-modules/pymorphy2/dicts-ru.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/pymorphy2/dicts-ru.nix diff --git a/pkgs/development/python-modules/pymorphy2/dicts-ru.nix b/pkgs/development/python-modules/pymorphy2/dicts-ru.nix new file mode 100644 index 00000000000..bee9dd49247 --- /dev/null +++ b/pkgs/development/python-modules/pymorphy2/dicts-ru.nix @@ -0,0 +1,23 @@ +{ lib +, fetchPypi +, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "pymorphy2-dicts-ru"; + version = "2.4.417127.4579844"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-eMrQOtymBQIavTh6Oy61FchRuG6UaCoe8jVKLHT8wZY="; + }; + + pythonImportsCheck = [ "pymorphy2_dicts_ru" ]; + + meta = with lib; { + description = "Russian dictionaries for pymorphy2"; + homepage = "https://github.com/kmike/pymorphy2-dicts/"; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ffea724ddb2..1095a443a72 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5873,6 +5873,8 @@ in { pymongo = callPackage ../development/python-modules/pymongo { }; + pymorphy2-dicts-ru = callPackage ../development/python-modules/pymorphy2/dicts-ru.nix { }; + pympler = callPackage ../development/python-modules/pympler { }; pymsgbox = callPackage ../development/python-modules/pymsgbox { }; From 28e8b89cec7905dc773b456948451fa2e36b6273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 16 May 2021 09:08:54 +0200 Subject: [PATCH 219/249] python3Packages.pymorphy2: init at 0.9.1 Morphological analyzer (POS tagger + inflection engine) for Russian and Ukrainian. --- .../python-modules/pymorphy2/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/pymorphy2/default.nix diff --git a/pkgs/development/python-modules/pymorphy2/default.nix b/pkgs/development/python-modules/pymorphy2/default.nix new file mode 100644 index 00000000000..8c00975d08b --- /dev/null +++ b/pkgs/development/python-modules/pymorphy2/default.nix @@ -0,0 +1,35 @@ +{ lib +, fetchPypi +, buildPythonPackage +, isPy3k +, dawg-python +, docopt +, pymorphy2-dicts-ru +}: + +buildPythonPackage rec { + pname = "pymorphy2"; + version = "0.9.1"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + hash = "sha256-hsRHFX3uLrI0HvvkU44SgadUdWuhqjLad6iWFMWLVgw="; + }; + + propagatedBuildInputs = [ + dawg-python + docopt + pymorphy2-dicts-ru + ]; + + pythonImportsCheck = [ "pymorphy2" ]; + + meta = with lib; { + description = "Morphological analyzer/inflection engine for Russian and Ukrainian"; + homepage = "https://github.com/kmike/pymorphy2"; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1095a443a72..6327231261c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5873,6 +5873,8 @@ in { pymongo = callPackage ../development/python-modules/pymongo { }; + pymorphy2 = callPackage ../development/python-modules/pymorphy2 { }; + pymorphy2-dicts-ru = callPackage ../development/python-modules/pymorphy2/dicts-ru.nix { }; pympler = callPackage ../development/python-modules/pympler { }; From e90940f28f564fb257f5ea36bff2fe0c32789877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 16 May 2021 09:10:54 +0200 Subject: [PATCH 220/249] python3Packages.spacy_pkuseg: init at 0.0.28 This is the spaCy fork of pkuseg, a Chinese word segmentation toolkit. --- .../python-modules/spacy-pkuseg/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/spacy-pkuseg/default.nix diff --git a/pkgs/development/python-modules/spacy-pkuseg/default.nix b/pkgs/development/python-modules/spacy-pkuseg/default.nix new file mode 100644 index 00000000000..670174a057e --- /dev/null +++ b/pkgs/development/python-modules/spacy-pkuseg/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, cython +, numpy +, srsly +}: + +buildPythonPackage rec { + pname = "spacy-pkuseg"; + version = "0.0.28"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit version; + pname = "spacy_pkuseg"; + hash = "sha256-mmA/baY9ohvrM41ak5L+G8CUrSQeZCrzmMAoND4X/NI="; + }; + + # Does not seem to have actual tests, but unittest discover + # recognizes some non-tests as tests and fails. + doCheck = false; + + nativeBuildInputs = [ cython ]; + + propagatedBuildInputs = [ numpy srsly ]; + + pythonImportsCheck = [ "spacy_pkuseg" ]; + + meta = with lib; { + description = "Toolkit for multi-domain Chinese word segmentation (spaCy fork)"; + homepage = "https://github.com/explosion/spacy-pkuseg"; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6327231261c..7c63f819028 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7720,6 +7720,8 @@ in { spacy_models = callPackage ../development/python-modules/spacy/models.nix { }; + spacy-pkuseg = callPackage ../development/python-modules/spacy-pkuseg { }; + spake2 = callPackage ../development/python-modules/spake2 { }; spark_parser = callPackage ../development/python-modules/spark_parser { }; From a3405dfa2624ba5800ffb914922649b590cc2ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 16 May 2021 09:17:55 +0200 Subject: [PATCH 221/249] python3Packages.spacy-alignments: init at 0.8.3 Package to align tokenizations for spaCy + transformers. --- .../spacy-alignments/default.nix | 60 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/python-modules/spacy-alignments/default.nix diff --git a/pkgs/development/python-modules/spacy-alignments/default.nix b/pkgs/development/python-modules/spacy-alignments/default.nix new file mode 100644 index 00000000000..0ac1edfd503 --- /dev/null +++ b/pkgs/development/python-modules/spacy-alignments/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, fetchPypi +, fetchpatch +, buildPythonPackage +, isPy3k +, rustPlatform +, setuptools-rust +, libiconv +}: + +buildPythonPackage rec { + pname = "spacy-alignments"; + version = "0.8.3"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + hash = "sha256-zrqBjaIjtF6bJMbmw7Zo+BeApN6sxxfLkrzsDjdvC78="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit patches src; + name = "${pname}-${version}"; + hash = "sha256-YRyG2yflEXKklNqXiDD9oK3J1lq4o704+Eeu2hyY3xI="; + }; + + patches = [ + # Add Cargo.lock, from upstream PR: + # https://github.com/explosion/spacy-alignments/pull/3 + (fetchpatch { + url = "https://github.com/explosion/spacy-alignments/commit/7b0ba13ff0d245bfbbe344a36fb7bbd311dd4906.diff"; + sha256 = "sha256-jx97SSC+3z+ByInNs8Uq58H50eCo4fDCwEi6VKxRs2k="; + excludes = [ ".gitignore" ]; + }) + ]; + + nativeBuildInputs = [ + setuptools-rust + ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); + + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + + # Fails because spacy_alignments module cannot be loaded correctly. + doCheck = false; + + pythonImportsCheck = [ "spacy_alignments" ]; + + meta = with lib; { + description = "Align tokenizations for spaCy and transformers"; + homepage = "https://github.com/explosion/spacy-alignments"; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c63f819028..514ce9626e6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7716,6 +7716,8 @@ in { spacy = callPackage ../development/python-modules/spacy { }; + spacy-alignments = callPackage ../development/python-modules/spacy-alignments { }; + spacy-legacy = callPackage ../development/python-modules/spacy/legacy.nix { }; spacy_models = callPackage ../development/python-modules/spacy/models.nix { }; From e15fd57929a77f8d69ecee4f2f2718cb000a0f33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 16 May 2021 10:01:08 +0200 Subject: [PATCH 222/249] python3Packages.spacy-transformers: init at 1.0.2 This package provides spaCy model pipelines that wrap Hugging Face's transformers package, so that they can be used in spaCy. --- .../spacy-transformers/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/spacy-transformers/default.nix diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix new file mode 100644 index 00000000000..0e8669d98ff --- /dev/null +++ b/pkgs/development/python-modules/spacy-transformers/default.nix @@ -0,0 +1,39 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pytorch +, spacy +, spacy-alignments +, srsly +, transformers +}: + +buildPythonPackage rec { + pname = "spacy-transformers"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-AYshH2trMTgeSkAPRb6wRWpm4gA5FaKV2NJd+PhzAy4="; + }; + + propagatedBuildInputs = [ + pytorch + spacy + spacy-alignments + srsly + transformers + ]; + + # Test fails due to missing arguments for trfs2arrays(). + doCheck = false; + + pythonImportsCheck = [ "spacy_transformers" ]; + + meta = with lib; { + description = "spaCy pipelines for pretrained BERT, XLNet and GPT-2"; + homepage = "https://github.com/explosion/spacy-transformers"; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 514ce9626e6..85c1a6a1f60 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7724,6 +7724,8 @@ in { spacy-pkuseg = callPackage ../development/python-modules/spacy-pkuseg { }; + spacy-transformers = callPackage ../development/python-modules/spacy-transformers { }; + spake2 = callPackage ../development/python-modules/spake2 { }; spark_parser = callPackage ../development/python-modules/spark_parser { }; From 51f398613c3716559daacd64de9364124d39ee35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 16 May 2021 10:02:43 +0200 Subject: [PATCH 223/249] python3Packages.spacy_models: 2.3.0 -> 3.0.0 Update models for compatibility with spaCy 3.0.0. --- .../spacy/annotation-test/annotate.py | 10 +- .../python-modules/spacy/models.json | 596 ++++++++++-------- .../python-modules/spacy/models.nix | 20 +- 3 files changed, 355 insertions(+), 271 deletions(-) diff --git a/pkgs/development/python-modules/spacy/annotation-test/annotate.py b/pkgs/development/python-modules/spacy/annotation-test/annotate.py index 822eb8ac074..eb628808488 100644 --- a/pkgs/development/python-modules/spacy/annotation-test/annotate.py +++ b/pkgs/development/python-modules/spacy/annotation-test/annotate.py @@ -26,10 +26,11 @@ def test_entities(doc_en_core_web_sm): assert entities == [ ('Sebastian Thrun', 'PERSON'), - ('Google', 'ORG'), ('2007', 'DATE'), + ('2007', 'DATE'), ('American', 'NORP'), - ('Thrun', 'ORG'), - ('earlier this week', 'DATE') + ('Thrun', 'PERSON'), + ('Recode', 'PERSON'), + ('earlier this week', 'DATE'), ] @@ -60,10 +61,9 @@ def test_verbs(doc_en_core_web_sm): 'work', 'drive', 'take', - 'can', 'tell', - 'would', 'shake', 'turn', + 'be', 'talk', 'say'] diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json index 3a427f8932a..a2989b6da50 100644 --- a/pkgs/development/python-modules/spacy/models.json +++ b/pkgs/development/python-modules/spacy/models.json @@ -1,264 +1,332 @@ -[{ - "pname": "da_core_news_lg", - "version": "2.3.0", - "sha256": "18y1jany1ha27jkwb9563haxsbylm0axkh5c8009lsfxc8y2w9hr", - "license": "cc-by-sa-40" -}, -{ - "pname": "da_core_news_md", - "version": "2.3.0", - "sha256": "06nm5grj5jdx0rja7vw1f91vvd69p6vhafrwpfr1npqk24j6cacb", - "license": "cc-by-sa-40" -}, -{ - "pname": "da_core_news_sm", - "version": "2.3.0", - "sha256": "00byhlrcbg4wxplr473g9b3126pvk4vwy0q34xg0zx4994qb6rgn", - "license": "cc-by-sa-40" -}, -{ - "pname": "de_core_news_lg", - "version": "2.3.0", - "sha256": "0rixhgdz4z7sq6f2b1w3n5cn1645cr37g40hbd9xzlvdzdf5cg6d", - "license": "mit" -}, -{ - "pname": "de_core_news_md", - "version": "2.3.0", - "sha256": "0kxir1w000r5fn1kpa38m7688xinkn2mk1m82aiwqlck3r72jdi6", - "license": "mit" -}, -{ - "pname": "de_core_news_sm", - "version": "2.3.0", - "sha256": "00cbmrf4njg28laysapdnp4rv4lw4yw03rxkynw1ain5fwb0izl7", - "license": "mit" -}, -{ - "pname": "el_core_news_lg", - "version": "2.3.0", - "sha256": "001c19dd1kirlvzbdv2i89zw8nf6c4icv2w0chm7rd6x9m3i13gd", - "license": "cc-by-nc-sa-30" -}, -{ - "pname": "el_core_news_md", - "version": "2.3.0", - "sha256": "170x8bzm5nf02mhkxyxjk58yk2639hsjb5b9prcc69500c0vmnp0", - "license": "cc-by-nc-sa-30" -}, -{ - "pname": "el_core_news_sm", - "version": "2.3.0", - "sha256": "10mh3za4jvr07rawzk8ps642rp11s3smraj9xvrxflik4fqkz18b", - "license": "cc-by-nc-sa-30" -}, -{ - "pname": "en_core_web_lg", - "version": "2.3.0", - "sha256": "0mfa5wz31ya295jhyj489gb4qy806zmpq1zc11bvv5alv2m35if2", - "license": "mit" -}, -{ - "pname": "en_core_web_md", - "version": "2.3.0", - "sha256": "1ys8sqkhiap1mq6mhbkbq8bc07lvl68xngbx725xkwvirzl5gabh", - "license": "mit" -}, -{ - "pname": "en_core_web_sm", - "version": "2.3.0", - "sha256": "04icv9qf4pj53ll8vqxcjl2a723q1k00i7lifk8wx5saif28g37a", - "license": "mit" -}, -{ - "pname": "en_vectors_web_lg", - "version": "2.3.0", - "sha256": "13g012rwh0bcxx3ii5mmygqzyryah1y3zd000zhidnacc1x1g743", - "license": "cc-by-sa-30" -}, -{ - "pname": "es_core_news_lg", - "version": "2.3.0", - "sha256": "1r0pr0lzs3j9w7rd5z9nw87iayjm36v7f7gamvaiiphs6bc5p7ls", - "license": "gpl3" -}, -{ - "pname": "es_core_news_md", - "version": "2.3.0", - "sha256": "0nz33bmpr3rxqbnv6vb1id8pkfsvh8ii8vqplwgb3b8772kmpzy2", - "license": "gpl3" -}, -{ - "pname": "es_core_news_sm", - "version": "2.3.0", - "sha256": "02xqhg4m0gg5r9yibvl02zixkll6w0nsmbdhp07y5yyaqjarc90d", - "license": "gpl3" -}, -{ - "pname": "fr_core_news_lg", - "version": "2.3.0", - "sha256": "1yliamws8nqqjhpk9gr2dzlk0dms2mr958zbj21biv8fimbq60ik", - "license": "lgpllr" -}, -{ - "pname": "fr_core_news_md", - "version": "2.3.0", - "sha256": "04fk212ksac3bp9dj7dmzsdcnbqmbsgymsic6ddcv9zbfdv5d0db", - "license": "lgpllr" -}, -{ - "pname": "fr_core_news_sm", - "version": "2.3.0", - "sha256": "0kldww855z67qfc9maa9z1lsvdf5vj5vc8gj0x3h68kv5n1xr4h0", - "license": "lgpllr" -}, -{ - "pname": "it_core_news_lg", - "version": "2.3.0", - "sha256": "192rdmqnwl3ajxzhnw4r1cqv5bkziv0yc2bbzckmzqss64wk7k70", - "license": "cc-by-nc-sa-30" -}, -{ - "pname": "it_core_news_md", - "version": "2.3.0", - "sha256": "019ih4vwq1w6j38j0wc8pyyg1an6yy37wxq2w4amwppynmmcnd5w", - "license": "cc-by-nc-sa-30" -}, -{ - "pname": "it_core_news_sm", - "version": "2.3.0", - "sha256": "1c3ywqa8li0j7cyvd1xqbb096y61978hd6qv7rc6cxxjdhmkrrds", - "license": "cc-by-nc-sa-40" -}, -{ - "pname": "lt_core_news_lg", - "version": "2.3.0", - "sha256": "0hn5w8n7mgv33i6gvnaxl1j44n9gz4j86gg1a9jjlgdw5z98n0p2", - "license": "cc-by-sa-40" -}, -{ - "pname": "lt_core_news_md", - "version": "2.3.0", - "sha256": "1xya79cz2xd5vgzg6qg0ww5j2bmv7kppdk3mdjf6zpwrlzwdbk5d", - "license": "cc-by-sa-40" -}, -{ - "pname": "lt_core_news_sm", - "version": "2.3.0", - "sha256": "0r3rbqgz4897wyhz5jli30lryb45039f4rlvn4q0364cg1pm92g9", - "license": "cc-by-sa-40" -}, -{ - "pname": "nb_core_news_lg", - "version": "2.3.0", - "sha256": "18mblypw3c82004qz5w1p3262iqwn99wl9b781dq7aqwxskr02d6", - "license": "mit" -}, -{ - "pname": "nb_core_news_md", - "version": "2.3.0", - "sha256": "0iw97k9glxbar8mrpvnmmcb1nffgdhb83akn99p53pwmqbzxy9p3", - "license": "mit" -}, -{ - "pname": "nb_core_news_sm", - "version": "2.3.0", - "sha256": "07b7xri2q3m7fvn9a2gjc1044a3f14231vr32hrw96h7k6vg95h7", - "license": "mit" -}, -{ - "pname": "nl_core_news_lg", - "version": "2.3.0", - "sha256": "016166kzpgi0p3m0x3k308a0r60a28yz7npagjvmpl1dfm9lzhnv", - "license": "cc-by-sa-40" -}, -{ - "pname": "nl_core_news_md", - "version": "2.3.0", - "sha256": "1anfhig531k9k14s0cbgsvmvifp3h50qi1h8dhx894kjmq10k2lg", - "license": "cc-by-sa-40" -}, -{ - "pname": "nl_core_news_sm", - "version": "2.3.0", - "sha256": "0alvz7pn7cj0yax8h5gp71vrdblh3mcsmyhzgiddsd44ry35nxnj", - "license": "cc-by-sa-40" -}, -{ - "pname": "pl_core_news_lg", - "version": "2.3.0", - "sha256": "1acchp8pv1h4c6cwvxz07lh4ychn6aw809zfg3mbbsxgsgd2ahjr", - "license": "gpl3" -}, -{ - "pname": "pl_core_news_md", - "version": "2.3.0", - "sha256": "19jjjjvbys3ayibkm3cx497b4bh63ll39hfq04wx116rj4ajpwwg", - "license": "gpl3" -}, -{ - "pname": "pl_core_news_sm", - "version": "2.3.0", - "sha256": "166mqlfkgiszcc6hwg2mr6sir9y88y22nd81a1nidq0fiif5lfji", - "license": "gpl3" -}, -{ - "pname": "pt_core_news_lg", - "version": "2.3.0", - "sha256": "18gvdmfwyy2sbq6206imglhghyagd6a4gb6wcfkwhm7lzbnq714d", - "license": "cc-by-sa-40" -}, -{ - "pname": "pt_core_news_md", - "version": "2.3.0", - "sha256": "1yxnpwby2aq6ydvd35lylc4fs141fisfnzlx8pl88pp2b2gxijvl", - "license": "cc-by-sa-40" -}, -{ - "pname": "pt_core_news_sm", - "version": "2.3.0", - "sha256": "1vcvzdg9f93x0vaafkk9l9xhpmaavfj0cf0l3p06c5kx2d76f9ph", - "license": "cc-by-sa-40" -}, -{ - "pname": "ro_core_news_sm", - "version": "2.3.0", - "sha256": "0lsmbdwsaczv37y5sa1vvgwszy2hs8jp24a0nvc5qm8vb71rxj8w", - "license": "cc-by-sa-40" -}, -{ - "pname": "ro_core_news_md", - "version": "2.3.0", - "sha256": "1igwkz3yd1117gi2g78yilh9ln8n5yrdimas4prfxjgzwid3q8bc", - "license": "cc-by-sa-40" -}, -{ - "pname": "ro_core_news_lg", - "version": "2.3.0", - "sha256": "0id1y32kjfans7llh1i55rgr4n2x6xn208y4qf6yl3pbc17i0n9z", - "license": "cc-by-sa-40" -}, -{ - "pname": "xx_ent_wiki_sm", - "version": "2.3.0", - "sha256": "0x3zmmybl5kh4dn5prkfmr4q5j9bh13p40qc3rhdfi0i3jxc11pn", - "license": "mit" -}, -{ - "pname": "zh_core_web_lg", - "version": "2.3.1", - "sha256": "17zxk7cz47k07yb3qaigc3sx4dj4zwilr1lsn2jq6w7jc8k2h1ll", - "license": "mit" -}, -{ - "pname": "zh_core_web_md", - "version": "2.3.1", - "sha256": "1n4iwxyam4ykn0f9jdzwkhczack8r9c3kkbyga3c4h6iwqsflzcj", - "license": "mit" -}, -{ - "pname": "zh_core_web_sm", - "version": "2.3.1", - "sha256": "1lj5nwhx38cpwnvajwxlfkf84dr1xx2h6wwbg3scycsh459i9fpc", - "license": "mit" -}] +[ + { + "pname": "da_core_news_lg", + "version": "3.0.0", + "sha256": "0l0wljc1lm9a72ngfd4aa90laz4zcc37ix9nsiaqlw004v01z7wj", + "license": "cc-by-sa-40" + }, + { + "pname": "da_core_news_md", + "version": "3.0.0", + "sha256": "14h3ym22224aimfk2kj88pmn83hkb57w402i0x6pd7ra86n372lh", + "license": "cc-by-sa-40" + }, + { + "pname": "da_core_news_sm", + "version": "3.0.0", + "sha256": "05893dpmx76waqnlysnkq8hz9271rkk30xf6hy98gka6244l9a1l", + "license": "cc-by-sa-40" + }, + { + "pname": "de_core_news_lg", + "version": "3.0.0", + "sha256": "0s7vfpr9gv22pvh697ffg35fppxkjhw23ynf4bpz73hl9jikdqvj", + "license": "mit" + }, + { + "pname": "de_core_news_md", + "version": "3.0.0", + "sha256": "09vvlm3rxmyiima81y4bvcyxhn9bjxrqlkbmglzmwhrhxm84nkmx", + "license": "mit" + }, + { + "pname": "de_core_news_sm", + "version": "3.0.0", + "sha256": "1w5aqfzknnnxpsi9i6kn6bki58j0mp24d4gr2203bf6g5kahiq03", + "license": "mit" + }, + { + "pname": "de_dep_news_trf", + "version": "3.0.0", + "sha256": "1snkm911jn73mqfz0y0anr12r6j3gdi6wd8qmd5alwm623x4s6hm", + "license": "mit" + }, + { + "pname": "el_core_news_lg", + "version": "3.0.0", + "sha256": "011lqmx3f3laf2vvqp0hxp5y105pn54kwdh1xzw4hs2pj6fac9p5", + "license": "cc-by-nc-sa-30" + }, + { + "pname": "el_core_news_md", + "version": "3.0.0", + "sha256": "0p75c18sg38j9dj79ykmm5kzcwjxccpgrcw4cjcscb6ad6wwvcjx", + "license": "cc-by-nc-sa-30" + }, + { + "pname": "el_core_news_sm", + "version": "3.0.0", + "sha256": "0gvisa7yg1w49hpfp79ahy50v64l3rmk56k0k7zkgc8ml1gn892r", + "license": "cc-by-nc-sa-30" + }, + { + "pname": "en_core_web_lg", + "version": "3.0.0", + "sha256": "0sdb85zvfb12d14k3wy23dfryy3xwc9ag79zq71qnxwpvvygmc8y", + "license": "mit" + }, + { + "pname": "en_core_web_md", + "version": "3.0.0", + "sha256": "0c669b1vsp3z28n52lfsijmkn9465r8zjjygjml5rlf9lf1paxa5", + "license": "mit" + }, + { + "pname": "en_core_web_sm", + "version": "3.0.0", + "sha256": "0risizvzkicffw7vgrj92z23dfb7zvvzihqgvjcrx8989b7b6wq6", + "license": "mit" + }, + { + "pname": "en_core_web_trf", + "version": "3.0.0", + "sha256": "0plmg77rv1spr0swn4jakci16mbqsxm32mz9nnwc9ylynbvgrhmn", + "license": "mit" + }, + { + "pname": "es_core_news_lg", + "version": "3.0.0", + "sha256": "0832w8qmg0fp2q8329ndlbbzpfkpbw9v38ny7106a45xaz0rn2xc", + "license": "gpl3" + }, + { + "pname": "es_core_news_md", + "version": "3.0.0", + "sha256": "01is980r63a5418jq917scapzkl9xydj56lrsxbr16fya0hh8qnn", + "license": "gpl3" + }, + { + "pname": "es_core_news_sm", + "version": "3.0.0", + "sha256": "1wgya0f25dgix57pb60fyl4hf2msma16d1f6cf617ypk6g3v80rb", + "license": "gpl3" + }, + { + "pname": "es_dep_news_trf", + "version": "3.0.0", + "sha256": "07lim35p0mxb75qiym79wcrak3j7wcan393260haxgwrj29rzpvv", + "license": "gpl3" + }, + { + "pname": "fr_core_news_lg", + "version": "3.0.0", + "sha256": "1frg734lb64gkm7pagqp1mj7lqpwsxxj5vyjm10yja0rkdi6kcca", + "license": "lgpllr" + }, + { + "pname": "fr_core_news_md", + "version": "3.0.0", + "sha256": "1xshr9r639hdb8vkj5nribk4lkm3a5fb7zrxj3y3p678dr53xalz", + "license": "lgpllr" + }, + { + "pname": "fr_core_news_sm", + "version": "3.0.0", + "sha256": "0n23c9rbg1b44c8yjlf6cc0g8ccj6x0rmfjg76ddmpkjaj83jwv1", + "license": "lgpllr" + }, + { + "pname": "fr_dep_news_trf", + "version": "3.0.0", + "sha256": "192l6n5yxn1ndc4fk8k759j2d5hryj9mfkpy2aminaxr4dmp2imr", + "license": "lgpllr" + }, + { + "pname": "it_core_news_lg", + "version": "3.0.0", + "sha256": "121nki732wrnfyzcflvsv54nvrz3l3hx55hkd72hlhrvjw0kvkv5", + "license": "cc-by-nc-sa-30" + }, + { + "pname": "it_core_news_md", + "version": "3.0.0", + "sha256": "0m168wrf1p6dz5kc4n5ga2h8c0d6jzxx876i3ndrg6b7z418hhi5", + "license": "cc-by-nc-sa-30" + }, + { + "pname": "it_core_news_sm", + "version": "3.0.0", + "sha256": "132v06cah8l7q4caxg6n4nw34v9jd8y8cqp20njryx4nirm9c36l", + "license": "cc-by-nc-sa-30" + }, + { + "pname": "lt_core_news_lg", + "version": "3.0.0", + "sha256": "034qycqpbdiyzhpzjz92kpnx6z2nai70dddz75r48hylzlw1d92h", + "license": "cc-by-sa-40" + }, + { + "pname": "lt_core_news_md", + "version": "3.0.0", + "sha256": "18mb2lmrjwnsc7s4yaq3yvdbh8p8p1k0xpm8cqn521hanpr0jqj3", + "license": "cc-by-sa-40" + }, + { + "pname": "lt_core_news_sm", + "version": "3.0.0", + "sha256": "1p998h9lnp16czj3gg8781gywg17dap2h9f8qc6f87daxyc9bdjs", + "license": "cc-by-sa-40" + }, + { + "pname": "mk_core_news_lg", + "version": "3.0.0", + "sha256": "1fmrpgq9plndid7402wkybidpi0phnybb3031jxppan99ihr3hfj", + "license": "cc-by-sa-40" + }, + { + "pname": "mk_core_news_md", + "version": "3.0.0", + "sha256": "1mnabkyjxph2xa4g2an5rqp24d4gbq969ln27zpjycyiwxlkz7vl", + "license": "cc-by-sa-40" + }, + { + "pname": "mk_core_news_sm", + "version": "3.0.0", + "sha256": "1ax6pl61n0p4qf4wcd6c7d42zqjrgh3vhlpl6xby57a78547asxr", + "license": "cc-by-sa-40" + }, + { + "pname": "nb_core_news_lg", + "version": "3.0.0", + "sha256": "07a8nsfswlpb2jc2afzf201bjkl2nlz40kqmjx3dbva8jphj3ljs", + "license": "mit" + }, + { + "pname": "nb_core_news_md", + "version": "3.0.0", + "sha256": "0y1vydhhgb6cifq7k4vc7dy4jl6wb1z6pklbv65v6nxl7rhn76fz", + "license": "mit" + }, + { + "pname": "nb_core_news_sm", + "version": "3.0.0", + "sha256": "1lk1869cb2176j6lvd8lraclfl706p12m1gvvf1ixm99ra8zkxhs", + "license": "mit" + }, + { + "pname": "nl_core_news_lg", + "version": "3.0.0", + "sha256": "0iq4ayzh9g9gil4l8kcl5qcm0l16hymavsqgiczf3ddvamciqaxs", + "license": "cc-by-sa-40" + }, + { + "pname": "nl_core_news_md", + "version": "3.0.0", + "sha256": "0g9dkzwxndcf05bnhkd9fzqj7n614naspyhalg6h9h1kb7v3m2ak", + "license": "cc-by-sa-40" + }, + { + "pname": "nl_core_news_sm", + "version": "3.0.0", + "sha256": "1l4mk3gs15yc5kssy4x4lyab9kmg9y199h4hvizwh8y1ifqbqy03", + "license": "cc-by-sa-40" + }, + { + "pname": "pl_core_news_lg", + "version": "3.0.0", + "sha256": "14ldch7rps1qxh3ldczh7f29ra3dq2kxaxpfbx7r6f1xpmk5s1rv", + "license": "gpl3" + }, + { + "pname": "pl_core_news_md", + "version": "3.0.0", + "sha256": "0fx6ipd8ll2d0w8qwn9cjw0q7w0r3l40467d6mizi4mx93q7m7iw", + "license": "gpl3" + }, + { + "pname": "pl_core_news_sm", + "version": "3.0.0", + "sha256": "0p1gcniyrn9qya4wg1qd6ijfchc7lhk0dh4iba8y71mss3n162fs", + "license": "gpl3" + }, + { + "pname": "pt_core_news_lg", + "version": "3.0.0", + "sha256": "1vsw1ng364466jz6ffyj9dj3jh4s68gk7csxylc1fj7wac8jxrbj", + "license": "cc-by-sa-40" + }, + { + "pname": "pt_core_news_md", + "version": "3.0.0", + "sha256": "11laikyd6m9zprk7bnfn0v2lixvkcgvpv95dp0zpc0q2izmky6q8", + "license": "cc-by-sa-40" + }, + { + "pname": "pt_core_news_sm", + "version": "3.0.0", + "sha256": "12d59q1gvpx8dj48iq17sindd6wid09hnjb4fw0rb00bb28rmqk1", + "license": "cc-by-sa-40" + }, + { + "pname": "ro_core_news_lg", + "version": "3.0.0", + "sha256": "11mkip5piy6g7rg51ljqjn61s4ydlafl6qp3v29zmm3lghc66h8c", + "license": "cc-by-sa-40" + }, + { + "pname": "ro_core_news_md", + "version": "3.0.0", + "sha256": "1jyf3khki7xqbp6ir0p4y2p7rdhs36zq2i1960ik4kr2mhnzrblg", + "license": "cc-by-sa-40" + }, + { + "pname": "ro_core_news_sm", + "version": "3.0.0", + "sha256": "0gc61gdfgji92mjdpznkf30nl1fz7378h9bz8dlhvnc401hjzsky", + "license": "cc-by-sa-40" + }, + { + "pname": "ru_core_news_lg", + "version": "3.0.0", + "sha256": "1x1hxvhki62ypj3x0s4syfhz3znlflp36qkp4l2g2sbxjj2qw7n3", + "license": "mit" + }, + { + "pname": "ru_core_news_md", + "version": "3.0.0", + "sha256": "0ks0qdyq6627cbg8fbbhvr83d3m8njs2aj8pri540gz9nrbj5479", + "license": "mit" + }, + { + "pname": "ru_core_news_sm", + "version": "3.0.0", + "sha256": "1x3bmd7f0fqf03wds01imwpbv4xng1qq9iq61m8rbqvskm5jlzbb", + "license": "mit" + }, + { + "pname": "xx_ent_wiki_sm", + "version": "3.0.0", + "sha256": "1115vap4c6snvkwq8bmc8dld1mw5ky0w9n112hadp85pv012ccds", + "license": "mit" + }, + { + "pname": "xx_sent_ud_sm", + "version": "3.0.0", + "sha256": "062g3xfb3fp33b56wa4fj84smr5rlc0dbja102khxnqm2aakk99k", + "license": "cc-by-sa-30" + }, + { + "pname": "zh_core_web_lg", + "version": "3.0.0", + "sha256": "1ai34fc2wfmb35f1zissddf6jjqpg51wqiyqqq35h03jyf4731jr", + "license": "mit" + }, + { + "pname": "zh_core_web_md", + "version": "3.0.0", + "sha256": "10npzl8nvyj4jdn2f9iai9inq5c4x3hxdk0ycgg9wcgqaj09gnxa", + "license": "mit" + }, + { + "pname": "zh_core_web_sm", + "version": "3.0.0", + "sha256": "1f9x5lr8vnvb1n8hc59vm2xi6kv2rj78x1vm916z6ic3vg7vwl1h", + "license": "mit" + }, + { + "pname": "zh_core_web_trf", + "version": "3.0.0", + "sha256": "178w8dfcvx4aabasid6r0pnwqd5k02cvlq35siqjgfn7j3zb56z0", + "license": "mit" + } +] diff --git a/pkgs/development/python-modules/spacy/models.nix b/pkgs/development/python-modules/spacy/models.nix index 8c57d2e0d26..c34bbdfb83d 100644 --- a/pkgs/development/python-modules/spacy/models.nix +++ b/pkgs/development/python-modules/spacy/models.nix @@ -1,4 +1,12 @@ -{ lib, buildPythonPackage, fetchurl, jieba, pkuseg, spacy }: +{ lib +, buildPythonPackage +, fetchurl +, jieba +, pymorphy2 +, sentencepiece +, spacy +, spacy-pkuseg +, spacy-transformers }: let buildModelPackage = { pname, version, sha256, license }: let @@ -12,7 +20,15 @@ let }; propagatedBuildInputs = [ spacy ] - ++ lib.optionals (lang == "zh") [ jieba pkuseg ]; + ++ lib.optionals (lang == "zh") [ jieba spacy-pkuseg ] + ++ lib.optionals (lib.hasSuffix "_trf" pname) [ spacy-transformers ] + ++ lib.optionals (lang == "ru") [ pymorphy2 ] + ++ lib.optionals (pname == "fr_dep_news_trf") [ sentencepiece ]; + + postPatch = lib.optionals (pname == "fr_dep_news_trf") '' + substituteInPlace meta.json \ + --replace "sentencepiece==0.1.91" "sentencepiece>=0.1.91" + ''; pythonImportsCheck = [ pname ]; From 636b3581f6d1ec5bd75054ef803a74c8a3ab0226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 16 May 2021 10:11:31 +0200 Subject: [PATCH 224/249] python3Packages.spacy-transformers: add passthru annotation test --- .../annotation-test/annotate.py | 68 +++++++++++++++++++ .../annotation-test/default.nix | 23 +++++++ .../spacy-transformers/default.nix | 3 + 3 files changed, 94 insertions(+) create mode 100644 pkgs/development/python-modules/spacy-transformers/annotation-test/annotate.py create mode 100644 pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix diff --git a/pkgs/development/python-modules/spacy-transformers/annotation-test/annotate.py b/pkgs/development/python-modules/spacy-transformers/annotation-test/annotate.py new file mode 100644 index 00000000000..d0be2d1c335 --- /dev/null +++ b/pkgs/development/python-modules/spacy-transformers/annotation-test/annotate.py @@ -0,0 +1,68 @@ +import pytest +import spacy + +en_text = ( + "When Sebastian Thrun started working on self-driving cars at " + "Google in 2007, few people outside of the company took him " + "seriously. “I can tell you very senior CEOs of major American " + "car companies would shake my hand and turn away because I wasn’t " + "worth talking to,” said Thrun, in an interview with Recode earlier " + "this week.") + + +@pytest.fixture +def en_core_web_trf(): + return spacy.load("en_core_web_trf") + + +@pytest.fixture +def doc_en_core_web_trf(en_core_web_trf): + return en_core_web_trf(en_text) + + +def test_entities(doc_en_core_web_trf): + entities = list(map(lambda e: (e.text, e.label_), + doc_en_core_web_trf.ents)) + + assert entities == [ + ('Sebastian Thrun', 'PERSON'), + ('Google', 'ORG'), + ('2007', 'DATE'), + ('American', 'NORP'), + ('Thrun', 'PERSON'), + ('Recode', 'ORG'), + ('earlier this week', 'DATE'), + ] + + +def test_nouns(doc_en_core_web_trf): + assert [ + chunk.text for chunk in doc_en_core_web_trf.noun_chunks] == [ + 'Sebastian Thrun', + 'self-driving cars', + 'Google', + 'few people', + 'the company', + 'him', + 'I', + 'you', + 'very senior CEOs', + 'major American car companies', + 'my hand', + 'I', + 'Thrun', + 'an interview', + 'Recode'] + + +def test_verbs(doc_en_core_web_trf): + assert [ + token.lemma_ for token in doc_en_core_web_trf if token.pos_ == "VERB"] == [ + 'start', + 'take', + 'tell', + 'shake', + 'turn', + 'be', + 'talk', + 'say'] diff --git a/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix b/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix new file mode 100644 index 00000000000..11a927a0a62 --- /dev/null +++ b/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix @@ -0,0 +1,23 @@ +{ stdenv, pytest, spacy_models }: + +stdenv.mkDerivation { + name = "spacy-transformers-annotation-test"; + + src = ./.; + + dontConfigure = true; + dontBuild = true; + doCheck = true; + + checkInputs = [ pytest spacy_models.en_core_web_trf ]; + + checkPhase = '' + pytest annotate.py + ''; + + installPhase = '' + touch $out + ''; + + meta.timeout = 60; +} diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix index 0e8669d98ff..1d02460167b 100644 --- a/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/default.nix @@ -1,4 +1,5 @@ { lib +, callPackage , fetchPypi , buildPythonPackage , pytorch @@ -30,6 +31,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "spacy_transformers" ]; + passthru.tests.annotation = callPackage ./annotation-test { }; + meta = with lib; { description = "spaCy pipelines for pretrained BERT, XLNet and GPT-2"; homepage = "https://github.com/explosion/spacy-transformers"; From d7cfce0e475eb78a18f554b2384a65de5d6c57a6 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 18 May 2021 00:12:08 +0200 Subject: [PATCH 225/249] ultrastardx: 2020.4.0 -> 2021-04-03 Not a lot has changed since last update, a few fixes were pushed to the master tree. We take the liberty to update to master for now. This updates the ffmpeg version from 2.x to 4.x, which seems to be supported upstream when we bend the minor version restriction a little. A simple karaoke song played just fine in my test. --- pkgs/games/ultrastardx/default.nix | 35 ++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index a486b899bb4..7b3390d9fda 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -31,28 +31,41 @@ let in stdenv.mkDerivation rec { pname = "ultrastardx"; - version = "2020.4.0"; + version = "2021-04-03"; src = fetchFromGitHub { owner = "UltraStar-Deluxe"; repo = "USDX"; - rev = "v${version}"; - sha256 = "0vmfv8zpyf8ymx3rjydpd7iqis080lni94vb316vfxkgvjmqbhym"; + rev = "d49e916705092f3d765d85d276b283b9e7e232a6"; + sha256 = "0sdcz2vc8i2z50nj7zbkdpxx2mvx0m0927lfsj7d7qr0p8vkm0wa"; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ fpc libpng ] ++ sharedLibs; - patches = [ - (fetchpatch { - name = "fpc-3.2-support.patch"; - url = "https://github.com/UltraStar-Deluxe/USDX/commit/1b8e8714c1523ef49c2fd689a1545d097a3d76d7.patch"; - sha256 = "02zmjymj9w1mkpf7armdpf067byvml6lprs1ca4lhpkv45abddp4"; - }) - ]; - postPatch = '' substituteInPlace src/config.inc.in \ --subst-var-by libpcre_LIBNAME libpcre.so.1 + + # ultrastardx binds to libffmpeg (and sublibs), specifying a very restrictive + # upper bounds on the minor versions of .so files. + # We can assume ffmpeg won’t break any major ABI compatibility, since their + # patch version seems to always stay at 100, + # and their minor version changes quite frequently. + sed \ + -e 's/^ LIBAVCODEC_MAX_VERSION_MINOR.*$/ LIBAVCODEC_MAX_VERSION_MINOR = 1000;/' \ + -i src/lib/ffmpeg-4.0/avcodec.pas + sed \ + -e 's/^ LIBAVFORMAT_MAX_VERSION_MINOR.*$/ LIBAVFORMAT_MAX_VERSION_MINOR = 1000;/' \ + -i src/lib/ffmpeg-4.0/avformat.pas + sed \ + -e 's/^ LIBAVUTIL_MAX_VERSION_MINOR.*$/ LIBAVUTIL_MAX_VERSION_MINOR = 1000;/' \ + -i src/lib/ffmpeg-4.0/avutil.pas + sed \ + -e 's/^ LIBSWRESAMPLE_MAX_VERSION_MINOR.*$/ LIBSWRESAMPLE_MAX_VERSION_MINOR = 1000;/' \ + -i src/lib/ffmpeg-4.0/swresample.pas + sed \ + -e 's/^ LIBSWSCALE_MAX_VERSION_MINOR.*$/ LIBSWSCALE_MAX_VERSION_MINOR = 1000;/' \ + -i src/lib/ffmpeg-4.0/swscale.pas ''; preBuild = with lib; From 60fcee7e5bd31ee2a5286c7bde20c57fc5c021a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 18 May 2021 09:07:09 +0200 Subject: [PATCH 226/249] unpackerr: fix darwin build --- pkgs/servers/unpackerr/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/unpackerr/default.nix b/pkgs/servers/unpackerr/default.nix index 2429e36f2ca..2e024010d41 100644 --- a/pkgs/servers/unpackerr/default.nix +++ b/pkgs/servers/unpackerr/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib, stdenv, fetchFromGitHub, buildGoModule, Cocoa, WebKit }: buildGoModule rec { pname = "unpackerr"; @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "1j79vmf0mkwkqrg5j6fm2b8y3a23y039kbiqkiwb56724bmd27dd"; + buildInputs = lib.optionals stdenv.isDarwin [ Cocoa WebKit ]; + meta = with lib; { description = "Extracts downloads for Radarr, Sonarr, Lidarr - Deletes extracted files after import"; homepage = "https://github.com/davidnewhall/unpackerr"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea30e6f58b4..f8cfc056dc2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19653,7 +19653,9 @@ in unifi6; unifi = unifi6; - unpackerr = callPackage ../servers/unpackerr { }; + unpackerr = callPackage ../servers/unpackerr { + inherit (darwin.apple_sdk.frameworks) Cocoa WebKit; + }; urserver = callPackage ../servers/urserver { }; From f283c27db8663ee1b75f0b522156a0c499794119 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Tue, 18 May 2021 09:32:24 +0200 Subject: [PATCH 227/249] deadbeef: ffmpeg_3 -> ffmpeg --- pkgs/applications/audio/deadbeef/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index 9eda6333112..10b4256a858 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -17,7 +17,7 @@ , aacSupport ? true, faad2 ? null , opusSupport ? true, opusfile ? null , wavpackSupport ? false, wavpack ? null -, ffmpegSupport ? false, ffmpeg_3 ? null +, ffmpegSupport ? false, ffmpeg ? null , apeSupport ? true, yasm ? null # misc plugins , zipSupport ? true, libzip ? null @@ -45,7 +45,7 @@ assert cdaSupport -> (libcdio != null && libcddb != null); assert aacSupport -> faad2 != null; assert opusSupport -> opusfile != null; assert zipSupport -> libzip != null; -assert ffmpegSupport -> ffmpeg_3 != null; +assert ffmpegSupport -> ffmpeg != null; assert apeSupport -> yasm != null; assert artworkSupport -> imlib2 != null; assert hotkeysSupport -> libX11 != null; @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { ++ optional aacSupport faad2 ++ optional opusSupport opusfile ++ optional zipSupport libzip - ++ optional ffmpegSupport ffmpeg_3 + ++ optional ffmpegSupport ffmpeg ++ optional apeSupport yasm ++ optional artworkSupport imlib2 ++ optional hotkeysSupport libX11 From 61b8bf948e14dbe468eaf98c0509fcb73ea6168b Mon Sep 17 00:00:00 2001 From: Pontus Stenetorp Date: Tue, 18 May 2021 07:35:11 +0000 Subject: [PATCH 228/249] julia: mark julia_10-bin as insecure --- pkgs/development/compilers/julia/1.0-bin.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/compilers/julia/1.0-bin.nix b/pkgs/development/compilers/julia/1.0-bin.nix index 50c421bbd43..dfda8da9e4d 100644 --- a/pkgs/development/compilers/julia/1.0-bin.nix +++ b/pkgs/development/compilers/julia/1.0-bin.nix @@ -68,5 +68,13 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ ninjin raskin ]; platforms = [ "x86_64-linux" ]; + knownVulnerabilities = [ + # Built with libgit2 v0.27.2: + # https://github.com/JuliaLang/julia/blob/e0837d1e64a9e4d17534a9f981e9a2a3f221356f/deps/libgit2.version + # https://nvd.nist.gov/vuln/detail/CVE-2020-12278 + "CVE-2020-12278" + # https://nvd.nist.gov/vuln/detail/CVE-2020-12279 + "CVE-2020-12279" + ]; }; } From 86fd2a5474dc1d1a0a9f67eda68a51f082b3adc8 Mon Sep 17 00:00:00 2001 From: Yannick Markus Date: Tue, 18 May 2021 10:43:36 +0200 Subject: [PATCH 229/249] bookstack: 21.04.3 -> 21.04.5 --- pkgs/servers/web-apps/bookstack/default.nix | 4 +- .../web-apps/bookstack/php-packages.nix | 114 +++++++++--------- 2 files changed, 59 insertions(+), 59 deletions(-) diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix index 761738ca854..14ccf4eb43f 100644 --- a/pkgs/servers/web-apps/bookstack/default.nix +++ b/pkgs/servers/web-apps/bookstack/default.nix @@ -15,13 +15,13 @@ let in package.override rec { name = "bookstack"; - version = "21.04.3"; + version = "21.04.5"; src = fetchFromGitHub { owner = "bookstackapp"; repo = name; rev = "v${version}"; - sha256 = "1vkl0v3c5q0734xvvqinq4zikhy37wjys6nj1h9qdbbka0h39592"; + sha256 = "0gwpa4g2xna4s3lnd970wjpr32i9cwyaixfqxhb8zbz1i9gyxjaa"; }; meta = with lib; { diff --git a/pkgs/servers/web-apps/bookstack/php-packages.nix b/pkgs/servers/web-apps/bookstack/php-packages.nix index 8791a4293e8..b2ea52df878 100644 --- a/pkgs/servers/web-apps/bookstack/php-packages.nix +++ b/pkgs/servers/web-apps/bookstack/php-packages.nix @@ -5,10 +5,10 @@ let "aws/aws-sdk-php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "aws-aws-sdk-php-0aa83b522d5ffa794c02e7411af87a0e241a3082"; + name = "aws-aws-sdk-php-948a4defbe2a571cc4460725015b8e98b7060f2d"; src = fetchurl { - url = https://api.github.com/repos/aws/aws-sdk-php/zipball/0aa83b522d5ffa794c02e7411af87a0e241a3082; - sha256 = "03qahdj01bz76aar21limham7xnv5r0d61gfk1fph8ljf2gbg33i"; + url = https://api.github.com/repos/aws/aws-sdk-php/zipball/948a4defbe2a571cc4460725015b8e98b7060f2d; + sha256 = "06vv6h5j909gbn2d8ih1yr2vf19jnw2va1kghj9qykvll6jzx1cq"; }; }; }; @@ -35,10 +35,10 @@ let "doctrine/cache" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-cache-13e3381b25847283a91948d04640543941309727"; + name = "doctrine-cache-a9c1b59eba5a08ca2770a76eddb88922f504e8e0"; src = fetchurl { - url = https://api.github.com/repos/doctrine/cache/zipball/13e3381b25847283a91948d04640543941309727; - sha256 = "088fxbpjssp8x95qr3ip2iynxrimimrby03xlsvp2254vcyx94c5"; + url = https://api.github.com/repos/doctrine/cache/zipball/a9c1b59eba5a08ca2770a76eddb88922f504e8e0; + sha256 = "0r1rdfs7k0zl6fqm35qjwbfiqmf3r3nbvfyxzig1379xsgvdd84y"; }; }; }; @@ -125,10 +125,10 @@ let "facade/flare-client-php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "facade-flare-client-php-6bf380035890cb0a09b9628c491ae3866b858522"; + name = "facade-flare-client-php-69742118c037f34ee1ef86dc605be4a105d9e984"; src = fetchurl { - url = https://api.github.com/repos/facade/flare-client-php/zipball/6bf380035890cb0a09b9628c491ae3866b858522; - sha256 = "1y0rjlpd71jkl0zzl3q4flv5s9gbk87947xgfi8w62sg5g7jjgl2"; + url = https://api.github.com/repos/facade/flare-client-php/zipball/69742118c037f34ee1ef86dc605be4a105d9e984; + sha256 = "1if56r0g9ymwankz40l5xhw5vch1qkjjy9914lz1vgbkj7ln9pvz"; }; }; }; @@ -165,10 +165,10 @@ let "filp/whoops" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "filp-whoops-d501fd2658d55491a2295ff600ae5978eaad7403"; + name = "filp-whoops-c13c0be93cff50f88bbd70827d993026821914dd"; src = fetchurl { - url = https://api.github.com/repos/filp/whoops/zipball/d501fd2658d55491a2295ff600ae5978eaad7403; - sha256 = "1mpgkl7yzw9j4pxkw404fvykapr42347lyz7jgrl1ks61pk6s9v5"; + url = https://api.github.com/repos/filp/whoops/zipball/c13c0be93cff50f88bbd70827d993026821914dd; + sha256 = "0janbd93xvr5hy2bms05q1l31gmwbqrgjfvbzkmv3bfw4gcksq0i"; }; }; }; @@ -195,10 +195,10 @@ let "guzzlehttp/psr7" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "guzzlehttp-psr7-35ea11d335fd638b5882ff1725228b3d35496ab1"; + name = "guzzlehttp-psr7-dc960a912984efb74d0a90222870c72c87f10c91"; src = fetchurl { - url = https://api.github.com/repos/guzzle/psr7/zipball/35ea11d335fd638b5882ff1725228b3d35496ab1; - sha256 = "1nsd7sla2jpx9kzg0lzk4kvc66d30bnkf2yfzdp7gghb67wvajfa"; + url = https://api.github.com/repos/guzzle/psr7/zipball/dc960a912984efb74d0a90222870c72c87f10c91; + sha256 = "06nc60wf8k6kcl89kprk04khsrrik5lnis615mx4a0m0pjn8bliz"; }; }; }; @@ -225,10 +225,10 @@ let "laravel/framework" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-framework-d94c07d72c14f07e7d2027458e7f0a76f9ceb0d9"; + name = "laravel-framework-0117d797dc1ab64b1f88d4f6b966380ea7def091"; src = fetchurl { - url = https://api.github.com/repos/laravel/framework/zipball/d94c07d72c14f07e7d2027458e7f0a76f9ceb0d9; - sha256 = "02cml6rg3qxnr8gynnd8iqwdyzflqwnyivxw034dzbm60xpg6w93"; + url = https://api.github.com/repos/laravel/framework/zipball/0117d797dc1ab64b1f88d4f6b966380ea7def091; + sha256 = "11aw7smg042g8kyyhdzawmkwgbv5hkn6l6k2m27lc34v84r6kdqm"; }; }; }; @@ -245,10 +245,10 @@ let "league/commonmark" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-commonmark-08fa59b8e4e34ea8a773d55139ae9ac0e0aecbaf"; + name = "league-commonmark-2651c497f005de305c7ba3f232cbd87b8c00ee8c"; src = fetchurl { - url = https://api.github.com/repos/thephpleague/commonmark/zipball/08fa59b8e4e34ea8a773d55139ae9ac0e0aecbaf; - sha256 = "10bs8r0qiq9bybypnascvk7a7181699cnwl27yq4m108cj1i223h"; + url = https://api.github.com/repos/thephpleague/commonmark/zipball/2651c497f005de305c7ba3f232cbd87b8c00ee8c; + sha256 = "0mf2avlnn0c9p4fi1jz5m85k6y7xg2p0dm1n4r7cpg25vngswmfs"; }; }; }; @@ -315,10 +315,10 @@ let "nesbot/carbon" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nesbot-carbon-2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4"; + name = "nesbot-carbon-606262fd8888b75317ba9461825a24fc34001e1e"; src = fetchurl { - url = https://api.github.com/repos/briannesbitt/Carbon/zipball/2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4; - sha256 = "0riizvfqxvvbkhhfadcqr8717s0q12p00qmffv26664h5kckl58r"; + url = https://api.github.com/repos/briannesbitt/Carbon/zipball/606262fd8888b75317ba9461825a24fc34001e1e; + sha256 = "0iqhb3gfmray8jkwki19pwm15vmf96vfj4m12nk7lmn74470lf2x"; }; }; }; @@ -455,10 +455,10 @@ let "psr/log" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "psr-log-0f73288fd15629204f9d42b7055f72dacbe811fc"; + name = "psr-log-d49695b909c3b7628b6289db5479a1c204601f11"; src = fetchurl { - url = https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc; - sha256 = "1npi9ggl4qll4sdxz1xgp8779ia73gwlpjxbb1f1cpl1wn4s42r4"; + url = https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11; + sha256 = "0sb0mq30dvmzdgsnqvw3xh4fb4bqjncx72kf8n622f94dd48amln"; }; }; }; @@ -615,30 +615,30 @@ let "symfony/console" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-console-1ba4560dbbb9fcf5ae28b61f71f49c678086cf23"; + name = "symfony-console-36bbd079b69b94bcc9c9c9e1e37ca3b1e7971625"; src = fetchurl { - url = https://api.github.com/repos/symfony/console/zipball/1ba4560dbbb9fcf5ae28b61f71f49c678086cf23; - sha256 = "1zsmv0p0xxdp44301yd3n1w9j79g631bvvfp04zniqk4h5q6kvg9"; + url = https://api.github.com/repos/symfony/console/zipball/36bbd079b69b94bcc9c9c9e1e37ca3b1e7971625; + sha256 = "0n5caxf7vgx0x6izsxfkkjdl9jw96qi7h9h0k4s8fccqqmwb61cc"; }; }; }; "symfony/css-selector" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-css-selector-f907d3e53ecb2a5fad8609eb2f30525287a734c8"; + name = "symfony-css-selector-01c77324d1d47efbfd7891f62a7c256c69330115"; src = fetchurl { - url = https://api.github.com/repos/symfony/css-selector/zipball/f907d3e53ecb2a5fad8609eb2f30525287a734c8; - sha256 = "19yqy81psz2wh8gy2j3phywsgrw9sbcw83l8lbnxbk5khg8hw3nm"; + url = https://api.github.com/repos/symfony/css-selector/zipball/01c77324d1d47efbfd7891f62a7c256c69330115; + sha256 = "12hd9vga35w8g4bwmlkr87pxlwdx71sp2bkxs8j854hf28yam75w"; }; }; }; "symfony/debug" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-debug-157bbec4fd773bae53c5483c50951a5530a2cc16"; + name = "symfony-debug-45b2136377cca5f10af858968d6079a482bca473"; src = fetchurl { - url = https://api.github.com/repos/symfony/debug/zipball/157bbec4fd773bae53c5483c50951a5530a2cc16; - sha256 = "0v7l7081fw2wr96xv472nhi1d0xzw6lnl8hnjgi9g3gnksfagwq8"; + url = https://api.github.com/repos/symfony/debug/zipball/45b2136377cca5f10af858968d6079a482bca473; + sha256 = "0p7g2mwrvg8x264kl9kn7a23adnqxh66jy1kjczq5c5xlpw2rxdb"; }; }; }; @@ -655,10 +655,10 @@ let "symfony/error-handler" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-error-handler-48e81a375525872e788c2418430f54150d935810"; + name = "symfony-error-handler-76603a8df8e001436df80758eb03a8baa5324175"; src = fetchurl { - url = https://api.github.com/repos/symfony/error-handler/zipball/48e81a375525872e788c2418430f54150d935810; - sha256 = "17hpwx8arv3h4cw4fwzkm7a39lsa92vwxsinyqmx723v1nr5z1d2"; + url = https://api.github.com/repos/symfony/error-handler/zipball/76603a8df8e001436df80758eb03a8baa5324175; + sha256 = "15s46vjwzny821qq93qsnd9ig14d72rakbavgb3sd43gipyjld8g"; }; }; }; @@ -705,30 +705,30 @@ let "symfony/http-foundation" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-foundation-02d968647fe61b2f419a8dc70c468a9d30a48d3a"; + name = "symfony-http-foundation-1a6f87ef99d05b1bf5c865b4ef7992263e1cb081"; src = fetchurl { - url = https://api.github.com/repos/symfony/http-foundation/zipball/02d968647fe61b2f419a8dc70c468a9d30a48d3a; - sha256 = "1bq4why2v8p7wy8801bdml43xh7kb5fli16cv74bvqpwlp4cdv9f"; + url = https://api.github.com/repos/symfony/http-foundation/zipball/1a6f87ef99d05b1bf5c865b4ef7992263e1cb081; + sha256 = "0da13w35j7hrkv87p8rrfxdxpksbf1dvji0ag7chwzhfg63516l6"; }; }; }; "symfony/http-kernel" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-kernel-0248214120d00c5f44f1cd5d9ad65f0b38459333"; + name = "symfony-http-kernel-cd2e325fc34a4a5bbec91eecf69dda8ee8c5ea4f"; src = fetchurl { - url = https://api.github.com/repos/symfony/http-kernel/zipball/0248214120d00c5f44f1cd5d9ad65f0b38459333; - sha256 = "032ljl732x0bs3my26wjfmxrxplz8vlxs0xzlqsxrh18lnyv6z3h"; + url = https://api.github.com/repos/symfony/http-kernel/zipball/cd2e325fc34a4a5bbec91eecf69dda8ee8c5ea4f; + sha256 = "0wk4nivw1w4kl7gziazvvzxzjhs7lalc2gc1pnscxj6k3gkfq6fl"; }; }; }; "symfony/mime" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-mime-1b2092244374cbe48ae733673f2ca0818b37197b"; + name = "symfony-mime-7af452bf51c46f18da00feb32e1ad36db9426515"; src = fetchurl { - url = https://api.github.com/repos/symfony/mime/zipball/1b2092244374cbe48ae733673f2ca0818b37197b; - sha256 = "0d2vhmd25d7yvh9xzl2vazx2bfsb8qyvd2kgvl9cry1va4vrpkj3"; + url = https://api.github.com/repos/symfony/mime/zipball/7af452bf51c46f18da00feb32e1ad36db9426515; + sha256 = "1rkm66zr6sfp8jw80h4vjrbpx40sqhhlpbc126x990mbzzapjlay"; }; }; }; @@ -815,20 +815,20 @@ let "symfony/process" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-process-7e950b6366d4da90292c2e7fa820b3c1842b965a"; + name = "symfony-process-f5481b22729d465acb1cea3455fc04ce84b0148b"; src = fetchurl { - url = https://api.github.com/repos/symfony/process/zipball/7e950b6366d4da90292c2e7fa820b3c1842b965a; - sha256 = "07ykgz5bjd45izf5n6jm2n27wcaa7aih2wlsiln1ffj9vqd6l1s4"; + url = https://api.github.com/repos/symfony/process/zipball/f5481b22729d465acb1cea3455fc04ce84b0148b; + sha256 = "1cz0gd7lkp07dlylf8c32fjpfsm9z3d66iwx45i7b5wh5gc96ns0"; }; }; }; "symfony/routing" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-routing-69919991c845b34626664ddc9b3aef9d09d2a5df"; + name = "symfony-routing-049e7c5c41f98511959668791b4adc0898a821b3"; src = fetchurl { - url = https://api.github.com/repos/symfony/routing/zipball/69919991c845b34626664ddc9b3aef9d09d2a5df; - sha256 = "0ghynrw6d9dpskhgyf3ljlz4pfmi68r3bzhr45lygadx21yacddw"; + url = https://api.github.com/repos/symfony/routing/zipball/049e7c5c41f98511959668791b4adc0898a821b3; + sha256 = "1557bvcmxpa7hmcvwl9qf94l7n9x0y7xw2k3s8v85ys35fi54clw"; }; }; }; @@ -865,10 +865,10 @@ let "symfony/var-dumper" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-var-dumper-0da0e174f728996f5d5072d6a9f0a42259dbc806"; + name = "symfony-var-dumper-c194bcedde6295f3ec3e9eba1f5d484ea97c41a7"; src = fetchurl { - url = https://api.github.com/repos/symfony/var-dumper/zipball/0da0e174f728996f5d5072d6a9f0a42259dbc806; - sha256 = "1qmv99bvq10siy8bbszqmn488cjcm70vip4xs8vxwm6x6x5cw1ia"; + url = https://api.github.com/repos/symfony/var-dumper/zipball/c194bcedde6295f3ec3e9eba1f5d484ea97c41a7; + sha256 = "0wccbr4l03asdar89bss3fhy486wjjqgjsk5iypmxaiga12ac01b"; }; }; }; From 242b03044dc270cd338ad1720dde5885289a074a Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Tue, 18 May 2021 02:00:08 -0700 Subject: [PATCH 230/249] squeekboard: unstable-2021-03-09 -> 1.13.0 (#121614) --- pkgs/applications/accessibility/squeekboard/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/accessibility/squeekboard/default.nix b/pkgs/applications/accessibility/squeekboard/default.nix index ec99666b6f4..71a0823f78d 100644 --- a/pkgs/applications/accessibility/squeekboard/default.nix +++ b/pkgs/applications/accessibility/squeekboard/default.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { pname = "squeekboard"; - version = "unstable-2021-03-09"; + version = "1.13.0"; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = pname; - rev = "bffd212e102bf71a94c599aac0359a8d30d19008"; - sha256 = "1j10zhyb8wyrcbryfj6f3drn9b0l9x0l7hnhy2imnjbfbnwwm4w7"; + rev = "v${version}"; + sha256 = "0xyd6ickbaqvrr8a7ak6j1ziqjk05jlnganjrdv43p74nnjyqr8y"; }; cargoDeps = rustPlatform.fetchCargoTarball { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { cat Cargo.toml.in Cargo.deps > Cargo.toml ''; name = "${pname}-${version}"; - sha256 = "1qaqiaxqc4x2x5bd31na4c49vbjwrmz5clmgli7733dv55rxxias"; + sha256 = "096skk7vmr93axcf0qj7kyr8hm1faj0nkmd349g8mnzwd68a9npz"; }; nativeBuildInputs = [ From e010c911049e5bccf2f626b3cc0c65fc72fe32db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 18 May 2021 10:53:39 +0200 Subject: [PATCH 231/249] openbox-menu: fix darwin build --- pkgs/applications/misc/openbox-menu/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix index 71c7903dfe2..e9646b9c21d 100644 --- a/pkgs/applications/misc/openbox-menu/default.nix +++ b/pkgs/applications/misc/openbox-menu/default.nix @@ -22,6 +22,13 @@ stdenv.mkDerivation rec { # Enables SVG support by uncommenting the Makefile patches = [ ./000-enable-svg.patch ]; + # The strip options are not recognized by Darwin. + postPatch = lib.optionalString stdenv.isDarwin '' + sed -i -e '/strip -s/d' Makefile + ''; + + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + installFlags = [ "prefix=${placeholder "out"}" ]; meta = with lib; { From 92d58ebc31aeee1abc3a0774e0920bfcddac727e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 18 May 2021 11:38:29 +0200 Subject: [PATCH 232/249] avxsynth: drop It was marked as broken in April 2018 --- pkgs/applications/video/avxsynth/default.nix | 43 -------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 -- 3 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 pkgs/applications/video/avxsynth/default.nix diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix deleted file mode 100644 index 3fd25bdf73d..00000000000 --- a/pkgs/applications/video/avxsynth/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config -, cairo, ffmpeg_3, ffms, libjpeg, log4cpp, pango -, avxeditSupport ? false, qt4 ? null -}: - -let - inherit (lib) enableFeature optional; -in - -stdenv.mkDerivation { - pname = "avxsynth"; - version = "2015-04-07"; - - src = fetchFromGitHub { - owner = "avxsynth"; - repo = "avxsynth"; - rev = "80dcb7ec8d314bc158130c92803308aa8e5e9242"; - sha256 = "0kckggvgv68b0qjdi7ms8vi97b46dl63n60qr96d2w67lf2nk87z"; - }; - - configureFlags = [ - "--enable-autocrop" - "--enable-framecapture" - "--enable-subtitle" - "--enable-ffms2" - (enableFeature avxeditSupport "avxedit") - "--with-jpeg=${libjpeg.out}/lib" - ]; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - - buildInputs = [ cairo ffmpeg_3 ffms libjpeg log4cpp pango ] - ++ optional avxeditSupport qt4; - - meta = with lib; { - description = "A script system that allows advanced non-linear editing"; - homepage = "https://github.com/avxsynth/avxsynth"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ codyopel ]; - platforms = platforms.linux; - broken = true; # 2018-04-10 - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fe2b1025c48..6313030a54f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -63,6 +63,7 @@ mapAliases ({ at_spi2_core = at-spi2-core; # added 2018-02-25 aucdtect = throw "aucdtect: Upstream no longer provides download urls."; # added 2020-12-26 avldrums-lv2 = x42-avldrums; # added 2020-03-29 + avxsynth = throw "avxsynth was removed because it was broken"; # added 2021-05-18 bar-xft = lemonbar-xft; # added 2015-01-16 bashCompletion = bash-completion; # Added 2016-09-28 batti = throw "batti has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c1240f0285..0ddbcf2b226 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22353,10 +22353,6 @@ in avrdudess = callPackage ../applications/misc/avrdudess { }; - avxsynth = callPackage ../applications/video/avxsynth { - libjpeg = libjpeg_original; # error: 'JCOPYRIGHT_SHORT' was not declared in this scope - }; - awesome-4-0 = callPackage ../applications/window-managers/awesome { cairo = cairo.override { xcbSupport = true; }; inherit (texFunctions) fontsConf; From 049d5a7219f712576d25f262a2d645f52e672219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 18 May 2021 11:39:57 +0200 Subject: [PATCH 233/249] pactorio: fix darwin build --- pkgs/development/tools/pactorio/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pactorio/default.nix b/pkgs/development/tools/pactorio/default.nix index d29e1244378..8defc8c06ca 100644 --- a/pkgs/development/tools/pactorio/default.nix +++ b/pkgs/development/tools/pactorio/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, installShellFiles, lib, rustPlatform }: +{ fetchFromGitHub, installShellFiles, lib, stdenv, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "pactorio"; @@ -14,6 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1m7bvi6i52xqvssjx5fr2dz25ny7hkmb8w8p23pczpdmpd2y0r7r"; nativeBuildInputs = [ installShellFiles ]; + buildInputs = lib.optional stdenv.isDarwin Security; preFixup = '' completions=($releaseDir/build/pactorio-*/out/completions) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c030fb9453f..9af2f0c0940 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13452,7 +13452,9 @@ in libiberty_static = libiberty.override { staticBuild = true; }; }; - pactorio = callPackage ../development/tools/pactorio { }; + pactorio = callPackage ../development/tools/pactorio { + inherit (darwin.apple_sdk.frameworks) Security; + }; pahole = callPackage ../development/tools/misc/pahole {}; From 5db1f83e23a4a884d24da7cdf4a8f1a70f23b1f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 18 May 2021 11:41:38 +0200 Subject: [PATCH 234/249] baresip: use ffmpeg instead of ffmpeg_3 --- .../networking/instant-messengers/baresip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index e3a8e682577..0c6b33e04a2 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, zlib, openssl, libre, librem, pkg-config, gst_all_1 -, cairo, mpg123, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg_3 +, cairo, mpg123, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg , gsm, speex, portaudio, spandsp, libuuid, libvpx }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; buildInputs = [zlib openssl libre librem cairo mpg123 - alsaLib SDL libv4l celt libsndfile srtp ffmpeg_3 gsm speex portaudio spandsp libuuid + alsaLib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid libvpx ] ++ (with gst_all_1; [ gstreamer gst-libav gst-plugins-base gst-plugins-bad gst-plugins-good ]); makeFlags = [ From 32cf9f812137f339bbc0759ffa2ecc70ceae61e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 18 May 2021 11:44:16 +0200 Subject: [PATCH 235/249] physfs_2: fix darwin build --- pkgs/development/libraries/physfs/default.nix | 5 ++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix index 3eb4077d985..faa338c94fc 100644 --- a/pkgs/development/libraries/physfs/default.nix +++ b/pkgs/development/libraries/physfs/default.nix @@ -1,5 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, doxygen, darwin -, zlib }: +{ lib, stdenv, fetchurl, cmake, doxygen, zlib, Foundation, Carbon }: let generic = version: sha256: @@ -15,7 +14,7 @@ let nativeBuildInputs = [ cmake doxygen ]; buildInputs = [ zlib ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; + ++ lib.optionals stdenv.isDarwin [ Foundation Carbon ]; patchPhase = '' sed s,-Werror,, -i CMakeLists.txt diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c030fb9453f..008314bac1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17217,7 +17217,9 @@ in pe-parse = callPackage ../development/libraries/pe-parse { }; - inherit (callPackage ../development/libraries/physfs { }) + inherit (callPackage ../development/libraries/physfs { + inherit (darwin.apple_sdk.frameworks) Foundation Carbon; + }) physfs_2 physfs; From df51504424086d4d48b0b34c03c9367f59d48095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 18 May 2021 11:46:51 +0200 Subject: [PATCH 236/249] pikchr: fix darwin build --- pkgs/tools/graphics/pikchr/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/graphics/pikchr/default.nix b/pkgs/tools/graphics/pikchr/default.nix index 9b06d062913..432c70231d0 100644 --- a/pkgs/tools/graphics/pikchr/default.nix +++ b/pkgs/tools/graphics/pikchr/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation { substituteInPlace Makefile --replace open "test -f" ''; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + installPhase = '' install -Dm755 pikchr $out/bin/pikchr install -Dm755 pikchr.out $out/lib/pikchr.o From 0b7ebd1b517da92cefe3eae027c02152c3412e69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 18 May 2021 11:59:23 +0200 Subject: [PATCH 237/249] privateer: drop It was marked as broken in August 2015. --- .../0001-fix-VSFile-constructor.patch | 25 ----------- pkgs/games/privateer/default.nix | 44 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 71 deletions(-) delete mode 100644 pkgs/games/privateer/0001-fix-VSFile-constructor.patch delete mode 100644 pkgs/games/privateer/default.nix diff --git a/pkgs/games/privateer/0001-fix-VSFile-constructor.patch b/pkgs/games/privateer/0001-fix-VSFile-constructor.patch deleted file mode 100644 index 05b02fe5d73..00000000000 --- a/pkgs/games/privateer/0001-fix-VSFile-constructor.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e779a2b8d53e7e4721ce5ddb8e8b1caa753b66dd Mon Sep 17 00:00:00 2001 -From: Florian Friesdorf -Date: Wed, 4 Jan 2012 23:32:19 +0100 -Subject: [PATCH] fix VSFile constructor - ---- - src/vsfilesystem.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/vsfilesystem.h b/src/vsfilesystem.h -index 4bb7a66..71bf9b9 100644 ---- a/src/vsfilesystem.h -+++ b/src/vsfilesystem.h -@@ -291,7 +291,7 @@ namespace VSFileSystem - VSFile(); - VSFile( const char * buffer, long size, VSFileType type=ZoneBuffer, VSFileMode=ReadOnly); - VSFile( const char * filename, VSFileType type=UnknownFile, VSFileMode=ReadOnly); -- VSFile( const string &filename, VSFileType type=UnknownFile) { VSFile::VSFile( filename.c_str(), type); } -+ VSFile( const string &filename, VSFileType type=UnknownFile) { VSFile( filename.c_str(), type); } - ~VSFile(); - - FILE * GetFP() { return this->fp; } // This is still needed for special cases (when loading PNG files) --- -1.7.8 - diff --git a/pkgs/games/privateer/default.nix b/pkgs/games/privateer/default.nix deleted file mode 100644 index f3ea6dc8cb1..00000000000 --- a/pkgs/games/privateer/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv, fetchsvn, boost, cmake, ffmpeg_3, freeglut, glib, - gtk2, libjpeg, libpng, libpthreadstubs, libvorbis, libXau, libXdmcp, - libXmu, libGLU, libGL, openal, pixman, pkg-config, python27, SDL }: - -stdenv.mkDerivation { - name = "privateer-1.03"; - - src = fetchsvn { - #url = "mirror://sourceforge/project/privateer/Wing%20Commander%20Privateer/Privateer%20Gemini%20Gold%201.03/PrivateerGold1.03.bz2.bin"; - url = "https://privateer.svn.sourceforge.net/svnroot/privateer/privgold/trunk/engine"; - rev = "294"; - sha256 = "e1759087d4565d3fc95e5c87d0f6ddf36b2cd5befec5695ec56ed5f3cd144c63"; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = - [ boost ffmpeg_3 freeglut glib gtk2 libjpeg libpng - libpthreadstubs libvorbis libXau libXdmcp libXmu libGLU libGL openal - pixman python27 SDL ]; - - patches = [ ./0001-fix-VSFile-constructor.patch ]; - - preConfigure = '' - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0)" - ''; - - installPhase = '' - mkdir -p $out/bin - cp vegastrike $out/bin - cp vegaserver $out/bin - ''; - - meta = with lib; { - homepage = "http://privateer.sourceforge.net/"; - description = "Adventure space flight simulation computer game"; - license = licenses.gpl2Plus; # and a special license for art data - # https://sourceforge.net/p/privateer/code/HEAD/tree/privgold/trunk/data/art-license.txt - - maintainers = with maintainers; [ ]; - platforms = with platforms; linux ++ darwin; - hydraPlatforms = []; - broken = true; # it won't build - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fe2b1025c48..3be4940d8b0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -606,6 +606,7 @@ mapAliases ({ postgis = postgresqlPackages.postgis; # end ppl-address-book = throw "ppl-address-book deprecated on 2019-05-02: abandoned by upstream."; + privateer = throw "privateer was removed because it was broken"; # added 2021-05-18 processing3 = processing; # added 2019-08-16 procps-ng = procps; # added 2018-06-08 proj_5 = throw "Proj-5 has been removed from nixpkgs, use proj instead."; # added 2021-04-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c1240f0285..68ec73e167a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28307,8 +28307,6 @@ in prboom = callPackage ../games/prboom { }; - privateer = callPackage ../games/privateer { }; - pysolfc = python3Packages.callPackage ../games/pysolfc { }; qqwing = callPackage ../games/qqwing { }; From 9284a2b99f46b60507d3b6279dedb7bb63947561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 18 May 2021 13:11:45 +0200 Subject: [PATCH 238/249] prometheus-wireguard-exporter: fix darwin build --- pkgs/servers/monitoring/prometheus/wireguard-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index c143c44704b..1dbb3179627 100644 --- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, lib, Security, nixosTests }: +{ stdenv, rustPlatform, fetchFromGitHub, lib, libiconv, Security, nixosTests }: rustPlatform.buildRustPackage rec { pname = "wireguard-exporter"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-lNFsO7FSmH1+DLM7ID0vn6234qTdtUoaLSnqKcbHoXE="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; passthru.tests = { inherit (nixosTests.prometheus-exporters) wireguard; }; From 23b30e11a07f2c976e95bc3dda68eeae0d13e70f Mon Sep 17 00:00:00 2001 From: David Wood Date: Tue, 18 May 2021 14:29:19 +0100 Subject: [PATCH 239/249] webssh: init at 1.5.3 (#122559) Co-authored-by: Sandro --- .../python-modules/webssh/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/webssh/default.nix diff --git a/pkgs/development/python-modules/webssh/default.nix b/pkgs/development/python-modules/webssh/default.nix new file mode 100644 index 00000000000..00aff794372 --- /dev/null +++ b/pkgs/development/python-modules/webssh/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi, tornado, paramiko }: + +buildPythonPackage rec { + pname = "webssh"; + version = "1.5.3"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Au6PE8jYm8LkEp0B1ymW//ZkrkcV0BauwufQmrHLEU4="; + }; + + propagatedBuildInputs = [ tornado paramiko ]; + + pythonImportsCheck = [ "webssh" ]; + + meta = with lib; { + homepage = "https://github.com/huashengdun/webssh/"; + description = "Web based ssh client"; + license = licenses.mit; + maintainers = with maintainers; [ davidtwco ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c8c3c5d712..e012152dd3a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27048,6 +27048,8 @@ in webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {}; + webssh = with python3Packages; toPythonApplication webssh; + webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {}; wrapWeechat = callPackage ../applications/networking/irc/weechat/wrapper.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 85c1a6a1f60..64adafc6207 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8713,6 +8713,8 @@ in { websockify = callPackage ../development/python-modules/websockify { }; + webssh = callPackage ../development/python-modules/webssh { }; + webtest = callPackage ../development/python-modules/webtest { }; webthing = callPackage ../development/python-modules/webthing { }; From 92a7f5cb67ee69602bdedfc1bc9eb646456e179e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 18 May 2021 13:41:32 +0000 Subject: [PATCH 240/249] find-cursor: 1.6 -> 1.7 --- pkgs/tools/X11/find-cursor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/find-cursor/default.nix b/pkgs/tools/X11/find-cursor/default.nix index 9e3b779d686..3f330c63b0f 100644 --- a/pkgs/tools/X11/find-cursor/default.nix +++ b/pkgs/tools/X11/find-cursor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "find-cursor"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "arp242"; repo = "find-cursor"; rev = "v${version}"; - sha256 = "13lpcxklv9ayqapyk9pmwxkinhxah5hkr6n0jc2m5hm68nh220w1"; + sha256 = "sha256-cFvhoEPDFLw6rsPYUF9gqAFzINewnszJEzxRK064NEU="; }; nativeBuildInputs = [ installShellFiles git ]; From 6e98a27ffa99d70cb5194e164b845cc8cb59bf03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Tue, 18 May 2021 16:26:25 +0200 Subject: [PATCH 241/249] gtk-sharp-2_0: fix with patch from arch --- pkgs/development/libraries/gtk-sharp/2.0.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix index 1e7c8653065..f35f5e0552c 100644 --- a/pkgs/development/libraries/gtk-sharp/2.0.nix +++ b/pkgs/development/libraries/gtk-sharp/2.0.nix @@ -20,6 +20,7 @@ , automake , libtool , which +, fetchpatch }: stdenv.mkDerivation rec { @@ -34,6 +35,13 @@ stdenv.mkDerivation rec { sha256 = "1vy6yfwkfv6bb45bzf4g6dayiqkvqqvlr02rsnhd10793hlpqlgg"; }; + patches = [ + (fetchpatch { + url = "https://projects.archlinux.de/svntogit/packages.git/plain/trunk/gtk-sharp2-2.12.12-gtkrange.patch?h=packages/gtk-sharp-2"; + sha256 = "bjx+OfgWnN8SO82p8G7pbGuxJ9EeQxMLeHnrtEm8RV8="; + }) + ]; + postInstall = '' pushd $out/bin for f in gapi2-* From 4bb1c4677d97eff6408bd9c0be58e32f075d6aff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 18 May 2021 16:33:26 +0200 Subject: [PATCH 242/249] rdesktop: fix darwin build (#123498) --- pkgs/applications/networking/remote/rdesktop/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix index acf1d7cc2d2..e2ee9428ad2 100644 --- a/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/pkgs/applications/networking/remote/rdesktop/default.nix @@ -1,4 +1,5 @@ -{lib, stdenv, fetchFromGitHub, openssl, libX11, krb5, libXcursor, libtasn1, nettle, gnutls, pkg-config, autoreconfHook +{ lib, stdenv, fetchFromGitHub, openssl, libX11, krb5, libXcursor, libtasn1 +, nettle, gnutls, pkg-config, autoreconfHook, libiconv , enableCredssp ? (!stdenv.isDarwin) } : @@ -15,7 +16,8 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [pkg-config autoreconfHook]; buildInputs = [openssl libX11 libXcursor libtasn1 nettle gnutls] - ++ lib.optional enableCredssp krb5; + ++ lib.optional enableCredssp krb5 + ++ lib.optional stdenv.isDarwin libiconv; configureFlags = [ "--with-ipv6" From 7e9451ffb325698b7192e5eb30b051cc5ac96a5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 18 May 2021 16:34:25 +0200 Subject: [PATCH 243/249] rink: fix darwin build (#123501) --- pkgs/applications/science/misc/rink/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix index 232e13218cb..fcacaefca44 100644 --- a/pkgs/applications/science/misc/rink/default.nix +++ b/pkgs/applications/science/misc/rink/default.nix @@ -1,4 +1,5 @@ -{ lib, fetchFromGitHub, rustPlatform, openssl, pkg-config, ncurses }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, ncurses +, libiconv, Security }: rustPlatform.buildRustPackage rec { version = "0.6.1"; @@ -14,7 +15,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0x4rvfnw3gl2aj6i006nkk3y1f8skyv8g0ss3z2v6qj9nhs7pyir"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ncurses ]; + buildInputs = [ ncurses ] + ++ (if stdenv.isDarwin then [ libiconv Security ] else [ openssl ]); # Some tests fail and/or attempt to use internet servers. doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e012152dd3a..558da9787c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29830,7 +29830,9 @@ in stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else gcc8Stdenv; }); - rink = callPackage ../applications/science/misc/rink { }; + rink = callPackage ../applications/science/misc/rink { + inherit (darwin.apple_sdk.frameworks) Security; + }; simgrid = callPackage ../applications/science/misc/simgrid { }; From fbf1525f0186aaaf7f7c84eee3ec35b9573e80f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 18 May 2021 16:35:37 +0200 Subject: [PATCH 244/249] probe-run: fix darwin build (#123494) --- pkgs/development/tools/rust/probe-run/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/probe-run/default.nix b/pkgs/development/tools/rust/probe-run/default.nix index 7371e4bb9ba..262d8c4945e 100644 --- a/pkgs/development/tools/rust/probe-run/default.nix +++ b/pkgs/development/tools/rust/probe-run/default.nix @@ -1,4 +1,5 @@ -{ lib, rustPlatform, fetchFromGitHub, pkg-config, libusb1 }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, libusb1 +, libiconv, AppKit, IOKit }: rustPlatform.buildRustPackage rec { pname = "probe-run"; @@ -14,7 +15,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "HmDKfb8F6sGnaX64FR3No2GbBYm4bVopbjs8d35WiZQ="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libusb1 ]; + buildInputs = [ libusb1 ] + ++ lib.optionals stdenv.isDarwin [ libiconv AppKit IOKit ]; meta = with lib; { description = "Run embedded programs just like native ones."; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 558da9787c3..06664e9216c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -265,7 +265,9 @@ in html5validator = python3Packages.callPackage ../applications/misc/html5validator { }; - probe-run = callPackage ../development/tools/rust/probe-run {}; + probe-run = callPackage ../development/tools/rust/probe-run { + inherit (darwin.apple_sdk.frameworks) AppKit IOKit; + }; proto-contrib = callPackage ../development/tools/proto-contrib {}; From 51eeb21486c35d97ec1fb46ab69edc83b798bc2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 18 May 2021 16:36:25 +0200 Subject: [PATCH 245/249] powershell: fix darwin build (#123484) --- pkgs/shells/powershell/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index dfc4f94e12b..cedf578d46a 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -38,6 +38,9 @@ stdenv.mkDerivation rec { rm -f $pslibs/libcrypto${ext}.1.0.0 rm -f $pslibs/libssl${ext}.1.0.0 + # At least the 7.1.3-osx package does not have the executable bit set. + chmod a+x $pslibs/pwsh + ls $pslibs '' + lib.optionalString (!stdenv.isDarwin) '' patchelf --replace-needed libcrypto${ext}.1.0.0 libcrypto${ext}.1.1 $pslibs/libmi.so @@ -55,7 +58,8 @@ stdenv.mkDerivation rec { doInstallCheck = true; installCheckPhase = '' - $out/bin/pwsh --help > /dev/null + # May need a writable home, seen on Darwin. + HOME=$TMP $out/bin/pwsh --help > /dev/null ''; meta = with lib; { From e097fa08c8c6908d3ed80952e30d6c984241fbd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 18 May 2021 16:38:38 +0200 Subject: [PATCH 246/249] nss_wrapper: broken on darwin (#123462) --- pkgs/development/libraries/nss_wrapper/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index 3cdeb93dc9b..0e08083c4d8 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { description = "A wrapper for the user, group and hosts NSS API"; homepage = "https://git.samba.org/?p=nss_wrapper.git;a=summary;"; license = licenses.bsd3; - platforms = platforms.all; + platforms = platforms.unix; + broken = stdenv.isDarwin; }; } From ec9cfba2d36726a008fcaa642cf97558d1a70857 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 May 2021 05:40:52 +0200 Subject: [PATCH 247/249] nixos/phosh: Fix unrestricted login because of insecure PAM config The PAM config deployed would not check anything meaningful. Remove it and rely on the defaults in the security.pam module to fix login with arbitrary credentials. Resolves: #123435 --- nixos/modules/programs/phosh.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/nixos/modules/programs/phosh.nix b/nixos/modules/programs/phosh.nix index 150874be674..1f50065f781 100644 --- a/nixos/modules/programs/phosh.nix +++ b/nixos/modules/programs/phosh.nix @@ -145,15 +145,7 @@ in { programs.feedbackd.enable = true; - # https://source.puri.sm/Librem5/phosh/-/issues/303 - security.pam.services.phosh = { - text = '' - auth requisite pam_nologin.so - auth required pam_succeed_if.so user != root quiet_success - auth required pam_securetty.so - auth requisite pam_nologin.so - ''; - }; + security.pam.services.phosh = {}; services.gnome.core-shell.enable = true; services.gnome.core-os-services.enable = true; From 89631e4df2b174913e15022ea437e961f5651744 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Tue, 18 May 2021 17:03:43 +0200 Subject: [PATCH 248/249] gnome-podcasts: 0.4.8 -> 0.4.9 --- .../audio/gnome-podcasts/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix index 6524700ae15..710110c8172 100644 --- a/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/pkgs/applications/audio/gnome-podcasts/default.nix @@ -8,8 +8,11 @@ , python3 , pkg-config , glib -, libhandy_0 +, cmake +, libhandy , gtk3 +, appstream-glib +, desktop-file-utils , dbus , openssl , sqlite @@ -19,20 +22,20 @@ stdenv.mkDerivation rec { pname = "gnome-podcasts"; - version = "0.4.8"; + version = "0.4.9"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "podcasts"; rev = version; - sha256 = "0y2332zjq7vf1v38wzwz98fs19vpzy9kl7y0xbdzqr303l59hjb1"; + sha256 = "1ah59ac3xm3sqai8zhil8ar30pviw83cm8in1n4id77rv24xkvgm"; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-GInRA/V61r42spb/JYlM8+mATSkmOxdm2zHPRWaKcck="; + sha256 = "1iihpfvkli09ysn46cnif53xizkwzk0m91bljmlzsygp3ip5i5yw"; }; nativeBuildInputs = [ @@ -49,9 +52,12 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + appstream-glib + cmake + desktop-file-utils glib gtk3 - libhandy_0 + libhandy dbus openssl sqlite From 903665f31c5c8aeaaf6481c44c3e47702ea465ad Mon Sep 17 00:00:00 2001 From: Ashlynn Anderson Date: Tue, 18 May 2021 11:29:37 -0400 Subject: [PATCH 249/249] nixos/self-deploy: init (#120940) Add `self-deploy` service to facilitate continuous deployment of NixOS configuration from a git repository. --- nixos/modules/module-list.nix | 1 + nixos/modules/services/system/self-deploy.nix | 170 ++++++++++++++++++ 2 files changed, 171 insertions(+) create mode 100644 nixos/modules/services/system/self-deploy.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 9830a5f203e..121696b17b8 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -895,6 +895,7 @@ ./services/system/kerberos/default.nix ./services/system/nscd.nix ./services/system/saslauthd.nix + ./services/system/self-deploy.nix ./services/system/uptimed.nix ./services/torrent/deluge.nix ./services/torrent/flexget.nix diff --git a/nixos/modules/services/system/self-deploy.nix b/nixos/modules/services/system/self-deploy.nix new file mode 100644 index 00000000000..3c82ed4fc59 --- /dev/null +++ b/nixos/modules/services/system/self-deploy.nix @@ -0,0 +1,170 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.self-deploy; + + workingDirectory = "/var/lib/nixos-self-deploy"; + repositoryDirectory = "${workingDirectory}/repo"; + outPath = "${workingDirectory}/system"; + + gitWithRepo = "git -C ${repositoryDirectory}"; + + renderNixArgs = args: + let + toArg = key: value: + if builtins.isString value + then " --argstr ${lib.escapeShellArg key} ${lib.escapeShellArg value}" + else " --arg ${lib.escapeShellArg key} ${lib.escapeShellArg (toString value)}"; + in + lib.concatStrings (lib.mapAttrsToList toArg args); + + isPathType = x: lib.strings.isCoercibleToString x && builtins.substring 0 1 (toString x) == "/"; + +in +{ + options.services.self-deploy = { + enable = lib.mkEnableOption "self-deploy"; + + nixFile = lib.mkOption { + type = lib.types.path; + + default = "/default.nix"; + + description = '' + Path to nix file in repository. Leading '/' refers to root of + git repository. + ''; + }; + + nixAttribute = lib.mkOption { + type = lib.types.str; + + description = '' + Attribute of `nixFile` that builds the current system. + ''; + }; + + nixArgs = lib.mkOption { + type = lib.types.attrs; + + default = { }; + + description = '' + Arguments to `nix-build` passed as `--argstr` or `--arg` depending on + the type. + ''; + }; + + switchCommand = lib.mkOption { + type = lib.types.enum [ "boot" "switch" "dry-activate" "test" ]; + + default = "switch"; + + description = '' + The `switch-to-configuration` subcommand used. + ''; + }; + + repository = lib.mkOption { + type = with lib.types; oneOf [ path str ]; + + description = '' + The repository to fetch from. Must be properly formatted for git. + + If this value is set to a path (must begin with `/`) then it's + assumed that the repository is local and the resulting service + won't wait for the network to be up. + + If the repository will be fetched over SSH, you must add an + entry to `programs.ssh.knownHosts` for the SSH host for the fetch + to be successful. + ''; + }; + + sshKeyFile = lib.mkOption { + type = with lib.types; nullOr path; + + default = null; + + description = '' + Path to SSH private key used to fetch private repositories over + SSH. + ''; + }; + + branch = lib.mkOption { + type = lib.types.str; + + default = "master"; + + description = '' + Branch to track + + Technically speaking any ref can be specified here, as this is + passed directly to a `git fetch`, but for the use-case of + continuous deployment you're likely to want to specify a branch. + ''; + }; + + startAt = lib.mkOption { + type = with lib.types; either str (listOf str); + + default = "hourly"; + + description = '' + The schedule on which to run the `self-deploy` service. Format + specified by `systemd.time 7`. + + This value can also be a list of `systemd.time 7` formatted + strings, in which case the service will be started on multiple + schedules. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.self-deploy = { + wantedBy = [ "multi-user.target" ]; + + requires = lib.mkIf (!(isPathType cfg.repository)) [ "network-online.target" ]; + + environment.GIT_SSH_COMMAND = lib.mkIf (!(isNull cfg.sshKeyFile)) + "${pkgs.openssh}/bin/ssh -i ${lib.escapeShellArg cfg.sshKeyFile}"; + + restartIfChanged = false; + + path = with pkgs; [ + git + nix + systemd + ]; + + script = '' + if [ ! -e ${repositoryDirectory} ]; then + mkdir --parents ${repositoryDirectory} + git init ${repositoryDirectory} + fi + + ${gitWithRepo} fetch ${lib.escapeShellArg cfg.repository} ${lib.escapeShellArg cfg.branch} + + ${gitWithRepo} checkout FETCH_HEAD + + nix-build${renderNixArgs cfg.nixArgs} ${lib.cli.toGNUCommandLineShell { } { + attr = cfg.nixAttribute; + out-link = outPath; + }} ${lib.escapeShellArg "${repositoryDirectory}${cfg.nixFile}"} + + ${lib.optionalString (cfg.switchCommand != "test") + "nix-env --profile /nix/var/nix/profiles/system --set ${outPath}"} + + ${outPath}/bin/switch-to-configuration ${cfg.switchCommand} + + rm ${outPath} + + ${gitWithRepo} gc --prune=all + + ${lib.optionalString (cfg.switchCommand == "boot") "systemctl reboot"} + ''; + }; + }; +}