Merge master into staging-next

This commit is contained in:
Frederik Rietdijk 2020-04-05 08:33:39 +02:00
commit 866c5aa090
78 changed files with 3362 additions and 3124 deletions

View File

@ -981,6 +981,12 @@
githubId = 2071583; githubId = 2071583;
name = "Benjamin Hipple"; name = "Benjamin Hipple";
}; };
bhougland = {
email = "benjamin.hougland@gmail.com";
github = "bhougland18";
githubId = 28444296;
name = "Benjamin Hougland";
};
binarin = { binarin = {
email = "binarin@binarin.ru"; email = "binarin@binarin.ru";
github = "binarin"; github = "binarin";
@ -6771,6 +6777,11 @@
github = "shmish111"; github = "shmish111";
name = "David Smith"; name = "David Smith";
}; };
shnarazk = {
email = "shujinarazaki@protonmail.com";
github = "shnarazk";
name = "Narazaki Shuji";
};
shou = { shou = {
email = "x+g@shou.io"; email = "x+g@shou.io";
github = "Shou"; github = "Shou";
@ -8040,6 +8051,12 @@
githubId = 13489144; githubId = 13489144;
name = "Calle Rosenquist"; name = "Calle Rosenquist";
}; };
xe = {
email = "me@christine.website";
github = "Xe";
githubId = 529003;
name = "Christine Dodrill";
};
xeji = { xeji = {
email = "xeji@cat3.de"; email = "xeji@cat3.de";
github = "xeji"; github = "xeji";

View File

@ -31,7 +31,6 @@ bind_host: "${cfg.bind_host}"
''} ''}
server_name: "${cfg.server_name}" server_name: "${cfg.server_name}"
pid_file: "/run/matrix-synapse.pid" pid_file: "/run/matrix-synapse.pid"
web_client: ${boolToString cfg.web_client}
${optionalString (cfg.public_baseurl != null) '' ${optionalString (cfg.public_baseurl != null) ''
public_baseurl: "${cfg.public_baseurl}" public_baseurl: "${cfg.public_baseurl}"
''} ''}
@ -202,13 +201,6 @@ in {
This is also the last part of your UserID. This is also the last part of your UserID.
''; '';
}; };
web_client = mkOption {
type = types.bool;
default = false;
description = ''
Whether to serve a web client from the HTTP/HTTPS root resource.
'';
};
public_baseurl = mkOption { public_baseurl = mkOption {
type = types.nullOr types.str; type = types.nullOr types.str;
default = null; default = null;
@ -719,6 +711,7 @@ in {
Database configuration must be done manually. An exemplary setup is demonstrated in Database configuration must be done manually. An exemplary setup is demonstrated in
<nixpkgs/nixos/tests/matrix-synapse.nix> <nixpkgs/nixos/tests/matrix-synapse.nix>
'') '')
(mkRemovedOptionModule [ "services" "matrix-synapse" "web_client" ] "")
]; ];
meta.doc = ./matrix-synapse.xml; meta.doc = ./matrix-synapse.xml;

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "BShapr"; pname = "BShapr";
version = "0.7"; version = "0.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sjaehn"; owner = "sjaehn";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1422xay28jkmqlj5y4vhb57kljy6ysvxh20cxpfxm980m8n54gq5"; sha256 = "0jlq5rjicc4fxlpk869dg0l5bwwz8k9aj2wfk9v89b0qw8l8kaxl";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tessera"; pname = "tessera";
version = "0.10.4"; version = "0.10.2";
src = fetchurl { src = fetchurl {
url = "https://oss.sonatype.org/service/local/repositories/releases/content/com/jpmorgan/quorum/${pname}-app/${version}/${pname}-app-${version}-app.jar"; url = "https://oss.sonatype.org/service/local/repositories/releases/content/com/jpmorgan/quorum/${pname}-app/${version}/${pname}-app-${version}-app.jar";
sha256 = "1sqj0mc80922yavx9hlwnl1kpmavpza2g2aycz1qd0zv0s31z9wj"; sha256 = "1zn8w7q0q5man0407kb82lw4mlvyiy9whq2f6izf2b5415f9s0m4";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

View File

@ -58556,7 +58556,7 @@
1434 1434
], ],
"commit": "1f596a93b3f1caadd7bba01030f8c179b029600b", "commit": "1f596a93b3f1caadd7bba01030f8c179b029600b",
"sha256": "0fdnkv37m7nf8yjjf01c856g2wrzyzqicv67fnbrnx7abrrfb1nd" "sha256": "0swnan2v2lc7s1jsnmkyzv7gajx08akgm6dvbsgm5hzp0mjbbpy4"
}, },
"stable": { "stable": {
"version": [ "version": [

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "pueue"; pname = "pueue";
version = "0.2.1"; version = "0.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Nukesor"; owner = "Nukesor";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1yx69pwdal0p5dfhabjdns9z6z3fa41wh7bxa4dpsjx37ziglcsp"; sha256 = "11x4y3ah9f7mv9jssws95sw7rd20fxwdh11mrhcb4vwk59cmqsjz";
}; };
cargoSha256 = "1ksr5fw9p3j1bnlgfimb5nsryb4si8ic2x4prsra1mwkc91hr7x3"; cargoSha256 = "06zv3li14sg4a8bgj38zzx576ggm32ss0djmys1g0h5a0nxaaqfx";
checkPhase = "cargo test -- --skip test_single_huge_payload"; checkPhase = "cargo test -- --skip test_single_huge_payload";

View File

@ -0,0 +1,25 @@
From 695e7a441fc28b874e65917fe2c0059b5b8ca749 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Sat, 28 Mar 2020 23:46:03 -0700
Subject: [PATCH] Patch plugindir to output
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 75e476f..cb1ddf7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,7 +55,7 @@ PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.40 gio-unix-2.0 gmodule-2.0 ])
PKG_CHECK_MODULES([cairo], [cairo])
PKG_CHECK_MODULES([rofi], [rofi])
-[rofi_PLUGIN_INSTALL_DIR]="`$PKG_CONFIG --variable=pluginsdir rofi`"
+[rofi_PLUGIN_INSTALL_DIR]="`echo $out/lib/rofi`"
AC_SUBST([rofi_PLUGIN_INSTALL_DIR])
LT_INIT([disable-static])
--
2.25.1

View File

@ -0,0 +1,69 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, substituteAll
, makeWrapper
, autoreconfHook
, pkgconfig
, cairo
, glib
, libnotify
, rofi-unwrapped
, wl-clipboard
, xclip
, xsel
}:
stdenv.mkDerivation rec {
pname = "rofi-emoji";
version = "2.1.2";
src = fetchFromGitHub {
owner = "Mange";
repo = pname;
rev = "v${version}";
sha256 = "0knsvsdff2c7ww94120bq92735qrfriyd28mi0n72ccb2iikyi8b";
};
patches = [
# Look for plugin-related files in $out/lib/rofi
./0001-Patch-plugindir-to-output.patch
];
postPatch = ''
patchShebangs clipboard-adapter.sh
'';
postFixup = ''
chmod +x $out/share/rofi-emoji/clipboard-adapter.sh
wrapProgram $out/share/rofi-emoji/clipboard-adapter.sh \
--prefix PATH ":" ${lib.makeBinPath [ libnotify wl-clipboard xclip xsel ]}
'';
nativeBuildInputs = [
autoreconfHook
pkgconfig
];
buildInputs = [
cairo
glib
libnotify
makeWrapper
rofi-unwrapped
wl-clipboard
xclip
xsel
];
meta = with lib; {
description = "An emoji selector plugin for Rofi";
homepage = "https://github.com/Mange/rofi-emoji";
license = licenses.mit;
maintainers = with maintainers; [ cole-h ];
platforms = platforms.linux;
};
}

View File

