From c09ffc7a5584ac3f9fbf0cee3e0e6f6596a6ed37 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 24 Apr 2020 15:38:01 +0200 Subject: [PATCH 01/92] sd-image: use zstd for compression --- nixos/modules/installer/cd-dvd/sd-image.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix index 901c60befb6..732319b654d 100644 --- a/nixos/modules/installer/cd-dvd/sd-image.nix +++ b/nixos/modules/installer/cd-dvd/sd-image.nix @@ -105,7 +105,7 @@ in default = true; description = '' Whether the SD image should be compressed using - bzip2. + zstd. ''; }; @@ -130,10 +130,10 @@ in sdImage.storePaths = [ config.system.build.toplevel ]; system.build.sdImage = pkgs.callPackage ({ stdenv, dosfstools, e2fsprogs, - mtools, libfaketime, utillinux, bzip2, zstd }: stdenv.mkDerivation { + mtools, libfaketime, utillinux, zstd }: stdenv.mkDerivation { name = config.sdImage.imageName; - nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime utillinux bzip2 zstd ]; + nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime utillinux zstd ]; inherit (config.sdImage) compressImage; @@ -143,7 +143,7 @@ in echo "${pkgs.stdenv.buildPlatform.system}" > $out/nix-support/system if test -n "$compressImage"; then - echo "file sd-image $img.bz2" >> $out/nix-support/hydra-build-products + echo "file sd-image $img.zst" >> $out/nix-support/hydra-build-products else echo "file sd-image $img" >> $out/nix-support/hydra-build-products fi @@ -190,7 +190,7 @@ in fsck.vfat -vn firmware_part.img dd conv=notrunc if=firmware_part.img of=$img seek=$START count=$SECTORS if test -n "$compressImage"; then - bzip2 $img + zstd -T$NIX_BUILD_CORES $img fi ''; }) {}; From f20fd89fc02454f41ec4844c3ddf03b7edbe2639 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 24 Apr 2020 18:12:42 +0200 Subject: [PATCH 02/92] iso-image: use zstd for compression --- nixos/lib/make-iso9660-image.nix | 4 ++-- nixos/lib/make-iso9660-image.sh | 9 +++++++-- nixos/modules/installer/cd-dvd/iso-image.nix | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/nixos/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix index 0f3f2b5b523..be8ad9912db 100644 --- a/nixos/lib/make-iso9660-image.nix +++ b/nixos/lib/make-iso9660-image.nix @@ -34,7 +34,7 @@ , # The path (outside the ISO file system) of the isohybrid-mbr image. isohybridMbrImage ? "" -, # Whether to compress the resulting ISO image with bzip2. +, # Whether to compress the resulting ISO image with zstd. compressImage ? false , # The volume ID. @@ -48,7 +48,7 @@ assert usbBootable -> isohybridMbrImage != ""; stdenv.mkDerivation { name = isoName; builder = ./make-iso9660-image.sh; - buildInputs = [ xorriso syslinux ]; + buildInputs = [ xorriso syslinux zstd ]; inherit isoName bootable bootImage compressImage volumeID efiBootImage efiBootable isohybridMbrImage usbBootable; diff --git a/nixos/lib/make-iso9660-image.sh b/nixos/lib/make-iso9660-image.sh index d4633d2c8d1..eb9edcd7026 100644 --- a/nixos/lib/make-iso9660-image.sh +++ b/nixos/lib/make-iso9660-image.sh @@ -129,9 +129,14 @@ fi if test -n "$compressImage"; then echo "Compressing image..." - bzip2 $out/iso/$isoName + zstd -T$NIX_BUILD_CORES $out/iso/$isoName fi mkdir -p $out/nix-support echo $system > $out/nix-support/system -echo "file iso $out/iso/$isoName" >> $out/nix-support/hydra-build-products + +if test -n "$compressImage"; then + echo "file iso $out/iso/$isoName.zst" >> $out/nix-support/hydra-build-products +else + echo "file iso $out/iso/$isoName" >> $out/nix-support/hydra-build-products +fi diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index cce7cc235ec..1cd2252ecf2 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -413,7 +413,7 @@ in default = false; description = '' Whether the ISO image should be compressed using - bzip2. + zstd. ''; }; From 8a675956362b9873d7b771e1f86848f6aff612fe Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 24 Apr 2020 18:13:37 +0200 Subject: [PATCH 03/92] nixos/system-path: add zstd --- nixos/modules/config/system-path.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index 4100ec89701..b9898d8155f 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -43,6 +43,7 @@ let pkgs.time pkgs.utillinux pkgs.which # 88K size + pkgs.zstd ]; in From 99f4ca8bf89d32c27acee1e9074de11c0d065593 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 24 Apr 2020 18:45:07 +0200 Subject: [PATCH 04/92] manual/rl-2009.xml: add mention about SD/ISO images compression --- nixos/doc/manual/release-notes/rl-2009.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 955c19bd98e..3b73f388da2 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -277,6 +277,9 @@ environment.systemPackages = [ Other Notable Changes + + SD and ISO images are now compressed by default using zstd. + was updated from From 62587f43ddf884335f2ed0ee83673d9ffa9a2465 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 27 Apr 2020 22:35:31 -0400 Subject: [PATCH 05/92] nixos-artwork: add file path attributes This makes things so much easier, and we install to the path that both gnome-backgrounds and elementary-wallpapers install to. --- .../services/x11/desktop-managers/gnome3.nix | 4 ++-- .../services/x11/display-managers/lightdm.nix | 6 +++++- nixos/modules/system/boot/loader/grub/grub.nix | 2 +- pkgs/data/misc/nixos-artwork/wallpapers.nix | 14 +++++++++++++- .../elementary-default-settings/default.nix | 2 +- .../desktop/elementary-greeter/default.nix | 4 ++-- 6 files changed, 24 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index bbc7feb2d04..50ee048802e 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -37,10 +37,10 @@ let chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF [org.gnome.desktop.background] - picture-uri='file://${pkgs.nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png' + picture-uri='file://${pkgs.nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}' [org.gnome.desktop.screensaver] - picture-uri='file://${pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom}/share/artwork/gnome/nix-wallpaper-simple-dark-gray_bottom.png' + picture-uri='file://${pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath}' [org.gnome.shell] favorite-apps=[ 'org.gnome.Epiphany.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ] diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 479548863b4..1ebc4b5930e 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -133,7 +133,8 @@ in background = mkOption { type = types.str; - default = "${pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom}/share/artwork/gnome/nix-wallpaper-simple-dark-gray_bottom.png"; + # Manual cannot depend on packages, we are actually setting the default in config below. + defaultText = "pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath"; description = '' The background image or color to use. ''; @@ -212,6 +213,9 @@ in } ]; + # Keep in sync with the defaultText value from the option definition. + services.xserver.displayManager.lightdm.background = mkDefault pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath; + # Set default session in session chooser to a specified values – basically ignore session history. # Auto-login is already covered by a config value. services.xserver.displayManager.job.preStart = optionalString (!cfg.autoLogin.enable && dmcfg.defaultSession != null) '' diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index c775632a4aa..e38bafabb02 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -83,7 +83,7 @@ let ] ++ (optional (cfg.fontSize!=null) "--size ${toString cfg.fontSize}"))) ); - defaultSplash = "${pkgs.nixos-artwork.wallpapers.simple-dark-gray-bootloader}/share/artwork/gnome/nix-wallpaper-simple-dark-gray_bootloader.png"; + defaultSplash = pkgs.nixos-artwork.wallpapers.simple-dark-gray-bootloader.gnomeFilePath; in { diff --git a/pkgs/data/misc/nixos-artwork/wallpapers.nix b/pkgs/data/misc/nixos-artwork/wallpapers.nix index a6a368e26e0..6e6b6e92678 100644 --- a/pkgs/data/misc/nixos-artwork/wallpapers.nix +++ b/pkgs/data/misc/nixos-artwork/wallpapers.nix @@ -3,12 +3,18 @@ let mkNixBackground = { name, src, description }: - stdenv.mkDerivation { + let + pkg = stdenv.mkDerivation { inherit name src; dontUnpack = true; installPhase = '' + # GNOME + mkdir -p $out/share/backgrounds/nixos + ln -s $src $out/share/backgrounds/nixos/${src.name} + + # TODO: is this path still needed? mkdir -p $out/share/artwork/gnome ln -s $src $out/share/artwork/gnome/${src.name} @@ -22,6 +28,11 @@ X-KDE-PluginInfo-Name=${name} _EOF ''; + passthru = { + gnomeFilePath = "${pkg}/share/backgrounds/nixos/${src.name}"; + kdeFilePath = "${pkg}/share/wallpapers/${name}/contents/images/${src.name}"; + }; + meta = with stdenv.lib; { inherit description; homepage = "https://github.com/NixOS/nixos-artwork"; @@ -29,6 +40,7 @@ _EOF platforms = platforms.all; }; }; +in pkg; in diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index 4e8d8bfeb15..3215c001a5e 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "--sysconfdir=${placeholder "out"}/etc" - "-Ddefault-wallpaper=${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png" + "-Ddefault-wallpaper=${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}" "-Dplank-dockitems=false" ]; diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 64c4509280a..c460d45dfee 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { # Needed until https://github.com/elementary/greeter/issues/360 is fixed (substituteAll { src = ./hardcode-fallback-background.patch; - default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png"; + default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}"; }) ]; @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { # Use NixOS default wallpaper substituteInPlace $out/etc/lightdm/io.elementary.greeter.conf \ --replace "#default-wallpaper=/usr/share/backgrounds/elementaryos-default" \ - "default-wallpaper=${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png" + "default-wallpaper=${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}" substituteInPlace $out/share/xgreeters/io.elementary.greeter.desktop \ --replace "Exec=io.elementary.greeter" "Exec=$out/bin/io.elementary.greeter" From 3d1706c28df08ca09e9502ef9e17322ea71a70a4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 29 Apr 2020 05:33:04 +0200 Subject: [PATCH 06/92] nixos/lightdm: change background type to path --- nixos/modules/services/x11/display-managers/lightdm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 1ebc4b5930e..678cade4442 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -132,7 +132,7 @@ in }; background = mkOption { - type = types.str; + type = types.path; # Manual cannot depend on packages, we are actually setting the default in config below. defaultText = "pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath"; description = '' From 7f3bc5b8fabb325c9378094d445762dfd44439f9 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 27 Apr 2020 22:36:56 -0400 Subject: [PATCH 07/92] nixos/gnome3: install nixos wallpapers --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 50ee048802e..803419f5d6c 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -320,6 +320,8 @@ in gnome-shell gnome-shell-extensions gnome-themes-extra + nixos-artwork.wallpapers.simple-dark-gray + nixos-artwork.wallpapers.simple-dark-gray-bottom pkgs.gnome-user-docs pkgs.orca pkgs.glib # for gsettings From 5100e4f250833d42dffd9c55e3fda82303b606fd Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 27 Apr 2020 22:38:10 -0400 Subject: [PATCH 08/92] nixos/pantheon: install nixos wallpaper Fixes #86146 --- nixos/modules/services/x11/desktop-managers/pantheon.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 01fe230b8a4..cf2c578450f 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -180,6 +180,7 @@ in gtk3.out hicolor-icon-theme lightlocker + nixos-artwork.wallpapers.simple-dark-gray onboard qgnomeplatform shared-mime-info From 4babef9608d708f5f3b1aea6942f4dd3ef91570f Mon Sep 17 00:00:00 2001 From: Karol Chmist Date: Thu, 21 May 2020 11:33:17 +0200 Subject: [PATCH 09/92] SDL2: Add dontDisableStatic = withStatic ? false --- pkgs/development/libraries/SDL2/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 93d708e7d31..5f3d42b4da3 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -15,6 +15,7 @@ , libpulseaudio , AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL , audiofile, libiconv +, withStatic ? false }: # NOTE: When editing this expression see if the same change applies to @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz"; sha256 = "0qy8wbqvfkb5ps8kxgaaf2zzpkjqbsw712hlp74znbn0jpv6i4il"; }; - + dontDisableStatic = withStatic; outputs = [ "out" "dev" ]; outputBin = "dev"; # sdl-config From fb93b96190475def408138944a2621ff04d1e7a4 Mon Sep 17 00:00:00 2001 From: Christoph Neidahl Date: Wed, 8 Apr 2020 16:19:54 +0200 Subject: [PATCH 10/92] np2kai: init at 0.86rev22 --- pkgs/misc/emulators/np2kai/default.nix | 196 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 198 insertions(+) create mode 100644 pkgs/misc/emulators/np2kai/default.nix diff --git a/pkgs/misc/emulators/np2kai/default.nix b/pkgs/misc/emulators/np2kai/default.nix new file mode 100644 index 00000000000..245bad1d535 --- /dev/null +++ b/pkgs/misc/emulators/np2kai/default.nix @@ -0,0 +1,196 @@ +{ stdenv +, lib +, fetchFromGitHub +, enable16Bit ? true +, enable32Bit ? true + +, enableSDL ? true +, withSDLVersion ? "2" +, SDL +, SDL_ttf +, SDL_mixer +, SDL2 +, SDL2_ttf +, SDL2_mixer + +, enableX11 ? stdenv.hostPlatform.isLinux +, automake +, autoconf +, autoconf-archive +, libtool +, pkg-config +, unzip +, gtk2 +, libusb1 +, libXxf86vm +, nasm +, libICE +, libSM + + # HAXM build succeeds but the binary segfaults, seemingly due to the missing HAXM kernel module + # Enable once there is a HAXM kernel module option in NixOS? Or somehow bind it to the system kernel having HAXM? + # Or leave it disabled by default? + # https://github.com/intel/haxm/blob/master/docs/manual-linux.md +, enableHAXM ? false +}: + +assert lib.assertMsg (enable16Bit || enable32Bit) + "Must enable 16-Bit and/or 32-Bit system variant."; +assert lib.assertMsg (enableSDL || enableX11) + "Must enable SDL and/or X11 graphics interfaces."; +assert lib.assertOneOf "withSDLVersion" withSDLVersion [ "1" "2" ]; +assert enableHAXM -> (lib.assertMsg enableX11 + "Must enable X11 graphics interface for HAXM build."); +let + inherit (lib) optional optionals optionalString; + inherit (lib.strings) concatStringsSep concatMapStringsSep; + isSDL2 = (withSDLVersion == "2"); + sdlInfix = optionalString isSDL2 "2"; + sdlDeps1 = [ + SDL + SDL_ttf + SDL_mixer + ]; + sdlDeps2 = [ + SDL2 + SDL2_ttf + SDL2_mixer + ]; + sdlDepsBuildonly = if isSDL2 then sdlDeps1 else sdlDeps2; + sdlDepsTarget = if isSDL2 then sdlDeps2 else sdlDeps1; + sdlMakefileSuffix = + if stdenv.hostPlatform.isWindows then "win" + else if stdenv.hostPlatform.isDarwin then "mac" + else "unix"; + sdlMakefiles = concatMapStringsSep " " (x: x + "." + sdlMakefileSuffix) + (optionals enable16Bit [ + "Makefile" + ] ++ optionals enable32Bit [ + "Makefile21" + ]); + sdlBuildFlags = concatStringsSep " " + (optionals enableSDL [ + "SDL_VERSION=${withSDLVersion}" + ]); + sdlBins = concatStringsSep " " + (optionals enable16Bit [ + "np2kai" + ] ++ optionals enable32Bit [ + "np21kai" + ]); + x11ConfigureFlags = concatStringsSep " " + (( + if ((enableHAXM && (enable16Bit || enable32Bit)) || (enable16Bit && enable32Bit)) then [ + "--enable-build-all" + ] else if enableHAXM then [ + "--enable-haxm" + ] else if enable32Bit then [ + "--enable-ia32" + ] else [ ] + ) ++ optionals (!isSDL2) [ + "--enable-sdl" + "--enable-sdlmixer" + "--enable-sdlttf" + + "--enable-sdl2=no" + "--enable-sdl2mixer=no" + "--enable-sdl2ttf=no" + ]); + x11BuildFlags = concatStringsSep " " [ + "SDL2_CONFIG=sdl2-config" + "SDL_CONFIG=sdl-config" + "SDL_CFLAGS=\"$(sdl${sdlInfix}-config --cflags)\"" + "SDL_LIBS=\"$(sdl${sdlInfix}-config --libs) -lSDL${sdlInfix}_mixer -lSDL${sdlInfix}_ttf\"" + ]; + x11Bins = concatStringsSep " " + (optionals enable16Bit [ + "xnp2kai" + ] ++ optionals enable32Bit [ + "xnp21kai" + ] ++ optionals enableHAXM [ + "xnp21kai_haxm" + ]); +in +stdenv.mkDerivation rec { + pname = "np2kai"; + version = "0.86rev22"; #update src.rev to commit rev accordingly + + src = fetchFromGitHub rec { + owner = "AZO234"; + repo = "NP2kai"; + rev = "4a317747724669343e4c33ebdd34783fb7043221"; + sha256 = "0kxysxhx6jyk82mx30ni0ydzmwdcbnlxlnarrlq018rsnwb4md72"; + }; + + configurePhase = '' + export GIT_VERSION=${builtins.substring 0 7 src.rev} + buildFlags="$buildFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES}" + '' + optionalString enableX11 '' + cd x11 + substituteInPlace Makefile.am \ + --replace 'GIT_VERSION :=' 'GIT_VERSION ?=' + ./autogen.sh ${x11ConfigureFlags} + ./configure ${x11ConfigureFlags} + cd .. + ''; + + nativeBuildInputs = sdlDepsBuildonly + ++ optionals enableX11 [ + automake + autoconf + autoconf-archive + libtool + pkg-config + unzip + nasm + ]; + + buildInputs = sdlDepsTarget + ++ optionals enableX11 [ + gtk2 + libICE + libSM + libusb1 + libXxf86vm + ]; + + enableParallelBuilding = true; + + buildPhase = optionalString enableSDL '' + cd sdl2 + for mkfile in ${sdlMakefiles}; do + substituteInPlace $mkfile \ + --replace 'GIT_VERSION :=' 'GIT_VERSION ?=' + echo make -f $mkfile $buildFlags ${sdlBuildFlags} clean + make -f $mkfile $buildFlags ${sdlBuildFlags} clean + make -f $mkfile $buildFlags ${sdlBuildFlags} + done + cd .. + '' + optionalString enableX11 '' + cd x11 + make $buildFlags ${x11BuildFlags} + cd .. + ''; + + installPhase = optionalString enableSDL '' + cd sdl2 + for emu in ${sdlBins}; do + install -D -m 755 $emu $out/bin/$emu + done + cd .. + '' + optionalString enableX11 '' + cd x11 + for emu in ${x11Bins}; do + install -D -m 755 $emu $out/bin/$emu + done + cd .. + ''; + + meta = with lib; { + description = "A PC-9801 series emulator."; + homepage = "https://github.com/AZO234/NP2kai"; + license = licenses.mit; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.x86; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4cfd71b806c..4377454d628 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4851,6 +4851,8 @@ in now-cli = callPackage ../development/web/now-cli {}; + np2kai = callPackage ../misc/emulators/np2kai { }; + file-rename = callPackage ../tools/filesystems/file-rename { }; kea = callPackage ../tools/networking/kea { }; From 98f346852baee5308399b10c72a7c482422d1f4b Mon Sep 17 00:00:00 2001 From: Christoph Neidahl Date: Wed, 8 Apr 2020 17:41:37 +0200 Subject: [PATCH 11/92] retroarch: add NP2kai core --- pkgs/misc/emulators/retroarch/cores.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 20 insertions(+) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 0ebd2b82a9a..73581429613 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -718,6 +718,25 @@ in with stdenv.lib.licenses; preBuild = "cd libretro"; }; + np2kai = mkLibRetroCore rec { + core = "np2kai"; + src = fetchFromGitHub rec { + owner = "AZO234"; + repo = "NP2kai"; + rev = "4a317747724669343e4c33ebdd34783fb7043221"; + sha256 = "0kxysxhx6jyk82mx30ni0ydzmwdcbnlxlnarrlq018rsnwb4md72"; + }; + description = "Neko Project II kai libretro port"; + license = mit; + makefile = "Makefile.libretro"; + preBuild = '' + cd sdl2 + substituteInPlace ${makefile} \ + --replace 'GIT_VERSION :=' 'GIT_VERSION ?=' + export GIT_VERSION=${builtins.substring 0 7 src.rev} + ''; + }; + o2em = mkLibRetroCore rec { core = "o2em"; src = fetchRetro { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4377454d628..dfc2133011a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22760,6 +22760,7 @@ in ++ optional (cfg.enableMupen64Plus or false) mupen64plus ++ optional (cfg.enableNeoCD or false) neocd ++ optional (cfg.enableNestopia or false) nestopia + ++ optional (cfg.enableNP2kai or false) np2kai ++ optional (cfg.enableO2EM or false) o2em ++ optional (cfg.enableOpera or false) opera ++ optional (cfg.enableParallelN64 or false) parallel-n64 From ab10f3b821d32c08812d436737eb7c70649a8f70 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Tue, 26 May 2020 23:19:19 +0300 Subject: [PATCH 12/92] cloudflare-wrangler: 1.9.1 -> 1.9.2 --- pkgs/development/tools/cloudflare-wrangler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/cloudflare-wrangler/default.nix b/pkgs/development/tools/cloudflare-wrangler/default.nix index 623afc3e743..e5c37bfaddb 100644 --- a/pkgs/development/tools/cloudflare-wrangler/default.nix +++ b/pkgs/development/tools/cloudflare-wrangler/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cloudflare-wrangler"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "cloudflare"; repo = "wrangler"; rev = "v${version}"; - sha256 = "09rq6lnv9993ah49jxqaqqhv5xxj51gxlqdi99wkj217cxp9gqqn"; + sha256 = "0i3fhdq8v9459mlnazkv9bpkcv01rdy5rk149lhpsan76zlyzzwr"; }; - cargoSha256 = "0vlb1g4pki84n2zf6w3bisa7jpv0ws8nb3lgr0bkjrirf60a9xsk"; + cargoSha256 = "0c2ss3j53vra1b4m3jsy2w2gdf6k1hw3qf6sd4qlg2ybk4k83g3b"; nativeBuildInputs = [ pkg-config ]; From a8fc1f4a642d890bcbae95c489161d965379f409 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Tue, 26 May 2020 23:22:44 +0300 Subject: [PATCH 13/92] cloudflare-wrangler: use canonical name --- .../tools/{cloudflare-wrangler => wrangler}/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/tools/{cloudflare-wrangler => wrangler}/default.nix (95%) diff --git a/pkgs/development/tools/cloudflare-wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix similarity index 95% rename from pkgs/development/tools/cloudflare-wrangler/default.nix rename to pkgs/development/tools/wrangler/default.nix index e5c37bfaddb..8ce3650bc6c 100644 --- a/pkgs/development/tools/cloudflare-wrangler/default.nix +++ b/pkgs/development/tools/wrangler/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin }: rustPlatform.buildRustPackage rec { - pname = "cloudflare-wrangler"; + pname = "wrangler"; version = "1.9.2"; src = fetchFromGitHub { owner = "cloudflare"; - repo = "wrangler"; + repo = pname; rev = "v${version}"; sha256 = "0i3fhdq8v9459mlnazkv9bpkcv01rdy5rk149lhpsan76zlyzzwr"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a5f349e9dd..024d5b8878f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -867,8 +867,6 @@ in cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { }; - cloudflare-wrangler = callPackage ../development/tools/cloudflare-wrangler { }; - codeql = callPackage ../development/tools/analysis/codeql { }; container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; @@ -3159,6 +3157,8 @@ in wob = callPackage ../tools/misc/wob { }; + wrangler = callPackage ../development/tools/wrangler { }; + xkcdpass = with pythonPackages; toPythonApplication xkcdpass; xob = callPackage ../tools/X11/xob { }; From 60582f7095e05f83b677bbd7c1dea9193f09630b Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Tue, 26 May 2020 23:23:32 +0300 Subject: [PATCH 14/92] wrangler: only use pkg-config and openssl on Linux --- pkgs/development/tools/wrangler/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix index 8ce3650bc6c..8b436498c93 100644 --- a/pkgs/development/tools/wrangler/default.nix +++ b/pkgs/development/tools/wrangler/default.nix @@ -13,14 +13,15 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0c2ss3j53vra1b4m3jsy2w2gdf6k1hw3qf6sd4qlg2ybk4k83g3b"; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; - buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ - curl - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.CoreFoundation - ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ + curl + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.CoreFoundation + ]; # tries to use "/homeless-shelter" and fails doCheck = false; From b2b5ae6e8c520ba8112ac32609610ef2c153f084 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Tue, 26 May 2020 23:24:06 +0300 Subject: [PATCH 15/92] wrangler: add filalex77 to maintainers --- pkgs/development/tools/wrangler/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix index 8b436498c93..cdbba236922 100644 --- a/pkgs/development/tools/wrangler/default.nix +++ b/pkgs/development/tools/wrangler/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { description = "A CLI tool designed for folks who are interested in using Cloudflare Workers"; homepage = "https://github.com/cloudflare/wrangler"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ filalex77 ]; platforms = platforms.all; }; } From a432801ff3d5ada384dcdc1416fc12dca0adebb5 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Sun, 31 May 2020 19:12:17 -0700 Subject: [PATCH 16/92] k3s: 1.17.3 -> 1.18.2 Fairly straightforward update. I properly git format-patch'd the patches too. --- .../networking/cluster/k3s/default.nix | 12 +-- .../cluster/k3s/patches/00-k3s.patch | 81 ----------------- ...0001-Use-rm-from-path-in-go-generate.patch | 25 ++++++ .../patches/0002-Add-nixpkgs-patches.patch | 87 +++++++++++++++++++ 4 files changed, 118 insertions(+), 87 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/k3s/patches/00-k3s.patch create mode 100644 pkgs/applications/networking/cluster/k3s/patches/0001-Use-rm-from-path-in-go-generate.patch create mode 100644 pkgs/applications/networking/cluster/k3s/patches/0002-Add-nixpkgs-patches.patch diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index ee1b08f8be4..eedc34d7d48 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -42,9 +42,9 @@ with lib; # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.17.3+k3s1"; # k3s git tag - traefikChartVersion = "1.81.0"; # taken from ./scripts/version.sh at the above k3s tag - k3sRootVersion = "0.3.0"; # taken from .s/cripts/version.sh at the above k3s tag + k3sVersion = "1.18.2+k3s1"; # k3s git tag + traefikChartVersion = "1.81.0"; # taken from ./scripts/download at the above k3s tag + k3sRootVersion = "0.3.0"; # taken from .s/cripts/download at the above k3s tag # bundled into the k3s binary traefikChart = fetchurl { url = "https://kubernetes-charts.storage.googleapis.com/traefik-${traefikChartVersion}.tgz"; @@ -93,7 +93,7 @@ let url = "https://github.com/rancher/k3s"; rev = "v${k3sVersion}"; leaveDotGit = true; # ./scripts/version.sh depends on git - sha256 = "0qahyc0mf9glxj49va6d20mcncqg4svfic2iz8b1lqid5c4g68mm"; + sha256 = "01ww3d71mlri2fk6z54rbd697aqwj942kbg323k0hfsnx7flkhps"; }; # Stage 1 of the k3s build: # Let's talk about how k3s is structured. @@ -124,7 +124,7 @@ let src = k3sRepo; - patches = [ ./patches/00-k3s.patch ]; + patches = [ ./patches/0001-Use-rm-from-path-in-go-generate.patch ./patches/0002-Add-nixpkgs-patches.patch ]; nativeBuildInputs = [ git pkgconfig ]; buildInputs = [ libseccomp ]; @@ -164,7 +164,7 @@ let src = k3sRepo; - patches = [ ./patches/00-k3s.patch ]; + patches = [ ./patches/0001-Use-rm-from-path-in-go-generate.patch ./patches/0002-Add-nixpkgs-patches.patch ]; nativeBuildInputs = [ git pkgconfig ]; buildInputs = [ k3sBuildStage1 k3sPlugins runc ]; diff --git a/pkgs/applications/networking/cluster/k3s/patches/00-k3s.patch b/pkgs/applications/networking/cluster/k3s/patches/00-k3s.patch deleted file mode 100644 index 1e39792df5c..00000000000 --- a/pkgs/applications/networking/cluster/k3s/patches/00-k3s.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff --git a/main.go b/main.go -index 62908bb7bb..0527222887 100644 ---- a/main.go -+++ b/main.go -@@ -1,5 +1,5 @@ - //go:generate go run pkg/codegen/cleanup/main.go --//go:generate /bin/rm -rf pkg/generated -+//go:generate rm -rf pkg/generated - //go:generate go run pkg/codegen/main.go - //go:generate go fmt pkg/deploy/zz_generated_bindata.go - //go:generate go fmt pkg/static/zz_generated_bindata.go -diff --git a/scripts/build b/scripts/build -index 72d3c07ece..3e5455b262 100755 ---- a/scripts/build -+++ b/scripts/build -@@ -10,7 +10,8 @@ PKG_CONTAINERD="github.com/containerd/containerd" - PKG_RANCHER_CONTAINERD="github.com/rancher/containerd" - PKG_CRICTL="github.com/kubernetes-sigs/cri-tools" - --buildDate=$(date -u '+%Y-%m-%dT%H:%M:%SZ') -+# Deterministic build date -+buildDate="$(date -d "$(git log -1 --format=%ai)" -u "+%Y-%m-%dT%H:%M:%SZ")" - - VENDOR_PREFIX="${PKG}/vendor/" - VERSIONFLAGS=" -@@ -82,17 +83,7 @@ cleanup() { - } - - INSTALLBIN=$(pwd)/bin --if [ ! -x ${INSTALLBIN}/cni ]; then --( -- echo Building cni -- TMPDIR=$(mktemp -d) -- trap cleanup EXIT -- WORKDIR=$TMPDIR/src/github.com/containernetworking/plugins -- git clone -b $VERSION_CNIPLUGINS https://github.com/rancher/plugins.git $WORKDIR -- cd $WORKDIR -- GOPATH=$TMPDIR CGO_ENABLED=0 go build -tags "$TAGS" -ldflags "$LDFLAGS $STATIC" -o $INSTALLBIN/cni --) --fi -+# skip building cni, use our separately built one - # echo Building agent - # CGO_ENABLED=1 go build -tags "$TAGS" -ldflags "$VERSIONFLAGS $LDFLAGS $STATIC" -o bin/k3s-agent ./cmd/agent/main.go - echo Building server -@@ -108,9 +99,8 @@ ln -s containerd ./bin/ctr - #CGO_ENABLED=1 go build -tags "$TAGS" -ldflags "$VERSIONFLAGS $LDFLAGS $STATIC_SQLITE" -o bin/ctr ./cmd/ctr/main.go - # echo Building containerd - # CGO_ENABLED=0 go build -tags "$TAGS" -ldflags "$VERSIONFLAGS $LDFLAGS $STATIC" -o bin/containerd ./cmd/containerd/ --echo Building runc --make EXTRA_LDFLAGS="-w -s" BUILDTAGS="apparmor seccomp" -C ./vendor/github.com/opencontainers/runc static --cp -f ./vendor/github.com/opencontainers/runc/runc ./bin/runc -+ -+# skip building runc; use our packaged one - - echo Building containerd-shim - make -C ./vendor/github.com/containerd/containerd bin/containerd-shim -diff --git a/scripts/package-cli b/scripts/package-cli -index 4c66ce32df..280b428bb8 100755 ---- a/scripts/package-cli -+++ b/scripts/package-cli -@@ -49,16 +49,16 @@ fi - - CMD_NAME=dist/artifacts/k3s${BIN_SUFFIX} - --go generate -+CGO_ENABLED=0 env -u GOARCH go generate - LDFLAGS=" - -X github.com/rancher/k3s/pkg/version.Version=$VERSION - -X github.com/rancher/k3s/pkg/version.GitCommit=${COMMIT:0:8} - -w -s - " --STATIC="-extldflags '-static'" - if [ "$DQLITE" = "true" ]; then - DQLITE_TAGS="dqlite" - fi --CGO_ENABLED=0 go build -tags "$DQLITE_TAGS" -ldflags "$LDFLAGS $STATIC" -o ${CMD_NAME} ./cmd/k3s/main.go -+go build -tags "$DQLITE_TAGS" -ldflags "$LDFLAGS" -o ${CMD_NAME} ./cmd/k3s/main.go - --./scripts/build-upload ${CMD_NAME} ${COMMIT} -+# for nixos, don't upload it -+# ./scripts/build-upload ${CMD_NAME} ${COMMIT} diff --git a/pkgs/applications/networking/cluster/k3s/patches/0001-Use-rm-from-path-in-go-generate.patch b/pkgs/applications/networking/cluster/k3s/patches/0001-Use-rm-from-path-in-go-generate.patch new file mode 100644 index 00000000000..c439241e855 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/patches/0001-Use-rm-from-path-in-go-generate.patch @@ -0,0 +1,25 @@ +From e79ddef65d08599ae3fe8ff39d202ea2416650b8 Mon Sep 17 00:00:00 2001 +From: Euan Kemp +Date: Sun, 31 May 2020 17:27:05 -0700 +Subject: [PATCH 1/2] Use 'rm' from path in go generate + +/bin/rm is less portable. On some distros, like nixos, it doesn't exist +at all. +--- + main.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/main.go b/main.go +index 62908bb7bb..0527222887 100644 +--- a/main.go ++++ b/main.go +@@ -1,5 +1,5 @@ + //go:generate go run pkg/codegen/cleanup/main.go +-//go:generate /bin/rm -rf pkg/generated ++//go:generate rm -rf pkg/generated + //go:generate go run pkg/codegen/main.go + //go:generate go fmt pkg/deploy/zz_generated_bindata.go + //go:generate go fmt pkg/static/zz_generated_bindata.go +-- +2.25.4 + diff --git a/pkgs/applications/networking/cluster/k3s/patches/0002-Add-nixpkgs-patches.patch b/pkgs/applications/networking/cluster/k3s/patches/0002-Add-nixpkgs-patches.patch new file mode 100644 index 00000000000..71dea7a9c6e --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/patches/0002-Add-nixpkgs-patches.patch @@ -0,0 +1,87 @@ +From 1891be119e298ef7c86347a6b74d40ff539cf06e Mon Sep 17 00:00:00 2001 +From: Euan Kemp +Date: Sun, 31 May 2020 19:02:37 -0700 +Subject: [PATCH 2/2] Add nixpkgs patches + +These patches let us re-use the upstream build scripts when building for +nix. +--- + scripts/build | 20 ++++---------------- + scripts/package-cli | 10 ++++++---- + 2 files changed, 10 insertions(+), 20 deletions(-) + +diff --git a/scripts/build b/scripts/build +index 4ca6333c4a..df15f7db1d 100755 +--- a/scripts/build ++++ b/scripts/build +@@ -12,7 +12,8 @@ PKG_CONTAINERD="github.com/containerd/containerd" + PKG_RANCHER_CONTAINERD="github.com/rancher/containerd" + PKG_CRICTL="github.com/kubernetes-sigs/cri-tools" + +-buildDate=$(date -u '+%Y-%m-%dT%H:%M:%SZ') ++# nixpkgs: deterministic build date ++buildDate="$(date -d "$(git log -1 --format=%ai)" -u "+%Y-%m-%dT%H:%M:%SZ")" + + VENDOR_PREFIX="${PKG}/vendor/" + VERSIONFLAGS=" +@@ -92,17 +93,7 @@ cleanup() { + } + + INSTALLBIN=$(pwd)/bin +-if [ ! -x ${INSTALLBIN}/cni ]; then +-( +- echo Building cni +- TMPDIR=$(mktemp -d) +- trap cleanup EXIT +- WORKDIR=$TMPDIR/src/github.com/containernetworking/plugins +- git clone -b $VERSION_CNIPLUGINS https://github.com/rancher/plugins.git $WORKDIR +- cd $WORKDIR +- GOPATH=$TMPDIR CGO_ENABLED=0 "${GO}" build -tags "$TAGS" -ldflags "$LDFLAGS $STATIC" -o $INSTALLBIN/cni +-) +-fi ++# nixpkgs: skip building cni, we build it separately + # echo Building agent + # CGO_ENABLED=1 "${GO}" build -tags "$TAGS" -ldflags "$VERSIONFLAGS $LDFLAGS $STATIC" -o bin/k3s-agent ./cmd/agent/main.go + echo Building server +@@ -118,10 +109,7 @@ ln -s containerd ./bin/ctr + #CGO_ENABLED=1 "${GO}" build -tags "$TAGS" -ldflags "$VERSIONFLAGS $LDFLAGS $STATIC_SQLITE" -o bin/ctr ./cmd/ctr/main.go + # echo Building containerd + # CGO_ENABLED=0 "${GO}" build -tags "$TAGS" -ldflags "$VERSIONFLAGS $LDFLAGS $STATIC" -o bin/containerd ./cmd/containerd/ +-echo Building runc +-rm -f ./vendor/github.com/opencontainers/runc/runc +-make EXTRA_LDFLAGS="-w -s" BUILDTAGS="$RUNC_TAGS" -C ./vendor/github.com/opencontainers/runc $RUNC_STATIC +-cp -f ./vendor/github.com/opencontainers/runc/runc ./bin/runc ++# nixpkgs: we build runc separately + + echo Building containerd-shim + rm -f ./vendor/github.com/containerd/containerd/bin/containerd-shim +diff --git a/scripts/package-cli b/scripts/package-cli +index f33d8c66dd..da34397a28 100755 +--- a/scripts/package-cli ++++ b/scripts/package-cli +@@ -49,16 +49,18 @@ fi + + CMD_NAME=dist/artifacts/k3s${BIN_SUFFIX} + +-"${GO}" generate ++CGO_ENABLED=0 env -u GOARCH "${GO}" generate + LDFLAGS=" + -X github.com/rancher/k3s/pkg/version.Version=$VERSION + -X github.com/rancher/k3s/pkg/version.GitCommit=${COMMIT:0:8} + -w -s + " +-STATIC="-extldflags '-static'" ++# STATIC="-extldflags '-static'" ++# nixpkgs: we can depend on dynamic linking because we have a good package manager + if [ "$DQLITE" = "true" ]; then + DQLITE_TAGS="dqlite" + fi +-CGO_ENABLED=0 "${GO}" build -tags "$DQLITE_TAGS" -ldflags "$LDFLAGS $STATIC" -o ${CMD_NAME} ./cmd/k3s/main.go ++"${GO}" build -tags "$DQLITE_TAGS" -ldflags "$LDFLAGS" -o ${CMD_NAME} ./cmd/k3s/main.go + +-./scripts/build-upload ${CMD_NAME} ${COMMIT} ++# nixpkgs: skip uploading ++# ./scripts/build-upload ${CMD_NAME} ${COMMIT} +-- +2.25.4 + From 6e41b08e7ab7d28f68e7e9ee05f26c0d459821f4 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 2 Jun 2020 11:21:01 +0200 Subject: [PATCH 17/92] electron_3: refactor, so we can use electron/default.nix for electron 3.x too --- pkgs/development/tools/electron/3.x.nix | 77 --------------------- pkgs/development/tools/electron/default.nix | 8 +++ pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 9 insertions(+), 80 deletions(-) delete mode 100644 pkgs/development/tools/electron/3.x.nix diff --git a/pkgs/development/tools/electron/3.x.nix b/pkgs/development/tools/electron/3.x.nix deleted file mode 100644 index ee4b69ddca3..00000000000 --- a/pkgs/development/tools/electron/3.x.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, gtk2, at-spi2-atk }: - -let - version = "3.1.13"; - name = "electron-${version}"; - - throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; - - meta = with stdenv.lib; { - description = "Cross platform desktop application shell"; - homepage = "https://github.com/electron/electron"; - license = licenses.mit; - maintainers = with maintainers; [ travisbhartwell manveru ]; - platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ]; - }; - - linux = { - inherit name version meta; - src = { - i686-linux = fetchurl { - url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip"; - sha256 = "04i0rcp4ajp4nf4arcl5crcc7a85sf0ixqd8jx07k2b1irv4dc23"; - }; - x86_64-linux = fetchurl { - url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; - sha256 = "1psmbplz6jhnnf6hmfhxbmmhn4n1dpnhzbc12pxn645xhfpk9ark"; - }; - armv7l-linux = fetchurl { - url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; - sha256 = "1pzs2cj12xw18jwab0mb8xhndwd95lbsj5ml5xdw2mb0ip5jsvsa"; - }; - aarch64-linux = fetchurl { - url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip"; - sha256 = "13pc7xn0dkb8i31vg9zplqcvb7r9r7q3inmr3419b5p9bl0687x8"; - }; - }.${stdenv.hostPlatform.system} or throwSystem; - - buildInputs = [ unzip makeWrapper ]; - - buildCommand = '' - mkdir -p $out/lib/electron $out/bin - unzip -d $out/lib/electron $src - ln -s $out/lib/electron/electron $out/bin - - fixupPhase - - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}:${gtk2}/lib:${at-spi2-atk}/lib:$out/lib/electron" \ - $out/lib/electron/electron - - wrapProgram $out/lib/electron/electron \ - --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 - ''; - }; - - darwin = { - inherit name version meta; - - src = fetchurl { - url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; - sha256 = "1vvjm4jifzjqvbs2kjlwg1h9p2czr2b5imjr9hld1j8nyfrzb0dx"; - }; - - buildInputs = [ unzip ]; - - buildCommand = '' - mkdir -p $out/Applications - unzip $src - mv Electron.app $out/Applications - mkdir -p $out/bin - ln -s $out/Applications/Electron.app/Contents/MacOS/Electron $out/bin/electron - ''; - }; -in - - stdenv.mkDerivation (if stdenv.isDarwin then darwin else linux) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 9ed0d27894e..7b608beb8cb 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -4,6 +4,14 @@ let mkElectron = import ./generic.nix args; in { + electron_3 = mkElectron "3.1.13" { + x86_64-linux = "1psmbplz6jhnnf6hmfhxbmmhn4n1dpnhzbc12pxn645xhfpk9ark"; + x86_64-darwin = "1vvjm4jifzjqvbs2kjlwg1h9p2czr2b5imjr9hld1j8nyfrzb0dx"; + i686-linux = "04i0rcp4ajp4nf4arcl5crcc7a85sf0ixqd8jx07k2b1irv4dc23"; + armv7l-linux = "1pzs2cj12xw18jwab0mb8xhndwd95lbsj5ml5xdw2mb0ip5jsvsa"; + aarch64-linux = "13pc7xn0dkb8i31vg9zplqcvb7r9r7q3inmr3419b5p9bl0687x8"; + }; + electron_4 = mkElectron "4.2.12" { x86_64-linux = "72c5319c92baa7101bea3254a036c0cd3bcf257f4a03a0bb153668b7292ee2dd"; x86_64-darwin = "89b0e16bb9b7072ed7ed1906fccd08540acdd9f42dd8a29c97fa17d811b8c5e5"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c62d3ed96f..e95b155c953 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10004,9 +10004,7 @@ in aws-adfs = with python3Packages; toPythonApplication aws-adfs; inherit (callPackages ../development/tools/electron { }) - electron_4 electron_5 electron_6 electron_7 electron_8 electron_9; - - electron_3 = callPackage ../development/tools/electron/3.x.nix { }; + electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9; electron = electron_4; autobuild = callPackage ../development/tools/misc/autobuild { }; From 8247dc86db786104543cc701bf4407497fce429d Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 27 Apr 2020 22:23:05 +0200 Subject: [PATCH 18/92] obinskit: update to new electron_3 packaging --- pkgs/applications/misc/obinskit/default.nix | 50 +++++++-------------- 1 file changed, 15 insertions(+), 35 deletions(-) diff --git a/pkgs/applications/misc/obinskit/default.nix b/pkgs/applications/misc/obinskit/default.nix index aa11c069a7a..bbaa135f47e 100644 --- a/pkgs/applications/misc/obinskit/default.nix +++ b/pkgs/applications/misc/obinskit/default.nix @@ -1,33 +1,24 @@ -{ lib -, stdenv +{ stdenv , fetchurl -, xorg , libxkbcommon , systemd -, gcc-unwrapped +, xorg , electron_3 -, wrapGAppsHook +, makeWrapper , makeDesktopItem }: - let - libPath = lib.makeLibraryPath [ - libxkbcommon - xorg.libXt - systemd.lib - stdenv.cc.cc.lib - ]; - desktopItem = makeDesktopItem rec { name = "Obinskit"; exec = "obinskit"; - icon = "obinskit.png"; + icon = "obinskit"; desktopName = "Obinskit"; genericName = "Obinskit keyboard configurator"; categories = "Utility"; }; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "obinskit"; version = "1.1.4"; @@ -40,44 +31,33 @@ in stdenv.mkDerivation rec { sourceRoot = "ObinsKit_${version}_x64"; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ makeWrapper ]; dontConfigure = true; dontBuild = true; installPhase = '' mkdir -p $out/opt/obinskit - install icudtl.dat $out/opt/obinskit/ - install natives_blob.bin $out/opt/obinskit/ - install v8_context_snapshot.bin $out/opt/obinskit/ - install blink_image_resources_200_percent.pak $out/opt/obinskit/ - install content_resources_200_percent.pak $out/opt/obinskit/ - install content_shell.pak $out/opt/obinskit/ - install ui_resources_200_percent.pak $out/opt/obinskit/ - install views_resources_200_percent.pak $out/opt/obinskit/ + cp -r resources $out/opt/obinskit/ cp -r locales $out/opt/obinskit/ - mkdir -p $out/bin - ln -s ${electron_3}/bin/electron $out/bin/obinskit - mkdir -p $out/share/{applications,pixmaps} install resources/icons/tray-darwin@2x.png $out/share/pixmaps/obinskit.png ln -s ${desktopItem}/share/applications/* $out/share/applications ''; - preFixup = '' - gappsWrapperArgs+=( - --add-flags $out/opt/obinskit/resources/app.asar - --prefix LD_LIBRARY_PATH : "${libPath}" - ) + postFixup = '' + makeWrapper ${electron_3}/bin/electron $out/bin/${pname} \ + --add-flags $out/opt/obinskit/resources/app.asar \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon systemd.lib xorg.libXt ]}" ''; - meta = with lib; { + meta = with stdenv.lib; { description = "Graphical configurator for Anne Pro and Anne Pro II keyboards"; - homepage = "http://en.obins.net/obinskit/"; + homepage = "http://en.obins.net/obinskit/"; # https is broken license = licenses.unfree; - maintainers = [ maintainers.shou ]; + maintainers = with maintainers; [ shou ]; platforms = [ "x86_64-linux" ]; }; } From e77c586dbc33c9337a6dba4244ba8d83517609a4 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 4 Jun 2020 04:23:29 +0000 Subject: [PATCH 19/92] tailscale: 0.97-219 -> 0.99.1-0 Signed-off-by: David Anderson --- pkgs/servers/tailscale/default.nix | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 9f0a8de4ef6..e61437c46ff 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,15 +2,16 @@ buildGoModule rec { pname = "tailscale"; - version = "0.97-219"; + # Tailscale uses "git describe" as version numbers. 0.99.1-0 means + # "tag v0.99.1 plus 0 commits", which corresponds to rev="v0.99.1" + # below. + version = "0.99.1-0"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; - # Tailscale uses "git describe" as version numbers. v0.97-219 - # means "tag v0.97 plus 219 commits", which is what this rev is. - rev = "afbfe4f217a2a202f0eefe943c7c1ef648311339"; - sha256 = "1an897ys3gycdmclqd0yqs9f7q88zxqxyc6r0gcgs4678svxhb68"; + rev = "v0.99.1"; + sha256 = "1kq4x5xknv0qq6n78xj5wjbf6svbdyw4nzs7z5gjb3ylj2vl97pb"; }; nativeBuildInputs = [ makeWrapper ]; @@ -18,14 +19,7 @@ buildGoModule rec { CGO_ENABLED = 0; goPackagePath = "tailscale.com"; - overrideModAttrs = (_: { - preBuild = '' - rm ipn/e2e_test.go - rm control/controlclient/auto_test.go - rm control/controlclient/direct_test.go - ''; - }); - vendorSha256 = "1v90lbwgrc2m4kvpglf2jykrm8rry3pbhqqbc3mcysrzmqlw84yl"; + vendorSha256 = "0yf2zdpd12w4qf4sbv7bkr40hw5faqynr6lb84v7w6v0az0nfzds"; subPackages = [ "cmd/tailscale" "cmd/tailscaled" ]; postInstall = '' @@ -41,4 +35,4 @@ buildGoModule rec { license = licenses.bsd3; maintainers = with maintainers; [ danderson mbaillie ]; }; -} \ No newline at end of file +} From 7291d2806d53a0b761b208b888c4d44bdadc1b86 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 4 Jun 2020 11:38:33 +0200 Subject: [PATCH 20/92] electron: 7.3.0 -> 7.3.1 --- pkgs/development/tools/electron/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 9ed0d27894e..1ffbcdc891e 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -28,12 +28,12 @@ in aarch64-linux = "4ae23b75be821044f7e5878fe8e56ab3109cbd403ecd88221effa6abf850260b"; }; - electron_7 = mkElectron "7.3.0" { - x86_64-linux = "5841d2dae8633ddec654574507689a61983acd774e6cdc8774a64b26eb41b5d4"; - x86_64-darwin = "dfe6aeda73b71aa016fb87f5fdbf87f7d8e574f1cf318fc2a5543399b4e975ae"; - i686-linux = "fdcedc8fda7c3580dadfa50d2ffcf9ebde4d7a01b0a36fb799703510e3a7811f"; - armv7l-linux = "b2989bab1be05230364c058fbadf9967b23873d24e24ac3f7c8d013c11ed73e4"; - aarch64-linux = "15a70ae79aabbf6bb9ee8a107fd08ddc1021c534679899f88e1fcc8d4de980fe"; + electron_7 = mkElectron "7.3.1" { + x86_64-linux = "66f37aadf65c0274cc6e46b09e52c38b2c8c5b2d6bbf1cd8196cd69b9f9ab737"; + x86_64-darwin = "351b30cab32539752ce5f9b53d2345352df922d57a152643c4eeb636a8941d23"; + i686-linux = "f80b8a684da13736d7614ca4ad5704812d12537111cb45010e5f42e7e4403554"; + armv7l-linux = "ef054696f4138e261b1310522d57bbdc5336e34488b3e273a8a794f8c26509c7"; + aarch64-linux = "f32376ca85c9017b7ab399e58fa176d882baacb048dd69d816831f8dde9054bb"; }; electron_8 = mkElectron "8.3.0" { From 5e86b84066e46a6eb0b7750d50e045c91a76919f Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 4 Jun 2020 11:39:02 +0200 Subject: [PATCH 21/92] electron: 8.3.0 -> 8.3.1 --- pkgs/development/tools/electron/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 1ffbcdc891e..490372d4c15 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -36,12 +36,12 @@ in aarch64-linux = "f32376ca85c9017b7ab399e58fa176d882baacb048dd69d816831f8dde9054bb"; }; - electron_8 = mkElectron "8.3.0" { - x86_64-linux = "e69d8e36d2f842c7e741794f71952dc8bc5fbaa46ff22bb82ffd71fcf16e2302"; - x86_64-darwin = "582c9f9b53e8752885aa14d829f9318283f1d56eeb12982a03051d795a23e535"; - i686-linux = "2cf7fc55a74427d96ebe67fb601ece2f27802deb95a5bae3d7b427afe71d272c"; - armv7l-linux = "14b67e8a41ce8882442816a2db0eee69fac141e359911704002beb7063aa0eff"; - aarch64-linux = "1d89a75fff3b690efe1295fe6f91225c4fa64f3c22c6acddec895d54e1040b4d"; + electron_8 = mkElectron "8.3.1" { + x86_64-linux = "d5ad2bd32f7bf88f869a401017b35be0ea71e6fc7798fe2397b21602573e2639"; + x86_64-darwin = "abe864d9e6327d499120f328e699f4819110d4245bce2f92b84e19d8cdc1c771"; + i686-linux = "e75692c062b15c7f664cf3ff30832a526f3f66080469f7f93befaa4e0860c011"; + armv7l-linux = "cfa0a14225b617492a311c21ad973f24708bc4013a992271368006cdb12ed488"; + aarch64-linux = "1b9cd3ed7eb53ed914ac04c82d736c2677af807e553c87f0698890c2a3dcfd57"; }; electron_9 = mkElectron "9.0.0" { From 024a7cec68b1cd9ea10f86124aa021ee806b04d8 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 4 Jun 2020 11:39:32 +0200 Subject: [PATCH 22/92] electron: 9.0.0 -> 9.0.2 --- pkgs/development/tools/electron/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 490372d4c15..7c8a223fe40 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -44,11 +44,11 @@ in aarch64-linux = "1b9cd3ed7eb53ed914ac04c82d736c2677af807e553c87f0698890c2a3dcfd57"; }; - electron_9 = mkElectron "9.0.0" { - x86_64-linux = "03c69d66ae8784edcc6a4b8081eb4e07da802035a6257fb6e2260a456371224f"; - x86_64-darwin = "86096d2ecff0698957bfbbe8a8d56c7f9ed9abe7e5a5bfe84a8f4af0635625e1"; - i686-linux = "67ea9e04db5a709b10d2f101d977e803b5f5da9e9573cbcc7bce362b1a9406d7"; - armv7l-linux = "7917624b81318197da52de04073e07c4b2d3947737d4103f647a8abc907600c0"; - aarch64-linux = "e3dd2e15cfd346a59c69ff4b0b234daf5bb06790b508ae0056a55c17eef78a9e"; + electron_9 = mkElectron "9.0.2" { + x86_64-linux = "08326f505692010d6c92f444a25f450cf19323cd98c5d94cab1057e80601caa1"; + x86_64-darwin = "8ab5b48f873582a9231bc85b0f73d9735fabca51364b8c505da8f8238d658da5"; + i686-linux = "2e950e4ab91453f7611fcfedbe90eff844677dbcc7df87a6fe0889bd3d82daaa"; + armv7l-linux = "cc098caebbed5022f26d12f9b5dc316a35dbae0bcf62b9fc72c3b385f93a32d5"; + aarch64-linux = "ee39854d8e9ee06e9b94c457a52b0556f570316bbd755d7022e3eade4b5974d5"; }; } From 5d3c56822aec619dcf425d5039c5af24c9ea07d3 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 4 Jun 2020 17:41:40 -0400 Subject: [PATCH 23/92] qgroundcontrol: 3.5.5 -> 4.0.8 --- .../robotics/qgroundcontrol/default.nix | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 1f9d43b3352..63247bcff72 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -1,34 +1,31 @@ { lib, mkDerivation, fetchgit, SDL2 , qtbase, qtcharts, qtlocation, qtserialport, qtsvg, qtquickcontrols2 -, qtgraphicaleffects, qtspeech, qmake -, makeWrapper -, gst_all_1, pkgconfig +, qtgraphicaleffects, qtspeech, qtx11extras, qmake, qttools +, gst_all_1, wayland, pkgconfig }: mkDerivation rec { pname = "qgroundcontrol"; - version = "3.5.5"; + version = "4.0.8"; qtInputs = [ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 - qtgraphicaleffects qtspeech + qtgraphicaleffects qtspeech qtx11extras ]; gstInputs = with gst_all_1; [ - gstreamer gst-plugins-base + gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad wayland ]; enableParallelBuilding = true; buildInputs = [ SDL2 ] ++ gstInputs ++ qtInputs; - nativeBuildInputs = [ pkgconfig makeWrapper qmake ]; + nativeBuildInputs = [ pkgconfig qmake qttools ]; preConfigure = '' mkdir build cd build ''; - NIX_CFLAGS_COMPILE = [ "-Wno-address-of-packed-member" ]; # Don't litter logs with these warnings - qmakeFlags = [ # Default install tries to copy Qt files into package "CONFIG+=QGC_DISABLE_BUILD_SETUP" @@ -36,6 +33,8 @@ mkDerivation rec { ]; installPhase = '' + runHook preInstall + cd .. mkdir -p $out/share/applications @@ -50,18 +49,19 @@ mkDerivation rec { mkdir -p $out/share/pixmaps cp -v resources/icons/qgroundcontrol.png $out/share/pixmaps + + runHook postInstall ''; postInstall = '' - wrapProgram "$out/bin/qgroundcontrol" \ - --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; # TODO: package mavlink so we can build from a normal source tarball src = fetchgit { url = "https://github.com/mavlink/qgroundcontrol.git"; rev = "v${version}"; - sha256 = "05zy6w9lwwh254wa8c6wysa67kk0flywcvipii9b1rmy47slflhs"; + sha256 = "0jr9jpjqdwizsvh9zm0fdp8k2r4536m40dxrn30fbr3ba8vnzkgq"; fetchSubmodules = true; }; @@ -70,6 +70,6 @@ mkDerivation rec { homepage = "http://qgroundcontrol.org/"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ lopsided98 ]; }; } From dc0f741db01317020e6da351cf28e56e714137d0 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Fri, 5 Jun 2020 14:53:14 +0200 Subject: [PATCH 24/92] atlassian-crowd: 3.4.5 -> 4.0.2 --- pkgs/servers/atlassian/crowd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix index 556380df464..893f20cf59a 100644 --- a/pkgs/servers/atlassian/crowd.nix +++ b/pkgs/servers/atlassian/crowd.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "atlassian-crowd"; - version = "3.4.5"; + version = "4.0.2"; src = fetchurl { url = "https://www.atlassian.com/software/crowd/downloads/binary/${pname}-${version}.tar.gz"; - sha256 = "1k72aar68iqiaf0l75i6pp81dpsllqkp69f70hja754hrzvhz8j3"; + sha256 = "1ndg9qb406rd239q7xycc2vdh2jd4fh9wryx1fm9493rxlncx28b"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; From fae468b3ce1a758da727796db18dbaca417d1a50 Mon Sep 17 00:00:00 2001 From: James Ravn Date: Fri, 5 Jun 2020 20:52:41 +0100 Subject: [PATCH 25/92] chromium: add rtc_use_pipewire This provides the browser flag #enable-webrtc-pipewire-capturer, which adds support for screensharing on Wayland via xdg-desktop-portal. The browser flag is disabled by default until a user enables it. At least one other major distribution (Arch) enables this compile time option, and so I believe it should be safe to enable by default. This is also needed to support xdg-desktop-portal-wlr which was added in https://github.com/NixOS/nixpkgs/pull/83485. --- pkgs/applications/networking/browsers/chromium/common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 8ce7c89bf78..33f859976f2 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -17,6 +17,7 @@ , protobuf, speechd, libXdamage, cups , ffmpeg, libxslt, libxml2, at-spi2-core , jre +, pipewire_0_2 # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport @@ -132,6 +133,7 @@ let libXScrnSaver libXcursor libXtst libGLU libGL pciutils protobuf speechd libXdamage at-spi2-core jre + pipewire_0_2 ] ++ optional useVaapi libva ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] @@ -243,6 +245,8 @@ let # added later in the wrapped -wv build or downloaded from Google. enable_widevine = true; use_cups = cupsSupport; + # Provides the enable-webrtc-pipewire-capturer flag to support Wayland screen capture. + rtc_use_pipewire = true; treat_warnings_as_errors = false; is_clang = stdenv.cc.isClang; From e27e475f0d7292f1ecb64c4f40de2d417b46f45a Mon Sep 17 00:00:00 2001 From: Michael Bishop Date: Fri, 5 Jun 2020 23:34:38 -0300 Subject: [PATCH 26/92] rust: fix rust cross-compile reasoning: sjlj (short jump long jump) exception handling makes no sense on x86_64, it's forcably slowing programs down as it produces a constant overhead. On x86_64 we have SEH (Structured Exception Handling) and we should use that. On i686, we do not have SEH, and have to use sjlj with dwarf2. Hence it's now conditional on x86_32 --- pkgs/development/compilers/gcc/common/configure-flags.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index be7f3df42de..f38ce180b1f 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -58,8 +58,9 @@ let "--with-gnu-as" "--with-gnu-ld" "--disable-debug" - "--enable-sjlj-exceptions" "--disable-win32-registry" + ] ++ lib.optionals (crossMingw && targetPlatform.isx86_32) [ + "--enable-sjlj-exceptions" ] else [ (if crossDarwin then "--with-sysroot=${lib.getLib libcCross}/share/sysroot" else "--with-headers=${lib.getDev libcCross}${libcCross.incdir or "/include"}") @@ -81,13 +82,14 @@ let # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865 "--disable-libmpx" ] ++ lib.optionals crossMingw [ - "--enable-sjlj-exceptions" "--enable-hash-synchronization" "--enable-libssp" "--disable-nls" - "--with-dwarf2" # To keep ABI compatibility with upstream mingw-w64 "--enable-fully-dynamic-string" + ] ++ lib.optionals (crossMingw && targetPlatform.isx86_32) [ + "--enable-sjlj-exceptions" + "--with-dwarf2" ] ++ lib.optional (targetPlatform.libc == "newlib") "--with-newlib" ++ lib.optional (targetPlatform.libc == "avrlibc") "--with-avrlibc" ); From 675215431b7bf762525dd5a25f577e075aba10d9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Jun 2020 03:07:26 +0000 Subject: [PATCH 27/92] bitwarden_rs: 1.14.2 -> 1.15.0 --- pkgs/tools/security/bitwarden_rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix index 6d3c4bccef9..158485dc982 100644 --- a/pkgs/tools/security/bitwarden_rs/default.nix +++ b/pkgs/tools/security/bitwarden_rs/default.nix @@ -8,13 +8,13 @@ let in rustPlatform.buildRustPackage rec { pname = "bitwarden_rs"; - version = "1.14.2"; + version = "1.15.0"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - sha256 = "0413yjbnj4k917x48h1gnj64kygbr6c1n55f23qkvj0hgbxpgssz"; + sha256 = "12mr7d0mjlh7za4nc3s7cizzbd6v0zfmd7q9s0f7pqz56vw5m21s"; }; nativeBuildInputs = [ pkgconfig ]; @@ -25,7 +25,7 @@ in rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; - cargoSha256 = "09747f9g7yyq9c8wbfdb3hwxii5xq23ynhba0vc01nhjpjyn0ksd"; + cargoSha256 = "0nacc8xvbkdzbyx4c17hdh03v9ykpis74pbpxkn6v95njw14wq53"; cargoBuildFlags = [ featuresFlag ]; checkPhase = '' From d3b5e28142499528f6750fffff3f3e10286ab16a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Jun 2020 04:56:35 +0000 Subject: [PATCH 28/92] cq-editor: 0.1RC2 -> 0.1.1 --- pkgs/applications/graphics/cq-editor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/cq-editor/default.nix b/pkgs/applications/graphics/cq-editor/default.nix index a6cfd256ac5..036edf80ab9 100644 --- a/pkgs/applications/graphics/cq-editor/default.nix +++ b/pkgs/applications/graphics/cq-editor/default.nix @@ -6,13 +6,13 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pname = "cq-editor"; - version = "0.1RC2"; + version = "0.1.1"; src = fetchFromGitHub { owner = "CadQuery"; repo = "CQ-editor"; rev = version; - sha256 = "0zima4pmn34s8b2axxwy6qd1f1r5ki34byq4x3rrd7n3g0hagxz5"; + sha256 = "1970izjaa60r5cg9i35rzz9lk5c5d8q1vw1rh2skvfbf63z1hnzv"; }; propagatedBuildInputs = with python3Packages; [ From 13abee9986b2e21b735dde8817d90aaf0d11830b Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 6 Jun 2020 02:35:31 -0300 Subject: [PATCH 29/92] tiny8086: update source and build script --- .../virtualization/8086tiny/builder.sh | 8 +++-- .../virtualization/8086tiny/default.nix | 34 +++++++++++-------- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/virtualization/8086tiny/builder.sh b/pkgs/applications/virtualization/8086tiny/builder.sh index 7cff2589abe..210f11e1328 100644 --- a/pkgs/applications/virtualization/8086tiny/builder.sh +++ b/pkgs/applications/virtualization/8086tiny/builder.sh @@ -1,17 +1,19 @@ source $stdenv/setup -mkdir -p ./$name $out/bin $out/share/$name $out/share/doc/$name/images +unpackPhase +cd $sourceRoot -cd $name -tar xf $src make 8086tiny + if [ $bios ]; then cd bios_source nasm -f bin bios.asm -o bios cd .. fi +mkdir -p $out/bin $out/share/$name $out/share/doc/$name/images + install -m 755 8086tiny $out/bin install -m 644 fd.img $out/share/$name/8086tiny-floppy.img install -m 644 bios_source/bios.asm $out/share/$name/8086tiny-bios-src.asm diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix index 464ea053cc4..96ccc255881 100644 --- a/pkgs/applications/virtualization/8086tiny/default.nix +++ b/pkgs/applications/virtualization/8086tiny/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchurl +{ stdenv, fetchFromGitHub , localBios ? true, nasm ? null , sdlSupport ? true, SDL ? null }: assert sdlSupport -> (SDL != null); -stdenv.mkDerivation { +stdenv.mkDerivation rec{ pname = "8086tiny"; version = "1.25"; - src = fetchurl { - url ="http://www.megalith.co.uk/8086tiny/downloads/8086tiny_125.tar.bz2"; - sha256 = "0kmq4iiwhi2grjwq43ljjk1b1f1v1x9gzrgrgq2fzfsj7m7s6ris"; + src = fetchFromGitHub { + owner = "adriancable"; + repo = pname; + rev = "c79ca2a34d96931d55ef724c815b289d0767ae3a"; + sha256 = "00aydg8f28sgy8l3rd2a7jvp56lx3b63hhak43p7g7vjdikv495w"; }; buildInputs = with stdenv.lib; @@ -22,18 +24,20 @@ stdenv.mkDerivation { builder = ./builder.sh; - meta = { - description = "An open-source 8086 emulator"; + meta = with stdenv.lib; { + description = "An open-source small 8086 emulator"; longDescription = '' - 8086tiny is a tiny, open-source (MIT), portable (little-endian hosts) Intel PC emulator, powerful enough to run DOS, Windows 3.0, Excel, MS Flight Simulator, AutoCAD, Lotus 1-2-3, and similar applications. 8086tiny emulates a "late 80's era" PC XT-type machine. + 8086tiny is a tiny, open-source (MIT), portable (little-endian hosts) + Intel PC emulator, powerful enough to run DOS, Windows 3.0, Excel, MS + Flight Simulator, AutoCAD, Lotus 1-2-3, and similar applications. 8086tiny + emulates a "late 80's era" PC XT-type machine. - 8086tiny is based on an IOCCC 2013 winning entry. In fact that is the "unobfuscated" version :) + 8086tiny is based on an IOCCC 2013 winning entry. In fact that is the + "unobfuscated" version :) ''; - homepage = "http://www.megalith.co.uk/8086tiny/index.html"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.linux; + homepage = "https://github.com/adriancable/8086tiny"; + license = licenses.mit; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } - -# TODO: add support for a locally made BIOS From a382d06ffdc1872f486ee9400cbe07d01ba4402f Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 6 Jun 2020 11:03:13 +0200 Subject: [PATCH 30/92] pipewire_0_2: move from 2.nix to 0.2.nix This wrongly suggests there's a 2.x version. --- pkgs/development/libraries/pipewire/{2.nix => 0.2.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/libraries/pipewire/{2.nix => 0.2.nix} (100%) diff --git a/pkgs/development/libraries/pipewire/2.nix b/pkgs/development/libraries/pipewire/0.2.nix similarity index 100% rename from pkgs/development/libraries/pipewire/2.nix rename to pkgs/development/libraries/pipewire/0.2.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd298ce24ea..188ecbe727f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9713,7 +9713,7 @@ in pipenv = callPackage ../development/tools/pipenv {}; pipewire = callPackage ../development/libraries/pipewire {}; - pipewire_0_2 = callPackage ../development/libraries/pipewire/2.nix {}; + pipewire_0_2 = callPackage ../development/libraries/pipewire/0.2.nix {}; pyradio = callPackage ../applications/radio/pyradio {}; From 6a38067fcff7b1954603bb0275f306484d3f2e87 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 6 Jun 2020 04:20:00 -0500 Subject: [PATCH 31/92] go-toml: init at 1.8.0 --- pkgs/development/tools/go-toml/default.nix | 24 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/tools/go-toml/default.nix diff --git a/pkgs/development/tools/go-toml/default.nix b/pkgs/development/tools/go-toml/default.nix new file mode 100644 index 00000000000..0cb16354b21 --- /dev/null +++ b/pkgs/development/tools/go-toml/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "go-toml"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "pelletier"; + repo = pname; + rev = "v${version}"; + sha256 = "0fxmjm85c9h43lvqz71wr93fcc63bhj82nwby80222xx8ja63g7y"; + }; + + goPackagePath = "github.com/pelletier/go-toml"; + + excludedPackages = [ "cmd/tomltestgen" ]; + + meta = with lib; { + description = "Go library for the TOML language"; + homepage = "https://github.com/pelletier/go-toml"; + maintainers = [ maintainers.marsam ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2b95da052c..845ac42747e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17353,6 +17353,8 @@ in go-symbols = callPackage ../development/tools/go-symbols { }; + go-toml = callPackage ../development/tools/go-toml { }; + go-outline = callPackage ../development/tools/go-outline { }; gocode = callPackage ../development/tools/gocode { }; From b48ad9b33df8da20aed3f8bde9b73ac7263d2ae7 Mon Sep 17 00:00:00 2001 From: "Tristan Helmich (omniIT)" Date: Fri, 5 Jun 2020 15:48:01 +0000 Subject: [PATCH 32/92] graylog: 3.2.5 -> 3.3.0 --- pkgs/tools/misc/graylog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index df645789c58..17ea2872478 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "graylog"; - version = "3.2.5"; + version = "3.3.0"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "1sbws735w0qww3nj8ai105a743nyrf1iprmcl89w5h8yirq2z1r9"; + sha256 = "1ydplg2lifql5s4bh64a4lwqp1q5vrvbljhn1pnxv9vz0ab73q1k"; }; dontBuild = true; From a265cd27b009fad78016d37de23320f9b7192cf8 Mon Sep 17 00:00:00 2001 From: "Tristan Helmich (omniIT)" Date: Fri, 5 Jun 2020 16:46:55 +0000 Subject: [PATCH 33/92] graylogPlugins: Update and add plugins * graylog-auth-sso: 3.1.0 -> 3.3.0 * graylog-enterprise-integrations: init at 3.3.0 * graylog-integrations: init at 3.3.0 * graylog-pagerduty: 1.3.0 -> 2.0.0 * graylog-snmp: init at 0.3.0 --- pkgs/tools/misc/graylog/plugins.nix | 58 +++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index 1f351b66203..5dbcc7479e5 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -38,10 +38,10 @@ in { auth_sso = glPlugin rec { name = "graylog-auth-sso-${version}"; pluginName = "graylog-plugin-auth-sso"; - version = "3.1.0"; + version = "3.3.0"; src = fetchurl { url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "0hwgpq1j3qk0j1zgap5f1avh2nvkcscgds81x8xr0gamphgps8y2"; + sha256 = "1g47hlld8vzicd47b5i9n2816rbrhv18vjq8gp765c7mdg4a2jn8"; }; meta = { homepage = "https://github.com/Graylog2/graylog-plugin-auth-sso"; @@ -61,6 +61,25 @@ in { description = "Message filter plugin can be used to do DNS lookups for the source field in Graylog messages"; }; }; + enterprise-integrations = glPlugin rec { + name = "graylog-enterprise-integrations-${version}"; + pluginName = "graylog-plugin-enterprise-integrations"; + version = "3.3.0"; + src = fetchurl { + url = "https://downloads.graylog.org/releases/graylog-enterprise-integrations/graylog-enterprise-integrations-plugins-${version}.tgz"; + sha256 = "1480ccii3nzvm0jp1xm2iddgc789zcwbgd19201q7p3v0ph02yj8"; + }; + installPhase = '' + mkdir -p $out/bin + tar --strip-components=2 -xf $src + cp ${pluginName}-${version}.jar $out/bin/${pluginName}-${version}.jar + ''; + meta = { + homepage = "https://docs.graylog.org/en/3.2/pages/integrations.html#enterprise"; + description = "Integrations are tools that help Graylog work with external systems (unfree enterprise integrations)"; + license = stdenv.lib.licenses.unfree; + }; + }; filter-messagesize = glPlugin rec { name = "graylog-filter-messagesize-${version}"; pluginName = "graylog-plugin-filter-messagesize"; @@ -74,6 +93,24 @@ in { description = "Prints out all messages that have an estimated size crossing a configured threshold during processing"; }; }; + integrations = glPlugin rec { + name = "graylog-integrations-${version}"; + pluginName = "graylog-plugin-integrations"; + version = "3.3.0"; + src = fetchurl { + url = "https://downloads.graylog.org/releases/graylog-integrations/graylog-integrations-plugins-${version}.tgz"; + sha256 = "08cpxviwk2p4zsgbr2h3symr88rf3fjfz1kkg4iglvdc5mqf71xx"; + }; + installPhase = '' + mkdir -p $out/bin + tar --strip-components=2 -xf $src + cp ${pluginName}-${version}.jar $out/bin/${pluginName}-${version}.jar + ''; + meta = { + homepage = https://github.com/Graylog2/graylog-plugin-integrations; + description = "A collection of open source Graylog integrations that will be released together"; + }; + }; internal-logs = glPlugin rec { name = "graylog-internal-logs-${version}"; pluginName = "graylog-plugin-internal-logs"; @@ -142,10 +179,10 @@ in { pagerduty = glPlugin rec { name = "graylog-pagerduty-${version}"; pluginName = "graylog-plugin-pagerduty"; - version = "1.3.0"; + version = "2.0.0"; src = fetchurl { url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "1g63c6rm5pkz7f0d73wb2lmk4zm430jqnhihbyq112cm4i7ymglh"; + sha256 = "0xhcwfwn7c77giwjilv7k7aijnj9azrjbjgd0r3p6wdrw970f27r"; }; meta = { homepage = "https://github.com/graylog-labs/graylog-plugin-pagerduty"; @@ -178,6 +215,19 @@ in { description = "Can notify Slack or Mattermost channels about triggered alerts in Graylog (Alarm Callback)"; }; }; + snmp = glPlugin rec { + name = "graylog-snmp-${version}"; + pluginName = "graylog-plugin-snmp"; + version = "0.3.0"; + src = fetchurl { + url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; + sha256 = "1hkaklwzcsvqq45b98chwqxqdgnnbj4dg68agsll13yq4zx37qpp"; + }; + meta = { + homepage = https://github.com/graylog-labs/graylog-plugin-snmp; + description = "Graylog plugin to receive SNMP traps"; + }; + }; spaceweather = glPlugin rec { name = "graylog-spaceweather-${version}"; pluginName = "graylog-plugin-spaceweather"; From e467f3280f5d6a9674b8dd1034a4e957e3283bd2 Mon Sep 17 00:00:00 2001 From: "Tristan Helmich (omniIT)" Date: Sat, 6 Jun 2020 10:30:58 +0000 Subject: [PATCH 34/92] python27Packages.phonenumbers: 8.12.4 -> 8.12.5 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 47a60acaa0a..e9f50420ca9 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.4"; + version = "8.12.5"; src = fetchPypi { inherit pname version; - sha256 = "021dc6kdzqh9kkrsbs08x3ibmfm4xr9hqvdnsji6l0knw1zrkia6"; + sha256 = "09kww3fzn85gbj4lw8kqrppm9kq7nmy7b96p76sscamrpsdg31im"; }; meta = { From c5734cb712de6b394e9faf6b2b7c6764f2f90886 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 6 Jun 2020 08:16:20 -0300 Subject: [PATCH 35/92] stilo-themes: 3.34-2 -> 3.36-2 --- pkgs/data/themes/stilo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/stilo/default.nix b/pkgs/data/themes/stilo/default.nix index 798c1b74f95..ecef868f287 100644 --- a/pkgs/data/themes/stilo/default.nix +++ b/pkgs/data/themes/stilo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "stilo-themes"; - version = "3.34-2"; + version = "3.36-2"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "1i5cl61dk8sxa6h61ghynm4wp1qzp3c7kwf4ks0ddzzk9dbvdrhb"; + sha256 = "0w4il6rk1f8yjmdxpnzq6zll2jjqbyp9dckxhzxgs4zh8fy9pzvh"; }; nativeBuildInputs = [ meson ninja sassc ]; From 759a3a265879913f075dc143113867e4439f2ae2 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 3 Jun 2020 18:44:25 +0200 Subject: [PATCH 36/92] jitsi-meet-electron: 2.0.2 -> 2.2.0 --- .../jitsi-meet-electron/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index 7afe273599f..715eef4229a 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -2,17 +2,20 @@ , fetchurl , appimageTools , makeWrapper -, electron_8 +, electron_9 }: +let + electron = electron_9; +in stdenv.mkDerivation rec { pname = "jitsi-meet-electron"; - version = "2.0.2"; + version = "2.2.0"; src = fetchurl { url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage"; - sha256 = "04y3qn2clvsfiyp9s6ib09mfxspv3kpr9248sda8s09n1cm0jpps"; - name="${pname}-${version}.AppImage"; + sha256 = "0gqyqjj69x1gxwj4zhwazddnj5xzy598xqz7vwkpdm1ldzna2iyj"; + name = "${pname}-${version}.AppImage"; }; appimageContents = appimageTools.extractType2 { @@ -42,7 +45,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - makeWrapper ${electron_8}/bin/electron $out/bin/${pname} \ + makeWrapper ${electron}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" ''; From 170ea57065c3a54aa1621a9c90d72e474f9780b1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Jun 2020 15:43:25 +0000 Subject: [PATCH 37/92] picard-tools: 2.22.8 -> 2.22.9 --- pkgs/applications/science/biology/picard-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 4b455eaca6f..a1616774d5d 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.22.8"; + version = "2.22.9"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "0g387jlf7r1p2kx8gya3vxksbjy3y2ywxa7yjqmxg3y8725fyixl"; + sha256 = "0qm32a58b2asiw8rnw1r6vz3bi61vfdan6wyr9f78fj4d07q7n53"; }; nativeBuildInputs = [ makeWrapper ]; From 1535270d91e82af7927c0f121f3f5605a0a7b248 Mon Sep 17 00:00:00 2001 From: James Ravn Date: Sat, 6 Jun 2020 17:08:39 +0100 Subject: [PATCH 38/92] Add pipewire to runtime path --- pkgs/applications/networking/browsers/chromium/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index df1dcb413e1..6f1380a42a0 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -2,6 +2,7 @@ , makeWrapper, ed , glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit , libva ? null +, pipewire_0_2 , gcc, nspr, nss, patchelfUnstable, runCommand , lib @@ -152,7 +153,7 @@ in stdenv.mkDerivation { buildCommand = let browserBinary = "${chromiumWV}/libexec/chromium/chromium"; getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")"; - libPath = stdenv.lib.makeLibraryPath [ libva ]; + libPath = stdenv.lib.makeLibraryPath [ libva pipewire_0_2 ]; in with stdenv.lib; '' mkdir -p "$out/bin" From 42b58942dcb2eda2a3c2358efa67cc12f0ced112 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Jun 2020 16:40:03 +0000 Subject: [PATCH 39/92] pt2-clone: 1.16 -> 1.17 --- pkgs/applications/audio/pt2-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index c5004634256..b72406b064d 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.16"; + version = "1.17"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "0rbjphhyca71j22lbyx53w3n2mkdw7xflks2knfaziwdkqcfcvp2"; + sha256 = "0paagzc1c7gdnvs2wwsw2h15d0x8a7fl995qq3pi06g8kmdm85pi"; }; nativeBuildInputs = [ cmake ]; From 228053294565a0543cc28d91c75b0a5f35897ec4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Jun 2020 17:59:00 +0000 Subject: [PATCH 40/92] sbt: 1.3.10 -> 1.3.12 --- pkgs/development/tools/build-managers/sbt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 64a2cedd1c9..ae9d47adddd 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "sbt"; - version = "1.3.10"; + version = "1.3.12"; src = fetchurl { urls = [ "https://piccolo.link/sbt-${version}.tgz" "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" ]; - sha256 = "1023qcbdbwl40l7mgyd3j0ggr6paz1zs2q787ym52dhrcibhcq1h"; + sha256 = "0mwdqn0vk90wdpfzrbbc8l28407z5d62bvsi6jlgds2vbywjprxl"; }; patchPhase = '' From da1dc613602428a40ecde2cb1e1a1e5d1321c605 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Jun 2020 18:09:39 +0000 Subject: [PATCH 41/92] sdate: 0.6 -> 0.7 --- pkgs/tools/misc/sdate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/sdate/default.nix b/pkgs/tools/misc/sdate/default.nix index 6c52aa217df..06b5360086c 100644 --- a/pkgs/tools/misc/sdate/default.nix +++ b/pkgs/tools/misc/sdate/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { pname = "sdate"; - version = "0.6"; + version = "0.7"; src = fetchurl { url = "https://github.com/ChristophBerg/sdate/archive/${version}.tar.gz"; - sha256 = "11irlbbhlzkg6y621smk351jl8ay3yjhl2j9hila0xa72hs4n7gz"; + sha256 = "1lfnsb8prac8rspnxcawd138jyhyivwf35rrmfvwq6dhsx23c6vy"; }; buildInputs = [ autoreconfHook ]; From 8022aa3afd06d6dc0042afc5b0671046c25ec46b Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 6 Jun 2020 14:10:38 -0400 Subject: [PATCH 42/92] vultr-cli: 0.3.1 -> 0.3.2 --- pkgs/development/tools/vultr-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix index acd26b638c9..6f217c60219 100644 --- a/pkgs/development/tools/vultr-cli/default.nix +++ b/pkgs/development/tools/vultr-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vultr-cli"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - sha256 = "1z3vbcpchrf3bak08p72c96c2l39hdp196fqc5wvsqar3mzrrz7s"; + sha256 = "1gqc4w5j9x7vxvxah6hmqd5i1lxyybpml7yfzzcbngwgwm3y5ym0"; }; vendorSha256 = null; From 2b4259005615e3cdd159ed7dc521dd6d196a02b1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Jun 2020 21:08:08 +0000 Subject: [PATCH 43/92] cargo-tarpaulin: 0.13.2 -> 0.13.3 --- pkgs/development/tools/analysis/cargo-tarpaulin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index b743ba4a2de..03764549095 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.13.2"; + version = "0.13.3"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = "${version}"; - sha256 = "0sjd0xvphrc2kxzvwk4l0dnshn062ghn9f29h7k2ifsf2myl7066"; + sha256 = "1zc03frbag0lhxxbrdhip5h61ah16rqfcs314nyx7lfn3jd0gqzd"; }; nativeBuildInputs = [ @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl ]; - cargoSha256 = "1w9pymg989kl29s4dhr32ck0nq61pg9h1qf4aad1sv83llbqahq0"; + cargoSha256 = "15qf5hb6gm4lm1dcsqqs8nmd43m1qmw2g2zpj3c0abs5fbdz8k3a"; #checkFlags = [ "--test-threads" "1" ]; doCheck = false; From 7fb84ea2f66373972b66aa35018404b97235a6f9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 6 Jun 2020 19:40:43 +0200 Subject: [PATCH 44/92] borgbackup: 1.1.11 -> 1.1.13 --- pkgs/tools/backup/borg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index de69a8db3de..90090367586 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "borgbackup"; - version = "1.1.11"; + version = "1.1.13"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "190gjzx83b6p64nqj840x382dgz9gfv0gm7wj585lnkrpa90j29n"; + sha256 = "089q3flmwbz7dc28zlscwylf64kgck3jf1n6lqpwww8hlrk8cjhn"; }; nativeBuildInputs = with python3.pkgs; [ From 0cadf9c028a7a640d96526442ae690d744ee0ce4 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 7 Jun 2020 10:11:23 +0200 Subject: [PATCH 45/92] ocamlPackages.sexplib_108_08_00: remove at 108.08.00 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a legacy version for OCaml ≤ 4.02 --- .../ocaml-modules/sexplib/108.08.00.nix | 28 ------------------- pkgs/top-level/ocaml-packages.nix | 3 -- 2 files changed, 31 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/sexplib/108.08.00.nix diff --git a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix deleted file mode 100644 index 349dffcf47b..00000000000 --- a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix +++ /dev/null @@ -1,28 +0,0 @@ -{stdenv, fetchurl, ocaml, findlib, type_conv, camlp4}: - -if !stdenv.lib.versionAtLeast ocaml.version "3.12" -|| stdenv.lib.versionAtLeast ocaml.version "4.03" -then throw "sexlib-108.08.00 is not available for OCaml ${ocaml.version}" else - -stdenv.mkDerivation { - name = "ocaml-sexplib-108.08.00"; - - src = fetchurl { - url = "https://ocaml.janestreet.com/ocaml-core/108.08.00/individual/sexplib-108.08.00.tar.gz"; - sha256 = "11z1k1d7dbb5m957klgalimpr0r602xp5zkkbgbffib1bphasarg"; - }; - - buildInputs = [ocaml findlib]; - propagatedBuildInputs = [type_conv camlp4]; - - createFindlibDestdir = true; - - meta = with stdenv.lib; { - branch = "108"; - homepage = "https://ocaml.janestreet.com/"; - description = "Library for serializing OCaml values to and from S-expressions"; - license = licenses.asl20; - maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms or []; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index e0ac6f08b9d..698f0a8a29d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -770,7 +770,6 @@ let then type_conv_108_08_00 else null; - sexplib_108_08_00 = callPackage ../development/ocaml-modules/sexplib/108.08.00.nix { }; sexplib_111_25_00 = callPackage ../development/ocaml-modules/sexplib/111.25.00.nix { }; sexplib_112_24_01 = callPackage ../development/ocaml-modules/sexplib/112.24.01.nix { }; @@ -779,8 +778,6 @@ let then sexplib_112_24_01 else if lib.versionOlder "4.00" ocaml.version then sexplib_111_25_00 - else if lib.versionOlder "3.12" ocaml.version - then sexplib_108_08_00 else null; ocaml-protoc = callPackage ../development/ocaml-modules/ocaml-protoc { }; From f4a7f9f4991d2ff321f84a2b6e7a323a61e88a0c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 7 Jun 2020 10:11:27 +0200 Subject: [PATCH 46/92] ocamlPackages.sexplib_111_25_00: remove at 111.25.00 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a legacy version for OCaml ≤ 4.02 --- .../ocaml-modules/sexplib/111.25.00.nix | 28 ------------------- pkgs/top-level/ocaml-packages.nix | 3 -- 2 files changed, 31 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/sexplib/111.25.00.nix diff --git a/pkgs/development/ocaml-modules/sexplib/111.25.00.nix b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix deleted file mode 100644 index adf878bca03..00000000000 --- a/pkgs/development/ocaml-modules/sexplib/111.25.00.nix +++ /dev/null @@ -1,28 +0,0 @@ -{stdenv, fetchurl, ocaml, findlib, type_conv, camlp4}: - -if !stdenv.lib.versionAtLeast ocaml.version "4.00" -|| stdenv.lib.versionAtLeast ocaml.version "4.03" -then throw "sexlib-111.25.00 is not available for OCaml ${ocaml.version}" else - - -stdenv.mkDerivation { - name = "ocaml-sexplib-111.25.00"; - - src = fetchurl { - url = "https://ocaml.janestreet.com/ocaml-core/111.25.00/individual/sexplib-111.25.00.tar.gz"; - sha256 = "0qh0zqp5nakqpmmhh4x7cg03vqj3j2bj4zj0nqdlksai188p9ila"; - }; - - buildInputs = [ocaml findlib]; - propagatedBuildInputs = [type_conv camlp4]; - - createFindlibDestdir = true; - - meta = with stdenv.lib; { - homepage = "https://ocaml.janestreet.com/"; - description = "Library for serializing OCaml values to and from S-expressions"; - license = licenses.asl20; - maintainers = [ maintainers.vbgl maintainers.ericbmerritt ]; - platforms = ocaml.meta.platforms or []; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 698f0a8a29d..ac78eab4a94 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -770,14 +770,11 @@ let then type_conv_108_08_00 else null; - sexplib_111_25_00 = callPackage ../development/ocaml-modules/sexplib/111.25.00.nix { }; sexplib_112_24_01 = callPackage ../development/ocaml-modules/sexplib/112.24.01.nix { }; sexplib_p4 = if lib.versionOlder "4.02" ocaml.version then sexplib_112_24_01 - else if lib.versionOlder "4.00" ocaml.version - then sexplib_111_25_00 else null; ocaml-protoc = callPackage ../development/ocaml-modules/ocaml-protoc { }; From cb6ffc170b86c2725a91243b8e02e9bb54ceb929 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 7 Jun 2020 10:11:31 +0200 Subject: [PATCH 47/92] ocamlPackages.sexplib_112_24_01: remove at 112.24.01 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a legacy version for OCaml ≤ 4.02 --- .../ocaml-modules/sexplib/112.24.01.nix | 25 ------------------- pkgs/top-level/ocaml-packages.nix | 9 +------ 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/sexplib/112.24.01.nix diff --git a/pkgs/development/ocaml-modules/sexplib/112.24.01.nix b/pkgs/development/ocaml-modules/sexplib/112.24.01.nix deleted file mode 100644 index fe7b9020dae..00000000000 --- a/pkgs/development/ocaml-modules/sexplib/112.24.01.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, buildOcaml, fetchurl, ocaml, type_conv, camlp4 }: - -if !stdenv.lib.versionAtLeast ocaml.version "4.02" -|| stdenv.lib.versionAtLeast ocaml.version "4.03" -then throw "sexlib-112.24.01 is not available for OCaml ${ocaml.version}" else - -buildOcaml rec { - minimumSupportedOcamlVersion = "4.02"; - name = "sexplib"; - version = "112.24.01"; - - src = fetchurl { - url = "https://github.com/janestreet/sexplib/archive/${version}.tar.gz"; - sha256 = "5f776aee295cc51c952aecd4b74b52dd2b850c665cc25b3d69bc42014d3ba073"; - }; - - propagatedBuildInputs = [ type_conv camlp4 ]; - - meta = with stdenv.lib; { - homepage = "https://ocaml.janestreet.com/"; - description = "Library for serializing OCaml values to and from S-expressions"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ac78eab4a94..87d67e5e8e6 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -770,13 +770,6 @@ let then type_conv_108_08_00 else null; - sexplib_112_24_01 = callPackage ../development/ocaml-modules/sexplib/112.24.01.nix { }; - - sexplib_p4 = - if lib.versionOlder "4.02" ocaml.version - then sexplib_112_24_01 - else null; - ocaml-protoc = callPackage ../development/ocaml-modules/ocaml-protoc { }; ocaml_extlib = callPackage ../development/ocaml-modules/extlib { }; @@ -1127,7 +1120,7 @@ let then janeStreet.sexplib else if lib.versionOlder "4.02" ocaml.version then callPackage ../development/ocaml-modules/janestreet/sexplib.nix {} - else sexplib_p4; + else null; variantslib = if lib.versionOlder "4.03" ocaml.version From 1cb40bdf086bb80bfd53199559d3e734458c3807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 7 Jun 2020 10:25:01 +0200 Subject: [PATCH 48/92] Revert "lua*Packages.cqueues: fixup darwin build" This reverts commit 47ad7d313135f97815efa2eaacfd7fdb52cc689c. The fix isn't needed after the update contained in PR #89632. --- pkgs/development/lua-modules/overrides.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index af349ba02aa..30be2c197a5 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -40,11 +40,6 @@ with super; { name = "CRYPTO"; dep = pkgs.openssl; } { name = "OPENSSL"; dep = pkgs.openssl; } ]; - - # https://github.com/wahern/cqueues/issues/227 - NIX_CFLAGS_COMPILE = with pkgs.stdenv; lib.optionalString hostPlatform.isDarwin - "-DCLOCK_MONOTONIC -DCLOCK_REALTIME"; - disabled = luaOlder "5.1" || luaAtLeast "5.4"; # Upstream rockspec is pointlessly broken into separate rockspecs, per Lua # version, which doesn't work well for us, so modify it From 0bbb0d488cb99079910647e4ad4c1cc025606d30 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 11 May 2020 02:45:33 +0000 Subject: [PATCH 49/92] wireless-regdb: 2019.06.03 -> 2020.04.29 --- pkgs/data/misc/wireless-regdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index 45ff07b8efc..cc22606c0d6 100644 --- a/pkgs/data/misc/wireless-regdb/default.nix +++ b/pkgs/data/misc/wireless-regdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wireless-regdb"; - version = "2019.06.03"; + version = "2020.04.29"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1gslvh0aqdkv48jyr2ddq153mw28i7qz2ybrjj9qvkk3dgc7x4fd"; + sha256 = "0yicda474ygahv8da18h1p4yf42s6x2f208mlwcw4xsrxld07zc9"; }; dontBuild = true; From adc908a87371e9567950afb0ea55b929b870823c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 17 May 2020 00:39:19 +0000 Subject: [PATCH 50/92] adwaita-qt: 1.1.1 -> 1.1.3 --- pkgs/data/themes/adwaita-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix index 9d5334bc79b..dce625de5e3 100644 --- a/pkgs/data/themes/adwaita-qt/default.nix +++ b/pkgs/data/themes/adwaita-qt/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "adwaita-qt"; - version = "1.1.1"; + version = "1.1.3"; src = fetchFromGitHub { owner = "FedoraQt"; repo = pname; rev = version; - sha256 = "1z1zl6b1190nffcdyjnwz2xy4s6cvgd98aas9z71l5iddwzy32fm"; + sha256 = "1zfah1ybfgi4dag3lxqap99giwwng9b3lgcick1ciylz6vwf2gwh"; }; nativeBuildInputs = [ From 3795ac59cf90011388010c2c3dd963211120662f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 7 Jun 2020 04:20:00 -0500 Subject: [PATCH 51/92] gitAndTools.git-subset: init at 0.1.1 --- .../git-and-tools/default.nix | 4 +++ .../git-and-tools/git-subset/default.nix | 26 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/git-subset/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 9c0e0d74d22..7043f724718 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -136,6 +136,10 @@ let git-subrepo = callPackage ./git-subrepo { }; + git-subset = callPackage ./git-subset { + inherit (darwin.apple_sdk.frameworks) Security; + }; + git-subtrac = callPackage ./git-subtrac { }; git-sync = callPackage ./git-sync { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-subset/default.nix b/pkgs/applications/version-management/git-and-tools/git-subset/default.nix new file mode 100644 index 00000000000..9893e6dd784 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-subset/default.nix @@ -0,0 +1,26 @@ +{ stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, curl, libiconv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "git-subset"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "jasonwhite"; + repo = pname; + rev = "v${version}"; + sha256 = "02z2r0kcd0nnn1zjslp6xxam5ddbhrmzn67qzxhlamsw0p9vvkbb"; + }; + + cargoSha256 = "1ydrrq35h1h5s59mx8kwwf3bp7lsmla3jl53ccdlsq29x0rj2jhs"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ curl libiconv Security ]; + + meta = with stdenv.lib; { + description = "Super fast Git tree filtering"; + homepage = "https://github.com/jasonwhite/git-subset"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} From 656468f4285735df63745f9cf9e9adff3a583320 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sun, 7 Jun 2020 14:07:20 +0200 Subject: [PATCH 52/92] audacity, isync: add self to maintainers --- pkgs/applications/audio/audacity/default.nix | 1 + pkgs/tools/networking/isync/default.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 542a1f85188..73d31046813 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { description = "Sound editor with graphical UI"; homepage = "http://audacityteam.org/"; license = licenses.gpl2Plus; + maintainers = with maintainers; [ lheckemann ]; platforms = intersectLists platforms.linux platforms.x86; # fails on ARM }; } diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 49efeac02a9..9ce1183d060 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ primeos lheckemann ]; }; } From aacbfe0805c02c29a9870d5c9f1ee33cc5d8618c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 7 Jun 2020 23:24:11 +1000 Subject: [PATCH 53/92] editorconfig-checker: 2.0.4 -> 2.1.0 https://github.com/editorconfig-checker/editorconfig-checker/releases/tag/2.1.0 --- .../development/tools/misc/editorconfig-checker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/development/tools/misc/editorconfig-checker/default.nix index 131c38df2f7..cda18ba280f 100644 --- a/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "editorconfig-checker"; - version = "2.0.4"; + version = "2.1.0"; src = fetchFromGitHub { owner = "editorconfig-checker"; repo = "editorconfig-checker"; rev = "${version}"; - sha256 = "1y90yz8da0iqig3m0kbjcicwblkirbbx0s3agpmz2pdca6y2ijwi"; + sha256 = "09v8gqwcaay3bqbidparmg20dy0mvlrzh34591hanbrx3cwhrz3f"; }; - vendorSha256 = "1lyrqrm3pyfv470dmymbkb3vpvp0i2zsndp7qw34fbhp2gnay5kh"; + vendorSha256 = "132blcdw3lywxhqslkcpwwvkzl4cpbbkhb7ba8mrvfgl5kvfm1q0"; nativeBuildInputs = [ installShellFiles ]; From ff0da2c3e7aadc0611f77440dcfb050d3eb90efe Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Sun, 7 Jun 2020 13:13:05 +0200 Subject: [PATCH 54/92] hactool: minor fixup --- pkgs/tools/compression/hactool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/hactool/default.nix b/pkgs/tools/compression/hactool/default.nix index c0bcca2d8cd..d34ca73556b 100644 --- a/pkgs/tools/compression/hactool/default.nix +++ b/pkgs/tools/compression/hactool/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "hactool"; version = "1.4.0"; src = fetchFromGitHub { owner = "SciresM"; repo = "hactool"; - rev = "1.4.0"; + rev = version; sha256 = "0305ngsnwm8npzgyhyifasi4l802xnfz19r0kbzzniirmcn4082d"; }; From 5d77078b46f1e0a48c39bb8db62a6a81210f1e13 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 7 Jun 2020 23:25:05 +1000 Subject: [PATCH 55/92] editorconfig-checker: add maintainer --- pkgs/development/tools/misc/editorconfig-checker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/development/tools/misc/editorconfig-checker/default.nix index cda18ba280f..6b45dc3c2a0 100644 --- a/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -25,6 +25,6 @@ buildGoModule rec { description = "A tool to verify that your files are in harmony with your .editorconfig"; homepage = "https://editorconfig-checker.github.io/"; license = licenses.mit; - maintainers = with maintainers; [ uri-canva ]; + maintainers = with maintainers; [ uri-canva zowoq ]; }; } From 69a601c62744d975f0f05e77e0aa4056073f926a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 7 Jun 2020 15:28:18 +0200 Subject: [PATCH 56/92] moosefs: fix datapath for mfscgiserv The datapath in mfscgisrv is hardcoded and pointed to the nix store, which made the program fail on startup. --- pkgs/tools/filesystems/moosefs/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix index af09cafe1de..8ceb3d7c0aa 100644 --- a/pkgs/tools/filesystems/moosefs/default.nix +++ b/pkgs/tools/filesystems/moosefs/default.nix @@ -5,7 +5,7 @@ , fuse , pkgconfig , libpcap -, zlib +, zlib }: stdenv.mkDerivation rec { @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { [ fuse libpcap zlib ]; postInstall = '' + substituteInPlace $out/sbin/mfscgiserv --replace "datapath=\"$out" "datapath=\"" wrapProgram $out/sbin/mfscgiserv \ --prefix PATH ":" "${python}/bin" ''; From c964291f3014b1d49c1cfd00ae3410ed2aa2524b Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Sun, 7 Jun 2020 14:55:45 +0200 Subject: [PATCH 57/92] yafaray-core: relax python dependency --- pkgs/tools/graphics/yafaray-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/yafaray-core/default.nix b/pkgs/tools/graphics/yafaray-core/default.nix index 8e15cd0d328..a02a97739ba 100644 --- a/pkgs/tools/graphics/yafaray-core/default.nix +++ b/pkgs/tools/graphics/yafaray-core/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, opencv, zlib , libxml2, freetype, libjpeg, libtiff, swig, openexr , ilmbase, boost165 -, withPython ? true, python35 +, withPython ? true, python3 }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake pkgconfig boost165 opencv zlib libxml2 freetype libjpeg libtiff swig openexr ilmbase - ] ++ stdenv.lib.optional withPython python35; + ] ++ stdenv.lib.optional withPython python3; meta = with stdenv.lib; { description = "A free, open source raytracer"; From 7bdddd0917484cfd6311507023e36ec4f45273e3 Mon Sep 17 00:00:00 2001 From: Jan Solanti Date: Thu, 21 May 2020 00:18:19 +0300 Subject: [PATCH 58/92] renderdoc: 1.7 -> 1.8 --- pkgs/applications/graphics/renderdoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index bf0b92b6f6d..2683206c8e4 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -13,14 +13,14 @@ let pythonPackages = python3Packages; in mkDerivation rec { - version = "1.7"; + version = "1.8"; pname = "renderdoc"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "0r0y0lx48hkyf39pgippsc9q8hdcf57bdva6gx7f35vlhicx5hlz"; + sha256 = "177j893abplj8wd8j4ava58m1mr7qq8fsffsq0w4hf5xgl5w8fq8"; }; buildInputs = [ From 8744ce01f187595d5a762180a546bce66cd6dde0 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Thu, 14 May 2020 21:52:47 +0200 Subject: [PATCH 59/92] unifiStable: 5.12.66 -> 5.12.72 --- pkgs/servers/unifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 3d49d4d71b5..56141be5f0a 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -49,7 +49,7 @@ in { }; unifiStable = generic { - version = "5.12.66"; - sha256 = "119jdwk2ys3vzg9wa4h25rwgl6sjly6v52k1g1ycrq0bspzxdhm2"; + version = "5.12.72"; + sha256 = "00d7kxn3f1c0i4kg81hz2hf9bdbccb3d1zs7js414rpc5k3xg3kz"; }; } From af13724bbbac9a40cb1e11f706d8f183dac61dbc Mon Sep 17 00:00:00 2001 From: Savanni D'Gerinel Date: Fri, 15 May 2020 09:21:57 -0400 Subject: [PATCH 60/92] Make sure glib and gtk3 are both in nativeBuildInputs I don't know why this didn't break before, but glib and (or) gtk3 need to be in nativeBuildInputs for glib-compile-schemas to be available. But they also need to be in buildInputs to be available at link time. I think worldofpeace mentioned this to me, but that it got lost in all of the other fixes I needed to make when I first submitted the derivation. --- pkgs/applications/misc/fitnesstrax/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/fitnesstrax/default.nix b/pkgs/applications/misc/fitnesstrax/default.nix index f0081c39102..e90e364aaee 100644 --- a/pkgs/applications/misc/fitnesstrax/default.nix +++ b/pkgs/applications/misc/fitnesstrax/default.nix @@ -19,6 +19,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ wrapGAppsHook + glib + gtk3 ]; buildInputs = [ From 2fd6a4811af5c90b57518f6d45fb2c7882e52953 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 6 Jun 2020 16:35:34 +0200 Subject: [PATCH 61/92] openbazaar: 0.14.2 -> 0.14.3 --- pkgs/applications/networking/openbazaar/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/openbazaar/default.nix b/pkgs/applications/networking/openbazaar/default.nix index 6a48b2962fa..aa341b29224 100644 --- a/pkgs/applications/networking/openbazaar/default.nix +++ b/pkgs/applications/networking/openbazaar/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "openbazaar"; - version = "0.14.2"; + version = "0.14.3"; suffix = { i686-linux = "linux-386"; @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/OpenBazaar/openbazaar-go/releases/download/v${version}/${pname}-go-${suffix}"; sha256 = { - i686-linux = "02kl4ci2pz86qqsll7578q0acygncsyylaschjzzii34c86f1aym"; - x86_64-darwin = "1v5m94x4x0nc6i8zlcwb36ps1zpgqgcsz81x1ghkz5c9xzszgzbp"; - x86_64-linux = "0m0digw66rzhwl2im88qavli9cc5vxd9pwj6ix86dcf98r93xsrp"; + i686-linux = "098dgxpz9m4rfswc9yg77s3bvaifd4453s20n8kmh55g5ipgs2x1"; + x86_64-darwin = "0q989m4zj7x9d6vimmpfkla78hmx2zr7bxm9yg61ir00w60l14jx"; + x86_64-linux = "093rwn4nfirknbxz58n16v0l0apj2h0yr63f64fqysmy78883al2"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From cf979789097c50c801d862a4a72a7fda592fd051 Mon Sep 17 00:00:00 2001 From: "Ian M. Jones" Date: Sat, 6 Jun 2020 12:23:33 +0100 Subject: [PATCH 62/92] snippetpixie: 1.3.2 -> 1.3.3 --- pkgs/tools/text/snippetpixie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/snippetpixie/default.nix b/pkgs/tools/text/snippetpixie/default.nix index 863e4764b69..991b496777c 100644 --- a/pkgs/tools/text/snippetpixie/default.nix +++ b/pkgs/tools/text/snippetpixie/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "snippetpixie"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "bytepixie"; repo = pname; rev = version; - sha256 = "0jhc47g5x34c36y4d32lcn32bpw4axxf1sydawgy4886hmkvb6kf"; + sha256 = "0ml57j6jagqvjlpgn1bcyx08h71kcxalh69y03y2lj84x5ib8qz3"; }; nativeBuildInputs = [ From 0710b5afecd55b059212d7d127a0b7625846661e Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 5 May 2020 07:45:25 +0200 Subject: [PATCH 63/92] speech-denoiser: fixup prefix --- pkgs/applications/audio/speech-denoiser/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/audio/speech-denoiser/default.nix b/pkgs/applications/audio/speech-denoiser/default.nix index 706a6956c5d..9c18665d399 100644 --- a/pkgs/applications/audio/speech-denoiser/default.nix +++ b/pkgs/applications/audio/speech-denoiser/default.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig meson ninja ]; buildInputs = [ lv2 rnnoise-nu ]; + mesonFlags = ("--prefix=${placeholder "out"}/lib/lv2"); + postPatch = '' substituteInPlace meson.build \ --replace "cc.find_library('rnnoise-nu',dirs: meson.current_source_dir() + '/rnnoise/.libs/',required : true)" "cc.find_library('rnnoise-nu', required : true)" From f7bc0a3996a7b4d5fab08c404edaba0eeff31043 Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Sun, 7 Jun 2020 14:12:28 +0000 Subject: [PATCH 64/92] rls: set RUST_SRC_PATH rls has racer baked in which needs to know where the rust source is to be able to do completion for std libs. By default rls will use: $(rustc --print sysroot)/lib/rustlib/src/rust/src which is nonexistent, this commit sets the correct source path in a same way like it's done in racer expression. --- pkgs/development/compilers/rust/rls/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/rust/rls/default.nix b/pkgs/development/compilers/rust/rls/default.nix index 4cf507fbf5c..05a9d5049a4 100644 --- a/pkgs/development/compilers/rust/rls/default.nix +++ b/pkgs/development/compilers/rust/rls/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform +{ stdenv, makeWrapper, fetchFromGitHub, rustPlatform , openssh, openssl, pkgconfig, cmake, zlib, curl, libiconv , CoreFoundation, Security }: @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage { CARGO_BUILD_RUSTFLAGS = if stdenv.isDarwin then "-C rpath" else null; nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ openssh openssl curl zlib libiconv rustPlatform.rust.rustc.llvm ] + buildInputs = [ openssh openssl curl zlib libiconv makeWrapper rustPlatform.rust.rustc.llvm ] ++ (stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security ]); doCheck = true; @@ -35,6 +35,11 @@ rustPlatform.buildRustPackage { $out/bin/rls --version ''; + RUST_SRC_PATH = rustPlatform.rustcSrc; + postInstall = '' + wrapProgram $out/bin/rls --set-default RUST_SRC_PATH ${rustPlatform.rustcSrc} + ''; + meta = with stdenv.lib; { description = "Rust Language Server - provides information about Rust programs to IDEs and other tools"; homepage = "https://github.com/rust-lang/rls/"; From fbf25a93082baabca7fac8831c97c4dbed7b72fb Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 7 Jun 2020 16:07:29 +0200 Subject: [PATCH 65/92] roundcube: 1.4.5 -> 1.4.6 https://github.com/roundcube/roundcubemail/releases/tag/1.4.6 --- pkgs/servers/roundcube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 27b3ad06bbf..03c1a6cf770 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.4.5"; + version = "1.4.6"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "1qjjyx6p71dvip1c4knkqkv6lhdvank1png773snaw9g4fz8h73f"; + sha256 = "06xxzvjd06r90fxpq9zh9fwylg6sbd26c08rxfd553jikyp5znsm"; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; From 8454ef7b296608f42a2447e6cc6db8c7dd542116 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 7 Jun 2020 16:08:39 +0200 Subject: [PATCH 66/92] i3status-rust: 0.13.1 -> 0.14.0 https://github.com/greshake/i3status-rust/releases/tag/v0.14.0 --- .../window-managers/i3/status-rust.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 62389e1230a..acc306a72f2 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -1,17 +1,25 @@ -{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, dbus, libpulseaudio }: +{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, dbus, libpulseaudio, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "v${version}"; - sha256 = "0va6ny1v7lk30hhx4i5qyk9fwg3apy2nmh6kbmxhcf0rs5449ikg"; + sha256 = "0d2xigm932x6pc9z24g5cg8xq2crd9n3wq1bwi96h35w799lagjg"; }; - cargoSha256 = "1lywr21kk3idjyc10gy4848dmmgyqc2jjf7hpzq0vywkp639bf2x"; + cargoPatches = [ + # https://github.com/greshake/i3status-rust/pull/732/ (Update Cargo.lock) + (fetchpatch { + url = "https://github.com/greshake/i3status-rust/commit/7762a5c7ad668272fb8bb8409f12242094b032b8.patch"; + sha256 = "097f6w91cn53cj1g3bbdqm9jjib5fkb3id91jqvq88h43x14b8zb"; + }) + ]; + + cargoSha256 = "1k50yhja73w91h6zjmkb5kh1hknpjzrqd3ilvjjyynll513m1sfd"; nativeBuildInputs = [ pkgconfig ]; From 3fec30cb9592db9bb152d32c3a856e71d5cb33c0 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 7 Jun 2020 16:09:18 +0200 Subject: [PATCH 67/92] dlib: 19.19 -> 19.20 https://github.com/davisking/dlib/releases/tag/v19.20 --- pkgs/development/libraries/dlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index e7cc12e0db5..a7d68d62f2a 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "dlib"; - version = "19.19"; + version = "19.20"; src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; rev ="v${version}"; - sha256 = "0574p46zf85nx33cam4yqcg20g94kkmrvi5689r1xshprr0szghp"; + sha256 = "10b5hrprlls0nhljx18ys8cms7bgqirvhxlx6gbvbprbi6q16f9r"; }; postPatch = '' From 0558bb9f640bc3de006decbe0ef93be850bc2e58 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 7 Jun 2020 16:09:34 +0200 Subject: [PATCH 68/92] cargo-make: 0.30.8 -> 0.31.0 https://github.com/sagiegurari/cargo-make/releases/tag/0.31.0 --- .../tools/rust/cargo-make/Cargo.lock | 124 ++++++++++-------- .../tools/rust/cargo-make/default.nix | 6 +- 2 files changed, 75 insertions(+), 55 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-make/Cargo.lock b/pkgs/development/tools/rust/cargo-make/Cargo.lock index 4390a1cf799..7ba549f28da 100644 --- a/pkgs/development/tools/rust/cargo-make/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-make/Cargo.lock @@ -104,7 +104,7 @@ checksum = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1" [[package]] name = "cargo-make" -version = "0.30.8" +version = "0.31.0" dependencies = [ "ci_info", "clap", @@ -133,9 +133,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.52" +version = "1.0.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d87b23d6a92cd03af510a5ade527033f6aa6fa92161e2d5863a907d4c5e31d" +checksum = "7bbb73db36c1246e9034e307d0fba23f9a2e251faa47ade70c1bd252220c8311" [[package]] name = "cfg-if" @@ -154,9 +154,9 @@ dependencies = [ [[package]] name = "clap" -version = "2.33.0" +version = "2.33.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" +checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" dependencies = [ "ansi_term", "atty", @@ -232,11 +232,10 @@ dependencies = [ [[package]] name = "dirs-sys" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" +checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" dependencies = [ - "cfg-if", "libc", "redox_users", "winapi", @@ -244,18 +243,18 @@ dependencies = [ [[package]] name = "duckscript" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b666b2baf849932922921c2ff4bdb30e49835468626561d18fda4949751b55" +checksum = "5f4c3da85470786f086bd14c0b299092715a99f8d8bb0ac2b787cbaab71e6ba6" dependencies = [ "fsio", ] [[package]] name = "duckscriptsdk" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc9026058fdb6382c5fc62bc7a789d18b796236ddf48bee5a01332f576c1c109" +checksum = "b258092ada5ae7b5dda45906ebcae3e77c419a98e324750bc92af2b8912dd65e" dependencies = [ "attohttpc", "base64 0.12.1", @@ -372,9 +371,9 @@ dependencies = [ [[package]] name = "fnv" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "foreign-types" @@ -441,9 +440,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "hermit-abi" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61565ff7aaace3525556587bd2dc31d4a07071957be715e63ce7b1eccf51a8f4" +checksum = "91780f809e750b0a89f5544be56617ff6b1227ee485bcb06ebe10cdf89bd3b71" dependencies = [ "libc", ] @@ -481,9 +480,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076f042c5b7b98f31d205f1249267e12a6518c1481e9dae9764af19b707d2292" +checksum = "c398b2b113b55809ceb9ee3e753fcbac793f1956663f3c36549c1346015c2afe" dependencies = [ "autocfg", "serde", @@ -513,9 +512,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.69" +version = "0.2.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005" +checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49" [[package]] name = "log" @@ -619,9 +618,9 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" [[package]] name = "openssl-sys" -version = "0.9.55" +version = "0.9.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7717097d810a0f2e2323f9e5d11e71608355e24828410b55b9d4f18aa5f9a5d8" +checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" dependencies = [ "autocfg", "cc", @@ -644,24 +643,24 @@ checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" [[package]] name = "ppv-lite86" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" +checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" [[package]] name = "proc-macro2" -version = "1.0.12" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8872cf6f48eee44265156c111456a700ab3483686b3f96df4cf5481c89157319" +checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" dependencies = [ "unicode-xid", ] [[package]] name = "quote" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c1f4b0efa5fc5e8ceb705136bfee52cfdb6a4e3509f770b478cd6ed434232a7" +checksum = "54a21852a652ad6f610c9510194f398ff6f8692e334fd1145fed931f7fbe44ea" dependencies = [ "proc-macro2", ] @@ -726,9 +725,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.3.7" +version = "1.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6020f034922e3194c711b82a627453881bc4682166cabb07134a10c26ba7692" +checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" dependencies = [ "aho-corasick", "memchr", @@ -738,9 +737,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.17" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae" +checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" [[package]] name = "remove_dir_all" @@ -753,9 +752,9 @@ dependencies = [ [[package]] name = "run_script" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9527b8b68ef929243a3e8ad7471a2d80f6ac23b810aafd3df4a2e5212d8dacc1" +checksum = "a8e8fc35067815a04a35fe2144361e1257b0f1041f0d413664f38e44d1a73cb4" dependencies = [ "fsio", ] @@ -792,9 +791,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3d612bc64430efeb3f7ee6ef26d590dce0c43249217bddc62112540c7941e1" +checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" [[package]] name = "same-file" @@ -807,9 +806,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "039c25b130bd8c1321ee2d7de7fde2659fa9c2744e4bb29711cfc852ea53cd19" +checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" dependencies = [ "lazy_static", "winapi", @@ -817,9 +816,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f331b9025654145cd425b9ded0caf8f5ae0df80d418b326e2dc1c3dc5eb0620" +checksum = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535" dependencies = [ "bitflags", "core-foundation", @@ -855,15 +854,15 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.106" +version = "1.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df6ac6412072f67cf767ebbde4133a5b2e88e76dc6187fa7104cd16f783399" +checksum = "c9124df5b40cbd380080b2cc6ab894c040a3070d995f5c9dc77e18c34a8ae37d" [[package]] name = "serde_derive" -version = "1.0.106" +version = "1.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e549e3abf4fb8621bd1609f11dfc9f5e50320802273b12f3811a67e6716ea6c" +checksum = "3f2c3ac8e6ca1e9c80b8be1023940162bf81ae3cffbb1809474152f2ce1eb250" dependencies = [ "proc-macro2", "quote", @@ -872,9 +871,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.52" +version = "1.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7894c8ed05b7a3a279aeb79025fdec1d3158080b75b98a08faf2806bb799edd" +checksum = "993948e75b189211a9b31a7528f950c6adc21f9720b6438ff80a7fa2f864cea2" dependencies = [ "itoa", "ryu", @@ -904,9 +903,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "syn" -version = "1.0.19" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8e5aa70697bb26ee62214ae3288465ecec0000f05182f039b477001f08f5ae7" +checksum = "93a56fabc59dce20fe48b6c832cc249c713e7ed88fa28b0ee0a3bfcaae5fe4e2" dependencies = [ "proc-macro2", "quote", @@ -936,6 +935,26 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "thiserror" +version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b13f926965ad00595dd129fa12823b04bbf866e9085ab0a5f2b05b850fbfc344" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "893582086c2f98cde18f906265a65b5030a074b1046c674ae898be6519a7f479" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "thread_local" version = "1.0.1" @@ -1015,9 +1034,9 @@ dependencies = [ [[package]] name = "vcpkg" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" +checksum = "55d1e41d56121e07f1e223db0a4def204e45c85425f6a16d462fd07c8d10d74c" [[package]] name = "vec_map" @@ -1044,11 +1063,12 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "which" -version = "3.1.1" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724" +checksum = "bd3edc3cf5458851a4d6a2329232bd5f42c7f9bbe4c4782c4ef9ce37e5d101b2" dependencies = [ "libc", + "thiserror", ] [[package]] diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 2950ed1b83b..d4023dcf254 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.30.8"; + version = "0.31.0"; src = let @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "0sx1kvrk2df5v9f35cd6201b3m8d6ynppmikqm00g55db9r4vfl2"; + sha256 = "0svb3avmmkgwsv1dvzgzixp5fvcl93hn8xb3zx729jq8a47l2vsi"; }; in runCommand "source" {} '' @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "1b0x12hcjy061dvbpy5cwgp6pwlzq2k1dapr9glw8dwprns57ar7"; + cargoSha256 = "0yk06kpqjfc39dxk9f67c5qijnm8f8lvrb9da1kn8ql8dv8crsw2"; # Some tests fail because they need network access. # However, Travis ensures a proper build. From b783e570aca435e49c7e62ebe5df33fb56d16061 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 6 Jun 2020 18:31:19 -0400 Subject: [PATCH 69/92] buildbot: 2.8.0 -> 2.8.1 --- .../python-modules/buildbot/default.nix | 15 +++++---------- pkgs/development/python-modules/buildbot/pkg.nix | 4 ++-- .../python-modules/buildbot/plugins.nix | 10 +++++----- .../python-modules/buildbot/worker.nix | 4 ++-- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index f9a73d24831..2b2e703026d 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, fetchpatch, makeWrapper, isPy3k, +{ stdenv, lib, buildPythonPackage, fetchPypi, fetchpatch, makeWrapper, isPy3k, python, twisted, jinja2, zope_interface, future, sqlalchemy, sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq, txrequests, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial, @@ -25,17 +25,12 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "2.8.0"; + version = "2.8.1"; - # tests fail with the 2.8.0 sdist, so fetchFromGitHub instead - # https://github.com/buildbot/buildbot/pull/5322 - src = fetchFromGitHub { - owner = "buildbot"; - repo = "buildbot"; - rev = "v${version}"; - sha256 = "0akd61mgjp53c3vyf2yyzd0xf0cjwpvsi7g8pz72xrvnil1s4w7k"; + src = fetchPypi { + inherit pname version; + sha256 = "1nrbn8a2c56l5j0axmn9ijaviw0a6nrd34sg81r5j05mzzpb69is"; }; - sourceRoot = "./source/master"; propagatedBuildInputs = [ # core diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index 12a7e99984f..c875bd09600 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "buildbot-pkg"; - version = "2.8.0"; + version = "2.8.1"; src = fetchPypi { inherit pname version; - sha256 = "09sf36h8q8wrp0n57nb9915k86qdjyjj4xpdzy8q4s9z121iw0xz"; + sha256 = "03ppmrnpyd77azylv1c673cffk6x53j9flx4i99k33bljmdy8iv4"; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index abb5d356540..302615dc469 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1xq7pqvvsvgd2n38yzk0bqx943ldxsldrdcldwjshazq831rbdbn"; + sha256 = "051y4z70dq0j343rb02wn3a1vkdbi8khjfib2msa80vdld3nxcyv"; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0ixq8x845glnykpab2z0vhwp69nbw98mg0df34kf32wjvm8j6kjh"; + sha256 = "0chw111j2c6ybvbb09x39zg7ghjz4ysw67wbpcmzd1v5jnwbaqdi"; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1gn0amv8l0n0ny1x78g8x4rpfsnhcs9gkws2zw3nx78y4pbs6lw5"; + sha256 = "14v2lj65ccgmijxqrr61vpgba30q6w5vnisz78y3hbf3qpxmmd7g"; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "04c0m4liyl4aaksq9x8wncasacfv0vgl0igafnhf440cf9lhkkwy"; + sha256 = "03q9am237f2r8ivqm1dfkyzm3bmns4xjn99c27ps6dw9an15f73a"; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0c7lr4q3dvz3zhbnsvs2chsc6yn2jh10dnh1y66axdxk8hpqs3nc"; + sha256 = "0wv5ghsfmhkbk96zimihcwn16rxjz1q1g5ppahb8gfrclmzhdynl"; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 4f77fb7ae06..ecec8c689f6 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -3,11 +3,11 @@ buildPythonPackage (rec { pname = "buildbot-worker"; - version = "2.8.0"; + version = "2.8.1"; src = fetchPypi { inherit pname version; - sha256 = "19pabha9jh3jnz9micfn5y4khnx4q6g1zc27wvfw6663mw6spykx"; + sha256 = "1cba1zmm3gfw3ikax7q4vbrxnvjxlby79x5lc4fg9c3igbm0nmwj"; }; propagatedBuildInputs = [ twisted future ]; From 573089724ce47913e1a0df9f6af37861040af29c Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 6 Jun 2020 18:47:37 -0400 Subject: [PATCH 70/92] buildbot-pkg: inherit version from buildbot --- pkgs/development/python-modules/buildbot/pkg.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index c875bd09600..ebf8fb9c94e 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -1,8 +1,8 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, buildbot }: buildPythonPackage rec { pname = "buildbot-pkg"; - version = "2.8.1"; + inherit (buildbot) version; src = fetchPypi { inherit pname version; From ca39097da8feaa62f89a8eb04be92d141ee07ec9 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 6 Jun 2020 19:16:19 -0400 Subject: [PATCH 71/92] buildbot-worker: inherit version from buildbot --- pkgs/development/python-modules/buildbot/worker.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index ecec8c689f6..936ef661eee 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -1,9 +1,9 @@ -{ lib, buildPythonPackage, fetchPypi, setuptoolsTrial, mock, twisted, future, - coreutils }: +{ lib, buildPythonPackage, fetchPypi, buildbot, setuptoolsTrial, mock, twisted, + future, coreutils }: buildPythonPackage (rec { pname = "buildbot-worker"; - version = "2.8.1"; + inherit (buildbot) version; src = fetchPypi { inherit pname version; From 069ca7e897cc9428dc78c0ee941499ab8c00b70b Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Sun, 7 Jun 2020 16:45:46 +0100 Subject: [PATCH 72/92] styx: 0.7.1 -> 0.7.2 --- pkgs/applications/misc/styx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/applications/misc/styx/default.nix index 67f48d67f80..06bf1bd5f2f 100644 --- a/pkgs/applications/misc/styx/default.nix +++ b/pkgs/applications/misc/styx/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "styx"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "styx-static"; repo = "styx"; - rev = "v${version}"; - sha256 = "01lklz7l9klqmmsncikwjnk3glzyz15c30118s82yd1chwpwhpfl"; + rev = "0f0a878156eac416620a177cc030fa9f2f69b1b8"; + sha256 = "0ig456j1s17w4zhhcmkrskpy6n7061v5f2isa3qhipmn0gwb91af"; }; server = "${caddy}/bin/caddy"; From b78c6d47eecb0641a4f1eb0a9a77fbaa9fa2d975 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 6 Jun 2020 21:53:52 +0000 Subject: [PATCH 73/92] autogen: More normal formatting --- pkgs/development/tools/misc/autogen/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 6b9e8db2f2a..17aa6e5fdf9 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -11,10 +11,12 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "lib" "out" "man" "info" ]; - nativeBuildInputs = [ which pkgconfig perl ] + nativeBuildInputs = [ + which pkgconfig perl + ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # autogen needs a build autogen when cross-compiling - ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - buildPackages.buildPackages.autogen buildPackages.texinfo ]; + buildPackages.buildPackages.autogen buildPackages.texinfo + ]; buildInputs = [ guile libxml2 ]; From 87e86b457467e09a1e26a48b7b4abc223a4d7d3f Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 7 Jun 2020 15:36:28 +0000 Subject: [PATCH 74/92] autoen: Fix cross build See comments for details. Patch can be removed whend version is bumped. --- pkgs/development/tools/misc/autogen/default.nix | 16 ++++++++++++++++ .../tools/misc/autogen/pkg-config-use-var.patch | 13 +++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/tools/misc/autogen/pkg-config-use-var.patch diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 17aa6e5fdf9..65c4f317405 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -11,6 +11,22 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "lib" "out" "man" "info" ]; + patches = [ + # Temporary, so builds with a prefixed pkg-config (like cross builds) work. + # + # https://savannah.gnu.org/support/?109050 was supposed to fix this, but + # the generated configure script mysteriously still contained hard-coded + # pkg-config. I tried regenerating it, but that didn't help. Only + # https://git.savannah.gnu.org/cgit/autogen.git/commit/?h=5cbe233387d7f7b36752736338d1cd4f71287daa, + # in the next release, finally fixes this, by getting rid of some + # metaprogramming of the autoconf m4 metaprogram! There evidentally was + # some sort escaping error such that the `PKG_CONFIG` check got evaluated + # before `configure` was generated. + # + # Remove this when the version is bumped + ./pkg-config-use-var.patch + ]; + nativeBuildInputs = [ which pkgconfig perl ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ diff --git a/pkgs/development/tools/misc/autogen/pkg-config-use-var.patch b/pkgs/development/tools/misc/autogen/pkg-config-use-var.patch new file mode 100644 index 00000000000..69476f62c6d --- /dev/null +++ b/pkgs/development/tools/misc/autogen/pkg-config-use-var.patch @@ -0,0 +1,13 @@ +diff --git a/configure b/configure +index c3f761d1c3f..14b101f67c1 +--- a/configure ++++ b/configure +@@ -16683,7 +16683,7 @@ fi + + + +- ag_gv=`gdir=\`pkg-config --cflags-only-I \ ++ ag_gv=`gdir=\`${PKG_CONFIG} --cflags-only-I \ + guile-${GUILE_EFFECTIVE_VERSION} | \ + sed 's/\(^\| \)-I/\1/g'\` + for d in $gdir From e4f445008e0ecbd69d06ad3f5a5531ee53954b31 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Sun, 7 Jun 2020 17:43:15 +0100 Subject: [PATCH 75/92] boot: fix order of arguments for `hasPrefix` (#89751) --- nixos/modules/system/boot/stage-1.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 9bf3228d1ad..d551466f52e 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -584,7 +584,7 @@ in { assertion = !config.boot.loader.supportsInitrdSecrets -> all (source: builtins.isPath source || - (builtins.isString source && hasPrefix source builtins.storeDir)) + (builtins.isString source && hasPrefix builtins.storeDir source)) (attrValues config.boot.initrd.secrets); message = '' boot.loader.initrd.secrets values must be unquoted paths when From 148bf83ceeaabf862cb83cf1e988bc8761a054a4 Mon Sep 17 00:00:00 2001 From: El-Hussein Abdelraouf Date: Sun, 7 Jun 2020 19:15:24 +0200 Subject: [PATCH 76/92] vscode: add %U to exec command of the desktop item (#88623) --- pkgs/applications/editors/vscode/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 30060086fb5..38d695bd74a 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -24,7 +24,7 @@ in desktopName = longName; comment = "Code Editing. Redefined."; genericName = "Text Editor"; - exec = executableName; + exec = "${executableName} %U"; icon = "code"; startupNotify = "true"; categories = "Utility;TextEditor;Development;IDE;"; From 00ec55d0437d88a5dd608db94307db1f41f75f0f Mon Sep 17 00:00:00 2001 From: Nikola Knezevic Date: Tue, 26 May 2020 12:44:16 +0200 Subject: [PATCH 77/92] 1password: 0.10.0 -> 1.0.0 --- pkgs/applications/misc/1password/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 22cbb0ec4a0..5e027fcdf04 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -2,24 +2,24 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "0.10.0"; + version = "1.0.0"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; - sha256 = "07j11ikd0rzsj4d8rv74rfy497svq6l2q94ndf3b0a0mr8riyazj"; + sha256 = "1d1lxmrmirh3837zib91dmxblb4imdz8gbq56pb7kgbff3zf96ql"; stripRoot = false; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; - sha256 = "177cl4x7rj3d74kzrpmiwps5n31axmlhqdwrdpkmay2gk9inswbs"; + sha256 = "0pscm61dc69vmkrzrnxi531d37ig9y48w8q1lvzsg13zvvwaw8hs"; stripRoot = false; } else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.pkg"; - sha256 = "13yxmnh77g6zvl2gqf77m5i3v5706p2plgbgsn5hqrrf3g8ql63b"; + sha256 = "1sb5qdssasqm7z7j4xzgkmkgf132zhgm93d7rkx3y5j0rac98y0g"; } else throw "Architecture not supported"; From cb682317b008799e3bf647484c6a48d078bc0230 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Sun, 7 Jun 2020 20:31:45 +0200 Subject: [PATCH 78/92] nixos/nextcloud: preserve OC_PASS env variable in the occ wrapper The OC_PASS environment variable can be used to create a user with `occ user:add --password-from-env`. It is currently not possible to use the `nextcloud-occ` to "non-interactively" create a user since this variable is ignored by sudo. --- nixos/modules/services/web-apps/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index f826096bf60..5b9065dec3c 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -34,7 +34,7 @@ let cd ${cfg.package} sudo=exec if [[ "$USER" != nextcloud ]]; then - sudo='exec /run/wrappers/bin/sudo -u nextcloud --preserve-env=NEXTCLOUD_CONFIG_DIR' + sudo='exec /run/wrappers/bin/sudo -u nextcloud --preserve-env=NEXTCLOUD_CONFIG_DIR --preserve-env=OC_PASS' fi export NEXTCLOUD_CONFIG_DIR="${cfg.home}/config" $sudo \ From 1e3559fe19039cdcd5cba8f5ead869ea14567a40 Mon Sep 17 00:00:00 2001 From: geistesk Date: Sun, 7 Jun 2020 21:08:38 +0200 Subject: [PATCH 79/92] watson: 1.8.0 -> 1.9.0 The src was switched to GitHub because PyPi does not contain all the necessary test artefacts. Furthermore, a custom patch to support the latest arrow version was added. --- pkgs/applications/office/watson/default.nix | 26 ++++++++++++++------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index 52c94ce378e..5d4b915edfb 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -1,17 +1,27 @@ -{ stdenv, pythonPackages, fetchpatch, installShellFiles }: +{ stdenv, fetchFromGitHub, pythonPackages, fetchpatch, installShellFiles }: with pythonPackages; buildPythonApplication rec { pname = "watson"; - version = "1.8.0"; + version = "1.9.0"; - src = fetchPypi { - inherit version; - pname = "td-watson"; - sha256 = "1ip66jhbcqifdw1avbhngwym0vv7fsqxgbph11da5wlqwfwp060n"; + src = fetchFromGitHub { + owner = "TailorDev"; + repo = "Watson"; + rev = version; + sha256 = "0f0ldwadjf0xncx3m4w4wwqddd4wjwcsrbhby8vgsnqsn48dnfcx"; }; + patches = [ + # https://github.com/TailorDev/Watson/pull/380 + # The nixpkgs' arrow version is too new / not supported by Watson's latest release. + (fetchpatch { + url = "https://github.com/TailorDev/Watson/commit/69b9ad25551525d52060f7fb2eef3653e872a455.patch"; + sha256 = "0zrswgr0y219f92zi41m7cymfaspkhmlada4v9ijnsjjdb4bn2c9"; + }) + ]; + checkPhase = '' pytest -vs tests ''; @@ -21,8 +31,8 @@ buildPythonApplication rec { installShellCompletion --zsh --name _watson watson.zsh-completion ''; - checkInputs = [ py pytest pytest-datafiles mock pytest-mock pytestrunner ]; - propagatedBuildInputs = [ requests click arrow ]; + checkInputs = [ py pytest pytest-datafiles pytest-mock pytestrunner ]; + propagatedBuildInputs = [ arrow click click-didyoumean requests ]; nativeBuildInputs = [ installShellFiles ]; meta = with stdenv.lib; { From c8d679a141ad4ae401b8607274097f84771ce3f9 Mon Sep 17 00:00:00 2001 From: 1000101 Date: Sun, 7 Jun 2020 15:57:37 +0200 Subject: [PATCH 80/92] ninvaders: init at 0.1.2 --- pkgs/games/ninvaders/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/games/ninvaders/default.nix diff --git a/pkgs/games/ninvaders/default.nix b/pkgs/games/ninvaders/default.nix new file mode 100644 index 00000000000..a8adc1182bd --- /dev/null +++ b/pkgs/games/ninvaders/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake, ncurses }: + +stdenv.mkDerivation rec{ + pname = "ninvaders"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "sf-refugees"; + repo = pname; + rev = "v${version}"; + sha256 = "1wmwws1zsap4bfc2439p25vnja0hnsf57k293rdxw626gly06whi"; + }; + + buildInputs = [ cmake ncurses ]; + + meta = with stdenv.lib; { + description = "Space Invaders clone based on ncurses"; + homepage = "http://ninvaders.sourceforge.net/"; + license = licenses.gpl2; + maintainers = with maintainers; [ maintainers."1000101" ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5004ef6dba7..58b5c99b484 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23865,6 +23865,8 @@ in nexuiz = callPackage ../games/nexuiz { }; + ninvaders = callPackage ../games/ninvaders { }; + njam = callPackage ../games/njam { }; newtonwars = callPackage ../games/newtonwars { }; From c597a7f869e446d0c024a9267748b3a0d105425c Mon Sep 17 00:00:00 2001 From: 1000101 Date: Sun, 7 Jun 2020 23:11:08 +0200 Subject: [PATCH 81/92] formatting: fix missing leading whitespace --- pkgs/applications/audio/sound-juicer/default.nix | 2 +- pkgs/applications/blockchains/btc1.nix | 2 +- pkgs/applications/misc/fme/default.nix | 2 +- pkgs/applications/office/wpsoffice/default.nix | 2 +- pkgs/applications/video/dvdauthor/default.nix | 2 +- pkgs/applications/window-managers/notion/default.nix | 2 +- pkgs/development/libraries/grib-api/default.nix | 2 +- pkgs/development/libraries/libchewing/default.nix | 2 +- pkgs/development/libraries/libqb/default.nix | 2 +- pkgs/development/libraries/libtap/default.nix | 2 +- pkgs/development/libraries/libwnck/3.x.nix | 2 +- pkgs/development/libraries/rapidcheck/default.nix | 2 +- pkgs/development/tools/clj-kondo/default.nix | 2 +- pkgs/development/tools/literate-programming/eweb/default.nix | 2 +- pkgs/development/tools/literate-programming/nuweb/default.nix | 2 +- pkgs/development/web/cypress/default.nix | 2 +- pkgs/games/freecell-solver/default.nix | 2 +- pkgs/games/galaxis/default.nix | 2 +- pkgs/games/ninvaders/default.nix | 2 +- pkgs/games/vms-empire/default.nix | 2 +- pkgs/misc/emulators/atari++/default.nix | 2 +- pkgs/misc/emulators/atari800/default.nix | 2 +- pkgs/misc/mxt-app/default.nix | 2 +- pkgs/tools/filesystems/netatalk/default.nix | 2 +- pkgs/tools/misc/chafa/default.nix | 2 +- pkgs/tools/misc/cowsay/default.nix | 2 +- pkgs/tools/networking/privoxy/default.nix | 2 +- pkgs/tools/networking/tinyproxy/default.nix | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index dcad0cec1e8..89653a59f43 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -5,7 +5,7 @@ let pname = "sound-juicer"; version = "3.24.0"; -in stdenv.mkDerivation rec{ +in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { diff --git a/pkgs/applications/blockchains/btc1.nix b/pkgs/applications/blockchains/btc1.nix index 3241148aee1..3442c9ba807 100644 --- a/pkgs/applications/blockchains/btc1.nix +++ b/pkgs/applications/blockchains/btc1.nix @@ -5,7 +5,7 @@ }: with stdenv.lib; -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { name = "bit1" + (toString (optional (!withGui) "d")) + "-" + version; version = "1.15.1"; diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix index cf93729eddd..34d5a45b8ea 100644 --- a/pkgs/applications/misc/fme/default.nix +++ b/pkgs/applications/misc/fme/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, autoconf, automake, gettext , fluxbox, bc, gtkmm2, glibmm, libglademm, libsigcxx }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { pname = "fme"; version = "1.1.3"; diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index 2d8f4d18621..1d32e6ff027 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -36,7 +36,7 @@ , zlib }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { pname = "wpsoffice"; version = "11.1.0.9505"; diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix index 6be1d8a1633..af1fe24cbbf 100644 --- a/pkgs/applications/video/dvdauthor/default.nix +++ b/pkgs/applications/video/dvdauthor/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng, zlib, pkgconfig , flex, bison }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { name = "dvdauthor-0.7.1"; src = fetchurl { diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix index ac4f00f4545..c18b2129f09 100644 --- a/pkgs/applications/window-managers/notion/default.nix +++ b/pkgs/applications/window-managers/notion/default.nix @@ -5,7 +5,7 @@ , xlibsWrapper, makeWrapper }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { pname = "notion"; version = "4.0.0"; diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix index 5a1620db30c..db884957d1e 100644 --- a/pkgs/development/libraries/grib-api/default.nix +++ b/pkgs/development/libraries/grib-api/default.nix @@ -2,7 +2,7 @@ cmake, netcdf, gfortran, libpng, openjpeg, enablePython ? false, pythonPackages }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { pname = "grib-api"; version = "1.28.0"; diff --git a/pkgs/development/libraries/libchewing/default.nix b/pkgs/development/libraries/libchewing/default.nix index 09d5d40f877..cd2df385f48 100644 --- a/pkgs/development/libraries/libchewing/default.nix +++ b/pkgs/development/libraries/libchewing/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, sqlite }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { pname = "libchewing"; version = "0.5.1"; diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/development/libraries/libqb/default.nix index 58eb64b0e48..244dcf0999b 100644 --- a/pkgs/development/libraries/libqb/default.nix +++ b/pkgs/development/libraries/libqb/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { name = "libqb-0.17.2"; src = fetchurl { diff --git a/pkgs/development/libraries/libtap/default.nix b/pkgs/development/libraries/libtap/default.nix index 1bb324b55f2..c1c506ef5e3 100644 --- a/pkgs/development/libraries/libtap/default.nix +++ b/pkgs/development/libraries/libtap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, cmake, perl }: with stdenv.lib; -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { pname = "libtap"; version = "1.14.0"; diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix index 9f60abd4f59..78aa231bda3 100644 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ b/pkgs/development/libraries/libwnck/3.x.nix @@ -19,7 +19,7 @@ , gnome3 }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { pname = "libwnck"; version = "3.36.0"; diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/pkgs/development/libraries/rapidcheck/default.nix index 92c42d19af6..bf96e8e76b8 100644 --- a/pkgs/development/libraries/rapidcheck/default.nix +++ b/pkgs/development/libraries/rapidcheck/default.nix @@ -1,6 +1,6 @@ { stdenv, cmake, fetchFromGitHub }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { pname = "rapidcheck"; version = "unstable-2018-09-27"; diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index b809d550097..b7eec641b4b 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, graalvm8, fetchurl }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { pname = "clj-kondo"; version = "2020.04.05"; diff --git a/pkgs/development/tools/literate-programming/eweb/default.nix b/pkgs/development/tools/literate-programming/eweb/default.nix index 53964c0e98b..39e309c4ce4 100644 --- a/pkgs/development/tools/literate-programming/eweb/default.nix +++ b/pkgs/development/tools/literate-programming/eweb/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python3, asciidoc }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { name = "eweb-${meta.version}"; diff --git a/pkgs/development/tools/literate-programming/nuweb/default.nix b/pkgs/development/tools/literate-programming/nuweb/default.nix index 4885081bc5b..1f4fba681c3 100644 --- a/pkgs/development/tools/literate-programming/nuweb/default.nix +++ b/pkgs/development/tools/literate-programming/nuweb/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, tex}: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { pname = "nuweb"; version = "1.60"; diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 10701f6b445..9c8c14bab65 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip, autoPatchelfHook, xorg, gtk2, gnome2, gtk3, nss, alsaLib, udev, unzip, wrapGAppsHook }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { pname = "cypress"; version = "4.5.0"; diff --git a/pkgs/games/freecell-solver/default.nix b/pkgs/games/freecell-solver/default.nix index f574f253955..1845ba825eb 100644 --- a/pkgs/games/freecell-solver/default.nix +++ b/pkgs/games/freecell-solver/default.nix @@ -3,7 +3,7 @@ , perlPackages, python3 }: with stdenv.lib; -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { pname = "freecell-solver"; version = "4.18.0"; diff --git a/pkgs/games/galaxis/default.nix b/pkgs/games/galaxis/default.nix index 1bbbc5ead94..19df8db78a0 100644 --- a/pkgs/games/galaxis/default.nix +++ b/pkgs/games/galaxis/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses, xmlto }: with stdenv.lib; -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { pname = "galaxis"; version = "1.10"; diff --git a/pkgs/games/ninvaders/default.nix b/pkgs/games/ninvaders/default.nix index a8adc1182bd..009cb1e548f 100644 --- a/pkgs/games/ninvaders/default.nix +++ b/pkgs/games/ninvaders/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, ncurses }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { pname = "ninvaders"; version = "0.1.2"; diff --git a/pkgs/games/vms-empire/default.nix b/pkgs/games/vms-empire/default.nix index d0920b0c68d..eb9108c32c9 100644 --- a/pkgs/games/vms-empire/default.nix +++ b/pkgs/games/vms-empire/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses, xmlto }: with stdenv.lib; -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { pname = "vms-empire"; version = "1.15"; diff --git a/pkgs/misc/emulators/atari++/default.nix b/pkgs/misc/emulators/atari++/default.nix index 80765f458f8..9d7a477be61 100644 --- a/pkgs/misc/emulators/atari++/default.nix +++ b/pkgs/misc/emulators/atari++/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libSM, libX11, libICE, SDL, alsaLib, gcc-unwrapped, libXext }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { pname = "atari++"; version = "1.83"; diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix index bb6323d18e0..6c846e2f0ab 100644 --- a/pkgs/misc/emulators/atari800/default.nix +++ b/pkgs/misc/emulators/atari800/default.nix @@ -2,7 +2,7 @@ , unzip, zlib, SDL, readline, libGLU, libGL, libX11 }: with stdenv.lib; -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { pname = "atari800"; version = "4.2.0"; diff --git a/pkgs/misc/mxt-app/default.nix b/pkgs/misc/mxt-app/default.nix index a5a621435ee..6ceb4d6c1a3 100644 --- a/pkgs/misc/mxt-app/default.nix +++ b/pkgs/misc/mxt-app/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, libtool }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { version="1.28"; pname = "mxt-app"; diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index faa0a1ebfe8..f7732cd76fd 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -3,7 +3,7 @@ , ed, glibc, libevent }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { name = "netatalk-3.1.12"; src = fetchurl { diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index 9e1671aec9d..9afdd93ad0a 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, which, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, imagemagick, darwin }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { version = "1.4.1"; pname = "chafa"; diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix index d2a27fa9cb0..972b2997d81 100644 --- a/pkgs/tools/misc/cowsay/default.nix +++ b/pkgs/tools/misc/cowsay/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, perl }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { version = "3.03+dfsg2"; pname = "cowsay"; diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index 331295ffd1f..10a25d5bf8b 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, autoreconfHook, zlib, pcre, w3m, man }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { pname = "privoxy"; version = "3.0.28"; diff --git a/pkgs/tools/networking/tinyproxy/default.nix b/pkgs/tools/networking/tinyproxy/default.nix index 1a476676a25..7d3c49db7b7 100644 --- a/pkgs/tools/networking/tinyproxy/default.nix +++ b/pkgs/tools/networking/tinyproxy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, asciidoc, libxml2, libxslt, docbook_xsl }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { pname = "tinyproxy"; version = "1.10.0"; From 2372dc54221a58dd40795b508d40f477f6f95107 Mon Sep 17 00:00:00 2001 From: Atemu Date: Mon, 8 Jun 2020 00:03:35 +0200 Subject: [PATCH 82/92] jc: 1.11.1 -> 1.11.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 7293846178c..e7942760b72 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.11.1"; + version = "1.11.2"; disabled = isPy27; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = "jc"; rev = "v${version}"; - sha256 = "0qackvhs35npgnga5riclnwqdwasc0kba48pwnrfxf0hm2i0kbgp"; + sha256 = "1gsvjgypjgw5a0k85kdvbbf7q6wspmv6z76acrgnidhav8sdn4dm"; }; propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; From a554e128330d36c076328858a333d9ae4f5dee0b Mon Sep 17 00:00:00 2001 From: davlum Date: Sun, 7 Jun 2020 18:06:35 -0400 Subject: [PATCH 83/92] idris2: fix build on macOS (#89548) The idris2 Makefile tries to use different versions of sed depending on the OS, but nix always uses the same version. Because the version of sed that is expected on macOS doesn't exist in the nix environment, the build fails. Setting the OS to empty string resolves the issue. --- pkgs/development/compilers/idris2/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix index 998a02633f2..d2a071b61dd 100644 --- a/pkgs/development/compilers/idris2/default.nix +++ b/pkgs/development/compilers/idris2/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { patchShebangs --build tests ''; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=$(out)" ] + ++ stdenv.lib.optional stdenv.isDarwin "OS="; # The name of the main executable of pkgs.chez is `scheme` buildFlags = [ "bootstrap-build" "SCHEME=scheme" ]; @@ -36,9 +37,9 @@ stdenv.mkDerivation rec { meta = { description = "A purely functional programming language with first class types"; - homepage = https://github.com/idris-lang/Idris2; + homepage = "https://github.com/idris-lang/Idris2"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ wchresta ]; + inherit (chez.meta) platforms; }; } - From 55912f3535217910b12e81f07fb10d70511a471b Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Fri, 22 May 2020 15:15:32 +1200 Subject: [PATCH 84/92] nixos/qemu-vm: add option to use a non-standard BIOS I'd like to change the default on x86 platforms to qboot at some point, since it saves a fair bit of startup time. --- nixos/modules/virtualisation/qemu-vm.nix | 15 +++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/qboot.nix | 13 +++++++++++++ .../applications/virtualization/qboot/default.nix | 4 +++- 4 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/qboot.nix diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index ac86330c098..42776e80ffe 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -441,6 +441,18 @@ in ''; }; + virtualisation.bios = + mkOption { + default = null; + type = types.nullOr types.package; + description = + '' + An alternate BIOS (such as qboot) with which to start the VM. + Should containin a file named bios.bin. + If null, QEMU's builtin SeaBIOS will be used. + ''; + }; + }; config = { @@ -521,6 +533,9 @@ in (mkIf cfg.useEFIBoot [ "-pflash $TMPDIR/bios.bin" ]) + (mkIf (cfg.bios != null) [ + "-bios ${cfg.bios}/bios.bin" + ]) (mkIf (!cfg.graphics) [ "-nographic" ]) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 796c626f3dd..8e262d8eee7 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -273,6 +273,7 @@ in prosody = handleTest ./xmpp/prosody.nix {}; prosodyMysql = handleTest ./xmpp/prosody-mysql.nix {}; proxy = handleTest ./proxy.nix {}; + qboot = handleTestOn ["x86_64-linux" "i686-linux"] ./qboot.nix {}; quagga = handleTest ./quagga.nix {}; quorum = handleTest ./quorum.nix {}; rabbitmq = handleTest ./rabbitmq.nix {}; diff --git a/nixos/tests/qboot.nix b/nixos/tests/qboot.nix new file mode 100644 index 00000000000..12aef6decfa --- /dev/null +++ b/nixos/tests/qboot.nix @@ -0,0 +1,13 @@ +import ./make-test-python.nix ({ pkgs, ...} : { + name = "qboot"; + + machine = { ... }: { + virtualisation.bios = pkgs.qboot; + }; + + testScript = + '' + start_all() + machine.wait_for_unit("multi-user.target") + ''; +}) diff --git a/pkgs/applications/virtualization/qboot/default.nix b/pkgs/applications/virtualization/qboot/default.nix index 800d601c76e..8d1f9dac2e5 100644 --- a/pkgs/applications/virtualization/qboot/default.nix +++ b/pkgs/applications/virtualization/qboot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, meson, ninja, fetchFromGitHub }: +{ stdenv, meson, ninja, fetchFromGitHub, nixosTests }: stdenv.mkDerivation { name = "qboot-20200423"; @@ -19,6 +19,8 @@ stdenv.mkDerivation { hardeningDisable = [ "stackprotector" "pic" ]; + passthru.tests = { qboot = nixosTests.qboot; }; + meta = { description = "A simple x86 firmware for booting Linux"; homepage = "https://github.com/bonzini/qboot"; From a239864fc610ff7738c5a8af2a7be25a0af4a28b Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 8 Jun 2020 00:25:01 +0000 Subject: [PATCH 85/92] systemd: Fix cross build This was very similar to the Mesa issues fixed in 62e6d73a09870174a891d2a8d29a38e62b05efd5: the user-written code is looking up an unprefixed binutils program. [I think we should have a way in Meson of specifying a program prefix in the cross / native files, as a fallback for any program that isn't explicitly specified. This could both be availible for user written rules, and help with the default rules.] Fixes https://github.com/NixOS/mobile-nixos/issues/161 --- pkgs/os-specific/linux/systemd/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 00a545ed3f5..3235fb3b95c 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -66,6 +66,13 @@ in stdenv.mkDerivation { postPatch = '' substituteInPlace src/basic/path-util.h --replace "@defaultPathNormal@" "${placeholder "out"}/bin/" + substituteInPlace src/boot/efi/meson.build \ + --replace \ + "find_program('ld'" \ + "find_program('${stdenv.cc.bintools.targetPrefix}ld'" \ + --replace \ + "find_program('objcopy'" \ + "find_program('${stdenv.cc.bintools.targetPrefix}objcopy'" ''; outputs = [ "out" "lib" "man" "dev" ]; From b59847b848079ba872e18b5f0683c1bff7e924ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 8 Jun 2020 06:27:16 +0200 Subject: [PATCH 86/92] systemd: avoid rebuild from the parent commit for now Otherwise we'd be delaying this staging-next cycle noticeably. --- pkgs/os-specific/linux/systemd/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 3235fb3b95c..722b4db9a80 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -66,6 +66,9 @@ in stdenv.mkDerivation { postPatch = '' substituteInPlace src/basic/path-util.h --replace "@defaultPathNormal@" "${placeholder "out"}/bin/" + '' + # TODO: unconditionalize on the next rebuild + + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' substituteInPlace src/boot/efi/meson.build \ --replace \ "find_program('ld'" \ From 0a8fb89fca5bb1fee4e015e52f003746fd4ec682 Mon Sep 17 00:00:00 2001 From: hyperfekt Date: Sun, 7 Jun 2020 19:51:13 +0200 Subject: [PATCH 87/92] rustPlatform: fix cross-compiling by using native diff --- pkgs/build-support/rust/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 795ce841ffb..770a6d1042e 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -70,7 +70,8 @@ let # Specify the stdenv's `diff` by abspath to ensure that the user's build # inputs do not cause us to find the wrong `diff`. - diff = "${diffutils}/bin/diff"; + # The `.nativeDrv` stanza works like nativeBuildInputs and ensures cross-compiling has the right version available. + diff = "${diffutils.nativeDrv or diffutils}/bin/diff"; in From 5ac6f222fa76544576780fb1bc4a87735fb37190 Mon Sep 17 00:00:00 2001 From: hyperfekt Date: Sun, 7 Jun 2020 20:32:28 +0200 Subject: [PATCH 88/92] nym: 0.6.0 -> 0.7.0 --- pkgs/applications/networking/nym/default.nix | 22 ++++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/networking/nym/default.nix b/pkgs/applications/networking/nym/default.nix index 6bb86c016ba..4a4f5c54f6b 100644 --- a/pkgs/applications/networking/nym/default.nix +++ b/pkgs/applications/networking/nym/default.nix @@ -9,33 +9,23 @@ rustPlatform.buildRustPackage rec { pname = "nym"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "nymtech"; repo = "nym"; rev = "v${version}"; - sha256 = "1q9i24mzys6a9kp9n0bnxr3iwzblabmc6iif3ah75gffyf0cipk4"; + sha256 = "05bxrpqwwf9spydac0q8sly65q8f1nk13i5fy3p5adr1phzxdnr8"; }; - cargoSha256 = "0qas544bs4wyllvqf2r5mvqxs1nviwcvxa3rzq10dvjyjm1xyh3k"; + cargoSha256 = "0mh8cwia86bm68b0wcrmnsq1af5cp6kj1j81nwxb03awnqpxc34n"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ]; - /* - Nym's test presence::converting_mixnode_presence_into_topology_mixnode::it_returns_resolved_ip_on_resolvable_hostname tries to resolve nymtech.net. - Since there is no external DNS resolution available in the build sandbox, we point cargo and its children (that's what we remove the 'unsetenv' call for) to a hosts file in which we statically resolve nymtech.net. - */ - preCheck = '' - export LD_PRELOAD=${libredirect.overrideAttrs (drv: { - postPatch = "sed -i -e /unsetenv/d libredirect.c"; - })}/lib/libredirect.so - export NIX_REDIRECTS=/etc/hosts=${writeText "nym_resolve_test_hosts" "127.0.0.1 nymtech.net"} - ''; - - postCheck = "unset NIX_REDIRECTS LD_PRELOAD"; + # tests disabled until a release with https://github.com/nymtech/nym/pull/260 is available + doCheck = false; passthru.updateScript = ./update.sh; @@ -49,6 +39,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://nymtech.net"; license = licenses.asl20; maintainers = [ maintainers.ehmry ]; - platforms = with platforms; intersectLists (linux ++ darwin) (x86 ++ x86_64); # see https://github.com/nymtech/nym/issues/179 for architectures + platforms = with platforms; intersectLists (linux ++ darwin) (concatLists [ x86 x86_64 aarch64 arm ]); }; } From 58ffaee5d7d02058a1dd8644990b2f3b6c8a94ef Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Mon, 8 Jun 2020 12:40:38 +0800 Subject: [PATCH 89/92] Update configure-flags.nix --- .../compilers/gcc/common/configure-flags.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index f38ce180b1f..0560fe0fda8 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -27,6 +27,16 @@ assert cloog != null -> stdenv.lib.versionOlder version "5"; assert langJava -> stdenv.lib.versionOlder version "7"; +# Note [Windows Exception Handling] +# sjlj (short jump long jump) exception handling makes no sense on x86_64, +# it's forcably slowing programs down as it produces a constant overhead. +# On x86_64 we have SEH (Structured Exception Handling) and we should use +# that. On i686, we do not have SEH, and have to use sjlj with dwarf2. +# Hence it's now conditional on x86_32 (i686 is 32bit). +# +# ref: https://stackoverflow.com/questions/15670169/what-is-difference-between-sjlj-vs-dwarf-vs-seh + + let inherit (stdenv) buildPlatform hostPlatform targetPlatform @@ -60,7 +70,9 @@ let "--disable-debug" "--disable-win32-registry" ] ++ lib.optionals (crossMingw && targetPlatform.isx86_32) [ + # See Note [Windows Exception Handling] "--enable-sjlj-exceptions" + "--with-dwarf2" ] else [ (if crossDarwin then "--with-sysroot=${lib.getLib libcCross}/share/sysroot" else "--with-headers=${lib.getDev libcCross}${libcCross.incdir or "/include"}") @@ -87,9 +99,6 @@ let "--disable-nls" # To keep ABI compatibility with upstream mingw-w64 "--enable-fully-dynamic-string" - ] ++ lib.optionals (crossMingw && targetPlatform.isx86_32) [ - "--enable-sjlj-exceptions" - "--with-dwarf2" ] ++ lib.optional (targetPlatform.libc == "newlib") "--with-newlib" ++ lib.optional (targetPlatform.libc == "avrlibc") "--with-avrlibc" ); From f2a33e4486b40434241b964be5c685600c84c3a7 Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Mon, 8 Jun 2020 12:43:58 +0800 Subject: [PATCH 90/92] Update configure-flags.nix --- .../compilers/gcc/common/configure-flags.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 0560fe0fda8..7e0d691412b 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -69,6 +69,11 @@ let "--with-gnu-ld" "--disable-debug" "--disable-win32-registry" + "--enable-hash-synchronization" + "--enable-libssp" + "--disable-nls" + # To keep ABI compatibility with upstream mingw-w64 + "--enable-fully-dynamic-string" ] ++ lib.optionals (crossMingw && targetPlatform.isx86_32) [ # See Note [Windows Exception Handling] "--enable-sjlj-exceptions" @@ -93,12 +98,6 @@ let ] ++ lib.optionals (targetPlatform.libc == "musl") [ # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865 "--disable-libmpx" - ] ++ lib.optionals crossMingw [ - "--enable-hash-synchronization" - "--enable-libssp" - "--disable-nls" - # To keep ABI compatibility with upstream mingw-w64 - "--enable-fully-dynamic-string" ] ++ lib.optional (targetPlatform.libc == "newlib") "--with-newlib" ++ lib.optional (targetPlatform.libc == "avrlibc") "--with-avrlibc" ); From 5f7d9d0985ad49e36f0477d65d29f38efd60d6cd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 8 Jun 2020 00:10:06 -0700 Subject: [PATCH 91/92] poco: 1.9.4 -> 1.10.1 (#80665) --- pkgs/development/libraries/poco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index 72f2952914a..b2a4fb1b0c3 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "poco"; - version = "1.9.4"; + version = "1.10.1"; src = fetchurl { url = "https://pocoproject.org/releases/${pname}-${version}/${pname}-${version}-all.tar.gz"; - sha256 = "0xzxi3r4v2076kcxhj7b1achma2lqy01spshxq8sfh0jn5bz4d7b"; + sha256 = "1jilzh0h6ik5lr167nax7q6nrpzxl99p11pkl202ig06pgh32nbz"; }; nativeBuildInputs = [ cmake pkgconfig ]; From 657f4927ebcde600377a8ef3d7722bc701548e32 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 6 Jun 2020 04:20:00 -0500 Subject: [PATCH 92/92] dune_2: 2.5.1 -> 2.6.0 Changelog: https://github.com/ocaml/dune/releases/tag/2.6.0 --- pkgs/development/tools/ocaml/dune/2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index 37f27768670..ac3b7f2a429 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.5.1"; + version = "2.6.0"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "0az5ih18wadsp3ljagvws1i7vf0vpg24h75ariy0v3i0gyld6xwg"; + sha256 = "1hvgj78xqqqph8dwn1jjkjp8bpppvwzx33lzkvwh5wn5zd4xij8j"; }; buildInputs = [ ocaml findlib ];