From 7914de9b8c9da562e2cd342b96a8547cf482a16c Mon Sep 17 00:00:00 2001 From: Dave Nicponski Date: Mon, 18 Nov 2019 15:48:04 -0500 Subject: [PATCH 01/96] substitute: init at 0 Similar to the colocated `substituteAll` script and derivation, this PR adds nix-level support for `substitute` directly. This is useful, for instance, to be able to easily make tweaks to patch files for an existing derivation's existing patch files. --- pkgs/build-support/substitute/substitute.nix | 14 ++++++++++++++ pkgs/build-support/substitute/substitute.sh | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 34 insertions(+) create mode 100644 pkgs/build-support/substitute/substitute.nix create mode 100644 pkgs/build-support/substitute/substitute.sh diff --git a/pkgs/build-support/substitute/substitute.nix b/pkgs/build-support/substitute/substitute.nix new file mode 100644 index 000000000000..7f0332334585 --- /dev/null +++ b/pkgs/build-support/substitute/substitute.nix @@ -0,0 +1,14 @@ +{ stdenvNoCC }: + +args: + +# This is a wrapper around `substitute` in the stdenv. +# The `replacements` attribute should be a list of list of arguments +# to `substitute`, such as `[ "--replace" "sourcetext" "replacementtext" ]` +stdenvNoCC.mkDerivation ({ + name = if args ? name then args.name else baseNameOf (toString args.src); + builder = ./substitute.sh; + inherit (args) src; + preferLocalBuild = true; + allowSubstitutes = false; +} // args // { replacements = args.replacements; }) diff --git a/pkgs/build-support/substitute/substitute.sh b/pkgs/build-support/substitute/substitute.sh new file mode 100644 index 000000000000..dbac275a80ed --- /dev/null +++ b/pkgs/build-support/substitute/substitute.sh @@ -0,0 +1,18 @@ +source $stdenv/setup + +args= + +target=$out +if test -n "$dir"; then + target=$out/$dir/$name + mkdir -p $out/$dir +fi + +substitute $src $target $replacements + +if test -n "$isExecutable"; then + chmod +x $target +fi + +eval "$postInstall" + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79b78ab3ad8b..81242c4720c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -420,6 +420,8 @@ in srcOnly = args: callPackage ../build-support/src-only args; + substitute = callPackage ../build-support/substitute/substitute.nix { }; + substituteAll = callPackage ../build-support/substitute/substitute-all.nix { }; substituteAllFiles = callPackage ../build-support/substitute-files/substitute-all-files.nix { }; From 7a5ef5067c7c6c2756a841871d394cc92779bc72 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 07:14:05 +0000 Subject: [PATCH 02/96] tilt: 0.20.5 -> 0.22.4 --- pkgs/applications/networking/cluster/tilt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index d717bd42652b..8c0fa980d81e 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.20.5"; + version = "0.22.4"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pUKKHrShED7yp5WSmHSbS+eiYs22Nm2/ouc2a8WYc38="; + sha256 = "sha256-bu8U3eJc10tnQhLLX0FwDrlTUVpjZBW7V4gbc/tBTBU="; }; vendorSha256 = null; From e89edcaf4a7f0ddafe67550ce36d9b68e7d91430 Mon Sep 17 00:00:00 2001 From: k4leg Date: Mon, 16 Aug 2021 17:21:04 +0300 Subject: [PATCH 03/96] maintainers/maintainer-list: add k4leg --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ef102e3a7a3d..060fb77c4bf6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5332,6 +5332,12 @@ githubId = 66669; name = "Jeff Zellner"; }; + k4leg = { + name = "k4leg"; + email = "python.bogdan@gmail.com"; + github = "k4leg"; + githubId = 39882583; + }; kaction = { name = "Dmitry Bogatov"; email = "KAction@disroot.org"; From c6de81559eb1a6aad6ed3255c78e3de29a9a545d Mon Sep 17 00:00:00 2001 From: k4leg Date: Mon, 16 Aug 2021 17:22:39 +0300 Subject: [PATCH 04/96] ventoy-bin: init at 1.0.51 --- pkgs/tools/cd-dvd/ventoy-bin/default.nix | 95 ++++++++++++++ .../fix-for-read-only-file-system.patch | 118 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 215 insertions(+) create mode 100644 pkgs/tools/cd-dvd/ventoy-bin/default.nix create mode 100644 pkgs/tools/cd-dvd/ventoy-bin/fix-for-read-only-file-system.patch diff --git a/pkgs/tools/cd-dvd/ventoy-bin/default.nix b/pkgs/tools/cd-dvd/ventoy-bin/default.nix new file mode 100644 index 000000000000..334b3abdfc95 --- /dev/null +++ b/pkgs/tools/cd-dvd/ventoy-bin/default.nix @@ -0,0 +1,95 @@ +{ lib, stdenv, fetchurl, fetchpatch +, autoPatchelfHook, makeWrapper +, hexdump, exfat, dosfstools, e2fsprogs, xz, util-linux, bash, parted +}: + +let arch = { + x86_64-linux = "x86_64"; + i686-linux = "i386"; + aarch64-linux = "aarch64"; + mipsel-linux = "mips64el"; +}.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}"); +in stdenv.mkDerivation rec { + pname = "ventoy-bin"; + version = "1.0.51"; + + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + buildInputs = [ hexdump exfat dosfstools e2fsprogs xz util-linux bash parted ]; + + src = fetchurl { + url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz"; + sha256 = "81ae02a06b132b5965dd09c9b64e000a6dafa1d57e03d8564feefda14ef1ee02"; + }; + patches = [ + (fetchpatch { + name = "sanitize.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/sanitize.patch?h=ventoy-bin&id=ce4c26c67a1de4b761f9448bf92e94ffae1c8148"; + sha256 = "c00f9f9cd5b4f81c566267b7b2480fa94d28dda43a71b1e47d6fa86f764e7038"; + }) + ./fix-for-read-only-file-system.patch + ]; + patchFlags = [ "-p0" ]; + postPatch = '' + # Fix permissions. + find -type f -name \*.sh -exec chmod a+x '{}' \; + + # Fix path to log. + sed -i 's:[lL]og\.txt:/var/log/ventoy\.log:g' WebUI/static/js/languages.js + ''; + installPhase = '' + # Setup variables. + local VENTOY_PATH="$out"/share/ventoy + local ARCH='${arch}' + + # Prepare. + cd tool/"$ARCH" + rm ash* hexdump* mkexfatfs* mount.exfat-fuse* xzcat* + for archive in *.xz; do + xzcat "$archive" > "''${archive%.xz}" + rm "$archive" + done + chmod a+x * + cd - + + # Cleanup. + case "$ARCH" in + x86_64) rm -r tool/{i386,aarch64,mips64el};; + i386) rm -r tool/{x86_64,aarch64,mips64el};; + aarch64) rm -r tool/{x86_64,i386,mips64el};; + mips64el) rm -r tool/{x86_64,i386,aarch64};; + esac + rm README + + # Copy from "$src" to "$out". + mkdir -p "$out"/bin "$VENTOY_PATH" + cp -r . "$VENTOY_PATH" + + # Fill bin dir. + for f in Ventoy2Disk.sh_ventoy VentoyWeb.sh_ventoy-web \ + CreatePersistentImg.sh_ventoy-persistent \ + ExtendPersistentImg.sh_ventoy-extend-persistent; do + makeWrapper "$VENTOY_PATH/''${f%_*}" "$out/bin/''${f#*_}" \ + --prefix PATH : "${lib.makeBinPath buildInputs}" \ + --run "cd '$VENTOY_PATH' || exit 1" + done + ''; + + meta = with lib; { + description = "An open source tool to create bootable USB drive for ISO/WIM/IMG/VHD(x)/EFI files"; + longDescription = '' + An open source tool to create bootable USB drive for + ISO/WIM/IMG/VHD(x)/EFI files. With ventoy, you don't need to format the + disk over and over, you just need to copy the ISO/WIM/IMG/VHD(x)/EFI + files to the USB drive and boot them directly. You can copy many files + at a time and ventoy will give you a boot menu to select them + (screenshot). x86 Legacy BIOS, IA32 UEFI, x86_64 UEFI, ARM64 UEFI and + MIPS64EL UEFI are supported in the same way. Most type of OS supported + (Windows/WinPE/Linux/Unix/VMware/Xen...). + ''; + homepage = "https://www.ventoy.net"; + changelog = "https://www.ventoy.net/doc_news.html"; + license = licenses.gpl3Plus; + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "mipsel-linux" ]; + maintainers = with maintainers; [ k4leg ]; + }; +} diff --git a/pkgs/tools/cd-dvd/ventoy-bin/fix-for-read-only-file-system.patch b/pkgs/tools/cd-dvd/ventoy-bin/fix-for-read-only-file-system.patch new file mode 100644 index 000000000000..fa3eb7c38b34 --- /dev/null +++ b/pkgs/tools/cd-dvd/ventoy-bin/fix-for-read-only-file-system.patch @@ -0,0 +1,118 @@ +diff -Naurp0 old/CreatePersistentImg.sh new/CreatePersistentImg.sh +--- CreatePersistentImg.sh 2021-07-17 13:13:51.000000000 +0300 ++++ CreatePersistentImg.sh 2021-07-20 17:37:53.605911754 +0300 +@@ -94,7 +94,3 @@ if [ -n "$config" ]; then +- if [ -d ./persist_tmp_mnt ]; then +- rm -rf ./persist_tmp_mnt +- fi +- +- mkdir ./persist_tmp_mnt +- if mount $freeloop ./persist_tmp_mnt; then +- echo '/ union' > ./persist_tmp_mnt/$config ++ path_to_persist_mnt="$(mktemp -d)" ++ if mount $freeloop "$path_to_persist_mnt"; then ++ echo '/ union' > "$path_to_persist_mnt"/$config +@@ -102 +98 @@ if [ -n "$config" ]; then +- umount ./persist_tmp_mnt ++ umount "$path_to_persist_mnt" +@@ -104 +100 @@ if [ -n "$config" ]; then +- rm -rf ./persist_tmp_mnt ++ rm -rf "$path_to_persist_mnt" +diff -Naurp0 old/tool/VentoyWorker.sh new/tool/VentoyWorker.sh +--- tool/VentoyWorker.sh 2021-07-17 13:13:51.000000000 +0300 ++++ tool/VentoyWorker.sh 2021-07-20 17:27:10.885452119 +0300 +@@ -153,12 +152,0 @@ fi +-#check tmp_mnt directory +-if [ -d ./tmp_mnt ]; then +- vtdebug "There is a tmp_mnt directory, now delete it." +- umount ./tmp_mnt >/dev/null 2>&1 +- rm -rf ./tmp_mnt +- if [ -d ./tmp_mnt ]; then +- vterr "tmp_mnt directory exits, please delete it first." +- exit 1 +- fi +-fi +- +- +@@ -322 +310 @@ if [ "$MODE" = "install" ]; then +- mkdir ./tmp_mnt ++ path_to_mnt="$(mktemp -d)" +@@ -326 +314 @@ if [ "$MODE" = "install" ]; then +- if mount ${PART2} ./tmp_mnt > /dev/null 2>&1; then ++ if mount ${PART2} "$path_to_mnt" > /dev/null 2>&1; then +@@ -335,9 +323,9 @@ if [ "$MODE" = "install" ]; then +- rm -f ./tmp_mnt/EFI/BOOT/BOOTX64.EFI +- rm -f ./tmp_mnt/EFI/BOOT/grubx64.efi +- rm -f ./tmp_mnt/EFI/BOOT/BOOTIA32.EFI +- rm -f ./tmp_mnt/EFI/BOOT/grubia32.efi +- rm -f ./tmp_mnt/EFI/BOOT/MokManager.efi +- rm -f ./tmp_mnt/EFI/BOOT/mmia32.efi +- rm -f ./tmp_mnt/ENROLL_THIS_KEY_IN_MOKMANAGER.cer +- mv ./tmp_mnt/EFI/BOOT/grubx64_real.efi ./tmp_mnt/EFI/BOOT/BOOTX64.EFI +- mv ./tmp_mnt/EFI/BOOT/grubia32_real.efi ./tmp_mnt/EFI/BOOT/BOOTIA32.EFI ++ rm -f "$path_to_mnt"/EFI/BOOT/BOOTX64.EFI ++ rm -f "$path_to_mnt"/EFI/BOOT/grubx64.efi ++ rm -f "$path_to_mnt"/EFI/BOOT/BOOTIA32.EFI ++ rm -f "$path_to_mnt"/EFI/BOOT/grubia32.efi ++ rm -f "$path_to_mnt"/EFI/BOOT/MokManager.efi ++ rm -f "$path_to_mnt"/EFI/BOOT/mmia32.efi ++ rm -f "$path_to_mnt"/ENROLL_THIS_KEY_IN_MOKMANAGER.cer ++ mv "$path_to_mnt"/EFI/BOOT/grubx64_real.efi "$path_to_mnt"/EFI/BOOT/BOOTX64.EFI ++ mv "$path_to_mnt"/EFI/BOOT/grubia32_real.efi "$path_to_mnt"/EFI/BOOT/BOOTIA32.EFI +@@ -348 +336 @@ if [ "$MODE" = "install" ]; then +- if umount ./tmp_mnt; then ++ if umount "$path_to_mnt"; then +@@ -350 +338 @@ if [ "$MODE" = "install" ]; then +- rm -rf ./tmp_mnt ++ rm -rf "$path_to_mnt" +@@ -407,2 +395,2 @@ else +- rm -f ./diskuuid.bin +- dd status=none conv=fsync if=${DISK} skip=384 bs=1 count=16 of=./diskuuid.bin ++ path_to_diskuuid="$(mktemp)" ++ dd status=none conv=fsync if=${DISK} skip=384 bs=1 count=16 of="$path_to_diskuuid" +@@ -411,2 +399,2 @@ else +- dd status=none conv=fsync if=./diskuuid.bin of=$DISK bs=1 count=16 seek=384 +- rm -f ./diskuuid.bin ++ dd status=none conv=fsync if="$path_to_diskuuid" of=$DISK bs=1 count=16 seek=384 ++ rm -f "$path_to_diskuuid" +@@ -415,2 +403,2 @@ else +- rm -f ./rsvdata.bin +- dd status=none conv=fsync if=${DISK} skip=2040 bs=512 count=8 of=./rsvdata.bin ++ path_to_rsvdata="$(mktemp)" ++ dd status=none conv=fsync if=${DISK} skip=2040 bs=512 count=8 of="$path_to_rsvdata" +@@ -438,2 +426,2 @@ else +- dd status=none conv=fsync if=./rsvdata.bin seek=2040 bs=512 count=8 of=${DISK} +- rm -f ./rsvdata.bin ++ dd status=none conv=fsync if="$path_to_rsvdata" seek=2040 bs=512 count=8 of=${DISK} ++ rm -f "$path_to_rsvdata" +@@ -448 +436 @@ else +- mkdir ./tmp_mnt ++ path_to_mnt="$(mktemp -d)" +@@ -454 +442 @@ else +- if mount ${PART2} ./tmp_mnt > /dev/null 2>&1; then ++ if mount ${PART2} "$path_to_mnt" > /dev/null 2>&1; then +@@ -463,9 +451,9 @@ else +- rm -f ./tmp_mnt/EFI/BOOT/BOOTX64.EFI +- rm -f ./tmp_mnt/EFI/BOOT/grubx64.efi +- rm -f ./tmp_mnt/EFI/BOOT/BOOTIA32.EFI +- rm -f ./tmp_mnt/EFI/BOOT/grubia32.efi +- rm -f ./tmp_mnt/EFI/BOOT/MokManager.efi +- rm -f ./tmp_mnt/EFI/BOOT/mmia32.efi +- rm -f ./tmp_mnt/ENROLL_THIS_KEY_IN_MOKMANAGER.cer +- mv ./tmp_mnt/EFI/BOOT/grubx64_real.efi ./tmp_mnt/EFI/BOOT/BOOTX64.EFI +- mv ./tmp_mnt/EFI/BOOT/grubia32_real.efi ./tmp_mnt/EFI/BOOT/BOOTIA32.EFI ++ rm -f "$path_to_mnt"/EFI/BOOT/BOOTX64.EFI ++ rm -f "$path_to_mnt"/EFI/BOOT/grubx64.efi ++ rm -f "$path_to_mnt"/EFI/BOOT/BOOTIA32.EFI ++ rm -f "$path_to_mnt"/EFI/BOOT/grubia32.efi ++ rm -f "$path_to_mnt"/EFI/BOOT/MokManager.efi ++ rm -f "$path_to_mnt"/EFI/BOOT/mmia32.efi ++ rm -f "$path_to_mnt"/ENROLL_THIS_KEY_IN_MOKMANAGER.cer ++ mv "$path_to_mnt"/EFI/BOOT/grubx64_real.efi "$path_to_mnt"/EFI/BOOT/BOOTX64.EFI ++ mv "$path_to_mnt"/EFI/BOOT/grubia32_real.efi "$path_to_mnt"/EFI/BOOT/BOOTIA32.EFI +@@ -476 +464 @@ else +- if umount ./tmp_mnt > /dev/null 2>&1; then ++ if umount "$path_to_mnt" > /dev/null 2>&1; then +@@ -478 +466 @@ else +- rm -rf ./tmp_mnt ++ rm -rf "$path_to_mnt" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 254651a4f5bf..6c69a2e3b0a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -896,6 +896,8 @@ in veikk-linux-driver-gui = libsForQt5.callPackage ../tools/misc/veikk-linux-driver-gui { }; + ventoy-bin = callPackage ../tools/cd-dvd/ventoy-bin { }; + xcd = callPackage ../tools/misc/xcd { }; xtrt = callPackage ../tools/archivers/xtrt { }; From 20a1ea5de7f484709935f58da8f6682ccd77c5a7 Mon Sep 17 00:00:00 2001 From: Alexander Kiselyov Date: Sun, 29 Aug 2021 00:33:01 +0300 Subject: [PATCH 05/96] python3Packages.pytorch: added BLAS provider passthru `torch.fft` is available only when BLAS provider is MKL. Passing it thru allows dependent derivations to easily check for FFT availability. --- pkgs/development/python-modules/pytorch/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index 0de0015ab1ec..a69268cd5aec 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -304,6 +304,8 @@ in buildPythonPackage rec { passthru = { inherit cudaSupport; cudaArchList = final_cudaArchList; + # At least for 1.9.0 `torch.fft` is unavailable unless BLAS provider is MKL. This attribute allows for easy detection of its availability. + blasProvider = blas.provider; }; meta = with lib; { From 0afd6fe4cb591f92a967b54c13104a6967eb4e89 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Mon, 30 Aug 2021 13:51:57 +1200 Subject: [PATCH 06/96] chore: Ignore JetBrains IDEA configuration --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b166a78d7d70..1a41704c9be3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ ,* .*.swp .*.swo +.idea/ result result-* /doc/NEWS.html From 06ad78abb8dd90d3252d14ea671f7b79b71113ce Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 12:24:28 +0000 Subject: [PATCH 07/96] openrazer-daemon,linuxPackages.openrazer: 3.0.1 -> 3.1.0 --- pkgs/development/python-modules/openrazer/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix index 985d4e199e18..5db17a83e8f3 100644 --- a/pkgs/development/python-modules/openrazer/common.nix +++ b/pkgs/development/python-modules/openrazer/common.nix @@ -1,12 +1,12 @@ { lib , fetchFromGitHub }: rec { - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "openrazer"; repo = "openrazer"; rev = "v${version}"; - sha256 = "sha256-ptB0jP0kp1Liynkfz0B0OMw6xNQG1s8IvxhgNAdEytM="; + sha256 = "133szhi0xsfbnjw47xbvyidflxd8fp7pv78vk5wf9s5ch3hpnvxs"; }; meta = with lib; { homepage = "https://openrazer.github.io/"; From b9b713bea1a8fcf1c09ac062b5585c31c989d68a Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 30 Aug 2021 09:20:59 -0400 Subject: [PATCH 08/96] vimPlugins.null-ls-nvim: clean up, add dependencies --- pkgs/misc/vim-plugins/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index f26258de3ba4..f8722ba28907 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -428,7 +428,7 @@ self: super: { }); null-ls-nvim = super.null-ls-nvim.overrideAttrs (old: { - path = "null-ls.nvim"; + dependencies = with self; [ plenary-nvim nvim-lspconfig ]; }); nvim-lsputils = super.nvim-lsputils.overrideAttrs (old: { From 59d5d090c2c7576cc3c14565fc05627bbb06471a Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Wed, 1 Sep 2021 12:09:37 +0000 Subject: [PATCH 09/96] spotify-unwrapped: 1.1.55.498.gf9a83c60 -> 1.1.67.586.gbb5ef64e --- pkgs/applications/audio/spotify/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index d81ab4b3ac72..7147b79d16d8 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -10,14 +10,14 @@ let # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.1.55.498.gf9a83c60"; + version = "1.1.67.586.gbb5ef64e"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # To get general information: # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "46"; + rev = "50"; deps = [ alsa-lib @@ -79,7 +79,7 @@ stdenv.mkDerivation { # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - sha512 = "dabb55d2ba41f977b6d3f03bfcf147d11785136dd1277efc62011c8371ef25cc04531266bd16608639b9b6a500c1a18a45f44ba7a43e17ab5ac139e36eff7149"; + sha512 = "f29aa4a3f3d6a72f108f350905789f12ab3ae50cf4f4828f021d3be7759b192506c9a397e45309a5ee659578b6e85de80d7d78f994af9ab631c9fb2dc527c242"; }; nativeBuildInputs = [ makeWrapper wrapGAppsHook squashfsTools ]; From 66dcfaa8500df9a5c57ea58e423cb7f691b2eccd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 Sep 2021 16:31:17 +0000 Subject: [PATCH 10/96] jc: 1.16.1 -> 1.16.2 --- pkgs/development/python-modules/jc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index bf671fcb1bac..86f435bc8f3d 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.16.1"; + version = "1.16.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = pname; rev = "v${version}"; - sha256 = "sha256-R/RKMxSilv8JJW5om+l99vvrZYHjEEK1OCdsYWuxA74="; + sha256 = "sha256-QTisaO0LNjZ+dltHCqyWDQDNCGTqc8woMSwqsoyfhbk="; }; propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; From 36e1c8753ceabca303fbc0d9600663afbb22957f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Sep 2021 04:40:57 +0000 Subject: [PATCH 11/96] yadm: 3.1.0 -> 3.1.1 --- pkgs/applications/version-management/yadm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index fc8bee5fcb78..e0e26b804f58 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "yadm"; - version = "3.1.0"; + version = "3.1.1"; buildInputs = [ git gnupg ]; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "TheLocehiliosan"; repo = "yadm"; rev = version; - sha256 = "0ga0p28nvqilswa07bzi93adk7wx6d5pgxlacr9wl9v1h6cds92s"; + sha256 = "sha256-bgiRBlqEjDq0gQ0+aUWpFDeE2piFX3Gy2gEAXgChAOk="; }; dontConfigure = true; From 7f2ce76f1a0d61e6550e106484ee65c5c4d58c0f Mon Sep 17 00:00:00 2001 From: Craig Younkins Date: Sun, 5 Sep 2021 16:11:29 -0400 Subject: [PATCH 12/96] maintainers: add cyounkins --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 09c65a77fde0..84236d62dce9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2269,6 +2269,12 @@ githubId = 1382175; name = "Oliver Matthews"; }; + cyounkins = { + name = "Craig Younkins"; + email = "cyounkins@gmail.com"; + github = "cyounkins"; + githubId = 346185; + }; cypherpunk2140 = { email = "stefan.mihaila@pm.me"; github = "stefan-mihaila"; From 4f665d9f4fd1b99084d72d0f8e7c4b696253c5b5 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 7 Sep 2021 09:01:08 +0300 Subject: [PATCH 13/96] termdbms: init at 2021-09-04 --- .../tools/database/termdbms/default.nix | 26 +++++++++++++++++++ .../tools/database/termdbms/viewer.patch | 12 +++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 40 insertions(+) create mode 100644 pkgs/development/tools/database/termdbms/default.nix create mode 100644 pkgs/development/tools/database/termdbms/viewer.patch diff --git a/pkgs/development/tools/database/termdbms/default.nix b/pkgs/development/tools/database/termdbms/default.nix new file mode 100644 index 000000000000..b045669ef902 --- /dev/null +++ b/pkgs/development/tools/database/termdbms/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "termdbms"; + version = "unstable-2021-09-04"; + + src = fetchFromGitHub { + owner = "mathaou"; + repo = "termdbms"; + rev = "d46e72c796e8aee0def71b8e3499b0ebe5ca3385"; + sha256 = "1c3xgidhmvlcdw7v5gcqzv27cb58f1ix8sfd4r14rfz7c8kbv37v"; + }; + + vendorSha256 = "0h9aw68niizd9gs0i890g6ij13af04qgpfy1g5pskyr4ryx0gn26"; + + patches = [ ./viewer.patch ]; + + ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; + + meta = with lib; { + homepage = "https://github.com/mathaou/termdbms/"; + description = "A TUI for viewing and editing database files"; + license = licenses.mit; + maintainers = with maintainers; [ izorkin ]; + }; +} diff --git a/pkgs/development/tools/database/termdbms/viewer.patch b/pkgs/development/tools/database/termdbms/viewer.patch new file mode 100644 index 000000000000..1b95c71de46b --- /dev/null +++ b/pkgs/development/tools/database/termdbms/viewer.patch @@ -0,0 +1,12 @@ +diff --git a/viewer/viewer.go b/viewer/viewer.go +index fcf850e..b0a0f8d 100644 +--- a/viewer/viewer.go ++++ b/viewer/viewer.go +@@ -5,7 +5,6 @@ import ( + "github.com/charmbracelet/bubbles/viewport" + tea "github.com/charmbracelet/bubbletea" + "github.com/charmbracelet/lipgloss" +- "github.com/mattn/go-runewidth" + "math" + "runtime" + "strings" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 122658d0848d..d7cb74549992 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27801,6 +27801,8 @@ with pkgs; tendermint = callPackage ../tools/networking/tendermint { }; + termdbms = callPackage ../development/tools/database/termdbms { }; + termdown = python3Packages.callPackage ../applications/misc/termdown { }; terminal-notifier = callPackage ../applications/misc/terminal-notifier {}; From 81d44553591da2e75096d837b55e0b31f491f2af Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 7 Sep 2021 23:02:28 +0300 Subject: [PATCH 14/96] iosevka-bin: make it possible to use sgr-iosevka variants --- pkgs/data/fonts/iosevka/bin.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index cd12033b505f..ced17e2cc8e0 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -3,7 +3,8 @@ }: let - name = "iosevka" + lib.optionalString (variant != "") "-" + variant; + name = if lib.hasPrefix "sgr" variant then variant + else "iosevka" + lib.optionalString (variant != "") "-" + variant; variantHashes = import ./variants.nix; validVariants = map (lib.removePrefix "iosevka-") From 21ddf57f7200c00ca521880ea3f35622a683b091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 8 Sep 2021 09:01:39 -0300 Subject: [PATCH 15/96] canta-theme: 2021-07-06 -> 2021-09-08 --- pkgs/data/themes/canta/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/data/themes/canta/default.nix b/pkgs/data/themes/canta/default.nix index f0a2339b3e63..5666eded73f0 100644 --- a/pkgs/data/themes/canta/default.nix +++ b/pkgs/data/themes/canta/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , gdk-pixbuf , librsvg @@ -12,13 +13,13 @@ stdenv.mkDerivation rec { pname = "canta-theme"; - version = "2021-07-06"; + version = "2021-09-08"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-dz78h9Qq25+/i6fmw/zGlPq3DVQB3ADYwehgaWReMQ8="; + sha256 = "05h42nrggb6znzjcbh4lqqfcm41h4r85n3vwimp3l4lq5p90igr2"; }; nativeBuildInputs = [ @@ -57,7 +58,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Flat Design theme for GTK based desktop environments"; homepage = "https://github.com/vinceliuice/Canta-theme"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; # numix-icon-theme-circle unavailable in darwin maintainers = [ maintainers.romildo ]; }; From e5880bd760b3ba7aa59da32e64f941db69860819 Mon Sep 17 00:00:00 2001 From: Craig Younkins Date: Sun, 5 Sep 2021 16:05:57 -0400 Subject: [PATCH 16/96] fclones: init at 0.14.0 --- pkgs/tools/misc/fclones/default.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/misc/fclones/default.nix diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix new file mode 100644 index 000000000000..1072bbcc5da3 --- /dev/null +++ b/pkgs/tools/misc/fclones/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, udev }: + +rustPlatform.buildRustPackage rec { + pname = "fclones"; + version = "0.14.0"; + + src = fetchFromGitHub { + owner = "pkolaczk"; + repo = pname; + rev = "v${version}"; + sha256 = "1ni5amy903cy822yhw070bcrrixrw2m1vr66q1h32bc98pyv4w05"; + }; + + cargoSha256 = "1gcb46k7bwdfsf6hyvmi6dna1nf6myzy63bhjfp0wy7c8g4m2mg8"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ udev ]; + + # tests in dedupe.rs fail due to + # "creation time is not available for the filesystem" + doCheck = false; + + meta = with lib; { + description = "Efficient Duplicate File Finder and Remover"; + homepage = "https://github.com/pkolaczk/fclones"; + license = licenses.mit; + maintainers = with maintainers; [ cyounkins ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 618ec5cdddae..8e53d833da16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24600,6 +24600,8 @@ with pkgs; fbida = callPackage ../applications/graphics/fbida { }; + fclones = callPackage ../tools/misc/fclones { }; + fcp = callPackage ../tools/misc/fcp { }; fdupes = callPackage ../tools/misc/fdupes { }; From 9d0e83d6af2ea38f6ee98db604b79b41c17af9d8 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Wed, 8 Sep 2021 15:01:45 -0700 Subject: [PATCH 17/96] spotify: add missing xorg.libxshmfence dependency --- pkgs/applications/audio/spotify/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 7147b79d16d8..fa8174e3a95b 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -21,9 +21,9 @@ let deps = [ alsa-lib - atk at-spi2-atk at-spi2-core + atk cairo cups curl @@ -46,7 +46,10 @@ let pango stdenv.cc.cc systemd + xorg.libICE + xorg.libSM xorg.libX11 + xorg.libxcb xorg.libXcomposite xorg.libXcursor xorg.libXdamage @@ -56,10 +59,8 @@ let xorg.libXrandr xorg.libXrender xorg.libXScrnSaver + xorg.libxshmfence xorg.libXtst - xorg.libxcb - xorg.libSM - xorg.libICE zlib ]; From 2972c7a670aab7ffd37a89d0f6593cd8a9e35be7 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 8 Sep 2021 21:13:18 -0400 Subject: [PATCH 18/96] texture-synthesis: init at 0.8.2 --- .../graphics/texture-synthesis/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/graphics/texture-synthesis/default.nix diff --git a/pkgs/tools/graphics/texture-synthesis/default.nix b/pkgs/tools/graphics/texture-synthesis/default.nix new file mode 100644 index 000000000000..c541f874adc0 --- /dev/null +++ b/pkgs/tools/graphics/texture-synthesis/default.nix @@ -0,0 +1,22 @@ +{ fetchFromGitHub, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "texture-synthesis"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "embarkstudios"; + repo = pname; + rev = version; + sha256 = "0n1wbxcnxb7x5xwakxdzq7kg1fn0c48i520j03p7wvm5x97vm5h4"; + }; + + cargoSha256 = "1xszis3ip1hymzbhdili2hvdwd862cycwvsxxyjqmz3g2rlg5b64"; + + meta = with lib; { + description = "Example-based texture synthesis written in Rust"; + homepage = "https://github.com/embarkstudios/texture-synthesis"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 122658d0848d..0351d29a9519 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27805,6 +27805,8 @@ with pkgs; terminal-notifier = callPackage ../applications/misc/terminal-notifier {}; + texture-synthesis = callPackage ../tools/graphics/texture-synthesis { }; + tty-solitaire = callPackage ../applications/misc/tty-solitaire { }; termtosvg = callPackage ../tools/misc/termtosvg { }; From 676aac102ab5d4b2ee5b6cec28c69680f0a6ce01 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 9 Sep 2021 02:51:15 +0000 Subject: [PATCH 19/96] python38Packages.azure-mgmt-web: 4.0.0 -> 5.0.0 --- pkgs/development/python-modules/azure-mgmt-web/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix index 9fc5abe968bd..1c9cb2e94570 100644 --- a/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "4.0.0"; + version = "5.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e57437a933e7dea9b0618fe790e0dadc63f9857735361ac8b5f5e8062b9c2a0d"; + sha256 = "0b10542600cd268d6369681c3367373a925eedcda5414eacbd3fbc9a0bdf1f24"; }; propagatedBuildInputs = [ From f4d7cc5704f268069e16191ee20b9c3e997126f9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 9 Sep 2021 02:56:25 +0000 Subject: [PATCH 20/96] python38Packages.azure-servicebus: 7.3.2 -> 7.3.3 --- pkgs/development/python-modules/azure-servicebus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index 611508b42450..99ff8bbb4e68 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.3.2"; + version = "7.3.3"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "6c9bef0bfb4ac2bb8158fdfb3938884cd42542be3162ac288fa8df4e254d3810"; + sha256 = "1c2133909a086bd4329135d6affcc05628e3a7da27afca584a0de8c21fc4e1ac"; }; propagatedBuildInputs = [ From b7316f8b7ab7141e5676796efe0a495c9ab31e01 Mon Sep 17 00:00:00 2001 From: Pavel Borzenkov Date: Thu, 9 Sep 2021 10:32:53 +0200 Subject: [PATCH 21/96] gops: 0.3.19 -> 0.3.20 --- pkgs/development/tools/gops/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/gops/default.nix b/pkgs/development/tools/gops/default.nix index bc9cba9df5f7..83da3588b275 100644 --- a/pkgs/development/tools/gops/default.nix +++ b/pkgs/development/tools/gops/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gops"; - version = "0.3.19"; + version = "0.3.20"; src = fetchFromGitHub { owner = "google"; repo = "gops"; rev = "v${version}"; - sha256 = "sha256-9QEhc0OVCrIdIY220PDn2+CjUsCF84l6QRQS0HjDEZY="; + sha256 = "sha256-eHcCi9D5TpRWxC39SnOD2GW3qyNBR69bHb8f/Gb+qAI="; }; vendorSha256 = null; From 15e5e83bb1f874cebb1982a2d5a3366e02b53d63 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 9 Sep 2021 13:58:50 +0000 Subject: [PATCH 22/96] python38Packages.pyglet: 1.5.19 -> 1.5.20 --- pkgs/development/python-modules/pyglet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index b530dfe0b5b1..66129553b736 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -18,13 +18,13 @@ }: buildPythonPackage rec { - version = "1.5.19"; + version = "1.5.20"; pname = "pyglet"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/kuh2RboWWoOs4KX0PyhNlYgKI8q2SyiWvMJvprg/8w="; + sha256 = "ce76ce598ac910fbae6aae0db00aac21d19d62bdc8c616ed6e6a6a395dc44513"; extension = "zip"; }; From 7c147222011f45cd19249f34fa55d620d225f9a7 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 9 Sep 2021 10:03:45 -0400 Subject: [PATCH 23/96] oha: init at 0.4.6 --- pkgs/tools/networking/oha/default.nix | 30 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/networking/oha/default.nix diff --git a/pkgs/tools/networking/oha/default.nix b/pkgs/tools/networking/oha/default.nix new file mode 100644 index 000000000000..185176440c1b --- /dev/null +++ b/pkgs/tools/networking/oha/default.nix @@ -0,0 +1,30 @@ +{ fetchFromGitHub, lib, pkg-config, rustPlatform, stdenv, openssl, Security }: + +rustPlatform.buildRustPackage rec { + pname = "oha"; + version = "0.4.6"; + + src = fetchFromGitHub { + owner = "hatoo"; + repo = pname; + rev = "v${version}"; + sha256 = "0vx8ki0wi9xil2iksvxzh8mhx4c5ikkhdcnc8mcwqn14cvjkggja"; + }; + + cargoSha256 = "1nx2lvbjflsjma5q9ck6vq499hf75w91i4h8wlzr83wqk37i7rhc"; + + nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; + + buildInputs = lib.optional stdenv.isLinux openssl + ++ lib.optional stdenv.isDarwin Security; + + # tests don't work inside the sandbox + doCheck = false; + + meta = with lib; { + description = "HTTP load generator inspired by rakyll/hey with tui animation"; + homepage = "https://github.com/hatoo/oha"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12d312b657a1..b62324b99e3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7708,6 +7708,10 @@ with pkgs; ocserv = callPackage ../tools/networking/ocserv { }; + oha = callPackage ../tools/networking/oha { + inherit (darwin.apple_sdk.frameworks) Security; + }; + opencorsairlink = callPackage ../tools/misc/opencorsairlink { }; openfpgaloader = callPackage ../development/embedded/fpga/openfpgaloader { }; From 2f7a46c1ea3db5931148f88d9bc6a74f1d232498 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Sep 2021 17:04:59 +0200 Subject: [PATCH 24/96] natscli: 0.0.25 -> 0.0.26 --- pkgs/tools/system/natscli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/natscli/default.nix b/pkgs/tools/system/natscli/default.nix index a7f4337ce815..226528782e5f 100644 --- a/pkgs/tools/system/natscli/default.nix +++ b/pkgs/tools/system/natscli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "natscli"; - version = "0.0.25"; + version = "0.0.26"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = version; - sha256 = "180511x3sciqs0njz80qc1a785m84ks9l338qi3liv7bcd541xcr"; + sha256 = "sha256-w0a2BzfRKf55hFgdaDLsR2YeC5Jqa2uynlRN2oGPX8g="; }; - vendorSha256 = "1j2a6wmyb9akndiwq79jqy5lz84bz2k01xp505j60ynsflim7shq"; + vendorSha256 = "sha256-kt6KflivmsG6prxWXtODcXSP2sNn4daH8ruZMxYLk3g="; meta = with lib; { description = "NATS Command Line Interface"; From 244e43d52fdf97cc472dd71f2fc5bb30c551d29b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 9 Sep 2021 15:06:03 +0000 Subject: [PATCH 25/96] cloud-hypervisor: 17.0 -> 18.0 --- .../virtualization/cloud-hypervisor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index 3bcb27898cc3..05e468a73228 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "17.0"; + version = "18.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - sha256 = "1m4v12sjifd5mf1wzjwkndvxg53n7kwd35k6ql45hdpiz3f5ipig"; + sha256 = "0k9gclkba2bhmyqhyigjgfgcnqpg16v3yczhh08ljxmbrsbs02ig"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc; - cargoSha256 = "11qspv061y75cyln60727x15gdn9rndi697zr9fmihnwn3dx4hvh"; + cargoSha256 = "086ldzb1rbbrzjbklay4nvhc18ipyxi9gnp56f06393zvfbhc5dl"; meta = with lib; { homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor"; From ed4e0e942ea0f2a06feacaba76532651dfcaf157 Mon Sep 17 00:00:00 2001 From: Mike Purvis Date: Thu, 9 Sep 2021 19:38:16 +0000 Subject: [PATCH 26/96] pcl: 1.12.0 propagation fix --- pkgs/development/libraries/pcl/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index d940d0518155..ee8f4dfe2e0a 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -12,6 +12,7 @@ , qtbase , libusb1 , libpcap +, libtiff , libXt , libpng , Cocoa @@ -33,20 +34,24 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ]; buildInputs = [ - qhull - flann - boost eigen libusb1 libpcap - libpng - vtk qtbase libXt ] ++ lib.optionals stdenv.isDarwin [ Cocoa AGL ] ++ lib.optionals withCuda [ cudatoolkit ]; + propagatedBuildInputs = [ + boost + flann + libpng + libtiff + qhull + vtk + ]; + cmakeFlags = lib.optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] ++ lib.optionals withCuda [ "-DWITH_CUDA=true" ]; From e4680255389ddf7d3a44ee299578a1b7de766576 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 9 Sep 2021 22:19:11 +0200 Subject: [PATCH 27/96] pulumi-bin: enable on aarch64-darwin and aarch64-linux --- pkgs/tools/admin/pulumi/data.nix | 182 ++++++++++++++++++++++++++++++ pkgs/tools/admin/pulumi/update.sh | 43 ++++--- 2 files changed, 212 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index 1a92d86ccf37..0bf1359bc272 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -191,5 +191,187 @@ sha256 = "1qb2gaiinclmbswyn5aakwjmm3gaggscckb1q2syx69k42hvp3s3"; } ]; + aarch64-linux = [ + { + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.12.0-linux-arm64.tar.gz"; + sha256 = "1hzm80ajndaqchxrxdpg0fvc5rqqagbhd5zs8msw166xyanavl9p"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-linux-arm64.tar.gz"; + sha256 = "1l7zpvacq6kyzj8n82drs9gdfa16k4j945w8nsd0z33byrswxr3w"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.19.0-linux-arm64.tar.gz"; + sha256 = "1d67npimg49lx1g9adds32gfpwwv0ikk52qz1kyzfbz10hz62xyx"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.5.0-linux-arm64.tar.gz"; + sha256 = "0fh4zrpmgg16jhzdmqihwq8k39bjlchd54mbkd50fphw1w2xw2jz"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.3.0-linux-arm64.tar.gz"; + sha256 = "1pjvrhmci1fbakx74yndjhkvxxy4yfnwrwbk12dyb3mxc07iycfj"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.1.0-linux-arm64.tar.gz"; + sha256 = "07c34x3g31f0bvwfwgxnnikqp5wzyn97hxzwlidvr6g1w7srj0qn"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.6.1-linux-arm64.tar.gz"; + sha256 = "1l1p5gqnxd3rb9107m9wi76k8d57ak9w86dniiwys3dqbwxjn1ix"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-linux-arm64.tar.gz"; + sha256 = "1lh1g90ab4blqmvx0yfp516hfsd6n1y751ab7fzhv7hcajf3klvi"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v2.0.0-linux-arm64.tar.gz"; + sha256 = "0xibm242vjv1jr2c2v5a1ndlafybq66iqfdmdghys3fa4csb5d4s"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.18.0-linux-arm64.tar.gz"; + sha256 = "18as1qkqz0b4cminqf9czd5lx04nr8da7w3g0dbp6bpr7biakra0"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.3.0-linux-arm64.tar.gz"; + sha256 = "0pwcn2hlfj5nh5fyql8nk4rzfpsrp6ph5kd3r62872z6kz4fr1f8"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.2.0-linux-arm64.tar.gz"; + sha256 = "1sc8rf930cz6nkyhqn6p0h7450iqzdsrlw2smhp8yyjjvcjmsksf"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.4.0-linux-arm64.tar.gz"; + sha256 = "0bz4i7bga2vy4pki9k93f7q6zfcy9yg17xz0j4wfyqmlaanfz8r0"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.7.0-linux-arm64.tar.gz"; + sha256 = "1vkfrgk6lk3v7fgs10ygaw3x3srp3mncr0wna1xdzf7s1gsz8m09"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.3.2-linux-arm64.tar.gz"; + sha256 = "1nyy1is8i9jx9ig1v01l5sbhp4xal1vklmfjnqhr8v8h5kjwkm4v"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.1.0-linux-arm64.tar.gz"; + sha256 = "1hicy131pj6z4ni074f34qhvjyycjxl0024iir5021g1scm3hp7w"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.0.0-linux-arm64.tar.gz"; + sha256 = "1slrl020xl092hjfr92zjf8i2ys8vzr3nxqh65fhnl0fzfsllvn0"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.3.0-linux-arm64.tar.gz"; + sha256 = "1cpr53shxap4s25pw3xd9vnbwh4jbmp1x0qfqz46i9af0isa10i8"; + } + # pulumi-resource-packet skipped (does not exist on remote) + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.2.0-linux-arm64.tar.gz"; + sha256 = "0mddv37k87wiygh6x9bnxpcr721qbmbqf6l5zk3xl61n56j8qyb1"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.2.0-linux-arm64.tar.gz"; + sha256 = "0y7wysd4j1dp73hrbydzj2bfvpgv8vxiza5m6dbg7nl66w9ng0rc"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.4.0-linux-arm64.tar.gz"; + sha256 = "0fa295br09w7392mb62qw31ia2116dqs15f4r634zcachb0ad93g"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.1-linux-arm64.tar.gz"; + sha256 = "03z7b32l2jp1si13qy2rjvkjw789sqaypza7q2k4vhwaxyiw715z"; + } + ]; + aarch64-darwin = [ + { + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.12.0-darwin-arm64.tar.gz"; + sha256 = "1sasxi57ga7gazjmni4sksyih5dw1qx0bhcmh5f5xyznsb9flk4v"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-darwin-arm64.tar.gz"; + sha256 = "1rmvc2kgjmb978sfmlga6xy4i0f629lk1l95i30wg0rmj1hx3dag"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.19.0-darwin-arm64.tar.gz"; + sha256 = "0hw0x8bxj0rdkxchlsa30phkglgcln14xv2capx67vpdp9qg8iyi"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.5.0-darwin-arm64.tar.gz"; + sha256 = "125mb2qmxb5cwnvqwckiaih9gq84azfb0qbrw2vmz338967sfz2c"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.3.0-darwin-arm64.tar.gz"; + sha256 = "0p7hmdax7bzn93mv6l79g3g38fh1axnryyq8sg3h16wj8gcc8kq5"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.1.0-darwin-arm64.tar.gz"; + sha256 = "1aijk67byw9nwlsdvmw7fiks6ih6wlcbvqpmijchzn86qxikppcq"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.6.1-darwin-arm64.tar.gz"; + sha256 = "1smg4r1aijl42hv28v2gjvbmlrhmcs5p4w4pzngv7wsgsm5y6lzm"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.1.0-darwin-arm64.tar.gz"; + sha256 = "1z0gd0fagv55dl3ki340h0ljw7dqj8818w4072pc5xxy5id90gb0"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v2.0.0-darwin-arm64.tar.gz"; + sha256 = "1170s85p6d850czb0amzk06d3bcyzyp14p49sgqvpa099jyvs4mm"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.18.0-darwin-arm64.tar.gz"; + sha256 = "0hvsprzznj0incv60lhxxh4jsx67h7l49v65288ic0x0nsgibn4x"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.3.0-darwin-arm64.tar.gz"; + sha256 = "0qjpay735gff28xdvippm11lh8gk2xsvh2mcil679ybgpk6kypw2"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.2.0-darwin-arm64.tar.gz"; + sha256 = "1c3pchbnk6dsnxsl02ypq7s4mmkxdgxszdhql1klpx5js7i1lv8k"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.4.0-darwin-arm64.tar.gz"; + sha256 = "1fcxgbqw6fpn202hza4yyq370r9vbfy8pw220g7yihg8vy9wb1dk"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.7.0-darwin-arm64.tar.gz"; + sha256 = "0h35d4j6s22sxgf579b6f0v14qp49z5rqzcb30pi4grsk8zkqrrr"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.3.2-darwin-arm64.tar.gz"; + sha256 = "0sg73w6h94w0mj9q45av9k2sw251k2a7lnh52ndkbc2phqx3rshh"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.1.0-darwin-arm64.tar.gz"; + sha256 = "118kszs5y3ajh702dyy4wivwdima30s3spbr3cdm9g7aabqhl5l6"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.0.0-darwin-arm64.tar.gz"; + sha256 = "10a2f5kdgk3jcd1441zbfcfnrl5zj6ks832jjmbyym33by7scvgc"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.3.0-darwin-arm64.tar.gz"; + sha256 = "17imdik9gb3bhqh71b82h12sx6rn13iann9dlbdxy3zj3g59k3ri"; + } + # pulumi-resource-packet skipped (does not exist on remote) + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.2.0-darwin-arm64.tar.gz"; + sha256 = "0fj1ai1kv8xgmsvfbmy5gsinxag70rx9a9gkifqgcpn3r9mj48ks"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.2.0-darwin-arm64.tar.gz"; + sha256 = "0waf4apw5bzn276s34yaxvm3xyk5333l3zcz2j52c56wkadzxvpg"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.4.0-darwin-arm64.tar.gz"; + sha256 = "1ywy4zv96k5x85j0fw36q331p11ka1fpg9x18d9ijwl424c7669j"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.1-darwin-arm64.tar.gz"; + sha256 = "0ci3xnxnwrk6dds21yifis1mrz24z2nxqdbya0qpqprkq6syvx41"; + } + ]; }; } diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index 69c417252cc3..756dce6b8eea 100755 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -33,7 +33,7 @@ plugins=( ) function genMainSrc() { - local url="https://get.pulumi.com/releases/sdk/pulumi-v${VERSION}-$1-x64.tar.gz" + local url="https://get.pulumi.com/releases/sdk/pulumi-v${VERSION}-${1}-${2}.tar.gz" local sha256 sha256=$(nix-prefetch-url "$url") echo " {" @@ -48,13 +48,17 @@ function genSrcs() { local version=${plugVers#*=} # url as defined here # https://github.com/pulumi/pulumi/blob/06d4dde8898b2a0de2c3c7ff8e45f97495b89d82/pkg/workspace/plugins.go#L197 - local url="https://api.pulumi.com/releases/plugins/pulumi-resource-${plug}-v${version}-$1-amd64.tar.gz" + local url="https://api.pulumi.com/releases/plugins/pulumi-resource-${plug}-v${version}-${1}-${2}.tar.gz" local sha256 sha256=$(nix-prefetch-url "$url") - echo " {" - echo " url = \"${url}\";" - echo " sha256 = \"$sha256\";" - echo " }" + if [ "$sha256" ]; then # file exists + echo " {" + echo " url = \"${url}\";" + echo " sha256 = \"$sha256\";" + echo " }" + else + echo " # pulumi-resource-${plug} skipped (does not exist on remote)" + fi done } @@ -65,16 +69,29 @@ function genSrcs() { { version = "${VERSION}"; pulumiPkgs = { - x86_64-linux = [ EOF - genMainSrc "linux" - genSrcs "linux" - echo " ];" - echo " x86_64-darwin = [" - genMainSrc "darwin" - genSrcs "darwin" + echo " x86_64-linux = [" + genMainSrc "linux" "x64" + genSrcs "linux" "amd64" echo " ];" + + echo " x86_64-darwin = [" + genMainSrc "darwin" "x64" + genSrcs "darwin" "amd64" + echo " ];" + + echo " aarch64-linux = [" + genMainSrc "linux" "arm64" + genSrcs "linux" "arm64" + echo " ];" + + echo " aarch64-darwin = [" + genMainSrc "darwin" "arm64" + genSrcs "darwin" "arm64" + echo " ];" + echo " };" echo "}" + } > data.nix From ed0e543cc6b2d752d8dadb716f12ebbc5a2f8738 Mon Sep 17 00:00:00 2001 From: Sam Alws Date: Fri, 10 Sep 2021 03:39:43 -0400 Subject: [PATCH 28/96] maintainers: add samalws --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f800e298dd60..1584cdb6a82a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9570,6 +9570,12 @@ github = "s1341"; githubId = 5682183; }; + samalws = { + email = "sam@samalws.com"; + name = "Sam Alws"; + github = "samalws"; + githubId = 20981725; + }; samb96 = { email = "samb96@gmail.com"; github = "samb96"; From 3fe64b3728a4beeaa53542375d1d7793517baab1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 10 Sep 2021 05:20:08 -0400 Subject: [PATCH 29/96] linux/hardened/patches/5.10: 5.10.62-hardened1 -> 5.10.63-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 5da3676a1c82..6a87f0e482ae 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -13,9 +13,9 @@ }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.62-hardened1.patch", - "sha256": "0xdj9mp0ccilj06pb8my5jqw47xwc2fk7f2ck36g4bzsp669nisj", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.62-hardened1/linux-hardened-5.10.62-hardened1.patch" + "name": "linux-hardened-5.10.63-hardened1.patch", + "sha256": "1v1w6ybfkgqisdprny9bb658443hbld86r96cvzqdkmd8wfh4513", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.63-hardened1/linux-hardened-5.10.63-hardened1.patch" }, "5.13": { "extra": "-hardened1", From 02b5c3b291cbf69867122862debca8521388ad39 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 10 Sep 2021 05:20:09 -0400 Subject: [PATCH 30/96] linux/hardened/patches/5.13: 5.13.14-hardened1 -> 5.13.15-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 6a87f0e482ae..0bd1799ccc01 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -19,9 +19,9 @@ }, "5.13": { "extra": "-hardened1", - "name": "linux-hardened-5.13.14-hardened1.patch", - "sha256": "00lmqq10d66s1852q1j2m8cj90bb0gfpsg617bc7f3pm2v6iyl93", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.13.14-hardened1/linux-hardened-5.13.14-hardened1.patch" + "name": "linux-hardened-5.13.15-hardened1.patch", + "sha256": "1g75jh5j9qbh4wbiy2wnc982i2gld2845ai47rczcj7ciycba8n7", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.13.15-hardened1/linux-hardened-5.13.15-hardened1.patch" }, "5.4": { "extra": "-hardened1", From 820d68d2dc5eacc10f199f7903301ee577f44a52 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 10 Sep 2021 05:20:10 -0400 Subject: [PATCH 31/96] linux/hardened/patches/5.14: init at 5.14.2-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 0bd1799ccc01..70a180e737eb 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -23,6 +23,12 @@ "sha256": "1g75jh5j9qbh4wbiy2wnc982i2gld2845ai47rczcj7ciycba8n7", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.13.15-hardened1/linux-hardened-5.13.15-hardened1.patch" }, + "5.14": { + "extra": "-hardened1", + "name": "linux-hardened-5.14.2-hardened1.patch", + "sha256": "0hcw61bavhyr9v621ajsrl2zgz7kc0z8r7p5kzm37dnlggwl4qh3", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.2-hardened1/linux-hardened-5.14.2-hardened1.patch" + }, "5.4": { "extra": "-hardened1", "name": "linux-hardened-5.4.144-hardened1.patch", From 7b7342d6484f3d88b150b96a8b4e191e2ae01ee4 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Fri, 10 Sep 2021 13:40:46 -0700 Subject: [PATCH 32/96] maintainers: add cameronnemo --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 43968e4d80d8..550a28b4eada 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1671,6 +1671,12 @@ githubId = 7435854; name = "Victor Calvert"; }; + cameronnemo = { + email = "cnemo@tutanota.com"; + github = "cameronnemo"; + githubId = 3212452; + name = "Cameron Nemo"; + }; campadrenalin = { email = "campadrenalin@gmail.com"; github = "campadrenalin"; From 6094ee5b4f9cf5873bc4f67b400b06084d6800dd Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 10 Sep 2021 22:53:27 +0200 Subject: [PATCH 33/96] chromiumDev: 95.0.4628.3 -> 95.0.4636.4 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 30d56c1014b3..a094e681e230 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,9 +31,9 @@ } }, "dev": { - "version": "95.0.4628.3", - "sha256": "04r2db9kl77lp4jyyj01pc70jkxrifbnz5hic4r91lf8m2gf1fa3", - "sha256bin64": "1ssf8jdk6gn2mrnyvgz2c9nkk70rsidd5y26w2kx3s0cllfr7d96", + "version": "95.0.4636.4", + "sha256": "1rhkmja9p2a8cxnjsrs0ipzajxwgp3c8q3903rp8ns1g579c4g3j", + "sha256bin64": "0l89iqi95fa10m3jdhbvfdjf4x88gscx6imkhy2x2ax669d19606", "deps": { "gn": { "version": "2021-08-11", From 44853e8cf338e9b42c1d3069287b9655658325bb Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 10 Sep 2021 18:46:48 -0400 Subject: [PATCH 34/96] nixos/git: init --- .../from_md/release-notes/rl-2111.section.xml | 7 +++ .../manual/release-notes/rl-2111.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/programs/git.nix | 45 +++++++++++++++++++ 4 files changed, 55 insertions(+) create mode 100644 nixos/modules/programs/git.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 5554927b8b2a..c723a6dd2add 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -232,6 +232,13 @@ services.nats. + + + git, a + distributed version control system. Available as + programs.git. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 00844d529b77..440069988d0c 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -71,6 +71,8 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable - [nats](https://nats.io/), a high performance cloud and edge messaging system. Available as [services.nats](#opt-services.nats.enable). +- [git](https://git-scm.com), a distributed version control system. Available as [programs.git](options.html#opt-programs.git.enable). + ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1998a309035b..3bc7c01d7ac0 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -145,6 +145,7 @@ ./programs/fuse.nix ./programs/gamemode.nix ./programs/geary.nix + ./programs/git.nix ./programs/gnome-disks.nix ./programs/gnome-documents.nix ./programs/gnome-terminal.nix diff --git a/nixos/modules/programs/git.nix b/nixos/modules/programs/git.nix new file mode 100644 index 000000000000..4e06b576f896 --- /dev/null +++ b/nixos/modules/programs/git.nix @@ -0,0 +1,45 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.git; +in + +{ + options = { + programs.git = { + enable = mkEnableOption "git"; + + package = mkOption { + type = types.package; + default = pkgs.git; + defaultText = "pkgs.git"; + example = literalExample "pkgs.gitFull"; + description = "The git package to use"; + }; + + config = mkOption { + type = types.attrs; + default = { }; + example = { + init.defaultBranch = "main"; + url."https://github.com/".insteadOf = [ "gh:" "github:" ]; + }; + description = '' + Configuration to write to /etc/gitconfig. See the CONFIGURATION FILE + section of git-config(1) for more information. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + environment.etc.gitconfig = mkIf (cfg.config != {}) { + text = generators.toGitINI cfg.config; + }; + }; + + meta.maintainers = with maintainers; [ figsoda ]; +} From f09495500ec8a1d0ad0a70399baa8b0532871992 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 11 Sep 2021 04:20:00 +0000 Subject: [PATCH 35/96] tflint: 0.31.0 -> 0.32.0 https://github.com/terraform-linters/tflint/releases/tag/v0.32.0 --- pkgs/development/tools/analysis/tflint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 6f3b62fc6e42..443d9b4b1e69 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "1aas07r5x2f7byzslfdqxi5dr0gwg5dy2qznnrs7w83ziqw6lxkm"; + sha256 = "1yf725lfwhvkc1mvzqpl9wchwq2z4pz3z7bp0qlbgdym8z66x8wm"; }; - vendorSha256 = "10b6ny1fq6iwvhgq5293cdvd55mq3xgr2sc9kqshvjznwimfnb5z"; + vendorSha256 = "0jg8a6vx2n71awr2zdkiisx76qcnj3qj6vj1w9m1c9kczz3mc7m3"; doCheck = false; From 49d149307296fa49a2cf8d265d51e11100efc9a0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Sep 2021 09:10:24 +0200 Subject: [PATCH 36/96] python3Packages.poolsense: 0.0.8 -> 0.1.0 --- pkgs/development/python-modules/poolsense/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/poolsense/default.nix b/pkgs/development/python-modules/poolsense/default.nix index 0ffdf8952277..10e50804ef58 100644 --- a/pkgs/development/python-modules/poolsense/default.nix +++ b/pkgs/development/python-modules/poolsense/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "poolsense"; - version = "0.0.8"; + version = "0.1.0"; src = fetchPypi { inherit pname version; - sha256 = "09y4fq0gdvgkfsykpxnvmfv92dpbknnq5v82spz43ak6hjnhgcyp"; + sha256 = "sha256-WCyuhk77QNJAiuzccrb2u0mfc81LYrYSSq9atgO0LdE="; }; propagatedBuildInputs = [ aiohttp ]; From 9af54f4731b936dc254e27096ea21eb80f78f230 Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Sun, 15 Aug 2021 20:38:55 +1000 Subject: [PATCH 37/96] python3Packages.hacking: init at 4.1.0 --- .../python-modules/hacking/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/hacking/default.nix diff --git a/pkgs/development/python-modules/hacking/default.nix b/pkgs/development/python-modules/hacking/default.nix new file mode 100644 index 000000000000..2c345691216d --- /dev/null +++ b/pkgs/development/python-modules/hacking/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pbr +, flake8 +, stestr +, eventlet +, ddt +, testtools +, testscenarios +}: + +buildPythonPackage rec { + pname = "hacking"; + version = "4.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0fg19rlcky3n1y1ri61xyjp7534yzf8r102z9dw3zqg93f4kj20m"; + }; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "flake8<3.9.0,>=3.8.0" "flake8" + ''; + + nativeBuildInputs = [ pbr ]; + + propagatedBuildInputs = [ + flake8 + ]; + + checkInputs = [ + ddt + stestr + testscenarios + ]; + + checkPhase = '' + stestr run + ''; + + pythonImportsCheck = [ "hacking" ]; + + meta = with lib; { + description = "OpenStack Hacking Guideline Enforcement"; + homepage = "https://github.com/openstack/hacking"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 22d654a489fe..cdb0ab040846 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3273,6 +3273,8 @@ in { hachoir = callPackage ../development/python-modules/hachoir { }; + hacking = callPackage ../development/python-modules/hacking { }; + hdate = callPackage ../development/python-modules/hdate { }; ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { }; From cddb6e320fa110dcfb6bf6cb348d0fbb506145d8 Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Sun, 15 Aug 2021 20:57:32 +1000 Subject: [PATCH 38/96] python3Packages.osc-lib: init at 2.4.1 --- .../python-modules/osc-lib/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/osc-lib/default.nix diff --git a/pkgs/development/python-modules/osc-lib/default.nix b/pkgs/development/python-modules/osc-lib/default.nix new file mode 100644 index 000000000000..8d0f9d51fb00 --- /dev/null +++ b/pkgs/development/python-modules/osc-lib/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cliff +, oslo-i18n +, oslo-utils +, openstacksdk +, pbr +, requests-mock +, simplejson +, stestr +}: + +buildPythonPackage rec { + pname = "osc-lib"; + version = "2.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ianpk32vwdllpbk4zhfifqb5b064cbmia2hm02lcrh2m76z0zi5"; + }; + + nativeBuildInputs = [ + pbr + ]; + + propagatedBuildInputs = [ + cliff + openstacksdk + oslo-i18n + oslo-utils + simplejson + ]; + + checkInputs = [ + requests-mock + stestr + ]; + + checkPhase = '' + stestr run + ''; + + pythonImportsCheck = [ "osc_lib" ]; + + meta = with lib; { + description = "OpenStackClient Library"; + homepage = "https://github.com/openstack/osc-lib"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cdb0ab040846..be64536c2988 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5136,6 +5136,8 @@ in { osc = callPackage ../development/python-modules/osc { }; + osc-lib = callPackage ../development/python-modules/osc-lib { }; + oscrypto = callPackage ../development/python-modules/oscrypto { }; oset = callPackage ../development/python-modules/oset { }; From b125cedcc180820a19ea10d897993382b4e2f01a Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Sun, 15 Aug 2021 20:56:24 +1000 Subject: [PATCH 39/96] python3Packages.openstacksdk: init at 0.59.0 --- .../python-modules/openstacksdk/default.nix | 85 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 87 insertions(+) create mode 100644 pkgs/development/python-modules/openstacksdk/default.nix diff --git a/pkgs/development/python-modules/openstacksdk/default.nix b/pkgs/development/python-modules/openstacksdk/default.nix new file mode 100644 index 000000000000..5e7442ebc5f0 --- /dev/null +++ b/pkgs/development/python-modules/openstacksdk/default.nix @@ -0,0 +1,85 @@ +{ lib +, buildPythonPackage +, fetchPypi +, appdirs +, cryptography +, ddt +, dogpile_cache +, hacking +, jmespath +, jsonpatch +, jsonschema +, keystoneauth1 +, munch +, netifaces +, os-service-types +, oslo-config +, oslotest +, pbr +, prometheus-client +, requests-mock +, requestsexceptions +, stestr +, testscenarios +}: + +buildPythonPackage rec { + pname = "openstacksdk"; + version = "0.59.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-PfdgzScjmKv6yM6+Yu64LLxJe7JdTdcHV290qM6avw0="; + }; + + propagatedBuildInputs = [ + appdirs + cryptography + dogpile_cache + jmespath + jsonpatch + keystoneauth1 + munch + netifaces + os-service-types + pbr + requestsexceptions + ]; + + checkInputs = [ + ddt + hacking + jsonschema + oslo-config + oslotest + prometheus-client + requests-mock + stestr + testscenarios + ]; + + checkPhase = '' + stestr run -e <(echo " + openstack.tests.unit.cloud.test_image.TestImage.test_create_image_task + openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_error_396 + openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_wait + openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails + openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails_different_attribute + openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match + openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match_with_none + openstack.tests.unit.test_stats.TestStats.test_list_projects + openstack.tests.unit.test_stats.TestStats.test_projects + openstack.tests.unit.test_stats.TestStats.test_servers + openstack.tests.unit.test_stats.TestStats.test_servers_no_detail + ") + ''; + + pythonImportsCheck = [ "openstack" ]; + + meta = with lib; { + description = "An SDK for building applications to work with OpenStack"; + homepage = "https://github.com/openstack/openstacksdk"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index be64536c2988..c0310e70c373 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5097,6 +5097,8 @@ in { opensimplex = callPackage ../development/python-modules/opensimplex { }; + openstacksdk = callPackage ../development/python-modules/openstacksdk { }; + opentimestamps = callPackage ../development/python-modules/opentimestamps { }; opentracing = callPackage ../development/python-modules/opentracing { }; From 01a6eec3a23e6c6ff8b18c1dee03de0ef408ac75 Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Sun, 15 Aug 2021 21:00:32 +1000 Subject: [PATCH 40/96] python3Packages.python-keystoneclient: init at 4.2.0 --- .../python-keystoneclient/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/python-keystoneclient/default.nix diff --git a/pkgs/development/python-modules/python-keystoneclient/default.nix b/pkgs/development/python-modules/python-keystoneclient/default.nix new file mode 100644 index 000000000000..d91a3a9d3139 --- /dev/null +++ b/pkgs/development/python-modules/python-keystoneclient/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchPypi +, keystoneauth1 +, openssl +, oslo-config +, oslo-serialization +, pbr +, requests-mock +, stestr +, testresources +, testscenarios +}: + +buildPythonPackage rec { + pname = "python-keystoneclient"; + version = "4.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "12jsiw82x2zcn8sf78xisf85kr28gl3jqj46a0wxx59v91p44j02"; + }; + + propagatedBuildInputs = [ + keystoneauth1 + oslo-config + oslo-serialization + pbr + ]; + + checkInputs = [ + openssl + requests-mock + stestr + testresources + testscenarios + ]; + + checkPhase = '' + stestr run + ''; + + pythonImportsCheck = [ "keystoneclient" ]; + + meta = with lib; { + description = "Client Library for OpenStack Identity"; + homepage = "https://github.com/openstack/python-keystoneclient"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c0310e70c373..e22f956268cf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5510,6 +5510,8 @@ in { python-juicenet = callPackage ../development/python-modules/python-juicenet { }; + python-keystoneclient = callPackage ../development/python-modules/python-keystoneclient { }; + python-lsp-black = callPackage ../development/python-modules/python-lsp-black { }; python-openems = callPackage ../development/python-modules/python-openems { }; From ef2939ac375b6d4037d73f7822ebfeb758d61783 Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Sun, 15 Aug 2021 20:59:59 +1000 Subject: [PATCH 41/96] python3Packages.python-novaclient: init at 17.5.0 --- .../python-novaclient/default.nix | 58 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/python-modules/python-novaclient/default.nix diff --git a/pkgs/development/python-modules/python-novaclient/default.nix b/pkgs/development/python-modules/python-novaclient/default.nix new file mode 100644 index 000000000000..afc8a51988ed --- /dev/null +++ b/pkgs/development/python-modules/python-novaclient/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchPypi +, ddt +, iso8601 +, keystoneauth1 +, openssl +, oslo-i18n +, oslo-serialization +, pbr +, prettytable +, requests-mock +, stestr +, testscenarios +}: + +buildPythonPackage rec { + pname = "python-novaclient"; + version = "17.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-yRDCCFMQ2mNfs0NYXxBwcS/w+cs8j3nUTKPWMsTyMPU="; + }; + + propagatedBuildInputs = [ + iso8601 + keystoneauth1 + oslo-i18n + oslo-serialization + pbr + prettytable + ]; + + checkInputs = [ + ddt + openssl + requests-mock + stestr + testscenarios + ]; + + checkPhase = '' + stestr run -e <(echo " + novaclient.tests.unit.test_shell.ShellTest.test_osprofiler + novaclient.tests.unit.test_shell.ShellTestKeystoneV3.test_osprofiler + ") + ''; + + pythonImportsCheck = [ "novaclient" ]; + + meta = with lib; { + description = "Client library for OpenStack Compute API"; + homepage = "https://github.com/openstack/python-novaclient"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e22f956268cf..07e7622c4d29 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7240,6 +7240,8 @@ in { python-nomad = callPackage ../development/python-modules/python-nomad { }; + python-novaclient = callPackage ../development/python-modules/python-novaclient { }; + python-oauth2 = callPackage ../development/python-modules/python-oauth2 { }; pythonocc-core = toPythonModule (callPackage ../development/python-modules/pythonocc-core { From 325d5e783d7f462f3d83f1df8df22941c43111b3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 Sep 2021 15:52:17 +0000 Subject: [PATCH 42/96] dictdDBs.wiktionary: 20210201 -> 20210901 --- pkgs/servers/dict/wiktionary/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dict/wiktionary/default.nix b/pkgs/servers/dict/wiktionary/default.nix index 05df86f3a784..faf87a904831 100644 --- a/pkgs/servers/dict/wiktionary/default.nix +++ b/pkgs/servers/dict/wiktionary/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dict-db-wiktionary"; - version = "20210201"; + version = "20210901"; src = fetchurl { url = "https://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2"; - sha256 = "0dc34cbadsg0f6lhfcyx0np7zjnlg6837piqhlvnn0b45xnzn0cs"; + sha256 = "S87E0aAFITOTugvsXOmbq8+P/LS2J+GmFvJYeYj79PM="; }; # script in nixpkgs does not support python2 From f07b4aff1569b1f12d0eb71e76d0c2b4b8173379 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 Sep 2021 16:03:40 +0000 Subject: [PATCH 43/96] enum4linux-ng: 1.0.1 -> 1.1.0 --- pkgs/tools/security/enum4linux-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/enum4linux-ng/default.nix b/pkgs/tools/security/enum4linux-ng/default.nix index d2fda127e8c7..a84de966b6f4 100644 --- a/pkgs/tools/security/enum4linux-ng/default.nix +++ b/pkgs/tools/security/enum4linux-ng/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { pname = "enum4linux-ng"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "cddmp"; repo = pname; rev = "v${version}"; - sha256 = "1j6qrhrzc4f9crbii4dpgxipngjh5icrhljxf26a7662dd4f7l8q"; + sha256 = "0fk6hzmvxb5y3nb41qr6dssxhdahkh5nxhbx480x42fhnqpssir5"; }; propagatedBuildInputs = [ From 3303ff68f2e6ead41e50e7fb11556396b3d11277 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Fri, 10 Sep 2021 13:43:23 -0700 Subject: [PATCH 44/96] loksh: init at 6.9 --- pkgs/shells/loksh/default.nix | 50 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 52 insertions(+) create mode 100644 pkgs/shells/loksh/default.nix diff --git a/pkgs/shells/loksh/default.nix b/pkgs/shells/loksh/default.nix new file mode 100644 index 000000000000..d8463d1773c4 --- /dev/null +++ b/pkgs/shells/loksh/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, meson +, ninja +, pkg-config +, ncurses +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "loksh"; + version = "6.9"; + + src = fetchFromGitHub { + owner = "dimkr"; + repo = pname; + rev = version; + fetchSubmodules = true; + sha256 = "0x33plxqhh5202hgqidgccz5hpg8d2q71ylgnm437g60mfi9z0px"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + ncurses + ]; + + postInstall = '' + mv $out/bin/ksh $out/bin/loksh + mv $out/share/man/man1/ksh.1 $out/share/man/man1/loksh.1 + mv $out/share/man/man1/sh.1 $out/share/man/man1/loksh-sh.1 + ''; + + passthru = { + shellPath = "/bin/loksh"; + }; + + meta = with lib; { + description = "Linux port of OpenBSD's ksh"; + homepage = "https://github.com/dimkr/loksh"; + license = licenses.publicDomain; + maintainers = with maintainers; [ cameronnemo ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 023d6f7da5b3..837279c9da9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10637,6 +10637,8 @@ with pkgs; oksh = callPackage ../shells/oksh { }; + loksh = callPackage ../shells/loksh { }; + pash = callPackage ../shells/pash { }; scponly = callPackage ../shells/scponly { }; From a0c0f33910315b28cd09769811776352f75cbcd5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 Sep 2021 16:10:57 +0000 Subject: [PATCH 45/96] erlang-ls: 0.18.0 -> 0.19.0 --- pkgs/development/beam-modules/erlang-ls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index 9f7d434193a4..cad68e6f302a 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper , stdenv, writeScript, lib }: let - version = "0.18.0"; + version = "0.19.0"; owner = "erlang-ls"; repo = "erlang_ls"; deps = import ./rebar-deps.nix { @@ -19,7 +19,7 @@ rebar3Relx { inherit version; src = fetchFromGitHub { inherit owner repo; - sha256 = "sha256-miCl04qqrirVPubOs558yWvXP3Sgs3bcDuGO9DZIsow="; + sha256 = "sha256-WesGgLoVR435lNXnsCFYcUoKXDMuL7hWImDluori+dc="; rev = version; }; releaseType = "escript"; From 042119cadebeea9034aa517b46d8ef4fd359a087 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 11 Sep 2021 13:56:43 +0100 Subject: [PATCH 46/96] qt514.qt3d: fix upstream URL hydra can't build qt514.qt3d binary as it fails to fetch the tarball from outdated source from: https://download.qt.io/official_releases/qt/ as it only contains `5.12`, `5.15`, `6.0` and `6.2`. `/archive` still has the releases: https://download.qt.io/archive/qt/5.14/5.14.2/submodules/ Let's use those instead. --- pkgs/development/libraries/qt-5/5.14/fetch.sh | 2 +- pkgs/development/libraries/qt-5/5.14/srcs.nix | 84 +++++++++---------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.14/fetch.sh b/pkgs/development/libraries/qt-5/5.14/fetch.sh index e4e02bd82ed3..ca0073afbbb4 100644 --- a/pkgs/development/libraries/qt-5/5.14/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.14/fetch.sh @@ -1,2 +1,2 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/ \ +WGET_ARGS=( https://download.qt.io/archive/qt/5.14/5.14.2/submodules/ \ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.14/srcs.nix b/pkgs/development/libraries/qt-5/5.14/srcs.nix index 6ac958442f49..b5b6eb1a32c6 100644 --- a/pkgs/development/libraries/qt-5/5.14/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.14/srcs.nix @@ -6,7 +6,7 @@ qt3d = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qt3d-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qt3d-everywhere-src-5.14.2.tar.xz"; sha256 = "9da82f1cc4b7d416d31ec96224c59d221473a48f6e579eef978f7d2e3932c674"; name = "qt3d-everywhere-src-5.14.2.tar.xz"; }; @@ -14,7 +14,7 @@ qtactiveqt = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtactiveqt-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtactiveqt-everywhere-src-5.14.2.tar.xz"; sha256 = "b53517d5d128719773a2941ba52da10acd7aa3149948862bc08c98f5b64152a9"; name = "qtactiveqt-everywhere-src-5.14.2.tar.xz"; }; @@ -22,7 +22,7 @@ qtandroidextras = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtandroidextras-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtandroidextras-everywhere-src-5.14.2.tar.xz"; sha256 = "4a8fd92b5c49a663cf0bd492804eaf1574d11137e2cbdd41d6bf5fad0c3c4d76"; name = "qtandroidextras-everywhere-src-5.14.2.tar.xz"; }; @@ -30,7 +30,7 @@ qtbase = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtbase-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtbase-everywhere-src-5.14.2.tar.xz"; sha256 = "48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a"; name = "qtbase-everywhere-src-5.14.2.tar.xz"; }; @@ -38,7 +38,7 @@ qtcharts = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtcharts-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtcharts-everywhere-src-5.14.2.tar.xz"; sha256 = "adb25203ea748d886cc3d8993c20def702115eccea311594592058134ba83bb7"; name = "qtcharts-everywhere-src-5.14.2.tar.xz"; }; @@ -46,7 +46,7 @@ qtconnectivity = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtconnectivity-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtconnectivity-everywhere-src-5.14.2.tar.xz"; sha256 = "abe67b3e3a775e2a2e27c62a5391f37007ffbe72bce58b96116995616cfcbc28"; name = "qtconnectivity-everywhere-src-5.14.2.tar.xz"; }; @@ -54,7 +54,7 @@ qtdatavis3d = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtdatavis3d-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtdatavis3d-everywhere-src-5.14.2.tar.xz"; sha256 = "723c03db2d2805b1be4ca534ac7bc867a1a21894d33a7e9261a382f3fa9d0e20"; name = "qtdatavis3d-everywhere-src-5.14.2.tar.xz"; }; @@ -62,7 +62,7 @@ qtdeclarative = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtdeclarative-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtdeclarative-everywhere-src-5.14.2.tar.xz"; sha256 = "a3c4617adc9760347c93d2eb6c25d22f620cd22f44afa0494eb499a805831650"; name = "qtdeclarative-everywhere-src-5.14.2.tar.xz"; }; @@ -70,7 +70,7 @@ qtdoc = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtdoc-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtdoc-everywhere-src-5.14.2.tar.xz"; sha256 = "5a55cdb55af35eb222d06179567851c175f24a3732f7dee5be073df4a893172b"; name = "qtdoc-everywhere-src-5.14.2.tar.xz"; }; @@ -78,7 +78,7 @@ qtgamepad = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtgamepad-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtgamepad-everywhere-src-5.14.2.tar.xz"; sha256 = "f77daadb4755cf760e11812264259fb103396fd1b06df1e06b5df162081c8d03"; name = "qtgamepad-everywhere-src-5.14.2.tar.xz"; }; @@ -86,7 +86,7 @@ qtgraphicaleffects = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtgraphicaleffects-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtgraphicaleffects-everywhere-src-5.14.2.tar.xz"; sha256 = "487a7f858244a08264363733055a8cf8b00e77c658c5608cc462817d15e4b50f"; name = "qtgraphicaleffects-everywhere-src-5.14.2.tar.xz"; }; @@ -94,7 +94,7 @@ qtimageformats = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtimageformats-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtimageformats-everywhere-src-5.14.2.tar.xz"; sha256 = "733eca0165c15e046b106039c989dac7f6bc2ecf215396d965ed065369264f8c"; name = "qtimageformats-everywhere-src-5.14.2.tar.xz"; }; @@ -102,7 +102,7 @@ qtlocation = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtlocation-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtlocation-everywhere-src-5.14.2.tar.xz"; sha256 = "c37708bc396f6dac397b49a6a268d5edb39e1c8296ca2337ce9e80bde04775cc"; name = "qtlocation-everywhere-src-5.14.2.tar.xz"; }; @@ -110,7 +110,7 @@ qtlottie = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtlottie-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtlottie-everywhere-src-5.14.2.tar.xz"; sha256 = "55d1392dc92cbec11263084360075dc5fc3fdc25c1969adfbdec84299b285978"; name = "qtlottie-everywhere-src-5.14.2.tar.xz"; }; @@ -118,7 +118,7 @@ qtmacextras = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtmacextras-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtmacextras-everywhere-src-5.14.2.tar.xz"; sha256 = "d12587b46c84a7822194fc3ccf46f7c18ff3b31566d3dde4f5fe772f1d8776e5"; name = "qtmacextras-everywhere-src-5.14.2.tar.xz"; }; @@ -126,7 +126,7 @@ qtmultimedia = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtmultimedia-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtmultimedia-everywhere-src-5.14.2.tar.xz"; sha256 = "7acd8ede6835314206e407b35b668f0add67544577fb51fe67afb03137fb9fe9"; name = "qtmultimedia-everywhere-src-5.14.2.tar.xz"; }; @@ -134,7 +134,7 @@ qtnetworkauth = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtnetworkauth-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtnetworkauth-everywhere-src-5.14.2.tar.xz"; sha256 = "4f00513dd18598487d02187b80b54c669662cf8a8f2573858c7f9282d7b9265e"; name = "qtnetworkauth-everywhere-src-5.14.2.tar.xz"; }; @@ -142,7 +142,7 @@ qtpurchasing = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtpurchasing-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtpurchasing-everywhere-src-5.14.2.tar.xz"; sha256 = "69b087001e8fcec5bb49ca333d5f44e6b7eb09f76421dc792fc9cd76dee9e851"; name = "qtpurchasing-everywhere-src-5.14.2.tar.xz"; }; @@ -150,7 +150,7 @@ qtquick3d = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtquick3d-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtquick3d-everywhere-src-5.14.2.tar.xz"; sha256 = "0640696d501f2b0bf57f64e98f30bfa3e1cc19c11c0e05e43d4fdb0d20488b2e"; name = "qtquick3d-everywhere-src-5.14.2.tar.xz"; }; @@ -158,7 +158,7 @@ qtquickcontrols = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtquickcontrols-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtquickcontrols-everywhere-src-5.14.2.tar.xz"; sha256 = "d55def1dd4ee1250bd6a4e76849f4e362368b6411c2216d5f669c761216d4461"; name = "qtquickcontrols-everywhere-src-5.14.2.tar.xz"; }; @@ -166,7 +166,7 @@ qtquickcontrols2 = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtquickcontrols2-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtquickcontrols2-everywhere-src-5.14.2.tar.xz"; sha256 = "faf7d349d8f4a8db36cd3c62a5724bcf689300f2fdb7dc1ea034392aab981560"; name = "qtquickcontrols2-everywhere-src-5.14.2.tar.xz"; }; @@ -174,7 +174,7 @@ qtquicktimeline = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtquicktimeline-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtquicktimeline-everywhere-src-5.14.2.tar.xz"; sha256 = "83a45d0998cbc77f8094854a477ab1ac0838ae7fd822563d995df40149893a9e"; name = "qtquicktimeline-everywhere-src-5.14.2.tar.xz"; }; @@ -182,7 +182,7 @@ qtremoteobjects = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtremoteobjects-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtremoteobjects-everywhere-src-5.14.2.tar.xz"; sha256 = "a6a601c4f4aab6fe41a462dae57033819f697e3317240a382cee45c08be614d6"; name = "qtremoteobjects-everywhere-src-5.14.2.tar.xz"; }; @@ -190,7 +190,7 @@ qtscript = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtscript-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtscript-everywhere-src-5.14.2.tar.xz"; sha256 = "e9fd487ccb3cbf00e86b0b803aa79e9f6bbe7a337b8e97d069e040c3e0789bfe"; name = "qtscript-everywhere-src-5.14.2.tar.xz"; }; @@ -198,7 +198,7 @@ qtscxml = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtscxml-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtscxml-everywhere-src-5.14.2.tar.xz"; sha256 = "030cea352a56074f577200f967ef37c959b2767127de61f766f59b0d99763790"; name = "qtscxml-everywhere-src-5.14.2.tar.xz"; }; @@ -206,7 +206,7 @@ qtsensors = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtsensors-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtsensors-everywhere-src-5.14.2.tar.xz"; sha256 = "bccfca6910b0383d8f65823496ff5011abed2fa8fd446b4b27333d0fd7bb8c61"; name = "qtsensors-everywhere-src-5.14.2.tar.xz"; }; @@ -214,7 +214,7 @@ qtserialbus = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtserialbus-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtserialbus-everywhere-src-5.14.2.tar.xz"; sha256 = "0b7762175a649a40c4dd619c5de61d772235dc86099343278e2c3229d0836a91"; name = "qtserialbus-everywhere-src-5.14.2.tar.xz"; }; @@ -222,7 +222,7 @@ qtserialport = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtserialport-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtserialport-everywhere-src-5.14.2.tar.xz"; sha256 = "a6d977dd723ad4d3368b5163691405b8852f809974a96ec54103494e834aea21"; name = "qtserialport-everywhere-src-5.14.2.tar.xz"; }; @@ -230,7 +230,7 @@ qtspeech = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtspeech-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtspeech-everywhere-src-5.14.2.tar.xz"; sha256 = "5e9e8ea62f0207ba894df1e136df0af9fc5443c7817d28c39f0ea2bbae9ec6da"; name = "qtspeech-everywhere-src-5.14.2.tar.xz"; }; @@ -238,7 +238,7 @@ qtsvg = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtsvg-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtsvg-everywhere-src-5.14.2.tar.xz"; sha256 = "c7d7faa01a3e7a6e4d38fafcec5529a488258218749779e6fa0e09a21173b5a1"; name = "qtsvg-everywhere-src-5.14.2.tar.xz"; }; @@ -246,7 +246,7 @@ qttools = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qttools-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qttools-everywhere-src-5.14.2.tar.xz"; sha256 = "5bb0cf7832b88eb6bc9d4289f98307eb14b16a453ad6cf42cca13c4fe1a053c5"; name = "qttools-everywhere-src-5.14.2.tar.xz"; }; @@ -254,7 +254,7 @@ qttranslations = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qttranslations-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qttranslations-everywhere-src-5.14.2.tar.xz"; sha256 = "2088ebee9f5dd0336c9fd11436899a95b7ce0141ce072290de1e8f315d82d1a6"; name = "qttranslations-everywhere-src-5.14.2.tar.xz"; }; @@ -262,7 +262,7 @@ qtvirtualkeyboard = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz"; sha256 = "364f3338563e617e7c964a37170b415b546c5f82965e781271f9dada3e3868d7"; name = "qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz"; }; @@ -270,7 +270,7 @@ qtwayland = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwayland-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwayland-everywhere-src-5.14.2.tar.xz"; sha256 = "d31633ca718fb407cf70870613d45d0ed80aa04c058586ac3036bae1aff7832a"; name = "qtwayland-everywhere-src-5.14.2.tar.xz"; }; @@ -278,7 +278,7 @@ qtwebchannel = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebchannel-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwebchannel-everywhere-src-5.14.2.tar.xz"; sha256 = "7d1dc8441523638c3d455c7d408ec65aebc073acab80e24063865f929231f874"; name = "qtwebchannel-everywhere-src-5.14.2.tar.xz"; }; @@ -286,7 +286,7 @@ qtwebengine = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebengine-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwebengine-everywhere-src-5.14.2.tar.xz"; sha256 = "e169d6a75d8c397e04f843bc1b9585950fb9a001255cd18d6293f66fa8a6c947"; name = "qtwebengine-everywhere-src-5.14.2.tar.xz"; }; @@ -294,7 +294,7 @@ qtwebglplugin = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebglplugin-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwebglplugin-everywhere-src-5.14.2.tar.xz"; sha256 = "eb4118910b65d03d8448658ac1646e860d337e59b82d6575beda21824e313417"; name = "qtwebglplugin-everywhere-src-5.14.2.tar.xz"; }; @@ -302,7 +302,7 @@ qtwebsockets = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebsockets-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwebsockets-everywhere-src-5.14.2.tar.xz"; sha256 = "f06e62b18313fe1b40a35566e79645de4a8e7ac9f7717d1d98a06c5b49afca84"; name = "qtwebsockets-everywhere-src-5.14.2.tar.xz"; }; @@ -310,7 +310,7 @@ qtwebview = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebview-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwebview-everywhere-src-5.14.2.tar.xz"; sha256 = "c61f9213ee84fd7408898c0194468208ffb51af9d257e87e6b53daf24f65ff4b"; name = "qtwebview-everywhere-src-5.14.2.tar.xz"; }; @@ -318,7 +318,7 @@ qtwinextras = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwinextras-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwinextras-everywhere-src-5.14.2.tar.xz"; sha256 = "980f1bc31b37c8597c0bac55f69ecf00d1677218ce82f7bc3933236cb6d907f2"; name = "qtwinextras-everywhere-src-5.14.2.tar.xz"; }; @@ -326,7 +326,7 @@ qtx11extras = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtx11extras-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtx11extras-everywhere-src-5.14.2.tar.xz"; sha256 = "be9a84a03a2ee81771215264e5dff7a996d04be6192b8cdaa1d41e319a81545a"; name = "qtx11extras-everywhere-src-5.14.2.tar.xz"; }; @@ -334,7 +334,7 @@ qtxmlpatterns = { version = "5.14.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtxmlpatterns-everywhere-src-5.14.2.tar.xz"; + url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtxmlpatterns-everywhere-src-5.14.2.tar.xz"; sha256 = "219a876665345e3801baff71f31f30f5495c1cb9ab23fbbd27602632c80fcfb7"; name = "qtxmlpatterns-everywhere-src-5.14.2.tar.xz"; }; From 689e408afc4266fdb7521ff50f46770c35c6df37 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Wed, 8 Sep 2021 21:32:28 -0400 Subject: [PATCH 47/96] =?UTF-8?q?pythonPackages.debugpy:=201.4.1=20?= =?UTF-8?q?=E2=86=92=201.4.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../python-modules/debugpy/default.nix | 4 ++-- .../debugpy/fix-test-pythonpath.patch | 2 +- .../python-modules/debugpy/hardcode-gdb.patch | 4 ++-- .../debugpy/hardcode-version.patch | 19 ++++++++----------- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 35ac416d5992..6c0cbab885a8 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "debugpy"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Microsoft"; repo = pname; rev = "v${version}"; - hash = "sha256-W51Y9tZB1Uyp175+hWCpXChwL+MBpDWjudF87F1MRso="; + hash = "sha256-asowRMcNWUsy5av7GOoWALy7Ph3WNk4sU/EsiwVUkf4="; }; patches = [ diff --git a/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch b/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch index f74b53a831b3..537531cd9747 100644 --- a/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch +++ b/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch @@ -1,5 +1,5 @@ diff --git a/tests/debug/session.py b/tests/debug/session.py -index 101492f..4ee7cfb 100644 +index 101492fc..4ee7cfbe 100644 --- a/tests/debug/session.py +++ b/tests/debug/session.py @@ -630,6 +630,7 @@ class Session(object): diff --git a/pkgs/development/python-modules/debugpy/hardcode-gdb.patch b/pkgs/development/python-modules/debugpy/hardcode-gdb.patch index 8b87ec7bda7a..09851260233f 100644 --- a/pkgs/development/python-modules/debugpy/hardcode-gdb.patch +++ b/pkgs/development/python-modules/debugpy/hardcode-gdb.patch @@ -1,8 +1,8 @@ diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py -index 51017f2..46654ab 100644 +index 3c0e1b94..e995a20f 100644 --- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py +++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py -@@ -398,7 +398,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show +@@ -399,7 +399,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show is_debug = 0 # Note that the space in the beginning of each line in the multi-line is important! cmd = [ diff --git a/pkgs/development/python-modules/debugpy/hardcode-version.patch b/pkgs/development/python-modules/debugpy/hardcode-version.patch index 2879716f704d..33f56a64f7ef 100644 --- a/pkgs/development/python-modules/debugpy/hardcode-version.patch +++ b/pkgs/development/python-modules/debugpy/hardcode-version.patch @@ -1,25 +1,22 @@ diff --git a/setup.py b/setup.py -index cfec60d..32ca206 100644 +index ee5bbba9..0b7b9b45 100644 --- a/setup.py +++ b/setup.py -@@ -24,7 +24,6 @@ elif "--abi" in sys.argv: - from setuptools import setup # noqa +@@ -15,7 +15,6 @@ from distutils.command.build_py import build_py as _build_py + sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) -import versioneer # noqa del sys.path[0] -@@ -86,7 +85,7 @@ if __name__ == "__main__": - if not os.getenv("SKIP_CYTHON_BUILD"): - cython_build() +@@ -129,12 +128,12 @@ if __name__ == "__main__": + if platforms is not None: + extras["platforms"] = platforms - cmds = versioneer.get_cmdclass() + cmds = {} - cmds["bdist_wheel"] = bdist_wheel - - extras = {} -@@ -96,7 +95,7 @@ if __name__ == "__main__": + cmds.update(build=build, build_py=build_py) setup( name="debugpy", @@ -29,7 +26,7 @@ index cfec60d..32ca206 100644 long_description=long_description, long_description_content_type="text/markdown", diff --git a/src/debugpy/__init__.py b/src/debugpy/__init__.py -index baa5a7c..5355327 100644 +index baa5a7c5..53553272 100644 --- a/src/debugpy/__init__.py +++ b/src/debugpy/__init__.py @@ -27,7 +27,6 @@ __all__ = [ From 97cfb35eb89661d99cda7a3727656595b3350c8d Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Fri, 10 Sep 2021 19:05:43 -0400 Subject: [PATCH 48/96] =?UTF-8?q?pythonPackages.debugpy:=201.4.2=20?= =?UTF-8?q?=E2=86=92=201.4.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/debugpy/default.nix | 4 ++-- .../python-modules/debugpy/hardcode-version.patch | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 6c0cbab885a8..10ed4c62e764 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "debugpy"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "Microsoft"; repo = pname; rev = "v${version}"; - hash = "sha256-asowRMcNWUsy5av7GOoWALy7Ph3WNk4sU/EsiwVUkf4="; + hash = "sha256-ULxVoZuMNDL0Win/+55RnbkCPZ8OI8nhSKshvJOMFQ4="; }; patches = [ diff --git a/pkgs/development/python-modules/debugpy/hardcode-version.patch b/pkgs/development/python-modules/debugpy/hardcode-version.patch index 33f56a64f7ef..7d3fd5abfc2d 100644 --- a/pkgs/development/python-modules/debugpy/hardcode-version.patch +++ b/pkgs/development/python-modules/debugpy/hardcode-version.patch @@ -1,8 +1,8 @@ diff --git a/setup.py b/setup.py -index ee5bbba9..0b7b9b45 100644 +index e7487100..10d36520 100644 --- a/setup.py +++ b/setup.py -@@ -15,7 +15,6 @@ from distutils.command.build_py import build_py as _build_py +@@ -12,7 +12,6 @@ import sys sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) @@ -10,15 +10,16 @@ index ee5bbba9..0b7b9b45 100644 del sys.path[0] -@@ -129,12 +128,12 @@ if __name__ == "__main__": +@@ -141,13 +140,13 @@ if __name__ == "__main__": if platforms is not None: extras["platforms"] = platforms - cmds = versioneer.get_cmdclass() + cmds = {} - cmds.update(build=build, build_py=build_py) + override_build(cmds) + override_build_py(cmds) - setup( + setuptools.setup( name="debugpy", - version=versioneer.get_version(), + version="@version@", From 366c670892bd38066102c47bbcc7fd39c7e709bb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 Sep 2021 16:24:51 +0000 Subject: [PATCH 49/96] evolution: 3.40.3 -> 3.40.4 --- .../networking/mailreaders/evolution/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index eff838256f5c..638d60777712 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.40.3"; + version = "3.40.4"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "/SkjomENe/6212+FMLpAJkBOIf0nOrKKLFtQCJIeDVw="; + sha256 = "BYXp36VQQOySNTWgRIdiRl2J4zE1Cawya76Eal1mA3Q="; }; nativeBuildInputs = [ From 36649cb7da0a9117cd6c2d4c0dfd1651801e822f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Sep 2021 18:45:53 +0200 Subject: [PATCH 50/96] sqlfluff: 0.6.4 -> 0.6.5 --- pkgs/development/tools/database/sqlfluff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 6661dfce8fba..348111c5e4f9 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.6.4"; + version = "0.6.5"; disabled = python3.pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-etnHr0epu7L/qIYNnJ2NOEL1ZmE/U62KpXSsiWsJJn0="; + sha256 = "sha256-JUvwp4Ptu1URWO7wyeOCjwjGW4S0XqYZwNjCyR3H/rc="; }; propagatedBuildInputs = with python3.pkgs; [ From e92c1c42d9d0579a817d5c02748c60ece830abd2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 Sep 2021 16:53:35 +0000 Subject: [PATCH 51/96] gdl: 3.34.0 -> 3.40.0 --- pkgs/development/libraries/gdl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdl/default.nix b/pkgs/development/libraries/gdl/default.nix index 5b73e3d7a139..6e7e1e39b38d 100644 --- a/pkgs/development/libraries/gdl/default.nix +++ b/pkgs/development/libraries/gdl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gdl"; - version = "3.34.0"; + version = "3.40.0"; src = fetchurl { url = "mirror://gnome/sources/gdl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "00ldva6wg6s4wlxmisiqzyz8ihsprra7sninx2rlqk6frpq312w5"; + sha256 = "NkHU/WadHhgYrv88+f+3iH/Fw2eFC3jCjHdeukq2pVU="; }; nativeBuildInputs = [ pkg-config intltool ]; From 8530881c1d25628570cfdb61009dead19067c386 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Sat, 11 Sep 2021 18:50:58 +0200 Subject: [PATCH 52/96] gnomeExtensions.unite: 54 -> 55 --- pkgs/desktops/gnome/extensions/unite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/unite/default.nix b/pkgs/desktops/gnome/extensions/unite/default.nix index 776139b36867..e73e43dd392e 100644 --- a/pkgs/desktops/gnome/extensions/unite/default.nix +++ b/pkgs/desktops/gnome/extensions/unite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-unite"; - version = "54"; + version = "55"; src = fetchFromGitHub { owner = "hardpixel"; repo = "unite-shell"; rev = "v${version}"; - sha256 = "sha256-Ys2kWPj/FugW/LkvLAZdbj7Ufg/KShC+EX6QrjKNVH8="; + sha256 = "0bav4vzky3p7np2gphxc6bw38c697kalmaibaar9vi0ip3xkkavk"; }; passthru = { From 7bee25daa244e1ddb9c1918f6afe7f2536bb5b0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 11 Sep 2021 12:02:49 +0200 Subject: [PATCH 53/96] python39Packages.eventlet: propagate pyopenssl as it is not only used in tests, cleanup pythonOlder inputs, update meta data --- pkgs/development/python-modules/eventlet/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index cc8154bcb95e..92ff2cdacaf6 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -1,9 +1,9 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , pythonOlder , dnspython -, enum34 , greenlet , monotonic , six @@ -22,10 +22,12 @@ buildPythonPackage rec { sha256 = "2f0bb8ed0dc0ab21d683975d5d8ab3c054d588ce61def9faf7a465ee363e839b"; }; - propagatedBuildInputs = [ dnspython greenlet monotonic six ] - ++ lib.optional (pythonOlder "3.4") enum34; + propagatedBuildInputs = [ dnspython greenlet pyopenssl six ] + ++ lib.optional (pythonOlder "3.5") monotonic; - checkInputs = [ nose pyopenssl ]; + checkInputs = [ nose ]; + + doCheck = !stdenv.isDarwin; preCheck = '' echo "nameserver 127.0.0.1" > resolv.conf @@ -47,7 +49,7 @@ buildPythonPackage rec { # pythonImportsCheck = [ "eventlet" ]; meta = with lib; { - homepage = "https://pypi.python.org/pypi/eventlet/"; + homepage = "https://github.com/eventlet/eventlet/"; description = "A concurrent networking library for Python"; maintainers = with maintainers; [ SuperSandro2000 ]; license = licenses.mit; From bb915c3840b0042c86cbcd0a5d02fb72a19882e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 11 Sep 2021 12:08:00 +0200 Subject: [PATCH 54/96] python39Packages.debtcollector: init at 2.3.0 --- .../python-modules/debtcollector/default.nix | 31 +++++++++++++++++++ .../python-modules/debtcollector/tests.nix | 30 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 63 insertions(+) create mode 100644 pkgs/development/python-modules/debtcollector/default.nix create mode 100644 pkgs/development/python-modules/debtcollector/tests.nix diff --git a/pkgs/development/python-modules/debtcollector/default.nix b/pkgs/development/python-modules/debtcollector/default.nix new file mode 100644 index 000000000000..75555569e235 --- /dev/null +++ b/pkgs/development/python-modules/debtcollector/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi, pbr, six, wrapt, callPackage }: + +buildPythonPackage rec { + pname = "debtcollector"; + version = "2.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "c7a9fac814ab5904e23905516b18356cc907e7d27c05da58d37103f001967846"; + }; + + nativeBuildInputs = [ pbr ]; + + propagatedBuildInputs = [ six wrapt ]; + + # check in passthru.tests.pytest to escape infinite recursion with other oslo components + doCheck = false; + + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; + + pythonImportsCheck = [ "debtcollector" ]; + + meta = with lib; { + description = "A collection of Python deprecation patterns and strategies that help you collect your technical debt in a non-destructive manner"; + homepage = "https://github.com/openstack/debtcollector"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/debtcollector/tests.nix b/pkgs/development/python-modules/debtcollector/tests.nix new file mode 100644 index 000000000000..cc3171da6d6e --- /dev/null +++ b/pkgs/development/python-modules/debtcollector/tests.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, debtcollector +, stestr +}: + +buildPythonPackage rec { + pname = "debtcollector-tests"; + inherit (debtcollector) version; + + src = debtcollector.src; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + debtcollector + stestr + ]; + + checkPhase = '' + stestr run + ''; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 07e7622c4d29..fb67812d19cc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1884,6 +1884,8 @@ in { debian-inspector = callPackage ../development/python-modules/debian-inspector { }; + debtcollector = callPackage ../development/python-modules/debtcollector { }; + debts = callPackage ../development/python-modules/debts { }; debugpy = callPackage ../development/python-modules/debugpy { }; From 2e7f79bb2cd0e23859621dff467c451cb925521f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 11 Sep 2021 12:08:50 +0200 Subject: [PATCH 55/96] python39Packages.keystoneauth1: init at 4.3.1 --- .../python-modules/keystoneauth1/default.nix | 77 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 79 insertions(+) create mode 100644 pkgs/development/python-modules/keystoneauth1/default.nix diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix new file mode 100644 index 000000000000..9eeb42b0b8c4 --- /dev/null +++ b/pkgs/development/python-modules/keystoneauth1/default.nix @@ -0,0 +1,77 @@ +{ lib +, buildPythonPackage +, fetchPypi +, betamax +, hacking +, iso8601 +, lxml +, oauthlib +, os-service-types +, oslo-config +, oslo-utils +, pbr +, pycodestyle +, pyyaml +, requests +, requests-kerberos +, requests-mock +, six +, stestr +, stevedore +, testresources +, testtools +}: + +buildPythonPackage rec { + pname = "keystoneauth1"; + version = "4.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "93605430a6d1424f31659bc5685e9dc1be9a6254e88c99f00cffc0a60c648a64"; + }; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + propagatedBuildInputs = [ + betamax + iso8601 + lxml + oauthlib + os-service-types + pbr + requests + requests-kerberos + six + stevedore + ]; + + checkInputs = [ + hacking + oslo-config + oslo-utils + pycodestyle + pyyaml + requests-mock + stestr + testresources + testtools + ]; + + checkPhase = '' + stestr run + ''; + + pythonImportsCheck = [ "keystoneauth1" ]; + + meta = with lib; { + description = "Authentication Library for OpenStack Identity"; + homepage = "https://github.com/openstack/keystoneauth"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fb67812d19cc..5e466b097901 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3968,6 +3968,8 @@ in { keystone-engine = callPackage ../development/python-modules/keystone-engine { }; + keystoneauth1 = callPackage ../development/python-modules/keystoneauth1 { }; + keyutils = callPackage ../development/python-modules/keyutils { inherit (pkgs) keyutils; }; From 98a7fd7d452521f33a1c3ac48ab4c5b03c5d63cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 11 Sep 2021 12:10:14 +0200 Subject: [PATCH 56/96] python39Packages.os-service-type: init at 1.7.0 --- .../os-service-types/default.nix | 41 +++++++++++++++++++ .../python-modules/os-service-types/tests.nix | 38 +++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 81 insertions(+) create mode 100644 pkgs/development/python-modules/os-service-types/default.nix create mode 100644 pkgs/development/python-modules/os-service-types/tests.nix diff --git a/pkgs/development/python-modules/os-service-types/default.nix b/pkgs/development/python-modules/os-service-types/default.nix new file mode 100644 index 000000000000..990af2ce6b9d --- /dev/null +++ b/pkgs/development/python-modules/os-service-types/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pbr +, six +, callPackage +}: + +buildPythonPackage rec { + pname = "os-service-types"; + version = "1.7.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "31800299a82239363995b91f1ebf9106ac7758542a1e4ef6dc737a5932878c6c"; + }; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + propagatedBuildInputs = [ pbr six ]; + + # check in passthru.tests.pytest to escape infinite recursion with other oslo components + doCheck = false; + + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; + + pythonImportsCheck = [ "os_service_types" ]; + + meta = with lib; { + description = "Python library for consuming OpenStack sevice-types-authority data"; + homepage = "https://github.com/openstack/os-service-types"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/os-service-types/tests.nix b/pkgs/development/python-modules/os-service-types/tests.nix new file mode 100644 index 000000000000..33f641d14c58 --- /dev/null +++ b/pkgs/development/python-modules/os-service-types/tests.nix @@ -0,0 +1,38 @@ +{ stdenv +, buildPythonPackage +, keystoneauth1 +, os-service-types +, oslotest +, requests-mock +, stestr +, testscenarios +}: + +buildPythonPackage rec { + pname = "os-service-types-tests"; + inherit (os-service-types) version; + + src = os-service-types.src; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + os-service-types + keystoneauth1 + oslotest + requests-mock + stestr + testscenarios + ]; + + checkPhase = '' + stestr run + ''; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5e466b097901..8c2a0e595e43 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5140,6 +5140,8 @@ in { orvibo = callPackage ../development/python-modules/orvibo { }; + os-service-types = callPackage ../development/python-modules/os-service-types { }; + osc = callPackage ../development/python-modules/osc { }; osc-lib = callPackage ../development/python-modules/osc-lib { }; From 13bf19d49b40dd76793475b80853c65c0f8f0d84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 11 Sep 2021 12:11:10 +0200 Subject: [PATCH 57/96] python39Packages.oslo-concurrency: init at 4.4.1 --- .../oslo-concurrency/default.nix | 70 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 72 insertions(+) create mode 100644 pkgs/development/python-modules/oslo-concurrency/default.nix diff --git a/pkgs/development/python-modules/oslo-concurrency/default.nix b/pkgs/development/python-modules/oslo-concurrency/default.nix new file mode 100644 index 000000000000..d3d90bfb2235 --- /dev/null +++ b/pkgs/development/python-modules/oslo-concurrency/default.nix @@ -0,0 +1,70 @@ +{ lib +, buildPythonPackage +, fetchPypi +, bash +, coreutils +, eventlet +, fasteners +, fixtures +, iana-etc +, libredirect +, oslo-config +, oslo-utils +, oslotest +, pbr +, stestr +}: + +buildPythonPackage rec { + pname = "oslo-concurrency"; + version = "4.4.1"; + + src = fetchPypi { + pname = "oslo.concurrency"; + inherit version; + sha256 = "6449cfbd15dbab20cf9907bbb2f057e0e5267f97161223d2b516cc8226b17ec3"; + }; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + + substituteInPlace oslo_concurrency/tests/unit/test_processutils.py \ + --replace "/bin/bash" "${bash}/bin/bash" \ + --replace "/bin/true" "${coreutils}/bin/true" \ + --replace "/usr/bin/env" "${coreutils}/bin/env" \ + --replace "/usr/bin/true" "${coreutils}/bin/true" + ''; + + propagatedBuildInputs = [ + fasteners + oslo-config + oslo-utils + pbr + ]; + + checkInputs = [ + eventlet + fixtures + oslotest + stestr + ]; + + checkPhase = '' + echo "nameserver 127.0.0.1" > resolv.conf + export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) + export LD_PRELOAD=${libredirect}/lib/libredirect.so + + stestr run + ''; + + pythonImportsCheck = [ "oslo_concurrency" ]; + + meta = with lib; { + description = "Oslo Concurrency library"; + homepage = "https://github.com/openstack/oslo.concurrency"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8c2a0e595e43..fbe5f0f9c810 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5154,6 +5154,8 @@ in { osmpythontools = callPackage ../development/python-modules/osmpythontools { }; + oslo-concurrency = callPackage ../development/python-modules/oslo-concurrency { }; + osqp = callPackage ../development/python-modules/osqp { }; outcome = callPackage ../development/python-modules/outcome { }; From 243294b2b46d1d865eb490f61d601bedc05a5dfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 11 Sep 2021 12:11:59 +0200 Subject: [PATCH 58/96] python39Packages.oslo-config: init at 8.7.1 --- .../python-modules/oslo-config/default.nix | 57 +++++++++++++++++++ .../python-modules/oslo-config/tests.nix | 43 ++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 102 insertions(+) create mode 100644 pkgs/development/python-modules/oslo-config/default.nix create mode 100644 pkgs/development/python-modules/oslo-config/tests.nix diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix new file mode 100644 index 000000000000..fface886eb94 --- /dev/null +++ b/pkgs/development/python-modules/oslo-config/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchPypi +, debtcollector +, netaddr +, oslo-i18n +, pbr +, pyyaml +, requests +, rfc3986 +, stevedore +, callPackage +}: + +buildPythonPackage rec { + pname = "oslo-config"; + version = "8.7.1"; + + src = fetchPypi { + pname = "oslo.config"; + inherit version; + sha256 = "a0c346d778cdc8870ab945e438bea251b5f45fae05d6d99dfe4953cca2277b60"; + }; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + propagatedBuildInputs = [ + debtcollector + netaddr + oslo-i18n + pbr + pyyaml + requests + rfc3986 + stevedore + ]; + + # check in passthru.tests.pytest to escape infinite recursion with other oslo components + doCheck = false; + + passthru.tests = { + pytest = callPackage ./tests.nix {}; + }; + + pythonImportsCheck = [ "oslo_config" ]; + + meta = with lib; { + description = "Oslo Configuration API"; + homepage = "https://github.com/openstack/oslo.config"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/oslo-config/tests.nix b/pkgs/development/python-modules/oslo-config/tests.nix new file mode 100644 index 000000000000..0c9fd661d6a3 --- /dev/null +++ b/pkgs/development/python-modules/oslo-config/tests.nix @@ -0,0 +1,43 @@ +{ stdenv +, buildPythonPackage +, oslo-config +, docutils +, oslo-log +, oslotest +, requests-mock +, sphinx +, stestr +, testscenarios +}: + +buildPythonPackage rec { + pname = "oslo-config-tests"; + inherit (oslo-config) version; + + src = oslo-config.src; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + oslo-config + docutils + oslo-log + oslotest + requests-mock + sphinx + stestr + testscenarios + ]; + + checkPhase = '' + stestr run + + ''; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fbe5f0f9c810..e433d4549838 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5156,6 +5156,8 @@ in { oslo-concurrency = callPackage ../development/python-modules/oslo-concurrency { }; + oslo-config = callPackage ../development/python-modules/oslo-config { }; + osqp = callPackage ../development/python-modules/osqp { }; outcome = callPackage ../development/python-modules/outcome { }; From 7f338392e1a535851ec842ad89571fdec4c3913c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 11 Sep 2021 12:13:05 +0200 Subject: [PATCH 59/96] python39Packages.oslo-context: init at 3.3.1 --- .../python-modules/oslo-context/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/oslo-context/default.nix diff --git a/pkgs/development/python-modules/oslo-context/default.nix b/pkgs/development/python-modules/oslo-context/default.nix new file mode 100644 index 000000000000..b4e52abd4237 --- /dev/null +++ b/pkgs/development/python-modules/oslo-context/default.nix @@ -0,0 +1,40 @@ +{ lib, buildPythonPackage, fetchPypi, debtcollector, oslotest, stestr, pbr }: + +buildPythonPackage rec { + pname = "oslo.context"; + version = "3.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "f578ea38569cf0a677e2167178196b21a54175471358c4320ddfd5c97c52f4d1"; + }; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + propagatedBuildInputs = [ + debtcollector + pbr + ]; + + checkInputs = [ + oslotest + stestr + ]; + + checkPhase = '' + stestr run + ''; + + pythonImportsCheck = [ "oslo_context" ]; + + meta = with lib; { + description = "Oslo Context library"; + homepage = "https://github.com/openstack/oslo.context"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e433d4549838..4c1506f691c7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5158,6 +5158,8 @@ in { oslo-config = callPackage ../development/python-modules/oslo-config { }; + oslo-context = callPackage ../development/python-modules/oslo-context { }; + osqp = callPackage ../development/python-modules/osqp { }; outcome = callPackage ../development/python-modules/outcome { }; From 1adeb1f2527f6fa6b01d1985bab8c0a4734c4217 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 11 Sep 2021 12:13:44 +0200 Subject: [PATCH 60/96] python39Packages.oslo-db: init at 11.0.0 --- .../python-modules/oslo-db/default.nix | 57 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/python-modules/oslo-db/default.nix diff --git a/pkgs/development/python-modules/oslo-db/default.nix b/pkgs/development/python-modules/oslo-db/default.nix new file mode 100644 index 000000000000..c0c9dff04334 --- /dev/null +++ b/pkgs/development/python-modules/oslo-db/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchPypi +, alembic +, oslo-config +, oslo-context +, oslo-utils +, oslotest +, pbr +, sqlalchemy +, sqlalchemy_migrate +, stestr +, testresources +, testscenarios +}: + +buildPythonPackage rec { + pname = "oslo-db"; + version = "11.0.0"; + + src = fetchPypi { + pname = "oslo.db"; + inherit version; + sha256 = "0cd5679868c0a0d194c916cc855348890820c3183b34a039af1e8698dac7afbf"; + }; + + nativeBuildInputs = [ pbr ]; + + propagatedBuildInputs = [ + alembic + oslo-config + oslo-context + oslo-utils + sqlalchemy + sqlalchemy_migrate + testresources + testscenarios + ]; + + checkInputs = [ + oslotest + stestr + ]; + + checkPhase = '' + stestr run + ''; + + pythonImportsCheck = [ "oslo_db" ]; + + meta = with lib; { + description = "Oslo Database library"; + homepage = "https://github.com/openstack/oslo.db"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4c1506f691c7..065d86d048ee 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5160,6 +5160,8 @@ in { oslo-context = callPackage ../development/python-modules/oslo-context { }; + oslo-db = callPackage ../development/python-modules/oslo-db { }; + osqp = callPackage ../development/python-modules/osqp { }; outcome = callPackage ../development/python-modules/outcome { }; From b5c7704111aa9a6364f0c5395051ff568b208918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 11 Sep 2021 12:14:06 +0200 Subject: [PATCH 61/96] python39Packages.oslo-i18n: init at 5.1.0 --- .../python-modules/oslo-i18n/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/oslo-i18n/default.nix diff --git a/pkgs/development/python-modules/oslo-i18n/default.nix b/pkgs/development/python-modules/oslo-i18n/default.nix new file mode 100644 index 000000000000..cdb6767c7a52 --- /dev/null +++ b/pkgs/development/python-modules/oslo-i18n/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchPypi +, oslotest +, pbr +, testscenarios +, stestr +}: + +buildPythonPackage rec { + pname = "oslo-i18n"; + version = "5.1.0"; + + src = fetchPypi { + pname = "oslo.i18n"; + inherit version; + sha256 = "6bf111a6357d5449640852de4640eae4159b5562bbba4c90febb0034abc095d0"; + }; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + nativeBuildInputs = [ pbr ]; + + checkInputs = [ + oslotest + stestr + testscenarios + ]; + + checkPhase = '' + stestr run + ''; + + pythonImportsCheck = [ "oslo_i18n" ]; + + meta = with lib; { + description = "Oslo i18n library"; + homepage = "https://github.com/openstack/oslo.i18n"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 065d86d048ee..e8e598f8c643 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5162,6 +5162,8 @@ in { oslo-db = callPackage ../development/python-modules/oslo-db { }; + oslo-i18n = callPackage ../development/python-modules/oslo-i18n { }; + osqp = callPackage ../development/python-modules/osqp { }; outcome = callPackage ../development/python-modules/outcome { }; From 76dd2dbadf2aec2dbaa3542b50d9127e562c87f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 11 Sep 2021 12:14:53 +0200 Subject: [PATCH 62/96] python39Packages.oslo-log: 4.6.0 --- .../python-modules/oslo-log/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/oslo-log/default.nix diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix new file mode 100644 index 000000000000..1e4598ead653 --- /dev/null +++ b/pkgs/development/python-modules/oslo-log/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, oslo-config +, oslo-context +, oslo-serialization +, oslo-utils +, oslotest +, pbr +, pyinotify +, python-dateutil +, stestr +}: + +buildPythonPackage rec { + pname = "oslo-log"; + version = "4.6.0"; + + src = fetchPypi { + pname = "oslo.log"; + inherit version; + sha256 = "dad5d7ff1290f01132b356d36a1bb79f98a3929d5005cce73e849ed31b385ba7"; + }; + + propagatedBuildInputs = [ + oslo-config + oslo-context + oslo-serialization + oslo-utils + pbr + python-dateutil + ] ++ lib.optionals stdenv.isLinux [ + pyinotify + ]; + + checkInputs = [ + oslotest + stestr + ]; + + checkPhase = '' + stestr run + ''; + + pythonImportsCheck = [ "oslo_log" ]; + + meta = with lib; { + description = "oslo.log library"; + homepage = "https://github.com/openstack/oslo.log"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e8e598f8c643..bc42bfdf4389 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5164,6 +5164,8 @@ in { oslo-i18n = callPackage ../development/python-modules/oslo-i18n { }; + oslo-log = callPackage ../development/python-modules/oslo-log { }; + osqp = callPackage ../development/python-modules/osqp { }; outcome = callPackage ../development/python-modules/outcome { }; From ec305549b4ef9ea17835e7e4c4184812a565c54f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 11 Sep 2021 12:15:25 +0200 Subject: [PATCH 63/96] python39Packages.oslo-serialization: init at 4.2.0 --- .../oslo-serialization/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/oslo-serialization/default.nix diff --git a/pkgs/development/python-modules/oslo-serialization/default.nix b/pkgs/development/python-modules/oslo-serialization/default.nix new file mode 100644 index 000000000000..e6b8d0d0c422 --- /dev/null +++ b/pkgs/development/python-modules/oslo-serialization/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchPypi +, msgpack +, oslo-utils +, oslotest +, pbr +, pytz +, stestr +}: + +buildPythonPackage rec { + pname = "oslo-serialization"; + version = "4.2.0"; + + src = fetchPypi { + pname = "oslo.serialization"; + inherit version; + sha256 = "3007e1b017ad3754cce54def894054cbcd05887e85928556657434b0fc7e4d83"; + }; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + nativeBuildInputs = [ pbr ]; + + propagatedBuildInputs = [ msgpack oslo-utils pytz ]; + + checkInputs = [ oslotest stestr ]; + + checkPhase = '' + stestr run + ''; + + pythonImportsCheck = [ "oslo_serialization" ]; + + meta = with lib; { + description = "Oslo Serialization library"; + homepage = "https://github.com/openstack/oslo.serialization"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bc42bfdf4389..fc9942ca22d8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5166,6 +5166,8 @@ in { oslo-log = callPackage ../development/python-modules/oslo-log { }; + oslo-serialization = callPackage ../development/python-modules/oslo-serialization { }; + osqp = callPackage ../development/python-modules/osqp { }; outcome = callPackage ../development/python-modules/outcome { }; From ac15248e5b68b1a9bcd487331939d55afa3ac902 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 11 Sep 2021 12:15:55 +0200 Subject: [PATCH 64/96] python39Packages.oslo-utils: init at 4.10.0 --- .../python-modules/oslo-utils/default.nix | 79 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 81 insertions(+) create mode 100644 pkgs/development/python-modules/oslo-utils/default.nix diff --git a/pkgs/development/python-modules/oslo-utils/default.nix b/pkgs/development/python-modules/oslo-utils/default.nix new file mode 100644 index 000000000000..3707a196d03e --- /dev/null +++ b/pkgs/development/python-modules/oslo-utils/default.nix @@ -0,0 +1,79 @@ +{ lib +, buildPythonPackage +, fetchPypi +, ddt +, debtcollector +, eventlet +, fixtures +, iso8601 +, netaddr +, netifaces +, oslo-i18n +, oslotest +, packaging +, pbr +, pyparsing +, pytz +, stestr +, testscenarios +, pyyaml +, iana-etc +, libredirect +}: + +buildPythonPackage rec { + pname = "oslo-utils"; + version = "4.10.0"; + + src = fetchPypi { + pname = "oslo.utils"; + inherit version; + sha256 = "9646e6570ed08a79f21b03acfb60d32a3ac453d76304f8759b1211a59ce372cb"; + }; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + nativeBuildInputs = [ pbr ]; + + propagatedBuildInputs = [ + debtcollector + iso8601 + netaddr + netifaces + oslo-i18n + packaging + pyparsing + pytz + ]; + + checkInputs = [ + ddt + eventlet + fixtures + oslotest + stestr + testscenarios + pyyaml + ]; + + checkPhase = '' + echo "nameserver 127.0.0.1" > resolv.conf + export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) + export LD_PRELOAD=${libredirect}/lib/libredirect.so + + stestr run + ''; + + pythonImportsCheck = [ "oslo_utils" ]; + + meta = with lib; { + description = "Oslo Utility library"; + homepage = "https://github.com/openstack/oslo.utils"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fc9942ca22d8..67f1f62147f7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5168,6 +5168,8 @@ in { oslo-serialization = callPackage ../development/python-modules/oslo-serialization { }; + oslo-utils = callPackage ../development/python-modules/oslo-utils { }; + osqp = callPackage ../development/python-modules/osqp { }; outcome = callPackage ../development/python-modules/outcome { }; From 5836d578ded885255162f2f8e798741d4260f6ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 11 Sep 2021 12:16:21 +0200 Subject: [PATCH 65/96] python39Packages.oslotest: init at 4.5.0 --- .../python-modules/oslotest/default.nix | 41 +++++++++++++++++++ .../python-modules/oslotest/tests.nix | 32 +++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 75 insertions(+) create mode 100644 pkgs/development/python-modules/oslotest/default.nix create mode 100644 pkgs/development/python-modules/oslotest/tests.nix diff --git a/pkgs/development/python-modules/oslotest/default.nix b/pkgs/development/python-modules/oslotest/default.nix new file mode 100644 index 000000000000..66e06c8b3e72 --- /dev/null +++ b/pkgs/development/python-modules/oslotest/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fixtures +, pbr +, subunit +, callPackage +}: + +buildPythonPackage rec { + pname = "oslotest"; + version = "4.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "360ad2c41ba3ad6f059c7c6e7291450d082c2e5dbb0012e839a829978053dfe6"; + }; + + nativeBuildInputs = [ pbr ]; + + propagatedBuildInputs = [ + fixtures + subunit + ]; + + # check in passthru.tests.pytest to escape infinite recursion with other oslo components + doCheck = false; + + passthru.tests = { + pytest = callPackage ./tests.nix {}; + }; + + pythonImportsCheck = [ "oslotest" ]; + + meta = with lib; { + description = "Oslo test framework"; + homepage = "https://github.com/openstack/oslotest"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/oslotest/tests.nix b/pkgs/development/python-modules/oslotest/tests.nix new file mode 100644 index 000000000000..3c07a35c17d8 --- /dev/null +++ b/pkgs/development/python-modules/oslotest/tests.nix @@ -0,0 +1,32 @@ +{ stdenv +, buildPythonPackage +, oslo-config +, oslotest +, stestr +}: + +buildPythonPackage rec { + pname = "oslotest-tests"; + inherit (oslotest) version; + + src = oslotest.src; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + oslotest + oslo-config + stestr + ]; + + checkPhase = '' + stestr run + ''; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 67f1f62147f7..7e7fe5d375e3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5170,6 +5170,8 @@ in { oslo-utils = callPackage ../development/python-modules/oslo-utils { }; + oslotest = callPackage ../development/python-modules/oslotest { }; + osqp = callPackage ../development/python-modules/osqp { }; outcome = callPackage ../development/python-modules/outcome { }; From 260ae860121b6eab3df4c452792f3c15817dc5ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 11 Sep 2021 12:16:44 +0200 Subject: [PATCH 66/96] python39Packages.subunit: add alias from python-subunit --- pkgs/top-level/python-aliases.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 27b467cbb2a4..0c375a664999 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -65,6 +65,7 @@ mapAliases ({ pytestquickcheck = pytest-quickcheck; # added 2021-07-20 pytestrunner = pytest-runner; # added 2021-01-04 python-lz4 = lz4; # added 2018-06-01 + python-subunit = subunit; # added 2021-09-10 pytest_xdist = pytest-xdist; # added 2021-01-04 python_simple_hipchat = python-simple-hipchat; # added 2021-07-21 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 From 1c8b1984e8604a5cb53855a41ff5ebbefab716c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 11 Sep 2021 12:17:12 +0200 Subject: [PATCH 67/96] python39Packages.python-cinderclient: init at 8.1.0 --- .../python-modules/oslo-config/tests.nix | 1 - .../python-cinderclient/default.nix | 57 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/python-cinderclient/default.nix diff --git a/pkgs/development/python-modules/oslo-config/tests.nix b/pkgs/development/python-modules/oslo-config/tests.nix index 0c9fd661d6a3..82400e67ea58 100644 --- a/pkgs/development/python-modules/oslo-config/tests.nix +++ b/pkgs/development/python-modules/oslo-config/tests.nix @@ -38,6 +38,5 @@ buildPythonPackage rec { checkPhase = '' stestr run - ''; } diff --git a/pkgs/development/python-modules/python-cinderclient/default.nix b/pkgs/development/python-modules/python-cinderclient/default.nix new file mode 100644 index 000000000000..8346074c9c51 --- /dev/null +++ b/pkgs/development/python-modules/python-cinderclient/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchPypi +, ddt +, keystoneauth1 +, oslo-i18n +, oslo-serialization +, oslo-utils +, pbr +, requests +, prettytable +, requests-mock +, simplejson +, stestr +, stevedore +}: + +buildPythonPackage rec { + pname = "python-cinderclient"; + version = "8.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "b57b432b2ac9161c2482a569a023211d2d3d0ada81c4da62c8f6e47f0b2bf82d"; + }; + + propagatedBuildInputs = [ + simplejson + keystoneauth1 + oslo-i18n + oslo-utils + pbr + prettytable + requests + stevedore + ]; + + checkInputs = [ + ddt + oslo-serialization + requests-mock + stestr + ]; + + checkPhase = '' + stestr run + ''; + + pythonImportsCheck = [ "cinderclient" ]; + + meta = with lib; { + description = "OpenStack Block Storage API Client Library"; + homepage = "https://github.com/openstack/python-cinderclient"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7e7fe5d375e3..e739ca473d6c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7127,6 +7127,8 @@ in { python-box = callPackage ../development/python-modules/python-box { }; + python-cinderclient = callPackage ../development/python-modules/python-cinderclient { }; + python-constraint = callPackage ../development/python-modules/python-constraint { }; python-crontab = callPackage ../development/python-modules/python-crontab { }; From 7b4c9f880fc5deddee0f37eeb60a235c01261efc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 11 Sep 2021 12:17:39 +0200 Subject: [PATCH 68/96] python39Packages.python-openstackclient: init at 5.6.0 --- .../python-openstackclient/default.nix | 49 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/python-openstackclient/default.nix diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix new file mode 100644 index 000000000000..d538c01acc66 --- /dev/null +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchPypi +, ddt +, osc-lib +, pbr +, python-cinderclient +, python-keystoneclient +, python-novaclient +, requests-mock +, stestr +}: + +buildPythonPackage rec { + pname = "python-openstackclient"; + version = "5.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0abc6666378c5a7db83ec83515a8524fb6246a919236110169cc5c216ac997ea"; + }; + + propagatedBuildInputs = [ + osc-lib + pbr + python-cinderclient + python-keystoneclient + python-novaclient + ]; + + checkInputs = [ + ddt + stestr + requests-mock + ]; + + checkPhase = '' + stestr run + ''; + + pythonImportsCheck = [ "openstackclient" ]; + + meta = with lib; { + description = "OpenStack Command-line Client"; + homepage = "https://github.com/openstack/python-openstackclient"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd69bf97e15e..7d5aa149708e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18206,6 +18206,8 @@ with pkgs; openslp = callPackage ../development/libraries/openslp {}; + openstackclient = with python3Packages; toPythonApplication python-openstackclient; + openvdb = callPackage ../development/libraries/openvdb {}; inherit (callPackages ../development/libraries/libressl { }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e739ca473d6c..672eb46acf83 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7279,6 +7279,8 @@ in { python-opendata-transport = callPackage ../development/python-modules/python-opendata-transport { }; + python-openstackclient = callPackage ../development/python-modules/python-openstackclient { }; + python_openzwave = callPackage ../development/python-modules/python_openzwave { }; python-packer = callPackage ../development/python-modules/python-packer { }; From 02a5e643207ab8d78d5cf7ab21e961368030794a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 11 Sep 2021 12:18:16 +0200 Subject: [PATCH 69/96] python39Packages.stestr: init at 3.2.0 --- .../python-modules/stestr/default.nix | 54 +++++++++++++++++++ .../python-modules/stestr/tests.nix | 32 +++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 88 insertions(+) create mode 100644 pkgs/development/python-modules/stestr/default.nix create mode 100644 pkgs/development/python-modules/stestr/tests.nix diff --git a/pkgs/development/python-modules/stestr/default.nix b/pkgs/development/python-modules/stestr/default.nix new file mode 100644 index 000000000000..88259dc718e1 --- /dev/null +++ b/pkgs/development/python-modules/stestr/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cliff +, fixtures +, future +, pbr +, subunit +, testtools +, voluptuous +, callPackage +}: + +buildPythonPackage rec { + pname = "stestr"; + version = "3.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "fb492cbdf3d3fdd6812645804efc84a99a68bb60dd7705f15c1a2949c8172bc4"; + }; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + propagatedBuildInputs = [ + cliff + fixtures + future + pbr + subunit + testtools + voluptuous + ]; + + # check in passthru.tests.pytest to escape infinite recursion with other oslo components + doCheck = false; + + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; + + pythonImportsCheck = [ "stestr" ]; + + meta = with lib; { + description = "A parallel Python test runner built around subunit"; + homepage = "https://github.com/mtreinish/stestr"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/stestr/tests.nix b/pkgs/development/python-modules/stestr/tests.nix new file mode 100644 index 000000000000..7a5d47b5dcfe --- /dev/null +++ b/pkgs/development/python-modules/stestr/tests.nix @@ -0,0 +1,32 @@ +{ stdenv +, buildPythonPackage +, ddt +, sqlalchemy +, stestr +, subunit2sql +}: + +buildPythonPackage rec { + pname = "stestr-tests"; + inherit (stestr) version; + + src = stestr.src; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + stestr + ]; + + checkPhase = '' + export PATH=$out/bin:$PATH + export HOME=$TMPDIR + ''; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 672eb46acf83..92e422543f9f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8553,6 +8553,8 @@ in { stem = callPackage ../development/python-modules/stem { }; + stestr = callPackage ../development/python-modules/stestr { }; + stevedore = callPackage ../development/python-modules/stevedore { }; stm32loader = callPackage ../development/python-modules/stm32loader { }; From 0eb567a2da26e89eb8dd1673c5665633623b1a74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 11 Sep 2021 12:18:50 +0200 Subject: [PATCH 70/96] python39Packages.subunit2sql: init at 1.10.0 --- .../python-modules/subunit2sql/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/python-modules/subunit2sql/default.nix diff --git a/pkgs/development/python-modules/subunit2sql/default.nix b/pkgs/development/python-modules/subunit2sql/default.nix new file mode 100644 index 000000000000..78035910397d --- /dev/null +++ b/pkgs/development/python-modules/subunit2sql/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchPypi +, mock +, oslo-concurrency +, oslo-db +, pbr +, python-dateutil +, stestr +}: + +buildPythonPackage rec { + pname = "subunit2sql"; + version = "1.10.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-c+Dg6moKiv30M0mmwGQSOEbc94gfH//ZnF7lnBgv8EU="; + }; + + propagatedBuildInputs = [ + oslo-db + pbr + python-dateutil + ]; + + checkInputs = [ + mock + oslo-concurrency + stestr + ]; + + checkPhase = '' + export PATH=$out/bin:$PATH + export HOME=$TMPDIR + + stestr run -e <(echo " + subunit2sql.tests.db.test_api.TestDatabaseAPI.test_get_failing_test_ids_from_runs_by_key_value + subunit2sql.tests.db.test_api.TestDatabaseAPI.test_get_id_from_test_id + subunit2sql.tests.db.test_api.TestDatabaseAPI.test_get_test_run_dict_by_run_meta_key_value + subunit2sql.tests.migrations.test_migrations.TestWalkMigrations.test_sqlite_opportunistically + subunit2sql.tests.test_shell.TestMain.test_main + subunit2sql.tests.test_shell.TestMain.test_main_with_targets + ") + ''; + + pythonImportsCheck = [ "subunit2sql" ]; + + meta = with lib; { + description = "Command to Read a subunit file or stream and put the data in a SQL DB"; + homepage = "https://opendev.org/opendev/subunit2sql"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 92e422543f9f..b3f72e5a7d5a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8607,6 +8607,8 @@ in { inherit (pkgs) subunit cppunit check; }; + subunit2sql = callPackage ../development/python-modules/subunit2sql { }; + suds-jurko = callPackage ../development/python-modules/suds-jurko { }; sumo = callPackage ../development/python-modules/sumo { }; From e8528a7e591508f711a92ec120c1f9ac2bba1195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 11 Sep 2021 14:01:46 +0200 Subject: [PATCH 71/96] maintainers/teams: fix capitalisation --- maintainers/team-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 391f401306e9..df0c9ce7cf61 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -182,7 +182,7 @@ with lib.maintainers; { members = [ angustrau superherointj - supersandro2000 + SuperSandro2000 ]; scope = "Maintain the ecosystem around OpenStack"; }; From 729b2d373ee414d46bafc5dc98381df4f0b26f04 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 Sep 2021 17:03:34 +0000 Subject: [PATCH 72/96] gensio: 2.2.8 -> 2.2.9 --- pkgs/development/libraries/gensio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index 0cd2f79ea552..c4d961f4b76f 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.2.8"; + version = "2.2.9"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6+hYytLMg5E1KTBPWSteVu2VjF0APkcoOiigqzrBI+U="; + sha256 = "sha256-SN8zMMBX02kIS9q1/7DO+t826DpmbZBO37TDZtvRT1A="; }; passthru = { From 50d04198ca5e14783c2b4253f6dfdd38e5e4abff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 11 Sep 2021 19:03:48 +0200 Subject: [PATCH 73/96] gofu: init at unstable-2021-09-11 --- pkgs/applications/misc/gofu/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/misc/gofu/default.nix diff --git a/pkgs/applications/misc/gofu/default.nix b/pkgs/applications/misc/gofu/default.nix new file mode 100644 index 000000000000..b951a3e48251 --- /dev/null +++ b/pkgs/applications/misc/gofu/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "gofu"; + version = "unstable-2021-09-11"; + + src = fetchFromGitHub { + owner = "majewsky"; + repo = pname; + rev = "cb398f58a5cb4f3e858fe60e84debde6ab58f7c8"; + sha256 = "sha256-R8Pr8SyLeoTaYKKV+PzHDPi1/RY4j7pkUbW8kE4ydBU="; + }; + + vendorSha256 = null; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Multibinary containing several utilities"; + homepage = "https://github.com/majewsky/gofu"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d05d615a76f..2f2a1ac50bea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -895,6 +895,8 @@ with pkgs; gobgp = callPackage ../tools/networking/gobgp { }; + gofu = callPackage ../applications/misc/gofu { }; + metapixel = callPackage ../tools/graphics/metapixel { }; pferd = callPackage ../tools/misc/pferd {}; From 023d0ce720cd42dbac5d78fbe18e663b05267e5b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Sep 2021 19:17:16 +0200 Subject: [PATCH 74/96] python3Packages.growattserver: 1.0.2 -> 1.1.0 --- pkgs/development/python-modules/growattserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/growattserver/default.nix b/pkgs/development/python-modules/growattserver/default.nix index 02c8bce05a27..18d6cd4dabb1 100644 --- a/pkgs/development/python-modules/growattserver/default.nix +++ b/pkgs/development/python-modules/growattserver/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "growattserver"; - version = "1.0.2"; + version = "1.1.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "indykoning"; repo = "PyPi_GrowattServer"; rev = version; - sha256 = "sha256-0i7pMJ4gAVOkvj2uYZJygr3rehgIAfyxq9cWbozwRIQ="; + sha256 = "sha256-Vooy+czqhrsWVw35zJb5paC5G0WwOlI5hF8PXxJG0cY="; }; propagatedBuildInputs = [ From 3935d8a9d2497424d72d4c774c4851d5c5e19fdc Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Sat, 11 Sep 2021 20:21:05 +0300 Subject: [PATCH 75/96] airshipper: init at 0.6.0 --- pkgs/games/airshipper/default.nix | 74 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 76 insertions(+) create mode 100644 pkgs/games/airshipper/default.nix diff --git a/pkgs/games/airshipper/default.nix b/pkgs/games/airshipper/default.nix new file mode 100644 index 000000000000..1fe33a86f978 --- /dev/null +++ b/pkgs/games/airshipper/default.nix @@ -0,0 +1,74 @@ +{ lib +, rustPlatform +, fetchFromGitLab +, openssl +, vulkan-loader +, wayland +, wayland-protocols +, libxkbcommon +, libX11 +, libXrandr +, libXi +, libXcursor +, pkg-config +, makeWrapper +}: + +rustPlatform.buildRustPackage rec { + pname = "airshipper"; + version = "0.6.0"; + + src = fetchFromGitLab { + owner = "Veloren"; + repo = "airshipper"; + rev = "v${version}"; + sha256 = "sha256-m3H2FE1DoV/uk9PGgf9PCagwmWWSQO/gCi7zpS02/WY="; + }; + + cargoSha256 = "sha256-ddy4TjT/ia+sLBnpwcXBVUzAS07ar+Jjc04KS5/arlU="; + + buildInputs = [ + openssl + wayland + wayland-protocols + libxkbcommon + libX11 + libXrandr + libXi + libXcursor + ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + + postInstall = '' + mkdir -p "$out/share/applications" && mkdir -p "$out/share/icons" + cp "client/assets/net.veloren.airshipper.desktop" "$out/share/applications" + cp "client/assets/logo.ico" "$out/share/icons/net.veloren.airshipper.ico" + ''; + + postFixup = + let + libPath = lib.makeLibraryPath [ + vulkan-loader + wayland + wayland-protocols + libxkbcommon + libX11 + libXrandr + libXi + libXcursor + ]; + in '' + patchelf --set-rpath "${libPath}" "$out/bin/airshipper" + ''; + + doCheck = false; + cargoBuildFlags = [ "--package" "airshipper" ]; + cargoTestFlags = [ "--package" "airshipper" ]; + + meta = with lib; { + description = "Provides automatic updates for the voxel RPG Veloren."; + homepage = "https://www.veloren.net"; + license = licenses.gpl3; + maintainers = with maintainers; [ yusdacra ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b15d8394d7a..735321b5ee0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29203,6 +29203,8 @@ with pkgs; adom = callPackage ../games/adom { }; + airshipper = callPackage ../games/airshipper { }; + airstrike = callPackage ../games/airstrike { }; alephone = callPackage ../games/alephone { }; From 7d7ab4f8958faf86577be7dc93aa534ae2848d9c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 Sep 2021 17:34:04 +0000 Subject: [PATCH 76/96] gitRepo: 2.16 -> 2.16.7 --- pkgs/applications/version-management/git-repo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 3623dbba6b8d..0cf131508b4e 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.16"; + version = "2.16.7"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-F36MuqgVkKM2RCIGEGJmL3/KpZy3eDRZ7WWUE15mTfU="; + sha256 = "sha256-AJD+WV8JilclcMXc4RFv2xY9QZNUJtYX1dsb1q85qZ0="; }; # Fix 'NameError: name 'ssl' is not defined' From 7fad7281d86fb063b57aaf11d78dabd506c80332 Mon Sep 17 00:00:00 2001 From: Sam Alws Date: Fri, 10 Sep 2021 03:57:47 -0400 Subject: [PATCH 77/96] wike: init at 1.5.6 --- pkgs/applications/misc/wike/default.nix | 60 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/applications/misc/wike/default.nix diff --git a/pkgs/applications/misc/wike/default.nix b/pkgs/applications/misc/wike/default.nix new file mode 100644 index 000000000000..fac8ac2886d3 --- /dev/null +++ b/pkgs/applications/misc/wike/default.nix @@ -0,0 +1,60 @@ +{ lib, stdenv, fetchFromGitHub +, meson, pkg-config, ninja +, python3 +, glib, appstream-glib , desktop-file-utils +, gobject-introspection, gtk3 +, wrapGAppsHook +, libhandy, webkitgtk, glib-networking +, gnome, dconf +}: +let + pythonEnv = python3.withPackages (p: with p; [ + pygobject3 + requests + ]); +in stdenv.mkDerivation rec { + pname = "wike"; + version = "1.5.6"; + + src = fetchFromGitHub { + owner = "hugolabe"; + repo = "Wike"; + rev = version; + sha256 = "1qnxzxqjj0sn522k15plskwa7nlhhbcipfc3w17fbq3k2zhpr1yy"; + }; + + nativeBuildInputs = [ + meson + pkg-config + ninja + appstream-glib + desktop-file-utils + gobject-introspection + wrapGAppsHook + ]; + + buildInputs = [ + glib + pythonEnv + gtk3 + libhandy + webkitgtk + glib-networking + gnome.adwaita-icon-theme + dconf + ]; + + postPatch = '' + patchShebangs build-aux/meson/postinstall.py + substituteInPlace src/wike.in --replace "@PYTHON@" "${pythonEnv}/bin/python" + substituteInPlace src/wike-sp.in --replace "@PYTHON@" "${pythonEnv}/bin/python" + ''; + + meta = with lib; { + description = "Wikipedia Reader for the GNOME Desktop"; + homepage = "https://github.com/hugolabe/Wike"; + license = licenses.gpl3Plus; + platforms = webkitgtk.meta.platforms; + maintainers = with maintainers; [ samalws ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d88657229168..ecde27247fde 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32504,6 +32504,8 @@ with pkgs; websocketd = callPackage ../applications/networking/websocketd { }; + wike = callPackage ../applications/misc/wike { }; + wikicurses = callPackage ../applications/misc/wikicurses { pythonPackages = python3Packages; }; From cb78051ccda2282df41f5a71c4c07078c9eaad75 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 Sep 2021 18:08:30 +0000 Subject: [PATCH 78/96] gnome.devhelp: 40.0 -> 40.1 --- pkgs/desktops/gnome/devtools/devhelp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/devtools/devhelp/default.nix b/pkgs/desktops/gnome/devtools/devhelp/default.nix index 46491cffc5f6..6be6c77f7c27 100644 --- a/pkgs/desktops/gnome/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome/devtools/devhelp/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "devhelp"; - version = "40.0"; + version = "40.1"; src = fetchurl { url = "mirror://gnome/sources/devhelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0zr64qp5c6jcc3x5hmfp7jhzpi96qwr6xplyfkmz4kjzvr9xidjd"; + sha256 = "PorZPoSEtEgjyuR0ov2dziLtbs0lZVWSzq17G2gya7s="; }; nativeBuildInputs = [ From 0ea1b56e6cd1ccfc1b69bc225969a21318e34b2b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Sep 2021 20:14:23 +0200 Subject: [PATCH 79/96] python3Packages.dpath: 2.0.3 -> 2.0.4 --- pkgs/development/python-modules/dpath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dpath/default.nix b/pkgs/development/python-modules/dpath/default.nix index 387dbfa1f64d..bfbeeaea0070 100644 --- a/pkgs/development/python-modules/dpath/default.nix +++ b/pkgs/development/python-modules/dpath/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "dpath"; - version = "2.0.3"; + version = "2.0.4"; disabled = isPy27; # uses python3 imports src = fetchPypi { inherit pname version; - sha256 = "sha256-p6icMudH3zqfKkRrt5dHLjWb66UzlRW3pvZbIzsqMac="; + sha256 = "0qjaa4sjw0m4b91mm18074wpkhir3xx7s87qwckmzpfb165gk837"; }; # use pytest as nosetests hangs From c4c93989e834f4de1fc14b1e612e0c4f0fd847a0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 Sep 2021 18:15:36 +0000 Subject: [PATCH 80/96] gnome.eog: 40.2 -> 40.3 --- pkgs/desktops/gnome/core/eog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix index e67a623069b1..bffcb8b74c23 100644 --- a/pkgs/desktops/gnome/core/eog/default.nix +++ b/pkgs/desktops/gnome/core/eog/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "eog"; - version = "40.2"; + version = "40.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-kITimZMftX3ih+V9vS7i0pf7Z0DA1TW52o1fGWqP0ZU="; + sha256 = "sha256-KKo7BwgdlWV1RvcIlJR/qIZjGix/lV5Wz4DbcxrjsjU="; }; nativeBuildInputs = [ From ebc030ce758ba1dd7576d68a235fbdad15844d65 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 9 Sep 2021 13:08:16 -0400 Subject: [PATCH 81/96] joshuto: init at 0.9.0 --- pkgs/applications/misc/joshuto/default.nix | 31 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/misc/joshuto/default.nix diff --git a/pkgs/applications/misc/joshuto/default.nix b/pkgs/applications/misc/joshuto/default.nix new file mode 100644 index 000000000000..89e5aea943a5 --- /dev/null +++ b/pkgs/applications/misc/joshuto/default.nix @@ -0,0 +1,31 @@ +{ fetchFromGitHub, lib, rustPlatform, stdenv, SystemConfiguration }: + +rustPlatform.buildRustPackage rec { + pname = "joshuto"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "kamiyaa"; + repo = pname; + rev = version; + sha256 = "08d6h7xwcgycw5bdzwwc6aaikcrw3yc7inkiydgml9q261kql7zl"; + # upstream includes an outdated Cargo.lock that stops cargo from compiling + postFetch = '' + mkdir -p $out + tar xf $downloadedFile --strip=1 -C $out + substituteInPlace $out/Cargo.lock \ + --replace 0.8.6 ${version} + ''; + }; + + cargoSha256 = "1scrqm7fs8y7anfiigimj7y5rjxcc2qvrxiq8ai7k5cwfc4v1ghm"; + + buildInputs = lib.optional stdenv.isDarwin SystemConfiguration; + + meta = with lib; { + description = "Ranger-like terminal file manager written in Rust"; + homepage = "https://github.com/kamiyaa/joshuto"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12d312b657a1..ee37cee66fb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6311,6 +6311,10 @@ with pkgs; jo = callPackage ../development/tools/jo { }; + joshuto = callPackage ../applications/misc/joshuto { + inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + }; + jrnl = python3Packages.callPackage ../applications/misc/jrnl { }; jsawk = callPackage ../tools/text/jsawk { }; From c6e09932da02f6a92530644447f010f708793fbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sat, 11 Sep 2021 13:31:20 -0500 Subject: [PATCH 82/96] =?UTF-8?q?android-studio-canary:=202021.1.1.5=20?= =?UTF-8?q?=E2=86=92=202021.1.1.11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 502c68d3269f..0c9bd808b53c 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -17,8 +17,8 @@ let sha256Hash = "04k7c328bl8ixi8bvp2mm33q2hmv40yc9p5dff5cghyycarwpd3f"; }; latestVersion = { # canary & dev - version = "2021.1.1.5"; # "Android Studio Bumblebee (2021.1.1) Canary 5" - sha256Hash = "0fx6nnazg4548rhb11wzaccm5c2si57mj8qwyl5j17x4k5r3m7nh"; + version = "2021.1.1.11"; # "Android Studio Bumblebee (2021.1.1) Canary 11" + sha256Hash = "0npvb7kr259799bs2bs2drvimmmwb0rdzswbkz8zgi5c2fwjcvvl"; }; in { # Attributes are named by their corresponding release channels From 124e8afb6a3f4a623dea0f206cc5c2b5e4577ba8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 Sep 2021 18:35:43 +0000 Subject: [PATCH 83/96] gnome.gnome-desktop: 40.3 -> 40.4 --- pkgs/desktops/gnome/core/gnome-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-desktop/default.nix index 1a7887fc35da..df8096b90eec 100644 --- a/pkgs/desktops/gnome/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-desktop/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "40.3"; + version = "40.4"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-U9ZGlEbXoJsCaTZ2nllTUv3zvlYy80a7Af5XyLUWLOs="; + sha256 = "sha256-iK6W9YXg0IcJQbuj113fPsQDSOHFrnQTIcpIL6ydRe8="; }; patches = [ From bd763298edeb1a7db10e39b1eac205b38a91f9de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 11 Sep 2021 20:54:17 +0200 Subject: [PATCH 84/96] typora: remove --- pkgs/applications/editors/typora/default.nix | 72 -------------------- pkgs/top-level/aliases.nix | 3 +- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 2 insertions(+), 75 deletions(-) delete mode 100644 pkgs/applications/editors/typora/default.nix diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix deleted file mode 100644 index a9afc774bc05..000000000000 --- a/pkgs/applications/editors/typora/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ stdenv -, lib -, fetchurl -, makeWrapper -, electron_9 -, dpkg -, gtk3 -, glib -, gsettings-desktop-schemas -, wrapGAppsHook -, withPandoc ? false -, pandoc -}: - -let - electron = electron_9; -in -stdenv.mkDerivation rec { - pname = "typora"; - version = "0.9.98"; - - src = fetchurl { - url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "sha256-JiqjxT8ZGttrcJrcQmBoGPnRuuYWZ9u2083RxZoLMus="; - }; - - nativeBuildInputs = [ - dpkg - makeWrapper - wrapGAppsHook - ]; - - buildInputs = [ - glib - gsettings-desktop-schemas - gtk3 - ]; - - # The deb contains setuid permission on `chrome-sandbox`, which will actually not get installed. - unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; - - dontWrapGApps = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share - { - cd usr - mv share/typora/resources/app $out/share/typora - mv share/{applications,icons,doc} $out/share/ - } - - runHook postInstall - ''; - - postFixup = '' - makeWrapper ${electron}/bin/electron $out/bin/typora \ - --add-flags $out/share/typora \ - "''${gappsWrapperArgs[@]}" \ - ${lib.optionalString withPandoc ''--prefix PATH : "${lib.makeBinPath [ pandoc ]}"''} \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}" - ''; - - meta = with lib; { - description = "A minimal Markdown reading & writing app"; - homepage = "https://typora.io"; - license = licenses.unfree; - maintainers = with maintainers; [ jensbin ]; - platforms = [ "x86_64-linux"]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c2e524b894f7..429ff77997a8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -913,7 +913,8 @@ mapAliases ({ truecrypt = veracrypt; # added 2018-10-24 tshark = wireshark-cli; # added 2018-04-25 tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # added 2021-03-07 - turbo-geth = throw "turbo-geth has been renamed to erigon"; # added 20201-08-08 + turbo-geth = throw "turbo-geth has been renamed to erigon"; # added 2021-08-08 + typora = throw "typora has been removed as it cannot be updated because newer versions use an anti-user encryption and refuse to start"; # added 2021-09-11 uberwriter = apostrophe; # added 2020-04-23 ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21 ucsFonts = ucs-fonts; # added 2016-07-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d05d615a76f..faacfcd2e56d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26614,8 +26614,6 @@ with pkgs; mlt-qt5 = libsForQt514.mlt; }; - typora = callPackage ../applications/editors/typora { }; - taxi = callPackage ../applications/networking/ftp/taxi { }; librep = callPackage ../development/libraries/librep { }; From cfae9b1b99439288368693dbde795ba462680ec9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 Sep 2021 17:08:49 +0000 Subject: [PATCH 85/96] gexiv2: 0.12.2 -> 0.12.3 --- pkgs/development/libraries/gexiv2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix index c46a42049bce..ff3e9ee52e99 100644 --- a/pkgs/development/libraries/gexiv2/default.nix +++ b/pkgs/development/libraries/gexiv2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gexiv2"; - version = "0.12.2"; + version = "0.12.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "IyK1UqyjMO73lySmmcUaMCNF1eB0c4V4s5i38v+XlEw="; + sha256 = "0jt5cqL8b4QBULrR7XnBy+xnKVHhgMHh7DPKbHMMWfM="; }; nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; From d0712a8462451a5fc615202bf7824bd134460340 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 Sep 2021 17:39:38 +0000 Subject: [PATCH 86/96] gjs: 1.68.2 -> 1.68.3 --- pkgs/development/libraries/gjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index e86775de623b..54f19d1756cb 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -30,13 +30,13 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.68.2"; + version = "1.68.3"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-cP8CraaC8TAzjsXMTFEQPcDlyrjVN+t2sYHsUSpl7jA="; + sha256 = "sha256-ghx/T3jxUA2mpWxUY3I72P+A3mM8y6Q6WrA9jMyiHT8="; }; patches = [ From ae42c3a0630c63bfc44f7f3c6e6ebc6d7c5f4554 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 Sep 2021 19:04:53 +0000 Subject: [PATCH 87/96] gnome.gnome-shell-extensions: 40.3 -> 40.4 --- pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index 8013e101913e..94b29e8b4dee 100644 --- a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extensions"; - version = "40.3"; + version = "40.4"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "nfh/qVNSAf68o9UI/b97rQFxz3ony2ZN1OPB+WxO0Es="; + sha256 = "9R1MQsIru9AxLKcY9Hz0Vp/FikbvQAdDrk0cx9kKzXk="; }; patches = [ From 1cc9e66b24fe52cc804893f998e3e52833fda4fd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 Sep 2021 19:21:28 +0000 Subject: [PATCH 88/96] gnome.gnome-weather: 40.0 -> 40.1 --- pkgs/desktops/gnome/apps/gnome-weather/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-weather/default.nix b/pkgs/desktops/gnome/apps/gnome-weather/default.nix index 39c10e82a1c2..17e98bb2a569 100644 --- a/pkgs/desktops/gnome/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-weather/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "gnome-weather"; - version = "40.0"; + version = "40.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1vxfcvga5waangq3rzwdrdxyy5sw40vv0l463lc651s0n8xafd9a"; + sha256 = "PREUTEeXxG0gaMPd9c4rwDD8oPJyzwPyGMT0baO3PE0="; }; nativeBuildInputs = [ From 7d761f4228e0550bc8e106ba5b9ac155d08ec489 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 Sep 2021 20:03:23 +0000 Subject: [PATCH 89/96] gnome.nautilus: 40.1 -> 40.2 --- pkgs/desktops/gnome/core/nautilus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix index f3ccdbce98cb..1f92e49c4f66 100644 --- a/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/pkgs/desktops/gnome/core/nautilus/default.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "40.1"; + version = "40.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0cwxr7bfa19dvzra81s9wfshzv0zv7ycpfffn4amigd0fh0vkkwf"; + sha256 = "tx7y/gfl7qiaK7HlvTCUe9GIc7+zD3nL8X7fvU0g9g0="; }; patches = [ From a5a4149b2f6bf56b0513c57c99948ee058c4a025 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 Sep 2021 20:13:06 +0000 Subject: [PATCH 90/96] gnome.quadrapassel: 40.1 -> 40.2 --- pkgs/desktops/gnome/games/quadrapassel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/games/quadrapassel/default.nix b/pkgs/desktops/gnome/games/quadrapassel/default.nix index c3724ef51058..956f9f842d3d 100644 --- a/pkgs/desktops/gnome/games/quadrapassel/default.nix +++ b/pkgs/desktops/gnome/games/quadrapassel/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "quadrapassel"; - version = "40.1"; + version = "40.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1d59sxmmmhi611hvr5jmsm276j9w20hc5yq4rk0s4d3svadyap79"; + sha256 = "C9giQUIHxzEj7WpJ9yPaWsjdTfXTXtwJn/6i4TmcwAo="; }; nativeBuildInputs = [ From a45c76d73ddb01e6d7aa9c5f6c9d67a4ef4e0ed0 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Wed, 8 Sep 2021 20:17:19 -0700 Subject: [PATCH 91/96] bandwidth: 1.9.4 -> 1.10.1, enable on arm add make flags needed for cross-compilation tested on pkgsCross.{aarch64-multiplatform,armv7l-hf-multiplatform} --- pkgs/tools/misc/bandwidth/default.nix | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index 677a9ddef514..710382fe8267 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -6,21 +6,35 @@ let in stdenv.mkDerivation rec { pname = "bandwidth"; - version = "1.9.4"; + version = "1.10.1"; src = fetchurl { url = "https://zsmith.co/archives/${pname}-${version}.tar.gz"; - sha256 = "0x798xj3vhiwq2hal0vmf92sq4h7yalp3i6ylqwhnnpv99m2zws4"; + sha256 = "sha256-trya+/cBNIittQAc5tcykZbImeISqIolO/Y8uOI0jGk="; }; postPatch = '' - sed -i 's,^CC=gcc .*,,' OOC/Makefile Makefile* sed -i 's,ar ,$(AR) ,g' OOC/Makefile + # Remove unnecessary -m32 for 32-bit targets + sed -i 's,-m32,,g' OOC/Makefile + # Fix wrong comment character + sed -i 's,# 32,; 32,g' routines-x86-32bit.asm + # Fix missing symbol exports for macOS clang + echo global _VectorToVector128 >> routines-x86-64bit.asm + echo global _VectorToVector256 >> routines-x86-64bit.asm ''; nativeBuildInputs = [ nasm ]; - buildFlags = [ arch ]; + buildFlags = [ + "AR=${stdenv.cc.targetPrefix}ar" + "CC=${stdenv.cc.targetPrefix}cc" + "ARM_AS=${stdenv.cc.targetPrefix}as" + "ARM_CC=$(CC)" + "UNAMEPROC=${stdenv.hostPlatform.parsed.cpu.name}" + "UNAMEMACHINE=${stdenv.hostPlatform.parsed.cpu.name}" + arch + ]; installPhase = '' mkdir -p $out/bin @@ -31,7 +45,7 @@ stdenv.mkDerivation rec { homepage = "https://zsmith.co/bandwidth.html"; description = "Artificial benchmark for identifying weaknesses in the memory subsystem"; license = licenses.gpl2Plus; - platforms = platforms.x86; + platforms = platforms.x86 ++ platforms.arm ++ platforms.aarch64; maintainers = with maintainers; [ r-burns ]; }; } From f50e55afdc542f919bd1facfbcbaf30c1ca12e75 Mon Sep 17 00:00:00 2001 From: Sandro Date: Sat, 11 Sep 2021 22:15:47 +0200 Subject: [PATCH 92/96] Update pkgs/top-level/aliases.nix Co-authored-by: Alyssa Ross --- pkgs/top-level/aliases.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 429ff77997a8..a7b3a40a875e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -914,7 +914,7 @@ mapAliases ({ tshark = wireshark-cli; # added 2018-04-25 tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # added 2021-03-07 turbo-geth = throw "turbo-geth has been renamed to erigon"; # added 2021-08-08 - typora = throw "typora has been removed as it cannot be updated because newer versions use an anti-user encryption and refuse to start"; # added 2021-09-11 + typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed."; # added 2021-09-11 uberwriter = apostrophe; # added 2020-04-23 ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21 ucsFonts = ucs-fonts; # added 2016-07-15 From 3dde4fd38bc51ccf8fc486bb58678007b4e6ee1a Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 11 Sep 2021 16:55:35 -0400 Subject: [PATCH 93/96] textplots: init at 0.8.0 --- pkgs/tools/graphics/textplots/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/tools/graphics/textplots/default.nix diff --git a/pkgs/tools/graphics/textplots/default.nix b/pkgs/tools/graphics/textplots/default.nix new file mode 100644 index 000000000000..a0c5e72ac23c --- /dev/null +++ b/pkgs/tools/graphics/textplots/default.nix @@ -0,0 +1,20 @@ +{ fetchCrate, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "textplots"; + version = "0.8.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "07lxnvg8g24r1j6h07w91j5lp0azngmb76lagk55y28br0y70qr4"; + }; + + cargoSha256 = "19xb1ann3bqx26nhjjvcwqdsvzg7lflg9fdrnlx05ndd2ip44flz"; + + meta = with lib; { + description = "Terminal plotting written in Rust"; + homepage = "https://github.com/loony-bean/textplots-rs"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 748e42e4f5c5..02c2ebf761c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27917,6 +27917,8 @@ with pkgs; terminal-notifier = callPackage ../applications/misc/terminal-notifier {}; + textplots = callPackage ../tools/graphics/textplots { }; + texture-synthesis = callPackage ../tools/graphics/texture-synthesis { }; tty-solitaire = callPackage ../applications/misc/tty-solitaire { }; From 62cc1f90e554a370ddb08b5c8c7bcec619665602 Mon Sep 17 00:00:00 2001 From: wahjava Date: Sun, 12 Sep 2021 02:25:55 +0530 Subject: [PATCH 94/96] cni-plugin-flannel: init at 20210910 (#137412) Co-authored-by: Sandro --- .../networking/cluster/cni/plugin-flannel.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/networking/cluster/cni/plugin-flannel.nix diff --git a/pkgs/applications/networking/cluster/cni/plugin-flannel.nix b/pkgs/applications/networking/cluster/cni/plugin-flannel.nix new file mode 100644 index 000000000000..69a4718d6039 --- /dev/null +++ b/pkgs/applications/networking/cluster/cni/plugin-flannel.nix @@ -0,0 +1,29 @@ +{ lib, pkgs, buildGoModule, fetchFromGitHub }: + +buildGoModule { + pname = "cni-plugin-flannel"; + version = "unstable-2021-09-10"; + + src = fetchFromGitHub { + owner = "flannel-io"; + repo = "cni-plugin"; + rev = "8ce83510da59681da905dccb8364af9472cac341"; + sha256 = "sha256-x6F8n+IJ1pZdbDwniWWmoGKgQm235ax3mbOcbYqWLCs="; + }; + + vendorSha256 = "sha256-TLAwE3pTnJYOi1AsOQfsG6t3xLKOah/7DvYjsqyltKs="; + + postInstall = '' + mv $out/bin/cni-plugin $out/bin/flannel + ''; + + doCheck = false; + + meta = with lib; { + description = "flannel CNI plugin"; + homepage = "https://github.com/flannel-io/cni-plugin/"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ abbe ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 748e42e4f5c5..ef801060c295 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23946,6 +23946,7 @@ with pkgs; cni = callPackage ../applications/networking/cluster/cni {}; cni-plugins = callPackage ../applications/networking/cluster/cni/plugins.nix {}; + cni-plugin-flannel = callPackage ../applications/networking/cluster/cni/plugin-flannel.nix {}; dnsname-cni = callPackage ../applications/networking/cluster/dnsname-cni {}; From 7a9f5d69c88efbf907bbffacaa21fbf159d23284 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 8 Sep 2021 22:38:57 +0200 Subject: [PATCH 95/96] ncdns: 2020-11-22 -> 2021-07-18 --- pkgs/servers/dns/ncdns/default.nix | 102 +++++++-- pkgs/servers/dns/ncdns/deps.nix | 318 ----------------------------- 2 files changed, 89 insertions(+), 331 deletions(-) delete mode 100644 pkgs/servers/dns/ncdns/deps.nix diff --git a/pkgs/servers/dns/ncdns/default.nix b/pkgs/servers/dns/ncdns/default.nix index b046aff12bd7..7fad548df7a5 100644 --- a/pkgs/servers/dns/ncdns/default.nix +++ b/pkgs/servers/dns/ncdns/default.nix @@ -1,27 +1,103 @@ -{ lib, nixosTests, git, buildGoPackage, fetchFromGitHub, libcap }: +{ lib +, buildGoModule +, fetchFromGitHub +, nixosTests +, libcap +}: -buildGoPackage rec { - pname = "ncdns"; - version = "2020-11-22"; +let - goPackagePath = "github.com/namecoin/ncdns"; - goDeps = ./deps.nix; - - src = fetchFromGitHub { + # ncdns source + ncdns = fetchFromGitHub { owner = "namecoin"; repo = "ncdns"; - rev = "2fa54cd3b5480dba82170ab8ecb511fbd4977c41"; - sha256 = "0mrxbg5lmy3s281ff6nxpp03z4mqwq7h5hkqm9qy8nb280x1sx7h"; + rev = "2a486311b0fe1a921af34aa3b31e6e4e0569accc"; + sha256 = "01arwlycp1iia4bd3dgyn8dam1av2a7d9hv7f085n14l2i2aza7v"; }; - patches = [ ./fix-tpl-path.patch ]; + # script to patch the crypto/x509 package + x509 = fetchFromGitHub { + owner = "namecoin"; + repo = "x509-compressed"; + rev = "fb9f2b7bc9fcba954d70f63857cc0c3841b1cf47"; + sha256 = "1arkbpbzvhcmz5fhjqg34x2jbjnwmlisapk22rjki17qpamh7zks"; + # ncdns must be put in a subdirectory for this to work. + extraPostFetch = '' + cp -r --no-preserve=mode "${ncdns}" "$out/ncdns" + ''; + }; + +in + +buildGoModule { + pname = "ncdns"; + version = "unstable-2020-07-18"; + + src = x509; + + vendorSha256 = "02bqf6vkj5msk35sr5sklnqqd16n7gns7knzqslw077xrxiz7bsg"; + + # Override the go-modules fetcher derivation to apply + # upstream's patch of the crypto/x509 library. + modBuildPhase = '' + go mod init github.com/namecoin/x509-compressed + go generate ./... + go mod tidy + + cd ncdns + go mod init github.com/namecoin/ncdns + go mod edit \ + -replace github.com/coreos/go-systemd=github.com/coreos/go-systemd/v22@latest \ + -replace github.com/namecoin/x509-compressed=$NIX_BUILD_TOP/source + go mod tidy + ''; + + # Copy over the lockfiles as well, because the source + # doesn't contain it. The fixed-output derivation is + # probably not reproducible anyway. + modInstallPhase = '' + mv -t vendor go.mod go.sum + cp -r --reflink=auto vendor "$out" + ''; buildInputs = [ libcap ]; + # The fetcher derivation must run with a different + # $sourceRoot, but buildGoModule doesn't allow that, + # so we use this ugly hack. + unpackPhase = '' + runHook preUnpack + + unpackFile "$src" + sourceRoot=$PWD/source/ncdns + chmod -R u+w -- "$sourceRoot" + cd $sourceRoot + + runHook postUpack + ''; + + # Same as above: can't use `patches` because that would + # be also applied to the fetcher derivation, thus failing. + patchPhase = '' + runHook prePatch + patch -p1 < ${./fix-tpl-path.patch} + runHook postPatch + ''; + + preBuild = '' + chmod -R u+w vendor + mv -t . vendor/go.{mod,sum} + ''; + + preCheck = '' + # needed to run the ncdns test suite + ln -s $PWD/vendor ../../go/src + ''; + postInstall = '' mkdir -p "$out/share" - cp -r "$src/_doc" "$out/share/doc" - cp -r "$src/_tpl" "$out/share/tpl" + cp -r _doc "$out/share/doc" + cp -r _tpl "$out/share/tpl" ''; meta = with lib; { diff --git a/pkgs/servers/dns/ncdns/deps.nix b/pkgs/servers/dns/ncdns/deps.nix deleted file mode 100644 index f48faa9648bd..000000000000 --- a/pkgs/servers/dns/ncdns/deps.nix +++ /dev/null @@ -1,318 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "ea60c4def909bde529d41a7e0674e31eba751da3"; - sha256 = "08xhd9jlgkql8kqpi98aaq9k8hgb6x7197r6crp84r1ic8k7im4y"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "fb15b899a75114aa79cc930e33c46b577cc664b1"; - sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "1786d5ef83d4868925e518b2995c30430aec0f06"; - sha256 = "1grs2y4gnyq8wv9w61c231a01c7qd916b7rxqy798b8sfirr3ci8"; - }; - } - { - goPackagePath = "github.com/btcsuite/btcd"; - fetch = { - type = "git"; - url = "https://github.com/btcsuite/btcd"; - rev = "6bd4c64a54faeb343d5e3c1ee5802450a291787f"; - sha256 = "15plh7rrmx1ydy3ldnylr727s9szrrkqzbf2ma2ka2qag1vy6nvb"; - }; - } - { - goPackagePath = "github.com/btcsuite/btclog"; - fetch = { - type = "git"; - url = "https://github.com/btcsuite/btclog"; - rev = "84c8d2346e9fc8c7b947e243b9c24e6df9fd206a"; - sha256 = "02dl46wcnfpg9sqvg0ipipkpnd7lrf4fnvb9zy56jqa7mfcwc7wk"; - }; - } - { - goPackagePath = "github.com/btcsuite/btcutil"; - fetch = { - type = "git"; - url = "https://github.com/btcsuite/btcutil"; - rev = "a53e38424cce1c9de2062b69364efd35fd428d15"; - sha256 = "1izjvgi0d5wnknfwdnqa196hn4vj1n5ga7swbhcfsgghk2zngwr4"; - }; - } - { - goPackagePath = "github.com/btcsuite/go-socks"; - fetch = { - type = "git"; - url = "https://github.com/btcsuite/go-socks"; - rev = "4720035b7bfd2a9bb130b1c184f8bbe41b6f0d0f"; - sha256 = "18cv2icj059lq4s99p6yh91hlas5f2gi3f1p4c10sjgwrs933d7b"; - }; - } - { - goPackagePath = "github.com/btcsuite/websocket"; - fetch = { - type = "git"; - url = "https://github.com/btcsuite/websocket"; - rev = "31079b6807923eb23992c421b114992b95131b55"; - sha256 = "0xpkf257ml6fpfdgv7hxxc41n0d5yxxm3njm50qpzp7j71l9cjwa"; - }; - } - { - goPackagePath = "github.com/coreos/go-systemd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-systemd"; - rev = "87511f396ae9991f8589f6e6dcf58e28a91ba52b"; - sha256 = "139ylav4vl4h7ndy1xkj0dn45rbknv2rfjlifrj622n96c4rrazx"; - }; - } - { - goPackagePath = "github.com/golang/groupcache"; - fetch = { - type = "git"; - url = "https://github.com/golang/groupcache"; - rev = "8c9f03a8e57eb486e42badaed3fb287da51807ba"; - sha256 = "0vjjr79r32icjzlb05wn02k59av7jx0rn1jijml8r4whlg7dnkfh"; - }; - } - { - goPackagePath = "github.com/hlandau/buildinfo"; - fetch = { - type = "git"; - url = "https://github.com/hlandau/buildinfo"; - rev = "337a29b5499734e584d4630ce535af64c5fe7813"; - sha256 = "1kq3r1i4rr9bcvj5yg8w1l95f6sfc3kn6kgcdmlh5i3j9w2sram8"; - }; - } - { - goPackagePath = "github.com/hlandau/degoutils"; - fetch = { - type = "git"; - url = "https://github.com/hlandau/degoutils"; - rev = "8fa2440b63444dad556d76366f1c3ee070c8a577"; - sha256 = "1yj39jbrk3xx3cyl8f4asakc74lsl0brasi25xjf6219pg69q0iy"; - }; - } - { - goPackagePath = "github.com/hlandau/dexlogconfig"; - fetch = { - type = "git"; - url = "https://github.com/hlandau/dexlogconfig"; - rev = "244f29bd260884993b176cd14ef2f7631f6f3c18"; - sha256 = "1d01ghx6xawj3nk3lpk51wbbpxdnc9vzvijvlayvp7cxgsacslbc"; - }; - } - { - goPackagePath = "github.com/hlandau/xlog"; - fetch = { - type = "git"; - url = "https://github.com/hlandau/xlog"; - rev = "197ef798aed28e08ed3e176e678fda81be993a31"; - sha256 = "08rjlqnjbfgpz5rbjq89l7y5vyhk99ivr928sqdi5gnqznbqs4m8"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "a883a8422cd235c67c6c4fdcb7bbb022143e10b1"; - sha256 = "0vp5ijbapw8j52c3l992m1wm8nhl23n68xk3lqxhad3srxmdb9z4"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "cafcf9720371e5625e7300397de921f58e069d17"; - sha256 = "0q164xvv7nwgjq2l2lln4y7yp036jpwx8v7yfsz432czl10d4g0h"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "cb30d6282491c185f77d9bec5d25de1bb61a06bc"; - sha256 = "0v59mv94acd2m72q8adhigxkx1vn38l5h0d8hp0nxga2v9f3v8kd"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "23c4faca9d32b0abbb6e179aa1aadc45ac53a916"; - sha256 = "1iir2yrx71wg0ab9j4qm70aycym2pxrb043dmbknyzbw9s43cabz"; - }; - } - { - goPackagePath = "github.com/namecoin/btcd"; - fetch = { - type = "git"; - url = "https://github.com/namecoin/btcd"; - rev = "69a10543311fa68737d0a77b4cd045b0b0abfb75"; - sha256 = "1zbfigs3hrjhdwp19877lpgivdcz3k80149nxdmxlmp03xcswcqy"; - }; - } - { - goPackagePath = "github.com/namecoin/ncbtcjson"; - fetch = { - type = "git"; - url = "https://github.com/namecoin/ncbtcjson"; - rev = "fa221af062c70f802db6ed66e1546cc4a41ec277"; - sha256 = "1fmz5aylsji27vj5f3f3gg9xj99735gh5prvcfz0gmk68v1mnr4i"; - }; - } - { - goPackagePath = "github.com/namecoin/ncrpcclient"; - fetch = { - type = "git"; - url = "https://github.com/namecoin/ncrpcclient"; - rev = "858e1a5acd8b2da56462f50323633cdf2fe80977"; - sha256 = "0pj951wm6fdkk2yv4bxaxka52i7rb6w3fs9ah3fy7p8wchr4smjx"; - }; - } - { - goPackagePath = "github.com/namecoin/splicesign"; - fetch = { - type = "git"; - url = "https://github.com/namecoin/splicesign"; - rev = "38bb6fb3ec66c72ecb3a14e1e714768cc6e56ed7"; - sha256 = "0irlbcrarbrvzdnph9kxrf8bkij1lzqpp5mxh8i60n5ii7bj0wsd"; - }; - } - { - goPackagePath = "github.com/namecoin/tlsrestrictnss"; - fetch = { - type = "git"; - url = "https://github.com/namecoin/tlsrestrictnss"; - rev = "945a9f3d995fcb175fd0b19549e21a3e87ba8c13"; - sha256 = "18qphkqnjw3bwflkyyrddyzgwscs37j7y6ynm9g78bqb5skviqqy"; - }; - } - { - goPackagePath = "github.com/ogier/pflag"; - fetch = { - type = "git"; - url = "https://github.com/ogier/pflag"; - rev = "73e519546fc0bce0c395610afcf6aa4e5aec88eb"; - sha256 = "114zpgl6l47gsz0sifpq62hi2i6k0ra9hi8wx7d39giablf9i4ii"; - }; - } - { - goPackagePath = "github.com/rogpeppe/go-internal"; - fetch = { - type = "git"; - url = "https://github.com/rogpeppe/go-internal"; - rev = "eea92b9e2c4424af886c8c620efa50fff5a56387"; - sha256 = "0lf4x32af40ixnysfzfm9r08gpsd3k3x7p3hr2k8q72llsa1zivz"; - }; - } - { - goPackagePath = "github.com/shiena/ansicolor"; - fetch = { - type = "git"; - url = "https://github.com/shiena/ansicolor"; - rev = "c7312218db184c554578219828d6c9498d02dcb1"; - sha256 = "14mhp5ir1vlshja9bam6df5wpbqdwg46qn1ysixjiap535ajhkza"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "eec23a3978adcfd26c29f4153eaa3e3d9b2cc53a"; - sha256 = "18cf6vhmx7v83ahyil7j8hkwhwf1012bgixglz7a6nc35qwwqb3r"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "6772e930b67bb09bf22262c7378e7d2f67cf59d1"; - sha256 = "0zlr39dxbg0fxfdrc20c4x0pw43n9kz749ssml97cdzqy116p5qa"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "0d417f6369309be088e227ead8736fb722d759d3"; - sha256 = "1cn19s7kg91alianr1c1bp6k6p1wccigg19h6fchd84jb2zakkvs"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "gopkg.in/hlandau/configurable.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/hlandau/configurable.v1"; - rev = "41496864a1fe3e0fef2973f22372b755d2897402"; - sha256 = "0i9jbdvi8rz12xsrzzbfxg5lwsqakjcmccsa5a32asmv26k5byqa"; - }; - } - { - goPackagePath = "gopkg.in/hlandau/easyconfig.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/hlandau/easyconfig.v1"; - rev = "c31249162931b4963bbe6e501cccb60d23271a3f"; - sha256 = "1v8j1pyzcfj1l4pmb1c6mszci6xzc4agdam2kq79kyvbsvbbw9dc"; - }; - } - { - goPackagePath = "gopkg.in/hlandau/madns.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/hlandau/madns.v2"; - rev = "26979b3e4b5aa3e0bd53cf0a014f9eaf43b578e3"; - sha256 = "09r4m4mqdgd7hvxyvss9m64lq0kk8nylnq2bgnkrclgzpi87fmmb"; - }; - } - { - goPackagePath = "gopkg.in/hlandau/service.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/hlandau/service.v2"; - rev = "b64b3467ebd16f64faec1640c25e318efc0c0d7b"; - sha256 = "0lpx88f46ylx9lf6jgwcjgklll1pc1mlakrywpa0wzhjj7a4jinc"; - }; - } - { - goPackagePath = "gopkg.in/hlandau/svcutils.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/hlandau/svcutils.v1"; - rev = "c25dac49e50cbbcbef8c81b089f56156f4067729"; - sha256 = "12b6p71mk33r44d71xizjq82fls0ykfwfl5gnmckbgpxms4bj2xf"; - }; - } -] From f74154a4b99e6f0d3e9b381d8f008aa9fe61963d Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Fri, 13 Aug 2021 16:11:37 +0200 Subject: [PATCH 96/96] sc-controller: switch to python3 fork The original sc-controller is being rewritten in C, while the current version is stuck in maintenance mode and python 2. This fork is based entirely on the original kozec's sc-controller and introduces python 3 support while staying backward-compatible (including versioning up to the patch number). --- pkgs/misc/drivers/sc-controller/default.nix | 19 ++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix index ff5fb6e5ee76..ab6817a99453 100644 --- a/pkgs/misc/drivers/sc-controller/default.nix +++ b/pkgs/misc/drivers/sc-controller/default.nix @@ -1,19 +1,20 @@ { lib, buildPythonApplication, fetchFromGitHub, wrapGAppsHook +, pytestCheckHook , gtk3, gobject-introspection, libappindicator-gtk3, librsvg -, evdev, pygobject3, pylibacl, pytest, bluez +, evdev, pygobject3, pylibacl, bluez, vdf , linuxHeaders , libX11, libXext, libXfixes, libusb1, udev }: buildPythonApplication rec { pname = "sc-controller"; - version = "0.4.7"; + version = "0.4.8.6"; src = fetchFromGitHub { - owner = "kozec"; + owner = "Ryochan7"; repo = pname; rev = "v${version}"; - sha256 = "1dskjh5qcjf4x21n4nk1zvdfivbgimsrc2lq1id85bibzps29499"; + sha256 = "1fgizgzm79zl9r2kkwvh1gf9lnxaix15283xxk6bz843inr8b88k"; }; # see https://github.com/NixOS/nixpkgs/issues/56943 @@ -23,9 +24,9 @@ buildPythonApplication rec { buildInputs = [ gtk3 gobject-introspection libappindicator-gtk3 librsvg ]; - propagatedBuildInputs = [ evdev pygobject3 pylibacl ]; + propagatedBuildInputs = [ evdev pygobject3 pylibacl vdf ]; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; postPatch = '' substituteInPlace scc/paths.py --replace sys.prefix "'$out'" @@ -48,12 +49,8 @@ buildPythonApplication rec { ) ''; - checkPhase = '' - PYTHONPATH=. py.test - ''; - meta = with lib; { - homepage = "https://github.com/kozec/sc-controller"; + homepage = "https://github.com/Ryochan7/sc-controller"; # donations: https://www.patreon.com/kozec description = "User-mode driver and GUI for Steam Controller and other controllers"; license = licenses.gpl2; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cff389cf951b..00489c4d9314 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32036,7 +32036,7 @@ with pkgs; satysfi = callPackage ../tools/typesetting/satysfi { }; - sc-controller = pythonPackages.callPackage ../misc/drivers/sc-controller { + sc-controller = python3Packages.callPackage ../misc/drivers/sc-controller { inherit libusb1; # Shadow python.pkgs.libusb1. };