@ -18,6 +18,7 @@ symlinkJoin {
rm $out/bin/rofi rm $out/bin/rofi
makeWrapper ${rofi-unwrapped}/bin/rofi $out/bin/rofi \ makeWrapper ${rofi-unwrapped}/bin/rofi $out/bin/rofi \
--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share \ --prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share \
${lib.optionalString (plugins != []) ''--prefix XDG_DATA_DIRS : ${lib.concatStringsSep ":" (lib.forEach plugins (p: "${p.out}/share"))}''} \
${lib.optionalString (theme != null) ''--add-flags "-theme ${theme}"''} \ ${lib.optionalString (theme != null) ''--add-flags "-theme ${theme}"''} \
${lib.optionalString (plugins != []) ''--add-flags "-plugin-path $out/lib/rofi"''} ${lib.optionalString (plugins != []) ''--add-flags "-plugin-path $out/lib/rofi"''}

View File

@ -7,10 +7,10 @@ in
rec { rec {
firefox = common rec { firefox = common rec {
pname = "firefox"; pname = "firefox";
ffversion = "74.0"; ffversion = "74.0.1";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "245n2ilfgx3rd0xlxzpg4gcwddcy0cgaqnaf5pwixjx0n8py1imiylwlsbihf70s41cq5q8awckchs287yysr4v6pdfqqbj7s0f02ki"; sha512 = "3aycj3wllsz97x30dxngpbwryqss209cisj91vs1yfgspp8nbl148fk37id6bgl33hga1irc4zxx7glmymibymkfkrmy0xx803w8dy4";
}; };
patches = [ patches = [
@ -33,10 +33,10 @@ rec {
firefox-esr-68 = common rec { firefox-esr-68 = common rec {
pname = "firefox-esr"; pname = "firefox-esr";
ffversion = "68.6.0esr"; ffversion = "68.6.1esr";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "2ipajk86s7hfz7qky9lh24i5fgzgpv9hl12invr1rr6jhpp0h6gbb44ffim0z9lmcj49cr01cgqis0swhb4vph8dl1jvgfq9rjmsml4"; sha512 = "1xg2hdk50ys9np5a0jdwr2wb543sq8ibmvr05h9apmb4yn1hhz3ml9yq9r4v2di4hnb3s181zvq4np5srka2v6aqz8rk7cq46096fls";
}; };
patches = [ patches = [

View File

@ -2,19 +2,21 @@
buildGoModule rec { buildGoModule rec {
pname = "fluxctl"; pname = "fluxctl";
version = "1.18.0"; version = "1.19.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "weaveworks"; owner = "weaveworks";
repo = "flux"; repo = "flux";
rev = version; rev = version;
sha256 = "1sk82cnrj5ngcaml54rhh7ak8dg80r25623c4s8p7ybrj1m7krqj"; sha256 = "1w6ndp0nrpps6pkxnq38hikbnzwahi6j9gn8l0bxd0qkf7cjc5w0";
}; };
modSha256 = "0ij5q31a0818nmqsdql1ii6rhq6nb0liplnw509qih8py7dk5xkg"; modSha256 = "0zwq7n1lggj27j5yxgfplbaccw5fhbm7vm0sja839r1jamrn3ips";
subPackages = [ "cmd/fluxctl" ]; subPackages = [ "cmd/fluxctl" ];
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "CLI client for Flux, the GitOps Kubernetes operator"; description = "CLI client for Flux, the GitOps Kubernetes operator";
homepage = "https://github.com/fluxcd/flux"; homepage = "https://github.com/fluxcd/flux";

View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "kubeseal"; pname = "kubeseal";
version = "0.10.0"; version = "0.12.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bitnami-labs"; owner = "bitnami-labs";
repo = "sealed-secrets"; repo = "sealed-secrets";
rev = "v${version}"; rev = "v${version}";
sha256 = "14ahb02p1gqcqbjz6mn3axw436b6bi4ygq5ckm85jzs28s4wrfsv"; sha256 = "0z51iwdc4m0y8wyyx3mcvbzxlrgws7n5wkcd0g7nr73irnsld4lh";
}; };
modSha256 = "04dmjyz3vi2l0dfpyy42lkp2fv1vlfkvblrxh1dvb37phrkd5lbd"; modSha256 = "029h0zr3fpzlsv9hf1d1x5j7aalxkcsyszsxjz8fqrhjafqc7zvq";
subPackages = [ "cmd/kubeseal" ]; subPackages = [ "cmd/kubeseal" ];

View File

@ -1,4 +1,7 @@
{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_7, riot-web, mkYarnPackage }: { stdenv, fetchFromGitHub
, makeWrapper, makeDesktopItem, mkYarnPackage
, electron_7, riot-web, gtk3,
}:
# Notes for maintainers: # Notes for maintainers:
# * versions of `riot-web` and `riot-desktop` should be kept in sync. # * versions of `riot-web` and `riot-desktop` should be kept in sync.
@ -24,7 +27,7 @@ in mkYarnPackage rec {
packageJSON = ./riot-desktop-package.json; packageJSON = ./riot-desktop-package.json;
yarnNix = ./riot-desktop-yarndeps.nix; yarnNix = ./riot-desktop-yarndeps.nix;
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper gtk3 ];
installPhase = '' installPhase = ''
# resources # resources
@ -47,7 +50,8 @@ in mkYarnPackage rec {
# executable wrapper # executable wrapper
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
--add-flags "$out/share/riot/electron" --add-flags "$out/share/riot/electron" \
--prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH
''; '';
# Do not attempt generating a tarball for riot-web again. # Do not attempt generating a tarball for riot-web again.

View File

@ -18,7 +18,7 @@ python27Packages.buildPythonApplication rec {
''; '';
propagatedBuildInputs = with python27Packages; [ propagatedBuildInputs = with python27Packages; [
pyside pyside setuptools
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

View File

@ -0,0 +1,29 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "cadical";
version = "1.2.1";
src = fetchFromGitHub {
owner = "arminbiere";
repo = "cadical";
rev = "rel-${version}";
hash = "sha256:1a66xkw42ad330fvw8i0sawrmg913m8wrq5c85lw5qandkwvxdi6";
};
dontAddPrefix = true;
installPhase = ''
install -Dm0755 build/cadical "$out/bin/cadical"
install -Dm0755 build/mobical "$out/bin/mobical"
mkdir -p "$out/share/doc/${pname}-${version}/"
install -Dm0755 {LICEN?E,README*,VERSION} "$out/share/doc/${pname}-${version}/"
'';
meta = with stdenv.lib; {
description = "Simplified Satisfiability Solver";
maintainers = with maintainers; [ shnarazk ];
platforms = platforms.unix;
license = licenses.mit;
homepage = "http://fmv.jku.at/cadical";
};
}

View File

@ -51,29 +51,24 @@ stdenv.mkDerivation (
configureFlags="--prefix=$prefix $configureFlags" configureFlags="--prefix=$prefix $configureFlags"
dontAddPrefix=1 dontAddPrefix=1
prefix=$TMPDIR/inst$prefix prefix=$TMPDIR/inst$prefix
''; # */ '';
doDist = true; doDist = true;
distPhase = distPhase = ''
'' mkdir -p $out/tarballs
mkdir -p $out/tarballs tar cvfj $out/tarballs/''${releaseName:-binary-dist}.tar.bz2 -C $TMPDIR/inst .
tar cvfj $out/tarballs/''${releaseName:-binary-dist}.tar.bz2 -C $TMPDIR/inst . '';
'';
finalPhase = ''
for i in $out/tarballs/*; do
echo "file binary-dist $i" >> $out/nix-support/hydra-build-products
done
finalPhase = # Propagate the release name of the source tarball. This is
'' # to get nice package names in channels.
for i in $out/tarballs/*; do test -n "$releaseName" && (echo "$releaseName" >> $out/nix-support/hydra-release-name)
echo "file binary-dist $i" >> $out/nix-support/hydra-build-products '';
done
# Propagate the release name of the source tarball. This is
# to get nice package names in channels.
test -n "$releaseName" && (echo "$releaseName" >> $out/nix-support/hydra-release-name)
'';
meta = (if args ? meta then args.meta else {}) // { meta = (if args ? meta then args.meta else {}) // {
description = "Build of a generic binary distribution"; description = "Build of a generic binary distribution";

View File

@ -88,7 +88,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
done done
eval "$postInstall" eval "$postInstall"
''; # */ '';
meta = (if args ? meta then args.meta else {}) // { meta = (if args ? meta then args.meta else {}) // {
description = "Deb package for ${diskImage.fullName}"; description = "Deb package for ${diskImage.fullName}";

View File

@ -1,4 +1,4 @@
{pkgs}: { pkgs }:
with pkgs; with pkgs;
@ -77,7 +77,7 @@ rec {
its contituents. Channel jobs are a special type of jobs that are its contituents. Channel jobs are a special type of jobs that are
listed in the channel tab of Hydra and that can be suscribed. listed in the channel tab of Hydra and that can be suscribed.
A tarball of the src attribute is distributed via the channel. A tarball of the src attribute is distributed via the channel.
- constituents: a list of derivations on which the channel success depends. - constituents: a list of derivations on which the channel success depends.
- name: the channel name that will be used in the hydra interface. - name: the channel name that will be used in the hydra interface.
- src: should point to the root folder of the nix-expressions used by the - src: should point to the root folder of the nix-expressions used by the
@ -88,7 +88,7 @@ rec {
name = "my-channel"; name = "my-channel";
src = ./.; src = ./.;
}; };
*/ */
channel = channel =
{ name, src, constituents ? [], meta ? {}, isNixOS ? true, ... }@args: { name, src, constituents ? [], meta ? {}, isNixOS ? true, ... }@args:

View File

@ -11,12 +11,12 @@
, ... , ...
} @ args : } @ args :
let let
mvnFlags = "-Dmaven.repo.local=$M2_REPO ${if doTest then "" else "-Dmaven.test.skip.exec=true"} ${extraMvnFlags}"; mvnFlags = "-Dmaven.repo.local=$M2_REPO ${if doTest then "" else "-Dmaven.test.skip.exec=true"} ${extraMvnFlags}";
in in
stdenv.mkDerivation ( { stdenv.mkDerivation ( {
inherit name src; inherit name src;
phases = "setupPhase unpackPhase patchPhase mvnCompile ${if doTestCompile then "mvnTestCompile mvnTestJar" else ""} ${if doTest then "mvnTest" else ""} ${if doJavadoc then "mvnJavadoc" else ""} ${if doCheckstyle then "mvnCheckstyle" else ""} mvnJar mvnAssembly mvnRelease finalPhase"; phases = "setupPhase unpackPhase patchPhase mvnCompile ${if doTestCompile then "mvnTestCompile mvnTestJar" else ""} ${if doTest then "mvnTest" else ""} ${if doJavadoc then "mvnJavadoc" else ""} ${if doCheckstyle then "mvnCheckstyle" else ""} mvnJar mvnAssembly mvnRelease finalPhase";
setupPhase = '' setupPhase = ''
@ -32,15 +32,15 @@ stdenv.mkDerivation ( {
mvnCompile = '' mvnCompile = ''
mvn compile ${mvnFlags} mvn compile ${mvnFlags}
''; '';
mvnTestCompile = '' mvnTestCompile = ''
mvn test-compile ${mvnFlags} mvn test-compile ${mvnFlags}
''; '';
mvnTestJar = '' mvnTestJar = ''
mvn jar:test-jar ${mvnFlags} mvn jar:test-jar ${mvnFlags}
''; '';
mvnTest = '' mvnTest = ''
mvn test ${mvnFlags} mvn test ${mvnFlags}
@ -53,21 +53,21 @@ stdenv.mkDerivation ( {
mvn surefire-report:report-only mvn surefire-report:report-only
echo "report coverage $out/site/surefire-report.html" >> $out/nix-support/hydra-build-products echo "report coverage $out/site/surefire-report.html" >> $out/nix-support/hydra-build-products
fi fi
''; '';
mvnJavadoc = '' mvnJavadoc = ''
mvn javadoc:javadoc ${mvnFlags} mvn javadoc:javadoc ${mvnFlags}
echo "report javadoc $out/site/apidocs" >> $out/nix-support/hydra-build-products echo "report javadoc $out/site/apidocs" >> $out/nix-support/hydra-build-products
''; '';
mvnCheckstyle = '' mvnCheckstyle = ''
mvn checkstyle:checkstyle ${mvnFlags} mvn checkstyle:checkstyle ${mvnFlags}
echo "report checkstyle $out/site/checkstyle.html" >> $out/nix-support/hydra-build-products echo "report checkstyle $out/site/checkstyle.html" >> $out/nix-support/hydra-build-products
''; '';
mvnJar = '' mvnJar = ''
mvn jar:jar ${mvnFlags} mvn jar:jar ${mvnFlags}
''; '';
mvnAssembly = '' mvnAssembly = ''
mvn assembly:assembly -Dmaven.test.skip=true ${mvnFlags} mvn assembly:assembly -Dmaven.test.skip=true ${mvnFlags}
@ -80,13 +80,13 @@ stdenv.mkDerivation ( {
releaseName=$(basename $zip .zip) releaseName=$(basename $zip .zip)
releaseName="$releaseName-r${toString src.rev or "0"}" releaseName="$releaseName-r${toString src.rev or "0"}"
cp $zip $out/release/$releaseName.zip cp $zip $out/release/$releaseName.zip
echo "$releaseName" > $out/nix-support/hydra-release-name echo "$releaseName" > $out/nix-support/hydra-release-name
${if doRelease then '' ${if doRelease then ''
echo "file zip $out/release/$releaseName.zip" >> $out/nix-support/hydra-build-products echo "file zip $out/release/$releaseName.zip" >> $out/nix-support/hydra-build-products
'' else ""} '' else ""}
''; '';
finalPhase = '' finalPhase = ''
if [ -d target/site ] ; then if [ -d target/site ] ; then
@ -94,5 +94,5 @@ stdenv.mkDerivation ( {
echo "report site $out/site" >> $out/nix-support/hydra-build-products echo "report site $out/site" >> $out/nix-support/hydra-build-products
fi fi
''; '';
} // args } // args
) )

View File

@ -44,7 +44,7 @@ vmTools.buildRPM (
for rpmdir in $extraRPMs ; do for rpmdir in $extraRPMs ; do
echo "file rpm-extra $(ls $rpmdir/rpms/*/*.rpm | grep -v 'src\.rpm' | sort | head -1)" >> $out/nix-support/hydra-build-products echo "file rpm-extra $(ls $rpmdir/rpms/*/*.rpm | grep -v 'src\.rpm' | sort | head -1)" >> $out/nix-support/hydra-build-products
done done
''; # */ '';
meta = (if args ? meta then args.meta else {}) // { meta = (if args ? meta then args.meta else {}) // {
description = "RPM package for ${diskImage.fullName}"; description = "RPM package for ${diskImage.fullName}";

View File

@ -1,7 +1,7 @@
{ lib, fetchzip }: { lib, fetchzip }:
let let
version = "1.043"; version = "1.046";
in in
fetchzip { fetchzip {
name = "recursive-${version}"; name = "recursive-${version}";
@ -14,7 +14,7 @@ fetchzip {
unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2 unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2
''; '';
sha256 = "0y7wg3ssr4j0r8dyxd0i0ji8bjvipzsqf0l6wznl5sfxk41mvjvd"; sha256 = "1j2rygkcmm2gpial24lks907mxjnhjrvl8z4skl8b43a55fg7mmp";
meta = with lib; { meta = with lib; {
homepage = "https://recursive.design/"; homepage = "https://recursive.design/";

View File

@ -1,6 +1,6 @@
{ fetchurl }: { fetchurl }:
fetchurl { fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/e0bc864e0b6edb5e5ce1ec4bfa763a442b343bf5.tar.gz"; url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/90b24a91103dca4f0df6cb28cecb205a7d7ab650.tar.gz";
sha256 = "1lmjxam58srrv9cjqajqz4bishx8hy99db3cx83i95qb3qiiiz6m"; sha256 = "1zfj8c6s9icqg83ycfvd150s4jd07ccbjg2w2mn10rx5ng76mn53";
} }

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "theme-obsidian2"; pname = "theme-obsidian2";
version = "2.10"; version = "2.11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "madmaxms"; owner = "madmaxms";
repo = "theme-obsidian-2"; repo = "theme-obsidian-2";
rev = "v${version}"; rev = "v${version}";
sha256 = "123f6hpz0h5xfmas44xa1ci68w8f3lcjj54jpnrqhsww66c9vs0i"; sha256 = "0n64cml2h8dw2m2m6j90d515saqapqzjz6xcv4kr544ibv62hn61";
}; };
propagatedUserEnvPkgs = [ gtk-engine-murrine ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ];
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Gnome theme, based upon Adwaita-Maia dark skin"; description = "Gnome theme, based upon Adwaita-Maia dark skin";
homepage = https://github.com/madmaxms/theme-obsidian-2; homepage = "https://github.com/madmaxms/theme-obsidian-2";
license = with licenses; [ gpl3 ]; license = with licenses; [ gpl3 ];
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

View File

@ -0,0 +1,76 @@
https://phabricator.kde.org/file/data/dyr2qr4wrhxg4eahkgd3/PHID-FILE-7d4og3zr4mk53u6lzkk2/D27442.diff
https://bugs.kde.org/show_bug.cgi?id=417316
diff -ru kscreen-5.17.5-orig/kcm/package/contents/ui/main.qml kscreen-5.17.5/kcm/package/contents/ui/main.qml
--- kscreen-5.17.5-orig/kcm/package/contents/ui/main.qml 2020-01-07 16:28:39.000000000 +0100
+++ kscreen-5.17.5/kcm/package/contents/ui/main.qml 2020-04-03 17:54:26.097809557 +0200
@@ -24,8 +24,8 @@
KCM.SimpleKCM {
id: root
- implicitWidth: units.gridUnit * 30
- implicitHeight: units.gridUnit * 38
+ implicitWidth: Kirigami.Units.gridUnit * 32
+ implicitHeight: Kirigami.Units.gridUnit * 38
property int selectedOutput: 0
@@ -113,7 +113,7 @@
id: screen
Layout.alignment: Qt.AlignHCenter
- Layout.preferredWidth: Math.max(root.width * 0.8, units.gridUnit * 26)
+ Layout.preferredWidth: Math.max(root.width * 0.8, Kirigami.Units.gridUnit * 26)
Layout.topMargin: Kirigami.Units.smallSpacing
Layout.bottomMargin: Kirigami.Units.largeSpacing * 2
diff -ru kscreen-5.17.5-orig/kcm/package/contents/ui/Output.qml kscreen-5.17.5/kcm/package/contents/ui/Output.qml
--- kscreen-5.17.5-orig/kcm/package/contents/ui/Output.qml 2020-01-07 16:28:39.000000000 +0100
+++ kscreen-5.17.5/kcm/package/contents/ui/Output.qml 2020-04-03 17:53:22.491686708 +0200
@@ -19,6 +19,7 @@
import QtQuick.Layouts 1.1
import QtQuick.Controls 2.3 as Controls
import QtGraphicalEffects 1.0
+import org.kde.kirigami 2.4 as Kirigami
Rectangle {
id: output
@@ -77,7 +78,7 @@
Controls.Label {
Layout.fillWidth: true
- Layout.margins: units.smallSpacing
+ Layout.margins: Kirigami.Units.smallSpacing
text: model.display
wrapMode: Text.Wrap
@@ -87,7 +88,7 @@
Controls.Label {
Layout.fillWidth: true
- Layout.bottomMargin: units.smallSpacing
+ Layout.bottomMargin: Kirigami.Units.smallSpacing
text: "(" + model.size.width + "x" + model.size.height + ")"
horizontalAlignment: Text.AlignHCenter
diff -ru kscreen-5.17.5-orig/kcm/package/contents/ui/Screen.qml kscreen-5.17.5/kcm/package/contents/ui/Screen.qml
--- kscreen-5.17.5-orig/kcm/package/contents/ui/Screen.qml 2020-01-07 16:28:39.000000000 +0100
+++ kscreen-5.17.5/kcm/package/contents/ui/Screen.qml 2020-04-03 17:53:22.491686708 +0200
@@ -45,7 +45,7 @@
property int xOffset: (width - totalSize.width / relativeFactor) / 2;
property int yOffset: (height - totalSize.height / relativeFactor) / 2;
- implicitHeight: Math.max(root.height * 0.4, units.gridUnit * 13)
+ implicitHeight: Math.max(root.height * 0.4, Kirigami.Units.gridUnit * 13)
Component.onCompleted: background.visible = true;
@@ -54,7 +54,7 @@
anchors {
bottom: parent.bottom
horizontalCenter: parent.horizontalCenter
- margins: units.smallSpacing
+ margins: Kirigami.Units.smallSpacing
}
spacing: units.smallSpacing
Controls.Button {

View File

@ -8,6 +8,7 @@
mkDerivation { mkDerivation {
name = "kscreen"; name = "kscreen";
patches = [ ./kscreen-417316.patch ];
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ buildInputs = [
kconfig kcmutils kconfigwidgets kdbusaddons kglobalaccel ki18n kconfig kcmutils kconfigwidgets kdbusaddons kglobalaccel ki18n

View File

@ -37,9 +37,6 @@ self: super: {
# compiled on Linux. We provide the name to avoid evaluation errors. # compiled on Linux. We provide the name to avoid evaluation errors.
unbuildable = throw "package depends on meta package 'unbuildable'"; unbuildable = throw "package depends on meta package 'unbuildable'";
# The test suite depends on old versions of tasty and QuickCheck.
hackage-security = dontCheck super.hackage-security;
# enable using a local hoogle with extra packagages in the database # enable using a local hoogle with extra packagages in the database
# nix-shell -p "haskellPackages.hoogleLocal { packages = with haskellPackages; [ mtl lens ]; }" # nix-shell -p "haskellPackages.hoogleLocal { packages = with haskellPackages; [ mtl lens ]; }"
# $ hoogle server # $ hoogle server
@ -86,7 +83,7 @@ self: super: {
name = "git-annex-${super.git-annex.version}-src"; name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/"; url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version; rev = "refs/tags/" + super.git-annex.version;
sha256 = "0y2qcjahi705c6nnypqpa5w3bzyzk4kqvbwfnpiaxzk5vna589gg"; sha256 = "1jjw6ar8ddcncwzksyx2xky50sm2jg1zjr7iiqk0vn8qq0fn2gwy";
}; };
}).override { }).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null; dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@ -326,6 +323,7 @@ self: super: {
hs2048 = dontCheck super.hs2048; hs2048 = dontCheck super.hs2048;
hsbencher = dontCheck super.hsbencher; hsbencher = dontCheck super.hsbencher;
hsexif = dontCheck super.hsexif; hsexif = dontCheck super.hsexif;
hspec-core = if pkgs.stdenv.isi686 then dontCheck super.hspec-core else super.hspec-core; # tests rely on `Int` being 64-bit; https://github.com/hspec/hspec/issues/431
hspec-server = dontCheck super.hspec-server; hspec-server = dontCheck super.hspec-server;
HTF = dontCheck super.HTF; HTF = dontCheck super.HTF;
htsn = dontCheck super.htsn; htsn = dontCheck super.htsn;
@ -359,7 +357,6 @@ self: super: {
optional = dontCheck super.optional; optional = dontCheck super.optional;
orgmode-parse = dontCheck super.orgmode-parse; orgmode-parse = dontCheck super.orgmode-parse;
os-release = dontCheck super.os-release; os-release = dontCheck super.os-release;
pandoc-crossref = dontCheck super.pandoc-crossref; # (most likely change when no longer 0.3.2.1) https://github.com/lierdakil/pandoc-crossref/issues/199
persistent-redis = dontCheck super.persistent-redis; persistent-redis = dontCheck super.persistent-redis;
pipes-extra = dontCheck super.pipes-extra; pipes-extra = dontCheck super.pipes-extra;
pipes-websockets = dontCheck super.pipes-websockets; pipes-websockets = dontCheck super.pipes-websockets;
@ -1192,10 +1189,10 @@ self: super: {
}); });
# Remove unecessary constraint: # Remove unecessary constraint:
# https://github.com/agrafix/superbuffer/pull/2 # https://github.com/haskell-infra/hackage-trustees/issues/258
superbuffer = overrideCabal super.superbuffer (drv: { data-accessor-template = overrideCabal super.data-accessor-template (drv: {
postPatch = '' postPatch = ''
sed -i 's#QuickCheck < 2.10#QuickCheck < 2.13#' superbuffer.cabal sed -i 's#template-haskell >=2.11 && <2.15#template-haskell#' data-accessor-template.cabal
''; '';
}); });
@ -1344,7 +1341,7 @@ self: super: {
}); });
# cabal-fmt requires Cabal3 # cabal-fmt requires Cabal3
cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_0_0_0; }; cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_2_0_0; };
# Several gtk2hs-provided packages at v0.13.8.0 fail to build on Darwin # Several gtk2hs-provided packages at v0.13.8.0 fail to build on Darwin
# until we pick up https://github.com/gtk2hs/gtk2hs/pull/293 so apply that # until we pick up https://github.com/gtk2hs/gtk2hs/pull/293 so apply that
@ -1463,6 +1460,11 @@ self: super: {
# haskell-ci-0.8 needs cabal-install-parsers ==0.1, but we have 0.2. # haskell-ci-0.8 needs cabal-install-parsers ==0.1, but we have 0.2.
haskell-ci = doJailbreak super.haskell-ci; haskell-ci = doJailbreak super.haskell-ci;
# Needs the latest version of vty.
matterhorn = super.matterhorn.overrideScope (self: super: {
vty = self.vty_5_28_2;
});
persistent-mysql = dontCheck super.persistent-mysql; persistent-mysql = dontCheck super.persistent-mysql;
# Fix EdisonAPI and EdisonCore for GHC 8.8: # Fix EdisonAPI and EdisonCore for GHC 8.8:
@ -1488,4 +1490,16 @@ self: super: {
# Needs a version that's newer than LTS-15.x provides. # Needs a version that's newer than LTS-15.x provides.
weeder = super.weeder.override { generic-lens = self.generic-lens_2_0_0_0; }; weeder = super.weeder.override { generic-lens = self.generic-lens_2_0_0_0; };
polysemy-plugin = super.polysemy-plugin.override {
# polysemy-plugin 0.2.5.0 has constraint ghc-tcplugins-extra (==0.3.*)
# This upstream issue is relevant:
# https://github.com/polysemy-research/polysemy/issues/322
ghc-tcplugins-extra = self.ghc-tcplugins-extra_0_3_2;
# version of Polysemy the plugin goes with
polysemy = self.polysemy_1_3_0_0;
};
# Fixed at head, but hasn't cut a release in awhile.
darcs = doJailbreak super.darcs;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

View File

@ -44,7 +44,7 @@ self: super: {
text = self.text_1_2_4_0; text = self.text_1_2_4_0;
# Needs Cabal 3.0.x. # Needs Cabal 3.0.x.
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_0_0_0; }; jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_0_0; };
# https://github.com/bmillwood/applicative-quoters/issues/6 # https://github.com/bmillwood/applicative-quoters/issues/6
applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch { applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {

View File

@ -40,9 +40,9 @@ self: super: {
unix = null; unix = null;
xhtml = null; xhtml = null;
# Needs Cabal 3.0.x. # Needs Cabal 3.2.x.
cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; }); cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_0_0_0; }; jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_0_0; };
# Restricts aeson to <1.4 # Restricts aeson to <1.4
# https://github.com/purescript/purescript/pull/3537 # https://github.com/purescript/purescript/pull/3537

View File

@ -42,8 +42,8 @@ self: super: {
xhtml = null; xhtml = null;
# Needs Cabal 3.0.x. # Needs Cabal 3.0.x.
cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; }); cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_0_0_0; }; jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_0_0; };
# https://github.com/tibbe/unordered-containers/issues/214 # https://github.com/tibbe/unordered-containers/issues/214
unordered-containers = dontCheck super.unordered-containers; unordered-containers = dontCheck super.unordered-containers;
@ -76,12 +76,10 @@ self: super: {
# cabal2nix needs the latest version of Cabal, and the one # cabal2nix needs the latest version of Cabal, and the one
# hackage-db uses must match, so take the latest # hackage-db uses must match, so take the latest
cabal2nix = super.cabal2nix.overrideScope (self: super: { cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });
Cabal = self.Cabal_3_0_0_0;
});
# cabal2spec needs a recent version of Cabal # cabal2spec needs a recent version of Cabal
cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; }); cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });
# Builds only with ghc-8.8.x and beyond. # Builds only with ghc-8.8.x and beyond.
policeman = markBroken super.policeman; policeman = markBroken super.policeman;

View File

@ -41,10 +41,13 @@ self: super: {
unix = null; unix = null;
xhtml = null; xhtml = null;
# These builds need Cabal 3.2.x.
cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_0_0; };
cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });
# Ignore overly restrictive upper version bounds. # Ignore overly restrictive upper version bounds.
aeson-diff = doJailbreak super.aeson-diff; aeson-diff = doJailbreak super.aeson-diff;
async = doJailbreak super.async; async = doJailbreak super.async;
cabal-install = doJailbreak super.cabal-install;
ChasingBottoms = doJailbreak super.ChasingBottoms; ChasingBottoms = doJailbreak super.ChasingBottoms;
chell = doJailbreak super.chell; chell = doJailbreak super.chell;
cryptohash-sha256 = doJailbreak super.cryptohash-sha256; cryptohash-sha256 = doJailbreak super.cryptohash-sha256;
@ -72,12 +75,6 @@ self: super: {
time-compat = doJailbreak super.time-compat; time-compat = doJailbreak super.time-compat;
http-media = doJailbreak super.http-media; http-media = doJailbreak super.http-media;
servant-server = doJailbreak super.servant-server; servant-server = doJailbreak super.servant-server;
# These packages don't work and need patching and/or an update.
hackage-security = appendPatch (doJailbreak super.hackage-security) (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hackage-security-0.5.3.0.patch";
sha256 = "0l8x0pbsn18fj5ak5q0g5rva4xw1s9yc4d86a1pfyaz467b9i5a4";
});
foundation = dontCheck super.foundation; foundation = dontCheck super.foundation;
vault = dontHaddock super.vault; vault = dontHaddock super.vault;

View File

@ -572,17 +572,34 @@ self: super: builtins.intersectAttrs super {
# The test-suite requires a running PostgreSQL server. # The test-suite requires a running PostgreSQL server.
Frames-beam = dontCheck super.Frames-beam; Frames-beam = dontCheck super.Frames-beam;
futhark = if pkgs.stdenv.isDarwin then super.futhark else with pkgs; # * Compile manpages (which are in RST and are compiled with Sphinx).
let path = stdenv.lib.makeBinPath [ gcc ]; #
in overrideCabal (addBuildTool super.futhark makeWrapper) (_drv: { # * Wrap so that binary can find GCC and OpenCL headers (dubious if
postInstall = '' # a good idea).
wrapProgram $out/bin/futhark \ futhark = with pkgs;
--prefix PATH : "${path}" \ let maybeWrap =
--set NIX_CC_WRAPPER_x86_64_unknown_linux_gnu_TARGET_HOST 1 \ if pkgs.stdenv.isDarwin then ""
--set NIX_CFLAGS_COMPILE "-I${opencl-headers}/include" \ else
--set NIX_CFLAGS_LINK "-L${ocl-icd}/lib" let path = stdenv.lib.makeBinPath [ gcc ];
''; in ''
}); wrapProgram $out/bin/futhark \
--prefix PATH : "${path}" \
--set NIX_CC_WRAPPER_x86_64_unknown_linux_gnu_TARGET_HOST 1 \
--set NIX_CFLAGS_COMPILE "-I${opencl-headers}/include" \
--set NIX_CFLAGS_LINK "-L${ocl-icd}/lib"
'';
in overrideCabal (addBuildTools super.futhark [makeWrapper python37Packages.sphinx])
(_drv: {
postBuild = (_drv.postBuild or "") + ''
make -C docs man
'';
postInstall = (_drv.postInstall or "") + ''
mkdir -p $out/share/man/man1
mv docs/_build/man/*.1 $out/share/man/man1/
''
+ maybeWrap;
});
git-annex = with pkgs; git-annex = with pkgs;
if (!stdenv.isLinux) then if (!stdenv.isLinux) then

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,82 @@
{ stdenv, fetchurl, graalvm8 }:
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "babashka";
version = "0.0.78";
reflectionJson = fetchurl {
name = "reflection.json";
url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-reflection.json";
sha256 = "1m1nwdxjsc6bkdzkbsll316ly0c3qxaimjzyfph1220irjxnm7xf";
};
src = fetchurl {
url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "01w990zk5qjrbnc846snh6na002kdyrlrfnqwg03ibx20g3mr7if";
};
dontUnpack = true;
buildInputs = [ graalvm8 ];
buildPhase = ''
native-image \
-jar ${src} \
-H:Name=bb \
-H:+ReportExceptionStackTraces \
-J-Dclojure.spec.skip-macros=true \
-J-Dclojure.compiler.direct-linking=true \
"-H:IncludeResources=BABASHKA_VERSION" \
"-H:IncludeResources=SCI_VERSION" \
-H:ReflectionConfigurationFiles=${reflectionJson} \
--initialize-at-run-time=java.lang.Math\$RandomNumberGeneratorHolder \
--initialize-at-build-time \
-H:Log=registerResource: \
-H:EnableURLProtocols=http,https \
--enable-all-security-services \
-H:+JNI \
--verbose \
--no-fallback \
--no-server \
--report-unsupported-elements-at-runtime \
"-J-Xmx3g"
'';
installPhase = ''
mkdir -p $out/bin
cp bb $out/bin/bb
'';
meta = with stdenv.lib; {
description = "A Clojure babushka for the grey areas of Bash";
longDescription = ''
The main idea behind babashka is to leverage Clojure in places where you
would be using bash otherwise.
As one user described it:
Im quite at home in Bash most of the time, but theres a substantial
grey area of things that are too complicated to be simple in bash, but
too simple to be worth writing a clj/s script for. Babashka really
seems to hit the sweet spot for those cases.
Goals:
- Low latency Clojure scripting alternative to JVM Clojure.
- Easy installation: grab the self-contained binary and run. No JVM needed.
- Familiarity and portability:
- Scripts should be compatible with JVM Clojure as much as possible
- Scripts should be platform-independent as much as possible. Babashka
offers support for linux, macOS and Windows.
- Allow interop with commonly used classes like java.io.File and System
- Multi-threading support (pmap, future, core.async)
- Batteries included (tools.cli, cheshire, ...)
- Library support via popular tools like the clojure CLI
'';
homepage = "https://github.com/borkdude/babashka";
license = licenses.epl10;
platforms = graalvm8.meta.platforms;
maintainers = with maintainers; [ bhougland DerGuteMoritz jlesquembre ];
};
}

View File

@ -3,9 +3,6 @@
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform
}: }:
assert pythonSupport -> python != null;
assert pythonSupport -> libxml2.pythonSupport;
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -53,5 +50,6 @@ stdenv.mkDerivation rec {
license = licenses.mit; license = licenses.mit;
platforms = platforms.all; platforms = platforms.all;
maintainers = [ maintainers.eelco ]; maintainers = [ maintainers.eelco ];
broken = !(pythonSupport -> libxml2.pythonSupport); # see #73102 for why this is not an assert
}; };
} }

View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
autoconf autoconf
''; '';
buildPhase = if stdenv.cc.isClang then "make all opt CPPFLAGS=-Wno-error" else "make all opt"; buildPhase = "make all opt CPPFLAGS=-Wno-error";
installPhase = "make install-opt"; installPhase = "make install-opt";

View File

@ -29,7 +29,9 @@ buildPythonPackage rec {
cvxopt cvxopt
ecos ecos
multiprocess multiprocess
numpy
osqp osqp
scipy
scs scs
six six
]; ];
@ -39,11 +41,11 @@ buildPythonPackage rec {
nosetests nosetests
''; '';
meta = { meta = with lib; {
description = "A domain-specific language for modeling convex optimization problems in Python."; description = "A domain-specific language for modeling convex optimization problems in Python.";
homepage = "https://www.cvxpy.org/"; homepage = "https://www.cvxpy.org/";
downloadPage = "https://github.com/cvxgrp/cvxpy/"; downloadPage = "https://github.com/cvxgrp/cvxpy/";
license = lib.licenses.asl20; license = licenses.asl20;
maintainers = with lib.maintainers; [ drewrisinger ]; maintainers = with maintainers; [ drewrisinger ];
}; };
} }

View File

@ -1,49 +1,52 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, aiofiles
, click , click
, click-default-group , click-default-group
, janus
, jinja2 , jinja2
, hupper , hupper
, pint , pint
, pluggy , pluggy
, pytest , uvicorn
# Check Inputs
, pytestCheckHook
, pytestrunner , pytestrunner
, pytest-asyncio , pytest-asyncio
, black , black
, aiohttp , aiohttp
, beautifulsoup4 , beautifulsoup4
, uvicorn
, asgiref , asgiref
, aiofiles
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "datasette"; pname = "datasette";
version = "0.35"; version = "0.39";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "simonw"; owner = "simonw";
repo = "datasette"; repo = "datasette";
rev = version; rev = version;
sha256 = "0v6af7agg27lapz1nbab07595v4hl2x5wm2f03drj81f7pm8y7hc"; sha256 = "07d46512bc9sdan9lv39sf1bwlf7vf1bfhcsm825vk7sv7g9kczd";
}; };
nativeBuildInputs = [ pytestrunner ]; nativeBuildInputs = [ pytestrunner ];
propagatedBuildInputs = [ propagatedBuildInputs = [
aiofiles
click click
click-default-group click-default-group
janus
jinja2 jinja2
hupper hupper
pint pint
pluggy pluggy
uvicorn uvicorn
aiofiles
]; ];
checkInputs = [ checkInputs = [
pytest pytestCheckHook
pytest-asyncio pytest-asyncio
aiohttp aiohttp
beautifulsoup4 beautifulsoup4
@ -53,24 +56,32 @@ buildPythonPackage rec {
postConfigure = '' postConfigure = ''
substituteInPlace setup.py \ substituteInPlace setup.py \
--replace "click-default-group==1.2" "click-default-group" \ --replace "click~=7.1.1" "click" \
--replace "Sanic==0.7.0" "Sanic" \ --replace "click-default-group~=1.2.2" "click-default-group" \
--replace "hupper==1.0" "hupper" \ --replace "Jinja2~=2.10.3" "Jinja2" \
--replace "pint~=0.8.1" "pint" \ --replace "hupper~=1.9" "hupper" \
--replace "pluggy~=0.12.0" "pint" \ --replace "pint~=0.9" "pint" \
--replace "Jinja2==2.10.1" "Jinja2" \ --replace "pluggy~=0.13.0" "pint" \
--replace "uvicorn~=0.8.4" "uvicorn" --replace "uvicorn~=0.11" "uvicorn" \
--replace "aiofiles~=0.4.0" "aiofiles" \
--replace "janus~=0.4.0" "janus" \
--replace "PyYAML~=5.3" "PyYAML"
''; '';
# many tests require network access # many tests require network access
# test_black fails on darwin # test_black fails on darwin
checkPhase = '' dontUseSetuptoolsCheck = true;
pytest --ignore tests/test_api.py \ pytestFlagsArray = [
--ignore tests/test_csv.py \ "--ignore=tests/test_api.py"
--ignore tests/test_html.py \ "--ignore=tests/test_csv.py"
--ignore tests/test_black.py \ "--ignore=tests/test_html.py"
-k 'not facet' "--ignore=tests/test_docs.py"
''; "--ignore=tests/test_black.py"
];
disabledTests = [
"facet"
"_invalid_database" # checks error message when connecting to invalid database
];
meta = with lib; { meta = with lib; {
description = "An instant JSON API for your SQLite databases"; description = "An instant JSON API for your SQLite databases";

View File

@ -18,9 +18,7 @@ buildPythonPackage rec {
sha256 = "0bkj1xfp6mnvk1i9hl5awsmwi07q6iwwsjznd7kvrx5m19i6dbnx"; sha256 = "0bkj1xfp6mnvk1i9hl5awsmwi07q6iwwsjznd7kvrx5m19i6dbnx";
}; };
nativeBuildInputs = [ nativeBuildInputs = lib.optional isPy27 mock;
pytestCheckHook
] ++ lib.optional isPy27 mock;
propagatedBuildInputs = [ propagatedBuildInputs = [
paramiko paramiko
@ -29,12 +27,15 @@ buildPythonPackage rec {
websocket_client websocket_client
] ++ lib.optional isPy27 backports_ssl_match_hostname; ] ++ lib.optional isPy27 backports_ssl_match_hostname;
checkInputs = [
pytestCheckHook
];
pytestFlagsArray = [ "tests/unit" ]; pytestFlagsArray = [ "tests/unit" ];
# Deselect socket tests on Darwin because it hits the path length limit for a Unix domain socket # Deselect socket tests on Darwin because it hits the path length limit for a Unix domain socket
disabledTests = lib.optionals stdenv.isDarwin [ "stream_response" "socket_file" ]; disabledTests = lib.optionals stdenv.isDarwin [ "stream_response" "socket_file" ];
# skip setuptoolsCheckPhase dontUseSetuptoolsCheck = true;
doCheck = false;
meta = with lib; { meta = with lib; {
description = "An API client for docker written in Python"; description = "An API client for docker written in Python";

View File

@ -4,10 +4,9 @@
, cmake , cmake
, future , future
, numpy , numpy
# check inputs
, scipy , scipy
# check inputs
, pytestCheckHook , pytestCheckHook
, mkl
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -23,16 +22,15 @@ buildPythonPackage rec {
dontUseCmakeConfigure = true; dontUseCmakeConfigure = true;
propagatedBuildInputs = [ propagatedBuildInputs = [
numpy
future future
numpy
scipy
]; ];
checkInputs = [ scipy pytestCheckHook mkl ];
pythonImportsCheck = [ "osqp" ]; pythonImportsCheck = [ "osqp" ];
dontUseSetuptoolsCheck = true; # running setup.py fails if false checkInputs = [ pytestCheckHook ];
preCheck = '' dontUseSetuptoolsCheck = true; # don't run checks twice
export LD_LIBRARY_PATH=${lib.strings.makeLibraryPath [ mkl ]}:$LD_LIBRARY_PATH; disabledTests = [ "mkl_" ];
'';
meta = with lib; { meta = with lib; {
description = "The Operator Splitting QP Solver"; description = "The Operator Splitting QP Solver";
@ -44,8 +42,8 @@ buildPythonPackage rec {
where x in R^n is the optimization variable where x in R^n is the optimization variable
''; '';
homepage = "https://osqp.org/"; homepage = "https://osqp.org/";
downloadPage = "https://github.com/oxfordcontrol/osqp"; downloadPage = "https://github.com/oxfordcontrol/osqp-python/releases";
license = licenses.asl20; license = licenses.asl20;
maintainers = with lib.maintainers; [ drewrisinger ]; maintainers = with maintainers; [ drewrisinger ];
}; };
} }

View File

@ -2,20 +2,40 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, isPy27 , isPy27
, pythonOlder
, funcsigs , funcsigs
, setuptools_scm
# Check Inputs
, pytestCheckHook
, numpy
, matplotlib
, uncertainties
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pint"; pname = "pint";
version = "0.9"; version = "0.11";
src = fetchPypi { src = fetchPypi {
inherit version; inherit version;
pname = "Pint"; pname = "Pint";
sha256 = "32d8a9a9d63f4f81194c0014b3b742679dce81a26d45127d9810a68a561fe4e2"; sha256 = "0kfgnmcs6z9ndhzvwg2xzhpwxgyyagdsdz5dns1jy40fa1q113rh";
}; };
propagatedBuildInputs = lib.optional isPy27 funcsigs; disabled = pythonOlder "3.6";
propagatedBuildInputs = [
setuptools_scm
] ++ lib.optional isPy27 funcsigs;
# Test suite explicitly requires pytest
checkInputs = [
pytestCheckHook
numpy
matplotlib
uncertainties
];
dontUseSetuptoolsCheck = true;
meta = with lib; { meta = with lib; {
description = "Physical quantities module"; description = "Physical quantities module";

View File

@ -1,22 +1,35 @@
{ stdenv, fetchFromGitHub { stdenv
, buildPythonPackage, python-jose, pyjwt, requests, deprecated, httpretty }: , buildPythonPackage
, cryptography
, deprecated
, fetchFromGitHub
, httpretty
, isPy3k
, parameterized
, pyjwt
, pytestCheckHook
, requests }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "PyGithub"; pname = "PyGithub";
version = "1.45"; version = "1.47";
disabled = !isPy3k;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "PyGithub"; owner = "PyGithub";
repo = "PyGithub"; repo = "PyGithub";
rev = "v${version}"; rev = "v${version}";
sha256 = "1aiyqwdxpcr7yzz7aqmmjn1g2ajs5bpbln4sax5zw19dqi6qgp9z"; sha256 = "0zvp1gib2lryw698vxkbdv40n3lsmdlhwp7vdcg41dqqa5nfryhn";
}; };
propagatedBuildInputs = [ python-jose pyjwt requests deprecated httpretty ]; checkInputs = [ httpretty parameterized pytestCheckHook ];
propagatedBuildInputs = [ cryptography deprecated pyjwt requests ];
# Test suite makes REST calls against github.com
doCheck = false; doCheck = false;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/PyGithub/PyGithub; homepage = "https://github.com/PyGithub/PyGithub";
description = "A Python (2 and 3) library to access the GitHub API v3"; description = "A Python (2 and 3) library to access the GitHub API v3";
platforms = platforms.all; platforms = platforms.all;
license = licenses.gpl3; license = licenses.gpl3;

View File

@ -6,16 +6,17 @@
, libuv , libuv
, psutil , psutil
, isPy27 , isPy27
, pythonAtLeast
, CoreServices , CoreServices
, ApplicationServices , ApplicationServices
# Check Inputs
, pytestCheckHook
# , pytest-asyncio
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "uvloop"; pname = "uvloop";
version = "0.14.0"; version = "0.14.0";
# python 3.8 hangs on tests, assuming it's subtly broken with race condition disabled = isPy27;
disabled = isPy27 || pythonAtLeast "3.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
@ -28,20 +29,44 @@ buildPythonPackage rec {
libuv libuv
] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
postPatch = '' pythonImportsCheck = [
# Removing code linting tests, which we don't care about "uvloop"
rm tests/test_sourcecode.py "uvloop.loop"
''; ];
checkInputs = [ pyopenssl psutil ]; dontUseSetuptoolsCheck = true;
checkInputs = [ pytestCheckHook pyopenssl psutil ];
pytestFlagsArray = [
# from pytest.ini, these are NECESSARY to prevent failures
"--capture=no"
"--assert=plain"
"--tb=native"
# ignore code linting tests
"--ignore=tests/test_sourcecode.py"
];
disabledTests = [
"test_sock_cancel_add_reader_race" # asyncio version of test is supposed to be skipped but skip doesn't happen. uvloop version runs fine
];
# force using installed/compiled uvloop vs source by moving tests to temp dir
preCheck = ''
export TEST_DIR=$(mktemp -d)
cp -r tests $TEST_DIR
pushd $TEST_DIR
'';
postCheck = ''
popd
'';
# Some of the tests use localhost networking. # Some of the tests use localhost networking.
__darwinAllowLocalNetworking = true; __darwinAllowLocalNetworking = true;
meta = with lib; { meta = with lib; {
description = "Fast implementation of asyncio event loop on top of libuv"; description = "Fast implementation of asyncio event loop on top of libuv";
homepage = https://github.com/MagicStack/uvloop; homepage = "https://github.com/MagicStack/uvloop";
license = licenses.mit; license = licenses.mit;
maintainers = [ maintainers.costrouc ]; maintainers = with maintainers; [ costrouc ];
}; };
} }

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "flow"; pname = "flow";
version = "0.121.0"; version = "0.122.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebook"; owner = "facebook";
repo = "flow"; repo = "flow";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "1lx3lfn0blnwpq6iph0x6xcr4nrdhyvfvx6x8qk6axwlmg2swdcy"; sha256 = "0a1pcrp0r7l0c8cyrg1qc1qz5dnj0mzd60v9nixgm419a7rrmp93";
}; };
installPhase = '' installPhase = ''

View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "tflint"; pname = "tflint";
version = "0.15.3"; version = "0.15.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "terraform-linters"; owner = "terraform-linters";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1j56dadkyg483i2p4i76d4kdkm229yjiyariga96zxp3s4rl0fni"; sha256 = "1z98zy04dj4hj94k9c9r1sfw167s3ywpxnjbylj7nsyxdlvwj37j";
}; };
modSha256 = "14vgy5lavyp4w16g7wpi9xbni3js541rc3w9qn5ab3khqw5rdhgn"; modSha256 = "1j6vflvg2k544r0kkdiw64n6v467c0kr7l2m39h8yjbyjbmwl5xz";
subPackages = [ "." ]; subPackages = [ "." ];

View File

@ -4,13 +4,13 @@
buildGoPackage rec { buildGoPackage rec {
pname = "buildah"; pname = "buildah";
version = "1.14.5"; version = "1.14.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "containers"; owner = "containers";
repo = "buildah"; repo = "buildah";
rev = "v${version}"; rev = "v${version}";
sha256 = "186jla2gy9xsl54siji5i7a3hc8sjp5gcc78j43xn11i8brdf684"; sha256 = "1sx4jl34l9djf115zv266qhz4sm1ndv0k0z49fbr3b6m7ll2mmlv";
}; };
outputs = [ "bin" "man" "out" ]; outputs = [ "bin" "man" "out" ];

View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec{ stdenv.mkDerivation rec{
pname = "clj-kondo"; pname = "clj-kondo";
version = "2019.12.14"; version = "2020.03.20";
reflectionJson = fetchurl { reflectionJson = fetchurl {
name = "reflection.json"; name = "reflection.json";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec{
src = fetchurl { src = fetchurl {
url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "1mprwqc5ydqn2wkssrj2g3wbpjss7flv584wss9j0jjfgy7jc4s1"; sha256 = "05z80cdzk8aw3j0nxfynzwpb9hhpbl54bbrv18dpqj5dj893mbgm";
}; };
dontUnpack = true; dontUnpack = true;

View File

@ -4,16 +4,16 @@ with rustPlatform;
buildRustPackage rec { buildRustPackage rec {
pname = "kubie"; pname = "kubie";
version = "0.7.1"; version = "0.7.3";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "sbstp"; owner = "sbstp";
repo = "kubie"; repo = "kubie";
sha256 = "0c94ggrkzyy8zl2z5r4pgfscyhcjp4x64k3bl2byqp3ysgjwkjqx"; sha256 = "186h5fng16gwqhsy2nxswbrrxsx0ysqrb4pqznyygbiz5cd9bgxp";
}; };
cargoSha256 = "1lzyda838s9fmg8hibg2w2wszwyvvqsy20w9877skfcx370rvndi"; cargoSha256 = "1yllpi8dp1fy39z4zmhyf1hdjpl62vwh8b8qlj0g778qsdrm9p98";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = description =

View File

@ -2,13 +2,15 @@
with ocamlPackages; buildDunePackage rec { with ocamlPackages; buildDunePackage rec {
pname = "ocamlformat"; pname = "ocamlformat";
version = "0.13.0"; version = "0.14.0";
minimumOCamlVersion = "4.06"; minimumOCamlVersion = "4.06";
useDune2 = true;
src = fetchurl { src = fetchurl {
url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/ocamlformat-${version}-2.tbz"; url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/ocamlformat-${version}.tbz";
sha256 = "0ki2flqi3xkhw9mfridivb6laxm7gml8rj9qz42vqmy9yx76jjxq"; sha256 = "070c0x6z5y0lyls56zm34g8lyc093wkr0jfp50dvrkr9fk1sx2wi";
}; };
buildInputs = [ buildInputs = [
@ -20,6 +22,8 @@ with ocamlPackages; buildDunePackage rec {
stdio stdio
uuseg uuseg
uutf uutf
fix
menhir
]; ];
meta = { meta = {

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nexus"; pname = "nexus";
version = "3.20.1-01"; version = "3.22.0-02";
src = fetchurl { src = fetchurl {
url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz"; url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz";
sha256 = "0l8fwcnpbc35lqadyrsljvr4rr5kp9gkx5dxs9i35mg2f0z9bagv"; sha256 = "12433fgva03gsgi37xqgkdnbglgq4b66lmzk5cyxfg22szl4xvwz";
}; };
preferLocalBuild = true; preferLocalBuild = true;

View File

@ -104,14 +104,14 @@ dependencies = [
[[package]] [[package]]
name = "cargo-make" name = "cargo-make"
version = "0.30.1" version = "0.30.2"
dependencies = [ dependencies = [
"ci_info 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "ci_info 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
"clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
"colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)", "colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
"dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"duckscript 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "duckscript 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"duckscriptsdk 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "duckscriptsdk 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"fern 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "fern 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"fsio 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "fsio 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -239,7 +239,7 @@ dependencies = [
[[package]] [[package]]
name = "duckscriptsdk" name = "duckscriptsdk"
version = "0.3.0" version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"attohttpc 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "attohttpc 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -964,7 +964,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" "checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
"checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" "checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
"checksum duckscript 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aa4a338912dce0ada9929b9aa81c3b279e51b101583da13541339efaee46dfa9" "checksum duckscript 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aa4a338912dce0ada9929b9aa81c3b279e51b101583da13541339efaee46dfa9"
"checksum duckscriptsdk 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9da937d7dc544fe56d34e2b70c68bac038a821f5822e8a567b1ce52d47edd1c0" "checksum duckscriptsdk 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cc45d92450a257a4fbf28126086983c88010dbe2f99f3559d0073a6ed440046"
"checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" "checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"
"checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" "checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91"
"checksum encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" "checksum encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81"

View File

@ -2,7 +2,7 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-make"; pname = "cargo-make";
version = "0.30.1"; version = "0.30.2";
src = src =
let let
@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
owner = "sagiegurari"; owner = "sagiegurari";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0s8qniliv2lq19zvymsw8lpg7jgvna2wi7i3kqgqxfkij95z383n"; sha256 = "1p7j80vqlrrprrlnaysng542kl3q87r6kv9mxzdb8605g1ma8wd6";
}; };
in in
runCommand "source" {} '' runCommand "source" {} ''
@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] buildInputs = [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
cargoSha256 = "0wkymahq8rd2i6j7s1x70rp22f60wlkqhl27qinsc03cnaky5c83"; cargoSha256 = "0j5ky547xlgfiz4mk7n7fhv1s9v697lvyqsjlj7jc5y9knx56n1j";
# Some tests fail because they need network access. # Some tests fail because they need network access.
# However, Travis ensures a proper build. # However, Travis ensures a proper build.

View File

@ -1,10 +1,11 @@
{ stdenv, fetchurl, jre }: { stdenv, fetchurl, jre_headless }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "minecraft-server"; pname = "minecraft-server";
version = "1.15.2"; version = "1.15.2";
src = fetchurl { src = fetchurl {
url = "https://launcher.mojang.com/v1/objects/bb2b6b1aefcd70dfd1892149ac3a215f6c636b07/server.jar"; url =
"https://launcher.mojang.com/v1/objects/bb2b6b1aefcd70dfd1892149ac3a215f6c636b07/server.jar";
sha256 = "12kynrpxgcdg8x12wcvwkxka0fxgm5siqg8qq0nnmv0443f8dkw0"; sha256 = "12kynrpxgcdg8x12wcvwkxka0fxgm5siqg8qq0nnmv0443f8dkw0";
}; };
@ -16,7 +17,7 @@ stdenv.mkDerivation {
cat > $out/bin/minecraft-server << EOF cat > $out/bin/minecraft-server << EOF
#!/bin/sh #!/bin/sh
exec ${jre}/bin/java \$@ -jar $out/lib/minecraft/server.jar nogui exec ${jre_headless}/bin/java \$@ -jar $out/lib/minecraft/server.jar nogui
EOF EOF
chmod +x $out/bin/minecraft-server chmod +x $out/bin/minecraft-server
@ -24,11 +25,11 @@ stdenv.mkDerivation {
phases = "installPhase"; phases = "installPhase";
meta = { meta = with stdenv.lib; {
description = "Minecraft Server"; description = "Minecraft Server";
homepage = "https://minecraft.net"; homepage = "https://minecraft.net";
license = stdenv.lib.licenses.unfreeRedistributable; license = licenses.unfreeRedistributable;
platforms = stdenv.lib.platforms.unix; platforms = platforms.unix;
maintainers = with stdenv.lib.maintainers; [ thoughtpolice tomberek costrouc]; maintainers = with maintainers; [ thoughtpolice tomberek costrouc ];
}; };
} }

View File

@ -6,17 +6,17 @@
let let
opengfx = fetchzip { opengfx = fetchzip {
url = "https://binaries.openttd.org/extra/opengfx/0.5.5/opengfx-0.5.5-all.zip"; url = "https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-all.zip";
sha256 = "065l0g5nawcd6fkfbsfgviwgq9610y7gxzkpmd19i423d0lrq6d8"; sha256 = "1zg871j6kv7r0aqwca68d9kdf3smclgzan8hj76vj4fyfkykh173";
}; };
opensfx = fetchzip { opensfx = fetchzip {
url = "https://binaries.openttd.org/extra/opensfx/0.2.3/opensfx-0.2.3-all.zip"; url = "https://cdn.openttd.org/opensfx-releases/0.2.3/opensfx-0.2.3-all.zip";
sha256 = "1bb167kszdd6dqbcdjrxxwab6b7y7jilhzi3qijdhprpm5gf1lp3"; sha256 = "1bb167kszdd6dqbcdjrxxwab6b7y7jilhzi3qijdhprpm5gf1lp3";
}; };
openmsx = fetchzip { openmsx = fetchzip {
url = "https://binaries.openttd.org/extra/openmsx/0.3.1/openmsx-0.3.1-all.zip"; url = "https://cdn.openttd.org/openmsx-releases/0.3.1/openmsx-0.3.1-all.zip";
sha256 = "0qnmfzz0v8vxrrvxnm7szphrlrlvhkwn3y92b4iy0b4b6yam0yd4"; sha256 = "0qnmfzz0v8vxrrvxnm7szphrlrlvhkwn3y92b4iy0b4b6yam0yd4";
}; };
@ -29,11 +29,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "openttd"; pname = "openttd";
version = "1.9.3"; version = "1.10.0";
src = fetchurl { src = fetchurl {
url = "https://proxy.binaries.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz"; url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz";
sha256 = "0ijq72kgx997ggw40i5f4a3nf7y2g72z37l47i18yjvgbdzy320r"; sha256 = "0lz2y2rjc23k0d97y65cqhy2splw9cmrbvhgz0iqps8xkan1m8hv";
}; };
nativeBuildInputs = [ pkgconfig makeWrapper ]; nativeBuildInputs = [ pkgconfig makeWrapper ];
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
''} ''}
''; '';
meta = { meta = with stdenv.lib; {
description = ''Open source clone of the Microprose game "Transport Tycoon Deluxe"''; description = ''Open source clone of the Microprose game "Transport Tycoon Deluxe"'';
longDescription = '' longDescription = ''
OpenTTD is a transportation economics simulator. In single player mode, OpenTTD is a transportation economics simulator. In single player mode,
@ -86,9 +86,9 @@ stdenv.mkDerivation rec {
- play cooperatively controlling the same business - play cooperatively controlling the same business
- observe as spectators - observe as spectators
''; '';
homepage = https://www.openttd.org/; homepage = "https://www.openttd.org/";
license = stdenv.lib.licenses.gpl2; license = licenses.gpl2;
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
maintainers = with stdenv.lib.maintainers; [ jcumming the-kenny fpletz ]; maintainers = with maintainers; [ jcumming the-kenny fpletz ];
}; };
} }

View File

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Program to run certain classic graphical point-and-click adventure games (such as Monkey Island)"; description = "Program to run certain classic graphical point-and-click adventure games (such as Monkey Island)";
homepage = https://www.scummvm.org/; homepage = "https://www.scummvm.org/";
license = licenses.gpl2; license = licenses.gpl2;
maintainers = [ maintainers.peterhoeg ]; maintainers = [ maintainers.peterhoeg ];
platforms = platforms.linux; platforms = platforms.linux;

View File

@ -74,6 +74,21 @@ in {
files = [ "sky.*" ]; files = [ "sky.*" ];
}; };
broken-sword-25 = generic rec {
plong = "Broken Sword 2.5";
pshort = "sword25";
pcode = "sword25";
description = "A fan game of the Broken Sword series";
version = "1.0";
src = fetchurl {
url = "mirror://sourceforge/scummvm/${pshort}-v${version}.zip";
sha256 = "0ivj1vflfpih5bs5a902mab88s4d77fwm3ya3fk7pammzc8gjqzz";
};
sourceRoot = ".";
docs = [ "README" "license-original.txt" ];
files = [ "data.b25c" ];
};
drascula-the-vampire-strikes-back = generic rec { drascula-the-vampire-strikes-back = generic rec {
plong = "Drascula: The Vampire Strikes Back"; plong = "Drascula: The Vampire Strikes Back";
pshort = "drascula"; pshort = "drascula";
@ -95,6 +110,21 @@ in {
files = [ "Packet.001" ]; files = [ "Packet.001" ];
}; };
dreamweb = generic rec {
plong = "Dreamweb";
pshort = "dreamweb";
pcode = "dreamweb";
description = "2D point-and-click cyberpunk top-down adventure game";
version = "1.1";
src = fetchurl {
url = "mirror://sourceforge/scummvm/${pshort}-cd-uk-${version}.zip";
sha256 = "0hh1p3rd7s0ckvri14lc6wdry9vv0vn4h4744v2n4zg63j8i6vsa";
};
sourceRoot = ".";
docs = [ "license.txt" ];
files = [ "DREAMWEB.*" "SPEECH" "track01.flac" ];
};
flight-of-the-amazon-queen = generic rec { flight-of-the-amazon-queen = generic rec {
plong = "Flight of the Amazon Queen"; plong = "Flight of the Amazon Queen";
pshort = "fotaq"; pshort = "fotaq";

View File

@ -1444,9 +1444,9 @@
}; };
} }
rec { rec {
name = "libvulkan1_1.1.73+dfsg-1+steamrt1.2+srt1_amd64"; name = "libvulkan1_1.2.135~srt-0+steamrt1.1+srt1_amd64";
sha256 = "e70dbce3db8d74df853dd10265d37c8b4b4f7336043f79ae480be3d6922c206c"; sha256 = "99b0d38e6a2240dbea57c3ebee18de7013ee5d346c82bc82243c18e66bc50ae4";
url = "mirror://steamrt/pool/main/v/vulkan/libvulkan1_1.1.73+dfsg-1+steamrt1.2+srt1_amd64.deb"; url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.2.135~srt-0+steamrt1.1+srt1_amd64.deb";
source = fetchurl { source = fetchurl {
inherit url sha256; inherit url sha256;
name = "libvulkan1.deb"; name = "libvulkan1.deb";
@ -1975,18 +1975,36 @@
}; };
} }
rec { rec {
name = "vulkan-utils_1.1.73+dfsg-1+steamrt1.2+srt1_amd64"; name = "vulkan-tools_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64";
sha256 = "01420d08d0c99d4f70d350af91ac127635e6a75a88200350a4691b8440a7926c"; sha256 = "b5c0c3fd9f5329f2aff54ce73f9281e3e61156556e1ee50c697b37f2144b1531";
url = "mirror://steamrt/pool/main/v/vulkan/vulkan-utils_1.1.73+dfsg-1+steamrt1.2+srt1_amd64.deb"; url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64.deb";
source = fetchurl {
inherit url sha256;
name = "vulkan-tools.deb";
};
}
rec {
name = "vulkan-tools-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64";
sha256 = "33b03b9413ec308f5ee5b8699e9f9ad939b501b602eea185fdcaa69863deb70c";
url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64.deb";
source = fetchurl {
inherit url sha256;
name = "vulkan-tools-multiarch.deb";
};
}
rec {
name = "vulkan-utils_1.2.131.1+dfsg1-1+steamrt1.1+srt1_all";
sha256 = "f10004e20ed5fc93edf035f8f34bb9f8307eb34974a3ed5aae9ba87f00a2c468";
url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-utils_1.2.131.1+dfsg1-1+steamrt1.1+srt1_all.deb";
source = fetchurl { source = fetchurl {
inherit url sha256; inherit url sha256;
name = "vulkan-utils.deb"; name = "vulkan-utils.deb";
}; };
} }
rec { rec {
name = "vulkan-utils-multiarch_1.1.73+dfsg-1+steamrt1.2+srt1_amd64"; name = "vulkan-utils-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64";
sha256 = "ea9fbf565059fc5106a2a13bd56e5a37f2d641655304fd0d4b0d3989b69a8046"; sha256 = "a1e9387bb5cb7effb23c5994dd2724614cfed7a447ec9c449ee4effcab58fd4c";
url = "mirror://steamrt/pool/main/v/vulkan/vulkan-utils-multiarch_1.1.73+dfsg-1+steamrt1.2+srt1_amd64.deb"; url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-utils-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64.deb";
source = fetchurl { source = fetchurl {
inherit url sha256; inherit url sha256;
name = "vulkan-utils-multiarch.deb"; name = "vulkan-utils-multiarch.deb";
@ -3480,9 +3498,9 @@
}; };
} }
rec { rec {
name = "libvulkan1_1.1.73+dfsg-1+steamrt1.2+srt1_i386"; name = "libvulkan1_1.2.135~srt-0+steamrt1.1+srt1_i386";
sha256 = "4e06285406434cc1184884438a15e6dd11f1d9aa2e1d6c95d2138fbe0f61a172"; sha256 = "ac161149e1106247de706788a7ea29dbe5e3c17c2b8aedf97ec892b311abbb75";
url = "mirror://steamrt/pool/main/v/vulkan/libvulkan1_1.1.73+dfsg-1+steamrt1.2+srt1_i386.deb"; url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.2.135~srt-0+steamrt1.1+srt1_i386.deb";
source = fetchurl { source = fetchurl {
inherit url sha256; inherit url sha256;
name = "libvulkan1.deb"; name = "libvulkan1.deb";
@ -4011,18 +4029,36 @@
}; };
} }
rec { rec {
name = "vulkan-utils_1.1.73+dfsg-1+steamrt1.2+srt1_i386"; name = "vulkan-tools_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386";
sha256 = "2deda8ceeaef31ec4103e614282e554f360db2a7f51e2e868918845cb1187c75"; sha256 = "6a8576cc6fadc4d18c97b100dc24bad1906f6f56cab024997787355025695df4";
url = "mirror://steamrt/pool/main/v/vulkan/vulkan-utils_1.1.73+dfsg-1+steamrt1.2+srt1_i386.deb"; url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386.deb";
source = fetchurl {
inherit url sha256;
name = "vulkan-tools.deb";
};
}
rec {
name = "vulkan-tools-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386";
sha256 = "fae0430f540c71bd8f6ab3099f8aa132d2eda858b66facf3d8a586ab38cffde6";
url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386.deb";
source = fetchurl {
inherit url sha256;
name = "vulkan-tools-multiarch.deb";
};
}
rec {
name = "vulkan-utils_1.2.131.1+dfsg1-1+steamrt1.1+srt1_all";
sha256 = "f10004e20ed5fc93edf035f8f34bb9f8307eb34974a3ed5aae9ba87f00a2c468";
url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-utils_1.2.131.1+dfsg1-1+steamrt1.1+srt1_all.deb";
source = fetchurl { source = fetchurl {
inherit url sha256; inherit url sha256;
name = "vulkan-utils.deb"; name = "vulkan-utils.deb";
}; };
} }
rec { rec {
name = "vulkan-utils-multiarch_1.1.73+dfsg-1+steamrt1.2+srt1_i386"; name = "vulkan-utils-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386";
sha256 = "13be3dd08ade9e67e7a3b870ee0787c2a96d6c2f99b3173c5439f643d52be220"; sha256 = "f81b81ef14f11662d2d5e5a7f688c2ef4f9ad9625ec5e59de91aab3f1ad45406";
url = "mirror://steamrt/pool/main/v/vulkan/vulkan-utils-multiarch_1.1.73+dfsg-1+steamrt1.2+srt1_i386.deb"; url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-utils-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386.deb";
source = fetchurl { source = fetchurl {
inherit url sha256; inherit url sha256;
name = "vulkan-utils-multiarch.deb"; name = "vulkan-utils-multiarch.deb";

View File

@ -6,16 +6,17 @@
, freetype, tcl, zlib , freetype, tcl, zlib
}: }:
stdenv.mkDerivation { with stdenv.lib;
stdenv.mkDerivation rec {
pname = "openmsx"; pname = "openmsx";
version = "git-2017-11-02"; version = "0.15.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "openMSX"; owner = "openMSX";
repo = "openMSX"; repo = "openMSX";
rev = "eeb74206ae347a3b17e9b99f91f2b4682c5db22c"; rev = "RELEASE_0_15_0";
sha256 = "170amj7k6wjhwx6psbplqljvckvhxxbv3aw72jrdxl1fb8zlnq3s"; sha256 = "1lv5kdw0812mkf7k20z2djzk0pbs792xq2mibbnz9rfjf02whi7l";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -35,13 +36,13 @@ stdenv.mkDerivation {
# for providing support to Nixpkgs :) # for providing support to Nixpkgs :)
TCL_CONFIG="${tcl}/lib/"; TCL_CONFIG="${tcl}/lib/";
meta = with stdenv.lib; { meta = {
description = "A MSX emulator"; description = "A MSX emulator";
longDescription = '' longDescription = ''
OpenMSX is an emulator for the MSX home computer system. Its goal is OpenMSX is an emulator for the MSX home computer system. Its goal is
to emulate all aspects of the MSX with 100% accuracy. to emulate all aspects of the MSX with 100% accuracy.
''; '';
homepage = https://openmsx.org; homepage = "https://openmsx.org";
maintainers = with maintainers; [ AndersonTorres ]; maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix; platforms = platforms.unix;
}; };

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "rkdeveloptool"; pname = "rkdeveloptool";
version = "1.3"; version = "unstable-2019-07-01";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rockchip-linux"; owner = "rockchip-linux";
repo = "rkdeveloptool"; repo = "rkdeveloptool";
rev = "081d237ad5bf8f03170c9d60bd94ceefa0352aaf"; rev = "6e92ebcf8b1812da02663494a68972f956e490d3";
sha256 = "05hh7j3xgb8l1k1v2lis3nvlc0gp87ihzg6jci7m5lkkm5qgv3ji"; sha256 = "0zwrkqfxd671iy69v3q0844gfdpm1yk51i9qh2rqc969bd8glxga";
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "grocy"; pname = "grocy";
version = "2.6.1"; version = "2.6.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip"; url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip";
sha256 = "1fq1zlxxhpcxj67xxlgf20dia95xcimgnm13cr56sy9f2vjx58m6"; sha256 = "1cjkyv50vwx24xb1mxgy51mr4qqsqgixjww06rql77d9czmmd94k";
}; };
nativeBuildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];

View File

@ -4,12 +4,12 @@ with python3.pkgs;
buildPythonPackage rec { buildPythonPackage rec {
pname = "mautrix-telegram"; pname = "mautrix-telegram";
version = "0.7.1"; version = "0.7.2";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1yi4h37lhlpa095hzd0gwn1ifbycq8878kj5n2sjhw8kk6nblda9"; sha256 = "1ahchkhrhyd160fwlg6g0d2v8v56j9f3h9rnm71nxibgfjcb6m3n";
}; };
postPatch = '' postPatch = ''

View File

@ -22,18 +22,16 @@ ValueError: invalid version number '41.4.0.post20191022'
1 file changed, 1 insertion(+), 14 deletions(-) 1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/certbot/setup.py b/certbot/setup.py diff --git a/certbot/setup.py b/certbot/setup.py
index c1bf914..7456bf2 100644 index d19327e5e..ac1524793 100644
--- a/certbot/setup.py --- a/certbot/setup.py
+++ b/certbot/setup.py +++ b/certbot/setup.py
@@ -3,7 +3,6 @@ import os @@ -1,5 +1,4 @@
import codecs
-from distutils.version import StrictVersion
import os
import re import re
import sys import sys
@@ -58,20 +57,8 @@ install_requires = [
-from distutils.version import StrictVersion
from setuptools import find_packages, setup, __version__ as setuptools_version
from setuptools.command.test import test as TestCommand
@@ -56,20 +55,8 @@ install_requires = [
# Add pywin32 on Windows platforms to handle low-level system calls. # Add pywin32 on Windows platforms to handle low-level system calls.
# This dependency needs to be added using environment markers to avoid its installation on Linux. # This dependency needs to be added using environment markers to avoid its installation on Linux.
@ -54,7 +52,7 @@ index c1bf914..7456bf2 100644
+install_requires.append(pywin32_req + " ; sys_platform == 'win32'") +install_requires.append(pywin32_req + " ; sys_platform == 'win32'")
dev_extras = [ dev_extras = [
'astroid==1.6.5', 'coverage',
-- --
2.24.1 2.24.1

View File

@ -1,22 +1,27 @@
{ stdenv, python37Packages, fetchFromGitHub, fetchurl, dialog, autoPatchelfHook }: { lib
, buildPythonApplication
, fetchFromGitHub
, ConfigArgParse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface
, dialog, mock, gnureadline
, pytest_xdist, pytest, dateutil
}:
buildPythonApplication rec {
python37Packages.buildPythonApplication rec {
pname = "certbot"; pname = "certbot";
version = "1.0.0"; version = "1.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "180x7gcpfbrzw8k654s7b5nxdy2yg61lq513dykyn3wz4gssw465"; sha256 = "1nzp1l63f64qqp89y1vyd4lgfhykfp5dkr6iwfiyf273y7sjwpsa";
}; };
patches = [ patches = [
./0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch ./0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch
]; ];
propagatedBuildInputs = with python37Packages; [ propagatedBuildInputs = [
ConfigArgParse ConfigArgParse
acme acme
configobj configobj
@ -24,26 +29,21 @@ python37Packages.buildPythonApplication rec {
distro distro
josepy josepy
parsedatetime parsedatetime
psutil
pyRFC3339 pyRFC3339
pyopenssl pyopenssl
pytz pytz
requests
six six
zope_component zope_component
zope_interface zope_interface
]; ];
buildInputs = [ dialog ] ++ (with python37Packages; [ mock gnureadline ]); buildInputs = [ dialog mock gnureadline ];
checkInputs = with python37Packages; [ checkInputs = [ pytest_xdist pytest dateutil ];
pytest_xdist
pytest
dateutil
];
postPatch = '' preBuild = ''
cd certbot cd certbot
substituteInPlace certbot/_internal/notify.py --replace "/usr/sbin/sendmail" "/run/wrappers/bin/sendmail"
''; '';
postInstall = '' postInstall = ''
@ -55,11 +55,11 @@ python37Packages.buildPythonApplication rec {
doCheck = true; doCheck = true;
meta = with stdenv.lib; { meta = with lib; {
homepage = src.meta.homepage; homepage = src.meta.homepage;
description = "ACME client that can obtain certs and extensibly update server configurations"; description = "ACME client that can obtain certs and extensibly update server configurations";
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.domenkozar ]; maintainers = with maintainers; [ domenkozar ];
license = licenses.asl20; license = with licenses; [ asl20 ];
}; };
} }

View File

@ -2,17 +2,17 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "sewer"; pname = "sewer";
version = "0.7.9"; version = "0.8.1";
src = python3Packages.fetchPypi { src = python3Packages.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "c083223d8aa66d4fc6801452d291a98540d1ee41557ce3e1754c62e73f7c9738"; sha256 = "0s8f0w6nv8dcs5yw7rn49981b3c9mnnx4f6wzqw4zha0rpp60z22";
}; };
propagatedBuildInputs = with python3Packages; [ pyopenssl requests tldextract ]; propagatedBuildInputs = with python3Packages; [ pyopenssl requests tldextract ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/komuw/sewer; homepage = "https://github.com/komuw/sewer";
description = "ACME client"; description = "ACME client";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ kevincox ]; maintainers = with maintainers; [ kevincox ];

View File

@ -1,55 +0,0 @@
{ stdenv, fetchurl, graalvm8 } :
stdenv.mkDerivation rec {
pname = "babashka";
version = "0.0.71";
src = fetchurl {
url = "https://github.com/borkdude/babashka/releases/download/v${version}/babashka-${version}-standalone.jar";
sha256 = "0gyahrxrvyfkvqg4dhzx81mg2hw56ji3aa1yxb9ycwa5bawb6080";
};
reflectionJson = fetchurl {
url = "https://github.com/borkdude/babashka/releases/download/v${version}/reflection.json";
sha256 = "13p1yw27sjvfi130pw7m9c1yzdgh7wxh8r6z8b4qmr3iifidfrcr";
};
dontUnpack = true;
buildInputs = [ graalvm8 ];
buildPhase = ''
native-image \
-jar ${src} \
-H:Name=bb \
-H:+ReportExceptionStackTraces \
-J-Dclojure.spec.skip-macros=true \
-J-Dclojure.compiler.direct-linking=true \
"-H:IncludeResources=BABASHKA_VERSION" \
"-H:IncludeResources=SCI_VERSION" \
-H:ReflectionConfigurationFiles=${reflectionJson} \
--initialize-at-run-time=java.lang.Math\$RandomNumberGeneratorHolder \
--initialize-at-build-time \
-H:Log=registerResource: \
-H:EnableURLProtocols=http,https \
--enable-all-security-services \
-H:+JNI \
--verbose \
--no-fallback \
--no-server \
-J-Xmx3g
'';
installPhase = ''
mkdir -p $out/bin
cp bb $out/bin
'';
meta = with stdenv.lib; {
description = "Tool for executing Clojure snippets or scripts in the same space where you would use Bash";
homepage = "https://github.com/borkdude/babashka/";
license = licenses.epl10;
platforms = graalvm8.meta.platforms;
maintainers = with maintainers; [ DerGuteMoritz ];
};
}

View File

@ -14,7 +14,7 @@ buildGoModule rec {
modSha256 = "15b3hik3nzb7xnd6806dqdb36v7z2a0wmvxbrfwvnbigd8zd2y0j"; modSha256 = "15b3hik3nzb7xnd6806dqdb36v7z2a0wmvxbrfwvnbigd8zd2y0j";
buildFlagsArray = [ buildFlagsArray = [
"-ldflags=-s -w -X github.com/twpayne/chezmoi/cmd.VersionStr=${version}" "-ldflags=-s -w -X main.version=${version} -X main.builtBy=nixpkgs"
]; ];
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View File

@ -0,0 +1,23 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "csv2latex";
version = "0.22";
src = fetchurl {
url = "http://brouits.free.fr/csv2latex/csv2latex-${version}.tar.gz";
sha256 = "09qih2zx6cvlii1n5phiinvm9xw1l8f4i60b5hg56pymzjhn97vy";
};
installPhase = ''
mkdir -p $out/bin
make PREFIX=$out install
'';
meta = with stdenv.lib; {
description = "Command-line CSV to LaTeX file converter";
homepage = http://brouits.free.fr/csv2latex/;
license = licenses.gpl2;
maintainers = [ maintainers.catern ];
};
}

View File

@ -6,20 +6,20 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "zoxide"; pname = "zoxide";
version = "0.3.0"; version = "0.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ajeetdsouza"; owner = "ajeetdsouza";
repo = "zoxide"; repo = "zoxide";
rev = "v${version}"; rev = "v${version}";
sha256 = "0w4by34chm2baqldxx72bhjz8ggsllpir1df07gxi5fjkmil8jy9"; sha256 = "1sad18d0pxfdy9gvjmixzgdskg1l7djvzp0aipx7pz0lyi6gs23z";
}; };
buildInputs = [ buildInputs = [
fzf fzf
]; ];
cargoSha256 = "19fziapiv5w9wxslw47rf3lgc2lv7dyl3n8py6bsddq41fzay30w"; cargoSha256 = "1sx3s1jnfxylbjr3x6v6j8a6zkl7hfyj4alzlyrsw36b1b64pwqm";
meta = with lib; { meta = with lib; {
description = "A fast cd command that learns your habits"; description = "A fast cd command that learns your habits";

View File

@ -8,13 +8,13 @@ let
in rustPlatform.buildRustPackage rec { in rustPlatform.buildRustPackage rec {
pname = "bitwarden_rs"; pname = "bitwarden_rs";
version = "1.14"; version = "1.14.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dani-garcia"; owner = "dani-garcia";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1ck0l0167kw1i5fjn507g4d18x2krbpk2ks0lnw9vzg0bwnzzwwd"; sha256 = "10fi5vvckmdbjvlg6mlaqh2dsm33sbkq1z1b6gmz8qjbijc8i7gw";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
@ -25,7 +25,7 @@ in rustPlatform.buildRustPackage rec {
RUSTC_BOOTSTRAP = 1; RUSTC_BOOTSTRAP = 1;
cargoSha256 = "0cgk61dmc057p82g0apd4sx6a8vhvcipxikrdb0hds4frhqsr6i8"; cargoSha256 = "1p8wpndj1aydhcjl15z3xhjf52a0l5rh5cy9qs6w4776crya2jjr";
cargoBuildFlags = [ featuresFlag ]; cargoBuildFlags = [ featuresFlag ];
checkPhase = '' checkPhase = ''

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bitwarden_rs-vault"; pname = "bitwarden_rs-vault";
version = "2.12.0e"; version = "2.13.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz";
sha256 = "1jy3c5ywlplrjsy37i90x5s8k0i5n1mn8y0fyl074s807glqaxbf"; sha256 = "1000iqjr670imm1dlw9r003d8psp5sq0m0p62sjnll7wnycd805r";
}; };
buildCommand = '' buildCommand = ''

View File

@ -2,13 +2,13 @@
buildGoPackage rec { buildGoPackage rec {
pname = "vault"; pname = "vault";
version = "1.3.3"; version = "1.3.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hashicorp"; owner = "hashicorp";
repo = "vault"; repo = "vault";
rev = "v${version}"; rev = "v${version}";
sha256 = "1scwclkpb7v5pcx1afgjqrfgcp0c1bd9gqvwdmjbpfcyxv1f032d"; sha256 = "1akcfrxnsb37apsxblyigdcgca6ma7al23h654hplfs6vmq9aypi";
}; };
goPackagePath = "github.com/hashicorp/vault"; goPackagePath = "github.com/hashicorp/vault";

View File

@ -0,0 +1,13 @@
diff --git a/Cargo.lock b/Cargo.lock
index 3f4eec6..2f565c6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1297,7 +1297,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "zenith"
-version = "0.8.0"
+version = "0.8.1"
dependencies = [
"battery",
"bincode",

View File

@ -0,0 +1,27 @@
{ stdenv, rustPlatform, fetchFromGitHub, IOKit }:
rustPlatform.buildRustPackage rec {
pname = "zenith";
version = "0.8.1";
src = fetchFromGitHub {
owner = "bvaisvil";
repo = pname;
rev = version;
sha256 = "12wbx4zhf1rf13g3mw8vcn8aqk9vcza61vi42y6c1pb2km73qw1h";
};
cargoPatches = [ ./cargo-lock.patch ];
cargoSha256 = "1nyci2vjwsyfscsd520d1r5vyazb33hv4mrsysy6amss4jdf2dlq";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
meta = with stdenv.lib; {
description = "Sort of like top or htop but with zoom-able charts, network, and disk usage";
homepage = "https://github.com/bvaisvil/zenith";
license = licenses.mit;
maintainers = with maintainers; [ bbigras ];
# doesn't build on aarch64 https://github.com/bvaisvil/zenith/issues/19
platforms = platforms.x86;
};
}

View File

@ -792,8 +792,6 @@ in
automirror = callPackage ../tools/misc/automirror { }; automirror = callPackage ../tools/misc/automirror { };
babashka = callPackage ../tools/misc/babashka { };
bash-my-aws = callPackage ../tools/admin/bash-my-aws { }; bash-my-aws = callPackage ../tools/admin/bash-my-aws { };
bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { }; bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { };
@ -1569,6 +1567,8 @@ in
csvkit = callPackage ../tools/text/csvkit { }; csvkit = callPackage ../tools/text/csvkit { };
csv2latex = callPackage ../tools/misc/csv2latex { };
csvs-to-sqlite = with python3Packages; toPythonApplication csvs-to-sqlite; csvs-to-sqlite = with python3Packages; toPythonApplication csvs-to-sqlite;
cucumber = callPackage ../development/tools/cucumber {}; cucumber = callPackage ../development/tools/cucumber {};
@ -7716,6 +7716,10 @@ in
zdelta = callPackage ../tools/compression/zdelta { }; zdelta = callPackage ../tools/compression/zdelta { };
zenith = callPackage ../tools/system/zenith {
inherit (darwin.apple_sdk.frameworks) IOKit;
};
zerotierone = callPackage ../tools/networking/zerotierone { }; zerotierone = callPackage ../tools/networking/zerotierone { };
zerofree = callPackage ../tools/filesystems/zerofree { }; zerofree = callPackage ../tools/filesystems/zerofree { };
@ -9193,6 +9197,8 @@ in
angelscript_2_22 = callPackage ../development/interpreters/angelscript/2.22.nix {}; angelscript_2_22 = callPackage ../development/interpreters/angelscript/2.22.nix {};
babashka = callPackage ../development/interpreters/clojure/babashka.nix { };
chibi = callPackage ../development/interpreters/chibi { }; chibi = callPackage ../development/interpreters/chibi { };
ceptre = callPackage ../development/interpreters/ceptre { }; ceptre = callPackage ../development/interpreters/ceptre { };
@ -11237,7 +11243,7 @@ in
ogre = ogre1_10; ogre = ogre1_10;
}; };
certbot = callPackage ../tools/admin/certbot { }; certbot = python3Packages.callPackage ../tools/admin/certbot { };
caf = callPackage ../development/libraries/caf {}; caf = callPackage ../development/libraries/caf {};
@ -18884,7 +18890,7 @@ in
dablin = callPackage ../applications/radio/dablin { }; dablin = callPackage ../applications/radio/dablin { };
darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.darcs) (drv: { darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskell.packages.ghc865.darcs) (drv: {
configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"];
}); });
@ -20722,6 +20728,8 @@ in
rofi-calc = callPackage ../applications/science/math/rofi-calc { }; rofi-calc = callPackage ../applications/science/math/rofi-calc { };
rofi-emoji = callPackage ../applications/misc/rofi-emoji { };
ympd = callPackage ../applications/audio/ympd { }; ympd = callPackage ../applications/audio/ympd { };
nload = callPackage ../applications/networking/nload { }; nload = callPackage ../applications/networking/nload { };
@ -23785,7 +23793,9 @@ in
inherit (callPackage ../games/scummvm/games.nix { }) inherit (callPackage ../games/scummvm/games.nix { })
beneath-a-steel-sky beneath-a-steel-sky
broken-sword-25
drascula-the-vampire-strikes-back drascula-the-vampire-strikes-back
dreamweb
flight-of-the-amazon-queen flight-of-the-amazon-queen
lure-of-the-temptress; lure-of-the-temptress;
@ -24661,6 +24671,8 @@ in
boogie = dotnetPackages.Boogie; boogie = dotnetPackages.Boogie;
cadical = callPackage ../applications/science/logic/cadical {};
inherit (callPackage ./coq-packages.nix { inherit (callPackage ./coq-packages.nix {
inherit (ocaml-ng) ocamlPackages_4_05; inherit (ocaml-ng) ocamlPackages_4_05;
}) mkCoqPackages }) mkCoqPackages

View File

@ -1234,5 +1234,5 @@ in let inherit (pkgs) callPackage; in rec
ocamlPackages_latest = ocamlPackages_4_10; ocamlPackages_latest = ocamlPackages_4_10;
ocamlPackages = ocamlPackages_4_08; ocamlPackages = ocamlPackages_4_09;
} }