Merge master into staging-next

This commit is contained in:
Frederik Rietdijk 2020-06-08 12:06:12 +02:00
commit dc33419285
125 changed files with 958 additions and 653 deletions

View file

@ -466,6 +466,9 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ];
<title>Other Notable Changes</title>
<itemizedlist>
<listitem>
<para>SD and ISO images are now compressed by default using <literal>zstd</literal>.</para>
</listitem>
<listitem>
<para>
<option>services.journald.rateLimitBurst</option> was updated from

View file

@ -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;

View file

@ -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

View file

@ -41,6 +41,7 @@ let
pkgs.time
pkgs.utillinux
pkgs.which # 88K size
pkgs.zstd
];
in

View file

@ -413,7 +413,7 @@ in
default = false;
description = ''
Whether the ISO image should be compressed using
<command>bzip2</command>.
<command>zstd</command>.
'';
};

View file

@ -105,7 +105,7 @@ in
default = true;
description = ''
Whether the SD image should be compressed using
<command>bzip2</command>.
<command>zstd</command>.
'';
};
@ -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
'';
}) {};

View file

@ -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 \

View file

@ -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' ]
@ -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

View file

@ -180,6 +180,7 @@ in
gtk3.out
hicolor-icon-theme
lightlocker
nixos-artwork.wallpapers.simple-dark-gray
onboard
qgnomeplatform
shared-mime-info

View file

@ -132,8 +132,9 @@ 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";
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 = ''
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) ''

View file

@ -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
{

View file

@ -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

View file

@ -441,6 +441,18 @@ in
'';
};
virtualisation.bios =
mkOption {
default = null;
type = types.nullOr types.package;
description =
''
An alternate BIOS (such as <package>qboot</package>) with which to start the VM.
Should containin a file named <literal>bios.bin</literal>.
If <literal>null</literal>, 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"
])

View file

@ -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 {};

13
nixos/tests/qboot.nix Normal file
View file

@ -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")
'';
})

View file

@ -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
};
}

View file

@ -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 ];

View file

@ -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 {

View file

@ -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)"

View file

@ -5,7 +5,7 @@
}:
with stdenv.lib;
stdenv.mkDerivation rec{
stdenv.mkDerivation rec {
name = "bit1" + (toString (optional (!withGui) "d")) + "-" + version;
version = "1.15.1";

View file

@ -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;";

View file

@ -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; [

View file

@ -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 = [

View file

@ -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";

View file

@ -19,6 +19,8 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [
wrapGAppsHook
glib
gtk3
];
buildInputs = [

View file

@ -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";

View file

@ -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" ];
};
}

View file

@ -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";

View file

@ -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 ]
@ -244,6 +246,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;

View file

@ -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
@ -161,7 +162,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"

View file

@ -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 ];

View file

@ -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}

View file

@ -0,0 +1,25 @@
From e79ddef65d08599ae3fe8ff39d202ea2416650b8 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euank@euank.com>
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

View file

@ -0,0 +1,87 @@
From 1891be119e298ef7c86347a6b74d40ff539cf06e Mon Sep 17 00:00:00 2001
From: Euan Kemp <euank@euank.com>
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

View file

@ -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 ]}"
'';

View file

@ -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 ]);
};
}

View file

@ -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}");
};

View file

@ -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; {

View file

@ -36,7 +36,7 @@
, zlib
}:
stdenv.mkDerivation rec{
stdenv.mkDerivation rec {
pname = "wpsoffice";
version = "11.1.0.9505";

View file

@ -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 ];

View file

@ -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 ];
};
}

View file

@ -144,6 +144,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 { };

View file

@ -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 ];
};
}

View file

@ -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 {

View file

@ -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

View file

@ -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

View file

@ -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";

View file

@ -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 ];

View file

@ -5,7 +5,7 @@
, xlibsWrapper, makeWrapper
}:
stdenv.mkDerivation rec{
stdenv.mkDerivation rec {
pname = "notion";
version = "4.0.0";

View file

@ -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

View file

@ -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

View file

@ -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;

View file

@ -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 = [

View file

@ -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 ];

View file

@ -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"
];

View file

@ -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"

View file

@ -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
@ -58,8 +68,16 @@ let
"--with-gnu-as"
"--with-gnu-ld"
"--disable-debug"
"--enable-sjlj-exceptions"
"--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"
"--with-dwarf2"
] else [
(if crossDarwin then "--with-sysroot=${lib.getLib libcCross}/share/sysroot"
else "--with-headers=${lib.getDev libcCross}${libcCross.incdir or "/include"}")
@ -80,14 +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-sjlj-exceptions"
"--enable-hash-synchronization"
"--enable-libssp"
"--disable-nls"
"--with-dwarf2"
# 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"
);

View file

@ -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;
};
}

View file

@ -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/";

View file

@ -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

View file

@ -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 = ''

View file

