Merge master into staging
This commit is contained in:
Robert Hensing
commit
1a5556867e
@ -124,6 +124,11 @@
|
||||
<literal>/var/lib/powerdns</literal> to <literal>/run/pdns</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<package>btc1</package> has been abandoned upstream, and removed.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<package>riak-cs</package> package removed along with <varname>services.riak-cs</varname> module.
|
||||
|
||||
@ -183,6 +183,11 @@ sub pciCheck {
|
||||
push @imports, "(modulesPath + \"/hardware/network/broadcom-43xx.nix\")";
|
||||
}
|
||||
|
||||
# In case this is a virtio scsi device, we need to explicitly make this available.
|
||||
if ($vendor eq "0x1af4" && $device eq "0x1004") {
|
||||
push @initrdAvailableKernelModules, "virtio_scsi";
|
||||
}
|
||||
|
||||
# Can't rely on $module here, since the module may not be loaded
|
||||
# due to missing firmware. Ideally we would check modules.pcimap
|
||||
# here.
|
||||
|
||||
@ -16,8 +16,12 @@ let
|
||||
serverConfig = {
|
||||
options = {
|
||||
accept = mkOption {
|
||||
type = types.int;
|
||||
description = "On which port stunnel should listen for incoming TLS connections.";
|
||||
type = types.either types.str types.int;
|
||||
description = ''
|
||||
On which [host:]port stunnel should listen for incoming TLS connections.
|
||||
Note that unlike other softwares stunnel ipv6 address need no brackets,
|
||||
so to listen on all IPv6 addresses on port 1234 one would use ':::1234'.
|
||||
'';
|
||||
};
|
||||
|
||||
connect = mkOption {
|
||||
@ -129,7 +133,6 @@ in
|
||||
type = with types; attrsOf (submodule serverConfig);
|
||||
example = {
|
||||
fancyWebserver = {
|
||||
enable = true;
|
||||
accept = 443;
|
||||
connect = 8080;
|
||||
cert = "/path/to/pem/file";
|
||||
|
||||
@ -311,6 +311,7 @@ in
|
||||
rxe = handleTest ./rxe.nix {};
|
||||
samba = handleTest ./samba.nix {};
|
||||
sanoid = handleTest ./sanoid.nix {};
|
||||
sbt = handleTest ./sbt.nix {};
|
||||
sddm = handleTest ./sddm.nix {};
|
||||
service-runner = handleTest ./service-runner.nix {};
|
||||
shadowsocks = handleTest ./shadowsocks {};
|
||||
|
||||
18
nixos/tests/sbt.nix
Normal file
18
nixos/tests/sbt.nix
Normal file
@ -0,0 +1,18 @@
|
||||
import ./make-test-python.nix ({ pkgs, ...} : {
|
||||
name = "sbt";
|
||||
meta = with pkgs.stdenv.lib.maintainers; {
|
||||
maintainers = [ nequissimus ];
|
||||
};
|
||||
|
||||
machine = { pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = [ pkgs.sbt ];
|
||||
};
|
||||
|
||||
testScript =
|
||||
''
|
||||
machine.succeed(
|
||||
"(sbt --offline --version 2>&1 || true) | grep 'getting org.scala-sbt sbt ${pkgs.sbt.version} (this may take some time)'"
|
||||
)
|
||||
'';
|
||||
})
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "padthv1";
|
||||
version = "0.9.17";
|
||||
version = "0.9.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/padthv1/${pname}-${version}.tar.gz";
|
||||
sha256 = "098fk8fwcgssnfr1gilqg8g17zvch62lrn3rqsswpzbr3an5adb3";
|
||||
sha256 = "1karrprb3ijrbiwpr43rl3nxnzc33lnmwrd1832psgr3flnr9fp5";
|
||||
};
|
||||
|
||||
buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftwFloat ];
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, pkg-config, qttools
|
||||
, alsaLib, ftgl, libGLU, libjack2, qtbase, rtmidi
|
||||
, alsaLib, ftgl, libGLU, libjack2, qtbase, rtmidi, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "03xcdnlpsij22ca3i6xj19yqzn3q2ch0d32r73v0c96nm04gvhjj";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config qttools ];
|
||||
nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [ alsaLib ftgl libGLU libjack2 qtbase rtmidi ];
|
||||
|
||||
|
||||
@ -44,13 +44,13 @@ let
|
||||
];
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "pulseeffects";
|
||||
version = "4.8.1";
|
||||
version = "4.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wwmm";
|
||||
repo = "pulseeffects";
|
||||
rev = "v${version}";
|
||||
sha256 = "17yfs3ja7vflywhxbn3n3r8n6hl829x257kzplg2vpppppg6ylj6";
|
||||
sha256 = "19h47mrxjm6x83pqcxfsshf48kd1babfk0kwdy1c7fjri7kj0g0s";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
{ stdenv, fetchurl, pkgconfig, autoreconfHook, hexdump, openssl, db48
|
||||
, boost, zlib, miniupnpc, qt4, protobuf, qrencode, libevent
|
||||
, AppKit
|
||||
, withGui ? !stdenv.isDarwin
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bit1" + (toString (optional (!withGui) "d")) + "-" + version;
|
||||
version = "1.15.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/btc1/bitcoin/archive/v${version}.tar.gz";
|
||||
sha256 = "0v0g2wb4nsnhddxzb63vj2bc1mgyj05vqm5imicjfz8prvgc0si8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook hexdump ];
|
||||
buildInputs = [ openssl db48 boost zlib miniupnpc protobuf libevent ]
|
||||
++ optionals withGui [ qt4 qrencode ]
|
||||
++ optional stdenv.isDarwin AppKit;
|
||||
|
||||
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
|
||||
++ optionals withGui [ "--with-gui=qt4" ];
|
||||
|
||||
meta = {
|
||||
description = "Peer-to-peer electronic cash system (btc1 client)";
|
||||
longDescription= ''
|
||||
Bitcoin is a free open source peer-to-peer electronic cash system that is
|
||||
completely decentralized, without the need for a central server or trusted
|
||||
parties. Users hold the crypto keys to their own money and transact directly
|
||||
with each other, with the help of a P2P network to check for double-spending.
|
||||
|
||||
btc1 is an implementation of a Bitcoin full node with segwit2x hard fork
|
||||
support.
|
||||
'';
|
||||
homepage = "https://github.com/btc1/bitcoin";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sorpaas ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "gpxsee";
|
||||
version = "7.33";
|
||||
version = "7.35";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tumic0";
|
||||
repo = "GPXSee";
|
||||
rev = version;
|
||||
sha256 = "1k4zl7knlpwxrpqk1axkmy8x12915z15h3q2sjnx3jcnx6qw73ja";
|
||||
sha256 = "1schmymcsd8s0r26qwyx56z107ql8pgrk1pnqy19mc7fyirdwmp5";
|
||||
};
|
||||
|
||||
patches = (substituteAll {
|
||||
@ -29,15 +29,14 @@ mkDerivation rec {
|
||||
wrapQtApp $out/Applications/GPXSee.app/Contents/MacOS/GPXSee
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://www.gpxsee.org/";
|
||||
description = "GPS log file viewer and analyzer";
|
||||
longDescription = ''
|
||||
GPXSee is a Qt-based GPS log file viewer and analyzer that supports
|
||||
all common GPS log file formats.
|
||||
'';
|
||||
homepage = "https://www.gpxsee.org/";
|
||||
changelog = "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ womfoo sikmir ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pdfsam-basic";
|
||||
version = "4.1.4";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb";
|
||||
sha256 = "1gw3cmc8c1xxc55bm71v1dz9x9560lbhx9nkwprarhxlmn0m0zzp";
|
||||
sha256 = "0dhwaadk2qw7avpfnw0mgqv3yhjsm4qm88yyy4w24a3cqzrvb56g";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
||||
@ -13,7 +13,7 @@ buildGoModule rec {
|
||||
let t = goPackagePath;
|
||||
in ''
|
||||
-ldflags=
|
||||
-s -X ${t}/pkg/buildinfo.Version=${version}
|
||||
-s -X ${t}/pkg/buildinfo.Version=v${version}
|
||||
-X ${t}/pkg/buildinfo.GitSHA=${rev}
|
||||
-X ${t}/pkg/buildDate=unknown
|
||||
'';
|
||||
|
||||
@ -167,6 +167,7 @@ let
|
||||
hcloud = callPackage ./hcloud {};
|
||||
keycloak = callPackage ./keycloak {};
|
||||
libvirt = callPackage ./libvirt {};
|
||||
linuxbox = callPackage ./linuxbox {};
|
||||
lxd = callPackage ./lxd {};
|
||||
shell = callPackage ./shell {};
|
||||
vpsadmin = callPackage ./vpsadmin {};
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
{ stdenv, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "terraform-provider-linuxbox";
|
||||
version = "0.3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "numtide";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1sxb2iv4dl0rw3v1r7k5dfkyh14nmp19cprqafhb7ncarmvawq39";
|
||||
};
|
||||
|
||||
vendorSha256 = "16hp0pv1qpvr34ac1syjci39csvyj3c748inllypjwx76q6rwp7k";
|
||||
|
||||
postInstall = "mv $out/bin/terraform-provider-linuxbox{,_v${version}}";
|
||||
|
||||
passthru.provider-source-address = "registry.terraform.io/numtide/linuxbox";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/numtide/terraform-provider-linuxbox";
|
||||
description = "Basic building block for Seed DevOps";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ zimbatm ];
|
||||
};
|
||||
}
|
||||
@ -25,7 +25,7 @@ let
|
||||
else "");
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "signal-desktop";
|
||||
version = "1.37.2"; # Please backport all updates to the stable channel.
|
||||
version = "1.37.3"; # Please backport all updates to the stable channel.
|
||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||
# When releases "expire" the application becomes unusable until an update is
|
||||
# applied. The expiration date for the current release can be extracted with:
|
||||
@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "0n4g2fh1ibw6fl5vbnnchx2vafasqrq8rl9w0ch7lai665zkxsk3";
|
||||
sha256 = "0gyg67qhrqqn1676m7ki8h9akhn29fh1sxmj0kw5j7dx4cyc4mid";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "picard-tools";
|
||||
version = "2.23.4";
|
||||
version = "2.23.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
|
||||
sha256 = "0xg4nbx02a2kckr6p8pqjpv5rmp95bkmglgm1bma6f77s7hkab7q";
|
||||
sha256 = "0aflbsxzc2pcp195bbgwk6zqabq0pszc41s1pw17khn8ywl2jjr2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -15,9 +15,13 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ gmp ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preConfigure = ''
|
||||
cd src
|
||||
'';
|
||||
cmakeDir = "../src";
|
||||
|
||||
# Running the tests is required to build the *.olean files for the core
|
||||
# library.
|
||||
doCheck = true;
|
||||
|
||||
postPatch = "patchShebangs .";
|
||||
|
||||
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace $out/bin/leanpkg \
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, unzip
|
||||
{ stdenv, lib, fetchurl, iosevka, unzip
|
||||
, variant ? ""
|
||||
}:
|
||||
|
||||
@ -29,17 +29,11 @@ in stdenv.mkDerivation rec {
|
||||
unzip -d $out/share/fonts/truetype $src
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://be5invis.github.io/Iosevka/";
|
||||
downloadPage = "https://github.com/be5invis/Iosevka/releases";
|
||||
description = ''
|
||||
Slender monospace sans-serif and slab-serif typeface inspired by Pragmata
|
||||
Pro, M+ and PF DIN Mono, designed to be the ideal font for programming.
|
||||
'';
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.cstrahan ];
|
||||
meta = iosevka.meta // {
|
||||
maintainers = with lib.maintainers; [
|
||||
cstrahan
|
||||
];
|
||||
};
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
passthru.updateScript = ./update-bin.sh;
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, pkgs, fetchFromGitHub, nodejs, nodePackages, remarshal
|
||||
, ttfautohint-nox, otfcc
|
||||
, ttfautohint-nox
|
||||
|
||||
# Custom font set options.
|
||||
# See https://github.com/be5invis/Iosevka#build-your-own-style
|
||||
@ -27,23 +27,30 @@
|
||||
|
||||
assert (privateBuildPlan != null) -> set != null;
|
||||
|
||||
let
|
||||
# We don't know the attribute name for the Iosevka package as it
|
||||
# changes not when our update script is run (which in turn updates
|
||||
# node-packages.json, but when node-packages/generate.sh is run
|
||||
# (which updates node-packages.nix).
|
||||
#
|
||||
# Doing it this way ensures that the package can always be built,
|
||||
# although possibly an older version than ioseva-bin.
|
||||
nodeIosevka = (
|
||||
lib.findSingle
|
||||
(drv: drv ? packageName && drv.packageName == "iosevka")
|
||||
(throw "no 'iosevka' package found in nodePackages")
|
||||
(throw "multiple 'iosevka' packages found in nodePackages")
|
||||
(lib.attrValues nodePackages)
|
||||
).override (drv: { dontNpmInstall = true; });
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = if set != null then "iosevka-${set}" else "iosevka";
|
||||
|
||||
version = "3.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "be5invis";
|
||||
repo = "Iosevka";
|
||||
rev = "v${version}";
|
||||
sha256 = "1wbnp6gr3ywvspwk6i0jn68zwjmsd38arn4n2dkh7mdkrmvah81k";
|
||||
};
|
||||
inherit (nodeIosevka) version src;
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
nodePackages."iosevka-build-deps-../../data/fonts/iosevka"
|
||||
nodeIosevka
|
||||
remarshal
|
||||
otfcc
|
||||
ttfautohint-nox
|
||||
];
|
||||
|
||||
@ -61,9 +68,7 @@ stdenv.mkDerivation rec {
|
||||
echo -e "\n" >> parameters.toml
|
||||
cat "$extraParametersPath" >> parameters.toml
|
||||
''}
|
||||
ln -s ${
|
||||
nodePackages."iosevka-build-deps-../../data/fonts/iosevka"
|
||||
}/lib/node_modules/iosevka-build-deps/node_modules .
|
||||
ln -s ${nodeIosevka}/lib/node_modules/iosevka/node_modules .
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
@ -74,13 +79,19 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
fontdir="$out/share/fonts/truetype"
|
||||
install -d "$fontdir"
|
||||
install "dist/$pname/ttf"/* "$fontdir"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = ./update-default.sh;
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://be5invis.github.io/Iosevka";
|
||||
downloadPage = "https://github.com/be5invis/Iosevka/releases";
|
||||
@ -96,6 +107,7 @@ stdenv.mkDerivation rec {
|
||||
ttuegel
|
||||
babariviere
|
||||
rileyinman
|
||||
AluisioASG
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
{
|
||||
"name": "iosevka-build-deps",
|
||||
"version": "3.2.2",
|
||||
"scripts": {
|
||||
"build": "verda -f verdafile.js"
|
||||
},
|
||||
"dependencies": {
|
||||
"@iarna/toml": "^2.2.5",
|
||||
"cldr": "^5.5.4",
|
||||
"ejs": "^3.1.3",
|
||||
"fs-extra": "^9.0.0",
|
||||
"object-assign": "^4.1.1",
|
||||
"otfcc-ttcize": "^0.10.2",
|
||||
"patel": "^0.33.1",
|
||||
"prettier": "^2.0.5",
|
||||
"semver": "^7.1.3",
|
||||
"spiro": "^2.0.0",
|
||||
"stylus": "^0.54.7",
|
||||
"topsort": "^0.0.2",
|
||||
"ttf2woff": "^2.0.1",
|
||||
"ttf2woff2": "^3.0.0",
|
||||
"typo-geom": "^0.8.0",
|
||||
"unicode-13.0.0": "^0.8.0",
|
||||
"unorm": "^1.6.0",
|
||||
"verda": "^1.0.1",
|
||||
"which": "^2.0.2"
|
||||
}
|
||||
}
|
||||
@ -1,11 +1,12 @@
|
||||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p curl jq
|
||||
|
||||
set -e
|
||||
set -euo pipefail
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
|
||||
release=$(curl -s https://api.github.com/repos/be5invis/Iosevka/releases/latest)
|
||||
|
||||
oldVersion=$(nix-instantiate --eval -E 'with import ./. {}; lib.getVersion iosevka-bin' | tr -d '"')
|
||||
oldVersion=$(nix-instantiate --eval -E 'with import ../../../.. {}; lib.getVersion iosevka-bin' | tr -d '"')
|
||||
version=$(echo "$release" | jq -r .tag_name | tr -d v)
|
||||
|
||||
if test "$oldVersion" = "$version"; then
|
||||
@ -13,8 +14,7 @@ if test "$oldVersion" = "$version"; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
file=$(nix-instantiate --eval -A iosevka-bin.meta.position | sed -r 's/^"(.*):[0-9]+"$/\1/')
|
||||
sed -i "s/$oldVersion/$version/" "$file"
|
||||
sed -i "s/$oldVersion/$version/" bin.nix
|
||||
|
||||
{
|
||||
echo '# This file was autogenerated. DO NOT EDIT!'
|
||||
@ -25,4 +25,4 @@ sed -i "s/$oldVersion/$version/" "$file"
|
||||
$(nix-prefetch-url "https://github.com/be5invis/Iosevka/releases/download/v$version/$asset")
|
||||
done
|
||||
echo '}'
|
||||
} >$(dirname "$file")/variants.nix
|
||||
} >variants.nix
|
||||
21
pkgs/data/fonts/iosevka/update-default.sh
Executable file
21
pkgs/data/fonts/iosevka/update-default.sh
Executable file
@ -0,0 +1,21 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p common-updater-scripts coreutils gawk replace
|
||||
set -euo pipefail
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
|
||||
nixpkgs=../../../..
|
||||
repo=https://github.com/be5invis/Iosevka
|
||||
|
||||
# Discover the latest version.
|
||||
current_version=$(nix-instantiate "$nixpkgs" --eval --strict -A iosevka.version | tr -d '"')
|
||||
new_version=$(list-git-tags "$repo" | sort --reverse --version-sort | awk 'match($0, /^v([0-9.]+)$/, m) { print m[1]; exit; }')
|
||||
if [[ "$new_version" == "$current_version" ]]; then
|
||||
echo "iosevka: no update found"
|
||||
exit
|
||||
fi
|
||||
|
||||
# Update the source package in nodePackages.
|
||||
current_source="$repo/archive/v$current_version.tar.gz"
|
||||
new_source="$repo/archive/v$new_version.tar.gz"
|
||||
replace-literal -ef "$current_source" "$new_source" ../../../development/node-packages/node-packages.json
|
||||
echo "iosevka: $current_version -> $new_version (after nodePackages update)"
|
||||
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Flat Design theme for GTK based desktop environments";
|
||||
homepage = "https://github.com/vinceliuice/Canta-theme";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.unix;
|
||||
platforms = platforms.linux; # numix-icon-theme-circle unavailable in darwin
|
||||
maintainers = [ maintainers.romildo ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
mkDerivation, lib,
|
||||
mkDerivation, lib, fetchpatch,
|
||||
extra-cmake-modules, kdoctools,
|
||||
|
||||
epoxy,libICE, libSM, libinput, libxkbcommon, udev, wayland, xcb-util-cursor,
|
||||
@ -37,6 +37,11 @@ mkDerivation {
|
||||
patches = [
|
||||
./0001-follow-symlinks.patch
|
||||
./0002-xwayland.patch
|
||||
(fetchpatch { # included in >= 5.18.6
|
||||
name = "EGL_TEXTURE_Y_XUXV_WL.diff";
|
||||
url = "https://github.com/KDE/kwin/commit/2c76cc478.diff";
|
||||
sha256 = "1ywaky05h5j1x758q3yhp3ap45ispffghyxynqz5lybl5n6yyxhy";
|
||||
})
|
||||
];
|
||||
CXXFLAGS = [
|
||||
''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"''
|
||||
|
||||
@ -163,7 +163,7 @@ in stdenv.mkDerivation (rec {
|
||||
description = "Collection of modular and reusable compiler and toolchain technologies";
|
||||
homepage = "https://llvm.org/";
|
||||
license = stdenv.lib.licenses.ncsa;
|
||||
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
|
||||
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill primeos ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
} // stdenv.lib.optionalAttrs enableManpages {
|
||||
|
||||
@ -11,8 +11,8 @@
|
||||
let
|
||||
major = "11";
|
||||
minor = "0";
|
||||
update = "8";
|
||||
build = "10";
|
||||
update = "9";
|
||||
build = "11";
|
||||
|
||||
openjdk = stdenv.mkDerivation rec {
|
||||
pname = "openjdk" + lib.optionalString headless "-headless";
|
||||
@ -20,7 +20,7 @@ let
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz";
|
||||
sha256 = "1sdncn1bk4h8xxfnmrl1125maqy6mc0v0y1dyifwsa04wasj9hbz";
|
||||
sha256 = "fc2ee2ee5822f2440e66114c8fa76888fea7ddd351282940c222d34b5f871858";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoconf ];
|
||||
|
||||
@ -19,8 +19,8 @@ let
|
||||
aarch64-linux = "aarch64";
|
||||
}.${stdenv.system} or (throw "Unsupported platform");
|
||||
|
||||
update = "265";
|
||||
build = if stdenv.isAarch64 then "b01" else "ga";
|
||||
update = "272";
|
||||
build = if stdenv.isAarch64 then "b10" else "b10";
|
||||
baseurl = if stdenv.isAarch64 then "https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah"
|
||||
else "https://hg.openjdk.java.net/jdk8u/jdk8u";
|
||||
repover = lib.optionalString stdenv.isAarch64 "aarch64-shenandoah-"
|
||||
@ -29,50 +29,50 @@ let
|
||||
jdk8 = fetchurl {
|
||||
name = "jdk8-${repover}.tar.gz";
|
||||
url = "${baseurl}/archive/${repover}.tar.gz";
|
||||
sha256 = if stdenv.isAarch64 then "1a2adw51af064rzlngsdlhs9gl47h3lv6dzvr8swqgl2n93nlbxa"
|
||||
else "02j1nbf3rxl581fqzc6i3ri6wwxx1dhkmj5klkh5xlp8dkhclr30";
|
||||
sha256 = if stdenv.isAarch64 then "db98897d6fddce85996a9b0daf4352abce4578be0b51eada41702ee1469dd415"
|
||||
else "8f0e8324d3500432e8ed642b4cc7dff90a617dbb2a18a94c07c1020d32f93b7a";
|
||||
};
|
||||
langtools = fetchurl {
|
||||
name = "langtools-${repover}.tar.gz";
|
||||
url = "${baseurl}/langtools/archive/${repover}.tar.gz";
|
||||
sha256 = if stdenv.isAarch64 then "0hfrbz7421s2barfrfp0fvmh45iksw2zx1z4ykjg3giv8zbmswfm"
|
||||
else "1r2adp7sn3y45rb5h059qygz18bgmkqr2g2jc9mpzskl5vwsqiw4";
|
||||
sha256 = if stdenv.isAarch64 then "6544c1cc455844bbbb3d2914ffc716b1cee7f19e6aa223764d41a7cddc41322c"
|
||||
else "632417b0b067c929eda6958341352e29c5810056a5fec138641eb3503f9635b7";
|
||||
};
|
||||
hotspot = fetchurl {
|
||||
name = "hotspot-${repover}.tar.gz";
|
||||
url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
|
||||
sha256 = if stdenv.isAarch64 then "0g5h74snfl2dj2xwlvb5hgfbqmnbhxax68axadz11mq7r2bhd0lk"
|
||||
else "10xj8qr499r6nla74bjh4dmq7pkj63iircijk1wyv9xz5v777pcc";
|
||||
sha256 = if stdenv.isAarch64 then "37abb89e66641607dc6f372946bfc6bd413f23fec0b9c3baf75f41ce517e21d8"
|
||||
else "2142f3b769800a955613b51ffe192551bab1db95b0c219900cf34febc6f20245";
|
||||
};
|
||||
corba = fetchurl {
|
||||
name = "corba-${repover}.tar.gz";
|
||||
url = "${baseurl}/corba/archive/${repover}.tar.gz";
|
||||
sha256 = if stdenv.isAarch64 then "0wfqrpr5m4gnavgsl6zcy2l3c7sgn3yl7yhp2crh9icp44ld2cj9"
|
||||
else "0lk4jimrafgphffsj5yyyhl6pib0y5xxqcr09bgr2w8sjkp4s04s";
|
||||
sha256 = if stdenv.isAarch64 then "5da82f7b4aceff32e02d2f559033e3b62b9509d79f1a6891af871502e1d125b1"
|
||||
else "320098d64c843c1ff2ae62579817f9fb4a81772bc0313a543ce68976ad7a6d98";
|
||||
};
|
||||
jdk = fetchurl {
|
||||
name = "jdk-${repover}.tar.gz";
|
||||
url = "${baseurl}/jdk/archive/${repover}.tar.gz";
|
||||
sha256 = if stdenv.isAarch64 then "0ss49bv2dzb9vkabpv1ag04wli5722p0a8gqkzqmzw4nj67snfqw"
|
||||
else "0anbp4vq8bzhqsqxlgjd0dx0irf57x4i5ddbpljl36vy2pi9xsm7";
|
||||
sha256 = if stdenv.isAarch64 then "ee613296d823605dcd1a0fe2f89b4c7393bdb8ae5f2659f48f5cbc0012bb1a47"
|
||||
else "957c24fc58ac723c8cd808ab60c77d7853710148944c8b9a59f470c4c809e1a0";
|
||||
};
|
||||
jaxws = fetchurl {
|
||||
name = "jaxws-${repover}.tar.gz";
|
||||
url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
|
||||
sha256 = if stdenv.isAarch64 then "1nwn6mz38app6pk5f1x3vya1x9qfckyl7z6bi62k6mj2c72ikfh5"
|
||||
else "113d5nx2mp30m6xy2m2wh0nixk45q8abimlszkiq09w1w1ckzpba";
|
||||
sha256 = if stdenv.isAarch64 then "7c426b85f0d378125fa46e6d1b25ddc27ad29d93514d38c5935c84fc540b26ce"
|
||||
else "4efb0ee143dfe86c8ee06db2429fb81a0c8c65af9ea8fc18daa05148c8a1162f";
|
||||
};
|
||||
jaxp = fetchurl {
|
||||
name = "jaxp-${repover}.tar.gz";
|
||||
url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
|
||||
sha256 = if stdenv.isAarch64 then "1rhgbwvp7xls7r3f5jm69dw7x521vamchv917dwiz1byvm2bwn7s"
|
||||
else "0nvqidjssmamcrchq15cg3lfv5v3cnrw05a4h20xmhlpgb9im0vj";
|
||||
sha256 = if stdenv.isAarch64 then "928e363877afa7e0ad0c350bb18be6ab056b23708c0624a0bd7f01c4106c2a14"
|
||||
else "25a651c670d5b036042f7244617a3eb11fec80c07745c1c8181a1cdebeda3d8e";
|
||||
};
|
||||
nashorn = fetchurl {
|
||||
name = "nashorn-${repover}.tar.gz";
|
||||
url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
|
||||
sha256 = if stdenv.isAarch64 then "14gp8q6jw1hq2wlmcalfwn1kgmnq5w9svqnbjww20f25phxkicij"
|
||||
else "0fm9ldps7ayk7r3wjqiyxp1s6hvi242kl7f92ydkmlxqyfajx60a";
|
||||
sha256 = if stdenv.isAarch64 then "f060e08c5924457d4f5047c02ad6a987bdbdcd1cea53d2208322073ba4f398c3"
|
||||
else "a28b41d86f0c87ceacd2b686dd31c9bf391d851b1b5187a49ef5e565fc2cbc84";
|
||||
};
|
||||
openjdk8 = stdenv.mkDerivation {
|
||||
pname = "openjdk" + lib.optionalString headless "-headless";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, graalvm8, glibcLocales }:
|
||||
{ stdenv, fetchurl, graalvm8-ce, glibcLocales }:
|
||||
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
dontUnpack = true;
|
||||
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
nativeBuildInputs = [ graalvm8 glibcLocales ];
|
||||
nativeBuildInputs = [ graalvm8-ce glibcLocales ];
|
||||
|
||||
buildPhase = ''
|
||||
native-image \
|
||||
@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
homepage = "https://github.com/borkdude/babashka";
|
||||
license = licenses.epl10;
|
||||
platforms = graalvm8.meta.platforms;
|
||||
platforms = graalvm8-ce.meta.platforms;
|
||||
maintainers = with maintainers; [ bandresen bhougland DerGuteMoritz jlesquembre ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-media-driver";
|
||||
version = "20.3.0";
|
||||
version = "20.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "media-driver";
|
||||
rev = "intel-media-${version}";
|
||||
sha256 = "0dy30g32iqyygap3cm1idbhwnm1p3qvf2j2nzcr9n5im287h5gcr";
|
||||
sha256 = "0nah3h3s6hqbgz1wqp5j1grzq0q939wbh4b9d27dmb4wy6ma41sl";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
|
||||
runHook preInstallCheck
|
||||
|
||||
export TZDIR=${tzdata}/share/zoneinfo
|
||||
ctest --output-on-failure --exclude-regex 'timezones|libical-glib-array|libical-glib-component|libical-glib-timezone'
|
||||
ctest --output-on-failure --exclude-regex 'regression|recur|timezones|libical-glib-array|libical-glib-component|libical-glib-timezone'
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
@ -14,8 +14,7 @@ assert (!blas.isILP64) && (!lapack.isILP64);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "linbox";
|
||||
version = "1.6.3";
|
||||
|
||||
version = "1.6.3"; # TODO: Check postPatch script on update
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linbox-team";
|
||||
@ -36,6 +35,20 @@ stdenv.mkDerivation rec {
|
||||
fflas-ffpack
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Remove inappropriate `const &` qualifiers on data members that can be
|
||||
# modified via member functions.
|
||||
# See also: https://github.com/linbox-team/linbox/pull/256
|
||||
./patches/linbox-pr256-part2.patch # TODO: Remove on 1.7.0 update
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Remove @LINBOXSAGE_LIBS@ that is actually undefined.
|
||||
# See also: https://github.com/linbox-team/linbox/pull/249
|
||||
# TODO: Remove on 1.7.0 update
|
||||
find . -type f -exec sed -e 's/@LINBOXSAGE_LIBS@//' -i {} \;
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-blas-libs=-lblas"
|
||||
"--disable-optimization"
|
||||
|
||||
@ -0,0 +1,13 @@
|
||||
--- a/linbox/algorithms/det-rational.h
|
||||
+++ b/linbox/algorithms/det-rational.h
|
||||
@@ -79,8 +79,8 @@
|
||||
struct MyRationalModularDet {
|
||||
const Blackbox &A;
|
||||
const MyMethod &M;
|
||||
- const Integer &mul;//multiplicative prec;
|
||||
- const Integer ÷
|
||||
+ Integer mul;//multiplicative prec;
|
||||
+ Integer div;
|
||||
|
||||
MyRationalModularDet(const Blackbox& b, const MyMethod& n,
|
||||
const Integer & p1, const Integer & p2) :
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "olm";
|
||||
version = "3.1.5";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://matrix.org/git/olm/-/archive/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "15l6cf029ghfk5bf8ii6nyy86gc90ji8n5hspjhj1xmzmk61xb4j";
|
||||
sha256 = "0iacbi9iibhzifh1bk6bi5xin557lvqmbf4ccsb8drj50dbxjiyr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "precice";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "precice";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1268dz39sx3gygnm7vpg59k1wdhy6rhf72i8i0kz4jckll0s9102";
|
||||
sha256 = "180db4nlir2409wzdnsc1bkyrllnki8d551qbm1rg82zkz3vdmqg";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -100,7 +100,7 @@
|
||||
, "indium"
|
||||
, "insect"
|
||||
, "ionic"
|
||||
, { "iosevka-build-deps": "../../data/fonts/iosevka" }
|
||||
, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v3.7.1.tar.gz"}
|
||||
, "jake"
|
||||
, "javascript-typescript-langserver"
|
||||
, "joplin"
|
||||
|
||||
1050
pkgs/development/node-packages/node-packages.nix
generated
1050
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -2,8 +2,8 @@
|
||||
buildPecl {
|
||||
pname = "event";
|
||||
|
||||
version = "2.5.7";
|
||||
sha256 = "0jkzcm5mmbg101jc7p3aws9qb6l6xbxkfff82mrf7s5fn7xd44im";
|
||||
version = "3.0.0";
|
||||
sha256 = "1k35qwcf4qz8617b4riy7bp0vna1j3ds0k9j52hlm7qrhww2yxqn";
|
||||
|
||||
configureFlags = [
|
||||
"--with-event-libevent-dir=${pkgs.libevent.dev}"
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ mkDerivation, fetchurl, pkgs, lib, php }:
|
||||
let
|
||||
pname = "php-cs-fixer";
|
||||
version = "2.16.4";
|
||||
version = "2.16.7";
|
||||
in
|
||||
mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar";
|
||||
sha256 = "05rdvypxc86hjs8b7id2csa7g1rf7dk2swzfvd5768abdgfasvr8";
|
||||
sha256 = "1azivqvgqy224g2ch9v9qgi31w4ml7fph3bsk8c304yvbvvfv5nh";
|
||||
};
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bitarray";
|
||||
version = "1.5.3";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "567631fc922b1c2c528c376795f18dcc0604d18702e0b8b50e8e35f0474214a5";
|
||||
sha256 = "ba157ddebddc723fe021fc80595b3c70924d69ee58286b62bfca21da48edfc9d";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "4.22.1";
|
||||
version = "4.23.0";
|
||||
pname = "breathe";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6e4b66e61876dac90e78b335788a38eaa3625ed9c70d0add261f98ddd128d36a";
|
||||
sha256 = "c28e251ad8a42e4d3dd6c0861a66128b400131614b36f19df505ea34c934f801";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ docutils six sphinx ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "btchip-python";
|
||||
version = "0.1.30";
|
||||
version = "0.1.31";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1mraf2lmh70b038k934adxi7d40431j7yq93my3aws99f5xccsb8";
|
||||
sha256 = "4167f3c6ea832dd189d447d0d7a8c2a968027671ae6f43c680192f2b72c39b2c";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ hidapi pyscard ecdsa ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cbor2";
|
||||
version = "5.1.2";
|
||||
version = "5.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "91759bd0ee5ef0d4fa24144dfa551670730baeca8cf2fff1cc59f734ecd21de6";
|
||||
sha256 = "a33aa2e5534fd74401ac95686886e655e3b2ce6383b3f958199b6e70a87c94bf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools_scm ];
|
||||
|
||||
@ -12,12 +12,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cssselect2";
|
||||
version = "0.3.0";
|
||||
version = "0.4.1";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "5c2716f06b5de93f701d5755a9666f2ee22cbcd8b4da8adddfc30095ffea3abc";
|
||||
sha256 = "93fbb9af860e95dd40bf18c3b2b6ed99189a07c0f29ba76f9c5be71344664ec8";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ tinycss2 ];
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, docopt
|
||||
, requests
|
||||
, smugpy
|
||||
, python
|
||||
, pkgs
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "smugline";
|
||||
version = "20160106";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gingerlime";
|
||||
repo = pname;
|
||||
rev = "134554c574c2d282112ba60165a8c5ffe0f16fd4";
|
||||
sha256 = "00n012ijkdrx8wsl8x3ghdcxcdp29s4kwr3yxvlyj79g5yhfvaj6";
|
||||
};
|
||||
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
|
||||
buildInputs = [ python pkgs.makeWrapper ];
|
||||
propagatedBuildInputs = [ docopt requests smugpy ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/libexec
|
||||
cp smugline.py $out/libexec
|
||||
makeWrapper ${python.interpreter} $out/bin/smugline \
|
||||
--add-flags "$out/libexec/smugline.py" \
|
||||
--prefix PYTHONPATH : "$PYTHONPATH"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/gingerlime/smugline";
|
||||
description = "A simple command line tool for smugmug ";
|
||||
license = licenses.mit;
|
||||
};
|
||||
|
||||
}
|
||||
@ -1,21 +0,0 @@
|
||||
{ stdenv, buildPythonPackage, fetchFromGitHub }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "smugpy";
|
||||
version = "20131218";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chrishoffman";
|
||||
repo = pname;
|
||||
rev = "f698d6749ce446e3d6c7d925b2cd1cd5b3d695ea";
|
||||
sha256 = "029x6hm1744iznv4sw8sfyl974wmx1sqnr1k5dvzzwpk3ja49a1y";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Python library for the SmugMug API";
|
||||
license = with licenses; [ mit ];
|
||||
homepage = "https://github.com/chrishoffman/smugpy";
|
||||
};
|
||||
|
||||
doCheck = false; # Tries to login to Smugmug…
|
||||
}
|
||||
@ -1,13 +1,14 @@
|
||||
{ stdenv, fetchurl, jre, autoPatchelfHook, zlib }:
|
||||
{ stdenv, fetchurl, jre, autoPatchelfHook, zlib, writeScript
|
||||
, common-updater-scripts, git, nixfmt, nix, coreutils, gnused, nixosTests }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sbt";
|
||||
version = "1.4.0";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
|
||||
sha256 = "1mgfs732w1c1p7dna7h47x8h073lvjs224fqlpkkvq10153mnxxl";
|
||||
sha256 = "1dw4l91sw4ybqxjid1hsb6r33ka5bl85rfdrbsr9m5vxl82a3mmc";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
@ -34,4 +35,35 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with maintainers; [ nequissimus ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
passthru = {
|
||||
tests = { inherit (nixosTests) sbt; };
|
||||
|
||||
updateScript = writeScript "update.sh" ''
|
||||
#!${stdenv.shell}
|
||||
set -o errexit
|
||||
PATH=${
|
||||
stdenv.lib.makeBinPath [
|
||||
common-updater-scripts
|
||||
git
|
||||
nixfmt
|
||||
nix
|
||||
coreutils
|
||||
gnused
|
||||
]
|
||||
}
|
||||
|
||||
oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion sbt" | tr -d '"')"
|
||||
latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags git@github.com:sbt/sbt.git '*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')"
|
||||
|
||||
if [ ! "$oldVersion" = "$latestTag" ]; then
|
||||
update-source-version sbt "$latestTag" --version-key=version --print-changes
|
||||
nixpkgs="$(git rev-parse --show-toplevel)"
|
||||
default_nix="$nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix"
|
||||
nixfmt "$default_nix"
|
||||
else
|
||||
echo "sbt is already up-to-date"
|
||||
fi
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, graalvm8, fetchurl }:
|
||||
{ stdenv, lib, graalvm8-ce, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clj-kondo";
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
buildInputs = [ graalvm8 ];
|
||||
buildInputs = [ graalvm8-ce ];
|
||||
|
||||
buildPhase = ''
|
||||
native-image \
|
||||
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
||||
description = "A linter for Clojure code that sparks joy";
|
||||
homepage = "https://github.com/borkdude/clj-kondo";
|
||||
license = licenses.epl10;
|
||||
platforms = graalvm8.meta.platforms;
|
||||
platforms = graalvm8-ce.meta.platforms;
|
||||
maintainers = with maintainers; [ jlesquembre bandresen ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
, pcre, makeWrapper }:
|
||||
|
||||
let
|
||||
version = "730-july-preview";
|
||||
version = "784-october-preview";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenXRay";
|
||||
repo = "xray-16";
|
||||
rev = version;
|
||||
sha256 = "1nish3sbpk0hsag7r4nyx8j6pl9mlgx58v8dhzg2vwj2q32isyb2";
|
||||
sha256 = "0q0h70gbpscdvn45wpxicljj4ji3cd2maijd5b7jhr1695h61q5y";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -25,8 +25,16 @@ stdenv.mkDerivation rec {
|
||||
sed -i 's|/usr|/|' Makefile
|
||||
'';
|
||||
|
||||
installFlags = [
|
||||
"install"
|
||||
"install_systemd"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
cp usr/iscsistart $out/sbin/
|
||||
for f in $out/lib/systemd/system/*; do
|
||||
substituteInPlace $f --replace /sbin $out/bin
|
||||
done
|
||||
$out/sbin/iscsistart -v
|
||||
'';
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pam_gnupg";
|
||||
version = "0.1";
|
||||
version = "0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cruegge";
|
||||
repo = "pam-gnupg";
|
||||
rev = "v${version}";
|
||||
sha256 = "0b70mazyvcbg6xyqllm62rwhbz0y94pcy202db1qyy4w8466bhsw";
|
||||
sha256 = "1d8046clv7r3bl77dbpza4f1zlkjffvdczbb5bci3prz7dyfrwsz";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchFromGitHub, fetchurl, substituteAll, cmake, makeWrapper, pkgconfig
|
||||
{ stdenv, lib, fetchFromGitHub, fetchurl, fetchpatch, substituteAll, cmake, makeWrapper, pkgconfig
|
||||
, curl, ffmpeg_3, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mysql, pcre, perl, perlPackages
|
||||
, polkit, utillinuxMinimal, x264, zlib
|
||||
, coreutils, procps, psmisc, nixosTests }:
|
||||
@ -78,13 +78,13 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "zoneminder";
|
||||
version = "1.34.16";
|
||||
version = "1.34.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ZoneMinder";
|
||||
repo = "zoneminder";
|
||||
rev = version;
|
||||
sha256 = "azQbm8EkbypBf2NjplDVCb6duEC476hhKDA0EGqxxWE=";
|
||||
sha256 = "1144j9crm0q5pwxnkmy3ahw1vbkddpbk2ys2m2pxxxiqifdhll83";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "procs";
|
||||
version = "0.10.4";
|
||||
version = "0.10.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dalance";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1a28kkxcrdfmrq2mmsfkdxfp3msklwga5nbfhjb7a7s64xh8jmjv";
|
||||
sha256 = "0w6a8pfk5s30yi5038kdqh4dncx2pskm7a23z66c4xj3842ci79c";
|
||||
};
|
||||
|
||||
cargoSha256 = "1xlxjr0pkwlzm7f5xlrsf76in28r9jj41n6gn44vxqbh4x161gs1";
|
||||
cargoSha256 = "07fwznx2czk1ibb77xcfhma9dpqps0m7rsmbb90gah6f32gah617";
|
||||
|
||||
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
|
||||
|
||||
|
||||
@ -3,16 +3,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "onefetch";
|
||||
version = "2.5.0";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "o2sh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-F1NbzcMoct0mjWKY2itz4cBqVToY7HpoaRzk3l683fY=";
|
||||
sha256 = "sha256-KdPr/6wGyoHhEwfPektL+B1khyoRfxDHI4aFcKNU0TM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-eBY+34VEPEAv5bqerxR3i7cJrVb1GtvmWyrM7uuef2E=";
|
||||
cargoSha256 = "sha256-MLlGz7Sid0G52//XekqkZgzLqFL7xoUwT6OvpaF4jm0=";
|
||||
|
||||
buildInputs = with stdenv;
|
||||
lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ];
|
||||
@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "Git repository summary on your terminal";
|
||||
homepage = "https://github.com/o2sh/onefetch";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ filalex77 ];
|
||||
maintainers = with maintainers; [ filalex77 kloenk ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "phoronix-test-suite";
|
||||
version = "9.8.0";
|
||||
version = "10.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz";
|
||||
sha256 = "05q01cr4a2mmyski50pqna9sgw2jy93fgfpjwkhbkc09na6400sq";
|
||||
sha256 = "09wrrcxfvh7pwv0jqpyzjsr0rd7askfr0s2xr1wv9v40znxmsmzz";
|
||||
};
|
||||
|
||||
buildInputs = [ php ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pspg";
|
||||
version = "3.1.3";
|
||||
version = "3.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okbob";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "16pajhzr4aahyhdzkp9g3ld2insnlk2z2w2pfab8bghw4f69j5xf";
|
||||
sha256 = "000h4yiaym7i5bcm268rvsjbs2brz2is9lhm6vm3dx0q7k1pcx45";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "slirp4netns";
|
||||
version = "1.1.4";
|
||||
version = "1.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rootless-containers";
|
||||
repo = "slirp4netns";
|
||||
rev = "v${version}";
|
||||
sha256 = "13hlljkqss9abjpwaa5gcn6qnax0ws03zzh45c4rv1if7rwk6nbl";
|
||||
sha256 = "1nspvzcpwmaipdq49jm7z3ymdg95zqgcyv1cjfs1zb950knrrggr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "packagekit-qt";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hughsie";
|
||||
repo = "PackageKit-Qt";
|
||||
rev = "v${version}";
|
||||
sha256 = "1ls6mn9abpwzw5wjgmslc5h9happj3516y1q67imppczk8g9h2yk";
|
||||
sha256 = "1d20r503msw1vix3nb6a8bmdqld7fj8k9jk33bkqsc610a2zsms6";
|
||||
};
|
||||
|
||||
buildInputs = [ packagekit ];
|
||||
|
||||
@ -65,6 +65,7 @@ mapAliases ({
|
||||
bittorrentSync = throw "bittorrentSync has been deprecated by resilio-sync."; # added 2019-06-03
|
||||
bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03
|
||||
bittorrentSync20 = throw "bittorrentSync20 has been deprecated by resilio-sync."; # added 2019-06-03
|
||||
btc1 = throw "btc1 has been removed, it was abandoned by upstream"; # added 2020-11-03
|
||||
buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12
|
||||
buildGo112Package = throw "buildGo112Package has been removed"; # added 2020-04-26
|
||||
buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26
|
||||
@ -540,6 +541,7 @@ mapAliases ({
|
||||
slurm-llnl-full = slurm-full; # renamed July 2017
|
||||
slurm-full = slurm; # added 2018-05-1
|
||||
smbclient = samba; # added 2018-04-25
|
||||
smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2020-11-04
|
||||
slim = throw "slim has been removed. Please use a different display-manager"; # added 2019-11-11
|
||||
slimThemes = throw "slimThemes has been removed because slim has been also"; # added 2019-11-11
|
||||
sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed";
|
||||
|
||||
@ -7192,8 +7192,6 @@ in
|
||||
|
||||
smu = callPackage ../tools/text/smu { };
|
||||
|
||||
smugline = python3Packages.smugline;
|
||||
|
||||
sn0int = callPackage ../tools/security/sn0int { };
|
||||
|
||||
snabb = callPackage ../tools/networking/snabb { } ;
|
||||
@ -24835,12 +24833,6 @@ in
|
||||
bitcoin-gold = libsForQt514.callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = true; };
|
||||
bitcoind-gold = callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = false; };
|
||||
|
||||
btc1 = callPackage ../applications/blockchains/btc1.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit;
|
||||
boost = boost165;
|
||||
};
|
||||
btc1d = btc1.override { withGui = false; };
|
||||
|
||||
btcpayserver = callPackage ../applications/blockchains/btcpayserver { };
|
||||
|
||||
cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { };
|
||||
|
||||
@ -6654,10 +6654,6 @@ in {
|
||||
|
||||
smpplib = callPackage ../development/python-modules/smpplib { };
|
||||
|
||||
smugline = callPackage ../development/python-modules/smugline { };
|
||||
|
||||
smugpy = callPackage ../development/python-modules/smugpy { };
|
||||
|
||||
snack = toPythonModule (pkgs.newt.override { inherit (self) python; });
|
||||
|
||||
snakebite = callPackage ../development/python-modules/snakebite { };
|
||||
|
||||
@ -30,7 +30,7 @@ let
|
||||
jobs =
|
||||
{ tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; };
|
||||
|
||||
#metrics = import ./metrics.nix { inherit pkgs nixpkgs; };
|
||||
metrics = import ./metrics.nix { inherit pkgs nixpkgs; };
|
||||
|
||||
manual = import ../../doc { inherit pkgs nixpkgs; };
|
||||
lib-tests = import ../../lib/tests/release.nix { inherit pkgs; };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user