@ -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";

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, sqlite }:
stdenv.mkDerivation rec{
stdenv.mkDerivation rec {
pname = "libchewing";
version = "0.5.1";

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig }:
stdenv.mkDerivation rec{
stdenv.mkDerivation rec {
name = "libqb-0.17.2";
src = fetchurl {

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, cmake, perl }:
with stdenv.lib;
stdenv.mkDerivation rec{
stdenv.mkDerivation rec {
pname = "libtap";
version = "1.14.0";

View file

@ -19,7 +19,7 @@
, gnome3
}:
stdenv.mkDerivation rec{
stdenv.mkDerivation rec {
pname = "libwnck";
version = "3.36.0";

View file

@ -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 ];

View file

@ -1,6 +1,6 @@
{ stdenv, cmake, fetchFromGitHub }:
stdenv.mkDerivation rec{
stdenv.mkDerivation rec {
pname = "rapidcheck";
version = "unstable-2018-09-27";

View file

@ -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

View file

@ -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 [];
};
}

View file

@ -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 [];
};
}

View file

@ -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 ];
};
}

View file

@ -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

View file

@ -1,12 +1,12 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k }:
{ lib, buildPythonPackage, fetchPypi, isPy3k, buildbot }:
buildPythonPackage rec {
pname = "buildbot-pkg";
version = "2.8.0";
inherit (buildbot) version;
src = fetchPypi {
inherit pname version;
sha256 = "09sf36h8q8wrp0n57nb9915k86qdjyjj4xpdzy8q4s9z121iw0xz";
sha256 = "03ppmrnpyd77azylv1c673cffk6x53j9flx4i99k33bljmdy8iv4";
};
postPatch = ''

View file

@ -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 ];

View file

@ -1,13 +1,13 @@
{ 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.0";
inherit (buildbot) version;
src = fetchPypi {
inherit pname version;
sha256 = "19pabha9jh3jnz9micfn5y4khnx4q6g1zc27wvfw6663mw6spykx";
sha256 = "1cba1zmm3gfw3ikax7q4vbrxnvjxlby79x5lc4fg9c3igbm0nmwj";
};
propagatedBuildInputs = [ twisted future ];

View file

@ -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 ];

View file

@ -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 = {

View file

@ -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;

View file

@ -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 = ''

View file

@ -1,6 +1,6 @@
{ stdenv, lib, graalvm8, fetchurl }:
stdenv.mkDerivation rec{
stdenv.mkDerivation rec {
pname = "clj-kondo";
version = "2020.04.05";

View file

@ -1,35 +0,0 @@
{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin }:
rustPlatform.buildRustPackage rec {
pname = "cloudflare-wrangler";
version = "1.9.1";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "wrangler";
rev = "v${version}";
sha256 = "09rq6lnv9993ah49jxqaqqhv5xxj51gxlqdi99wkj217cxp9gqqn";
};
cargoSha256 = "0vlb1g4pki84n2zf6w3bisa7jpv0ws8nb3lgr0bkjrirf60a9xsk";
nativeBuildInputs = [ 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
];
# tries to use "/homeless-shelter" and fails
doCheck = false;
meta = with stdenv.lib; {
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; [ ];
platforms = platforms.all;
};
}

View file

@ -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)

View file

@ -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";
@ -28,27 +36,27 @@ 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" {
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" {
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";
};
}

View file

@ -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;
};
}

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, python3, asciidoc }:
stdenv.mkDerivation rec{
stdenv.mkDerivation rec {
name = "eweb-${meta.version}";

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, tex}:
stdenv.mkDerivation rec{
stdenv.mkDerivation rec {
pname = "nuweb";
version = "1.60";

View file

@ -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 ];
@ -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 ];
};
}

View file

@ -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 ];

View file

@ -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]]

View file

@ -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.

View file

@ -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;

View file

@ -0,0 +1,36 @@
{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin }:
rustPlatform.buildRustPackage rec {
pname = "wrangler";
version = "1.9.2";
src = fetchFromGitHub {
owner = "cloudflare";
repo = pname;
rev = "v${version}";
sha256 = "0i3fhdq8v9459mlnazkv9bpkcv01rdy5rk149lhpsan76zlyzzwr";
};
cargoSha256 = "0c2ss3j53vra1b4m3jsy2w2gdf6k1hw3qf6sd4qlg2ybk4k83g3b";
nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
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;
meta = with stdenv.lib; {
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; [ filalex77 ];
platforms = platforms.all;
};
}

View file

@ -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";

View file

@ -3,7 +3,7 @@
, perlPackages, python3 }:
with stdenv.lib;
stdenv.mkDerivation rec{
stdenv.mkDerivation rec {
pname = "freecell-solver";
version = "4.18.0";

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, ncurses, xmlto }:
with stdenv.lib;
stdenv.mkDerivation rec{
stdenv.mkDerivation rec {
pname = "galaxis";
version = "1.10";

View file

@ -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;
};
}

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, ncurses, xmlto }:
with stdenv.lib;
stdenv.mkDerivation rec{
stdenv.mkDerivation rec {
pname = "vms-empire";
version = "1.15";

View file

@ -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";

Some files were not shown because too many files have changed in this diff Show more