Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-07-26 18:01:32 +00:00 committed by GitHub
commit 1071ab374f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 3606 additions and 3457 deletions

View file

@ -2824,6 +2824,15 @@
githubId = 743057; githubId = 743057;
name = "Danylo Hlynskyi"; name = "Danylo Hlynskyi";
}; };
danc86 = {
name = "Dan Callaghan";
email = "djc@djc.id.au";
github = "danc86";
githubId = 398575;
keys = [{
fingerprint = "1C56 01F1 D70A B56F EABB 6BC0 26B5 AA2F DAF2 F30A";
}];
};
dancek = { dancek = {
email = "hannu.hartikainen@gmail.com"; email = "hannu.hartikainen@gmail.com";
github = "dancek"; github = "dancek";
@ -14082,6 +14091,12 @@
githubId = 5978566; githubId = 5978566;
name = "Yves-Stan Le Cornec"; name = "Yves-Stan Le Cornec";
}; };
ylh = {
email = "nixpkgs@ylh.io";
github = "ylh";
githubId = 9125590;
name = "Yestin L. Harrison";
};
ylwghst = { ylwghst = {
email = "ylwghst@onionmail.info"; email = "ylwghst@onionmail.info";
github = "ylwghst"; github = "ylwghst";

View file

@ -57,6 +57,7 @@ with lib;
(builtins.map (l: (replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] l) + "/UTF-8") ( (builtins.map (l: (replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] l) + "/UTF-8") (
[ [
"C.UTF-8" "C.UTF-8"
"en_US.UTF-8"
config.i18n.defaultLocale config.i18n.defaultLocale
] ++ (attrValues (filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings)) ] ++ (attrValues (filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings))
)); ));

View file

@ -0,0 +1,33 @@
{ lib
, fetchFromGitHub
, rustPlatform
, libX11
, libXft
, libXinerama
}:
rustPlatform.buildRustPackage rec {
pname = "rlaunch";
version = "1.3.13";
src = fetchFromGitHub {
owner = "PonasKovas";
repo = pname;
rev = version;
sha256 = "1w8qvny72l5358wnk4dmqnrv4mrpzxrzf49svav9grzxzzf8mqy2";
};
cargoSha256 = "00lnw48kn97gp45lylv5c6v6pil74flzpsq9k69xgvvjq9yqjzrx";
# The x11_dl crate dlopen()s these libraries, so we have to inject them into rpath.
postFixup = ''
patchelf --set-rpath ${lib.makeLibraryPath [ libX11 libXft libXinerama ]} $out/bin/rlaunch
'';
meta = with lib; {
description = "A lightweight application launcher for X11";
homepage = "https://github.com/PonasKovas/rlaunch";
license = licenses.mit;
maintainers = with maintainers; [ danc86 ];
};
}

View file

@ -219,7 +219,7 @@ buildStdenv.mkDerivation ({
"profilingPhase" "profilingPhase"
]; ];
patches = [ patches = lib.optionals (lib.versionOlder version "103") [
(fetchpatch { (fetchpatch {
# https://bugzilla.mozilla.org/show_bug.cgi?id=1773259 # https://bugzilla.mozilla.org/show_bug.cgi?id=1773259
name = "rust-cbindgen-0.24.2-compat.patch"; name = "rust-cbindgen-0.24.2-compat.patch";

View file

@ -3,10 +3,10 @@
rec { rec {
firefox = buildMozillaMach rec { firefox = buildMozillaMach rec {
pname = "firefox"; pname = "firefox";
version = "102.0.1"; version = "103.0";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "a930d359fb81e473b963a93f6db5110871e9fd57f6d0f352513047d363d930dd4811e8dd786c2f6f3541c3871eb1c0169b718652d9ee076fd13a20f52af30417"; sha512 = "016c2f276fb94e5174626f7d8b1a821b2de0f5a07f8a10f00a7ea4d4285591b0c23dd3ef45306579de79b3dfa99ccc527224c33f3319f61cf088b1f4bd097f9e";
}; };
meta = { meta = {
@ -28,11 +28,11 @@ rec {
firefox-esr-102 = buildMozillaMach rec { firefox-esr-102 = buildMozillaMach rec {
pname = "firefox-esr"; pname = "firefox-esr";
version = "102.0.1esr"; version = "102.1.0esr";
applicationName = "Mozilla Firefox ESR"; applicationName = "Mozilla Firefox ESR";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "ce804fa4e5dda3b8c4c7937f18994a184b0eb7d8fb9484dc924d04d3213ee3daf018141f91703daed6d060a99bfc5d915186db10a4ddcf220c2ea43e369e58df"; sha512 = "2505b87ce4115445568eb6b7d8af41678bd787fd07f3f79e9f0a22d90cdf752ae5d4371856cf9c56e2d9da7d5b7c3939dc2aab5753fcc017398e7d65260f6f03";
}; };
meta = { meta = {
@ -55,11 +55,11 @@ rec {
firefox-esr-91 = buildMozillaMach rec { firefox-esr-91 = buildMozillaMach rec {
pname = "firefox-esr"; pname = "firefox-esr";
version = "91.11.0esr"; version = "91.12.0esr";
applicationName = "Mozilla Firefox ESR"; applicationName = "Mozilla Firefox ESR";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "bff3a399c03bd1cdaaec0b6963b1558aa35b6338b6c02042ffd65fec0aedd344d01718692e881332f5f352c32da15ba09a20a09ee072200b47ae840bc0585a96"; sha512 = "323fb752488b45872b40f0b0ee1d8c1dffa16874dbff2afde19a54286c824ef48177233e029faeafa5946184e71c31c6bc5ba7ec17a571e21af64fc5f7334042";
}; };
meta = { meta = {

View file

@ -19,15 +19,16 @@
, libsecret , libsecret
, gobject-introspection , gobject-introspection
, glib-networking , glib-networking
, gitUpdater
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "liferea"; pname = "liferea";
version = "1.13.8"; version = "1.13.9";
src = fetchurl { src = fetchurl {
url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
sha256 = "0x2857nhn98hlzqxmxb2h2wcasr5jkhciih71wcnp0cja60aw20h"; sha256 = "IP3TSmnRekFebxeBh5JRegeSedx+y24e4X9muMAyhFk=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -69,6 +70,12 @@ stdenv.mkDerivation rec {
gappsWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH") gappsWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH")
''; '';
passthru.updateScript = gitUpdater {
inherit pname version;
url = "https://github.com/lwindolf/${pname}";
rev-prefix = "v";
};
meta = with lib; { meta = with lib; {
description = "A GTK-based news feed aggregator"; description = "A GTK-based news feed aggregator";
homepage = "http://lzone.de/liferea/"; homepage = "http://lzone.de/liferea/";

View file

@ -2,7 +2,7 @@
with python.pkgs; with python.pkgs;
buildPythonApplication rec { buildPythonApplication rec {
version = "0.5.0"; version = "0.6.0";
pname = "nbstripout"; pname = "nbstripout";
# Mercurial should be added as a build input but because it's a Python # Mercurial should be added as a build input but because it's a Python
@ -14,7 +14,7 @@ buildPythonApplication rec {
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "86ab50136998d62c9fa92478d2eb9ddc4137e51a28568f78fa8f24a6fbb6a7d8"; sha256 = "sha256-TWxDAhVqskaMyOcgLvKPNN2RhFFOIeRDQLzShpaMgss=";
}; };
# for some reason, darwin uses /bin/sh echo native instead of echo binary, so # for some reason, darwin uses /bin/sh echo native instead of echo binary, so

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "closure-compiler"; pname = "closure-compiler";
version = "20220502"; version = "20220601";
src = fetchurl { src = fetchurl {
url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar"; url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar";
sha256 = "sha256-ha0y/voqnYpZ7VmAkfZ/r/Iw7KAV+2ELOfWCpFjOdd4="; sha256 = "sha256-S061TQcvLRP1tw+i0XGcpU1cpA6mhISnCjAFV/Y+lLg=";
}; };
dontUnpack = true; dontUnpack = true;

View file

@ -5,7 +5,7 @@ with lib; let hb = mkCoqDerivation {
owner = "math-comp"; owner = "math-comp";
inherit version; inherit version;
defaultVersion = with versions; switch coq.coq-version [ defaultVersion = with versions; switch coq.coq-version [
{ case = isEq "8.15"; out = "1.2.1"; } { case = range "8.15" "8.16"; out = "1.2.1"; }
{ case = range "8.13" "8.14"; out = "1.2.0"; } { case = range "8.13" "8.14"; out = "1.2.0"; }
{ case = range "8.12" "8.13"; out = "1.1.0"; } { case = range "8.12" "8.13"; out = "1.1.0"; }
{ case = isEq "8.11"; out = "0.10.0"; } { case = isEq "8.11"; out = "0.10.0"; }

View file

@ -8,10 +8,12 @@ mkCoqDerivation {
inherit version; inherit version;
defaultVersion = with lib; with versions; switch [ coq.version mathcomp.version ] [ defaultVersion = with lib; with versions; switch [ coq.version mathcomp.version ] [
{ cases = [ (range "8.10" "8.15") (isGe "1.12.0") ]; out = "1.2.0"; } { cases = [ (range "8.10" "8.16") (range "1.12.0" "1.15.0") ]; out = "1.2.1"; }
{ cases = [ (range "8.10" "8.15") (range "1.12.0" "1.14.0") ]; out = "1.2.0"; }
{ cases = [ (range "8.10" "8.14") (range "1.11.0" "1.12.0") ]; out = "1.1.2"; } { cases = [ (range "8.10" "8.14") (range "1.11.0" "1.12.0") ]; out = "1.1.2"; }
] null; ] null;
release."1.2.1".sha256 = "sha256-M1q6WIPBsayHde2hwlTxylH169hcTs3OuFsEkM0e3yc=";
release."1.2.0".sha256 = "1picd4m85ipj22j3b84cv8ab3330radzrhd6kp0gpxq14dhv02c2"; release."1.2.0".sha256 = "1picd4m85ipj22j3b84cv8ab3330radzrhd6kp0gpxq14dhv02c2";
release."1.1.2".sha256 = "0565w713z1cwxvvdlqws2z5lgdys8lddf0vpwfdj7bpd7pq9hwxg"; release."1.1.2".sha256 = "0565w713z1cwxvvdlqws2z5lgdys8lddf0vpwfdj7bpd7pq9hwxg";
release."1.0.0".sha256 = "190jd8hb8anqsvr9ysr514pm5sh8qhw4030ddykvwxx9d9q6rbp3"; release."1.0.0".sha256 = "190jd8hb8anqsvr9ysr514pm5sh8qhw4030ddykvwxx9d9q6rbp3";

View file

@ -23,11 +23,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "spidermonkey"; pname = "spidermonkey";
version = "91.11.0"; version = "91.12.0";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
sha512 = "bff3a399c03bd1cdaaec0b6963b1558aa35b6338b6c02042ffd65fec0aedd344d01718692e881332f5f352c32da15ba09a20a09ee072200b47ae840bc0585a96"; sha512 = "323fb752488b45872b40f0b0ee1d8c1dffa16874dbff2afde19a54286c824ef48177233e029faeafa5946184e71c31c6bc5ba7ec17a571e21af64fc5f7334042";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

View file

@ -50,13 +50,6 @@ buildPythonPackage rec {
++ passthru.optional-dependencies.async ++ passthru.optional-dependencies.async
++ passthru.optional-dependencies.usb; ++ passthru.optional-dependencies.usb;
disabledTests = lib.optionals (pythonAtLeast "3.10") [
# Tests are failing with Python 3.10
# https://github.com/JeffLIrion/adb_shell/issues/198
"TestAdbDeviceAsync"
"TestTcpTransportAsync"
];
pythonImportsCheck = [ pythonImportsCheck = [
"adb_shell" "adb_shell"
]; ];

View file

@ -68,7 +68,7 @@ buildPythonPackage rec {
''; '';
meta = with lib; { meta = with lib; {
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; broken = stdenv.isLinux && stdenv.isAarch64;
homepage = "https://sfepy.org/"; homepage = "https://sfepy.org/";
description = "Simple Finite Elements in Python"; description = "Simple Finite Elements in Python";
license = licenses.bsd3; license = licenses.bsd3;

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "millet"; pname = "millet";
version = "0.2.7"; version = "0.2.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "azdavis"; owner = "azdavis";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-nFFgVvctkGCU0BOh8JWftw2pt0KP5bYh+uhm/LhdspQ="; sha256 = "sha256-ZvLpLQ7WkRvApSZ7vPDmQH8iLLpKUEY5ig5Mn+rkMI8=";
}; };
cargoSha256 = "sha256-MoXKNUgNeg2AG7G78wnZvLXADhCsK/WB5WiT5lTSmIQ="; cargoSha256 = "sha256-I5JgtW5Bgz2swJYiY2gV1UbSgeGxef7Hb4gDQYz/0TU=";
cargoBuildFlags = [ "--package" "lang-srv" ]; cargoBuildFlags = [ "--package" "lang-srv" ];

View file

@ -1,15 +1,15 @@
{ lib, stdenv, fetchurl, makeWrapper, sbcl_2_0_8, sqlite, freetds, libzip, curl, git, cacert, openssl }: { lib, stdenv, fetchurl, makeWrapper, sbcl_2_2_6, sqlite, freetds, libzip, curl, git, cacert, openssl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pgloader"; pname = "pgloader";
version = "3.6.2"; version = "3.6.6";
src = fetchurl { src = fetchurl {
url = "https://github.com/dimitri/pgloader/releases/download/v3.6.2/pgloader-bundle-3.6.2.tgz"; url = "https://github.com/dimitri/pgloader/releases/download/v3.6.6/pgloader-bundle-3.6.6.tgz";
sha256 = "1jqnw6pw11kwyy8zm2g7g85r8197fy0q4l70yybw9wr87wnqqnz3"; sha256 = "sha256-GDdWXY/O2xMsaIhaQIk+w8WQt9qevO8cDlgLGfNTVE0=";
}; };
nativeBuildInputs = [ git makeWrapper ]; nativeBuildInputs = [ git makeWrapper ];
buildInputs = [ sbcl_2_0_8 cacert sqlite freetds libzip curl openssl ]; buildInputs = [ sbcl_2_2_6 cacert sqlite freetds libzip curl openssl ];
LD_LIBRARY_PATH = lib.makeLibraryPath [ sqlite libzip curl git openssl freetds ]; LD_LIBRARY_PATH = lib.makeLibraryPath [ sqlite libzip curl git openssl freetds ];

View file

@ -15,16 +15,16 @@
buildGoModule rec { buildGoModule rec {
pname = "wails"; pname = "wails";
version = "2.0.0-beta.38"; version = "2.0.0-beta.42";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wailsapp"; owner = "wailsapp";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-yZgqdJMc48IKd3fimCWPLNkCdUEeIiQs4Xi4D9f5sHA="; sha256 = "sha256-ZfzaDUUM3W2ZvmLJufeVZ3eK/grvSxbKbsReV7BmcGA=";
} + "/v2"; } + "/v2";
vendorSha256 = "sha256-tUNOMNQ2NoYvNt2AdKzkMa+oiPNszBjuhs9EgbDVcTU="; vendorSha256 = "sha256-qmj7pZV9VaxWcC7EgbKZOjlDj6/66Qf5d222aj4TViw=";
proxyVendor = true; proxyVendor = true;
@ -66,8 +66,6 @@ buildGoModule rec {
--set CGO_LDFLAGS "-L${lib.makeLibraryPath [ zlib ]}" --set CGO_LDFLAGS "-L${lib.makeLibraryPath [ zlib ]}"
''; '';
doCheck = true;
meta = with lib; { meta = with lib; {
description = "Build applications using Go + HTML + CSS + JS"; description = "Build applications using Go + HTML + CSS + JS";
homepage = "https://wails.io"; homepage = "https://wails.io";

View file

@ -1,12 +1,12 @@
# This file has been generated by node2nix 1.9.0. Do not edit! # This file has been generated by node2nix 1.11.1. Do not edit!
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}:
let let
nodeEnv = import ./node-env.nix { nodeEnv = import ./node-env.nix {
inherit (pkgs) stdenv lib python2 runCommand writeTextFile; inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
inherit pkgs nodejs; inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
}; };

View file

@ -1,6 +1,6 @@
# This file originates from node2nix # This file originates from node2nix
{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}: {lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}:
let let
# Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
@ -40,36 +40,22 @@ let
''; '';
}; };
includeDependencies = {dependencies}: # Common shell logic
lib.optionalString (dependencies != []) installPackage = writeShellScript "install-package" ''
(lib.concatMapStrings (dependency: installPackage() {
'' local packageName=$1 src=$2
# Bundle the dependencies of the package
mkdir -p node_modules
cd node_modules
# Only include dependencies if they don't exist. They may also be bundled in the package. local strippedName
if [ ! -e "${dependency.name}" ]
then
${composePackage dependency}
fi
cd .. local DIR=$PWD
''
) dependencies);
# Recursively composes the dependencies of a package
composePackage = { name, packageName, src, dependencies ? [], ... }@args:
builtins.addErrorContext "while evaluating node package '${packageName}'" ''
DIR=$(pwd)
cd $TMPDIR cd $TMPDIR
unpackFile ${src} unpackFile $src
# Make the base dir in which the target dependency resides first # Make the base dir in which the target dependency resides first
mkdir -p "$(dirname "$DIR/${packageName}")" mkdir -p "$(dirname "$DIR/$packageName")"
if [ -f "${src}" ] if [ -f "$src" ]
then then
# Figure out what directory has been unpacked # Figure out what directory has been unpacked
packageDir="$(find . -maxdepth 1 -type d | tail -1)" packageDir="$(find . -maxdepth 1 -type d | tail -1)"
@ -79,28 +65,53 @@ let
chmod -R u+w "$packageDir" chmod -R u+w "$packageDir"
# Move the extracted tarball into the output folder # Move the extracted tarball into the output folder
mv "$packageDir" "$DIR/${packageName}" mv "$packageDir" "$DIR/$packageName"
elif [ -d "${src}" ] elif [ -d "$src" ]
then then
# Get a stripped name (without hash) of the source directory. # Get a stripped name (without hash) of the source directory.
# On old nixpkgs it's already set internally. # On old nixpkgs it's already set internally.
if [ -z "$strippedName" ] if [ -z "$strippedName" ]
then then
strippedName="$(stripHash ${src})" strippedName="$(stripHash $src)"
fi fi
# Restore write permissions to make building work # Restore write permissions to make building work
chmod -R u+w "$strippedName" chmod -R u+w "$strippedName"
# Move the extracted directory into the output folder # Move the extracted directory into the output folder
mv "$strippedName" "$DIR/${packageName}" mv "$strippedName" "$DIR/$packageName"
fi fi
# Unset the stripped name to not confuse the next unpack step # Change to the package directory to install dependencies
unset strippedName cd "$DIR/$packageName"
}
'';
# Include the dependencies of the package # Bundle the dependencies of the package
cd "$DIR/${packageName}" #
# Only include dependencies if they don't exist. They may also be bundled in the package.
includeDependencies = {dependencies}:
lib.optionalString (dependencies != []) (
''
mkdir -p node_modules
cd node_modules
''
+ (lib.concatMapStrings (dependency:
''
if [ ! -e "${dependency.packageName}" ]; then
${composePackage dependency}
fi
''
) dependencies)
+ ''
cd ..
''
);
# Recursively composes the dependencies of a package
composePackage = { name, packageName, src, dependencies ? [], ... }@args:
builtins.addErrorContext "while evaluating node package '${packageName}'" ''
installPackage "${packageName}" "${src}"
${includeDependencies { inherit dependencies; }} ${includeDependencies { inherit dependencies; }}
cd .. cd ..
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
@ -246,8 +257,8 @@ let
var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
if(![1, 2].includes(packageLock.lockfileVersion)) { if(![1, 2].includes(packageLock.lockfileVersion)) {
process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
process.exit(1); process.exit(1);
} }
if(packageLock.dependencies !== undefined) { if(packageLock.dependencies !== undefined) {
@ -379,7 +390,7 @@ let
buildNodePackage = buildNodePackage =
{ name { name
, packageName , packageName
, version , version ? null
, dependencies ? [] , dependencies ? []
, buildInputs ? [] , buildInputs ? []
, production ? true , production ? true
@ -391,13 +402,14 @@ let
, dontStrip ? true , dontStrip ? true
, unpackPhase ? "true" , unpackPhase ? "true"
, buildPhase ? "true" , buildPhase ? "true"
, meta ? {}
, ... }@args: , ... }@args:
let let
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ];
in in
stdenv.mkDerivation ({ stdenv.mkDerivation ({
name = "node_${name}-${version}"; name = "${name}${if version == null then "" else "-${version}"}";
buildInputs = [ tarWrapper python nodejs ] buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.isLinux) utillinux ++ lib.optional (stdenv.isLinux) utillinux
++ lib.optional (stdenv.isDarwin) libtool ++ lib.optional (stdenv.isDarwin) libtool
@ -414,6 +426,8 @@ let
passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
installPhase = '' installPhase = ''
source ${installPackage}
# Create and enter a root node_modules/ folder # Create and enter a root node_modules/ folder
mkdir -p $out/lib/node_modules mkdir -p $out/lib/node_modules
cd $out/lib/node_modules cd $out/lib/node_modules
@ -427,6 +441,14 @@ let
if [ -d "$out/lib/node_modules/.bin" ] if [ -d "$out/lib/node_modules/.bin" ]
then then
ln -s $out/lib/node_modules/.bin $out/bin ln -s $out/lib/node_modules/.bin $out/bin
# Patch the shebang lines of all the executables
ls $out/bin/* | while read i
do
file="$(readlink -f "$i")"
chmod u+rwx "$file"
patchShebangs "$file"
done
fi fi
# Create symlinks to the deployed manual page folders, if applicable # Create symlinks to the deployed manual page folders, if applicable
@ -446,13 +468,18 @@ let
# Run post install hook, if provided # Run post install hook, if provided
runHook postInstall runHook postInstall
''; '';
meta = {
# default to Node.js' platforms
platforms = nodejs.meta.platforms;
} // meta;
} // extraArgs); } // extraArgs);
# Builds a node environment (a node_modules folder and a set of binaries) # Builds a node environment (a node_modules folder and a set of binaries)
buildNodeDependencies = buildNodeDependencies =
{ name { name
, packageName , packageName
, version , version ? null
, src , src
, dependencies ? [] , dependencies ? []
, buildInputs ? [] , buildInputs ? []
@ -470,7 +497,7 @@ let
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
in in
stdenv.mkDerivation ({ stdenv.mkDerivation ({
name = "node-dependencies-${name}-${version}"; name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";
buildInputs = [ tarWrapper python nodejs ] buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.isLinux) utillinux ++ lib.optional (stdenv.isLinux) utillinux
@ -486,6 +513,8 @@ let
passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
installPhase = '' installPhase = ''
source ${installPackage}
mkdir -p $out/${packageName} mkdir -p $out/${packageName}
cd $out/${packageName} cd $out/${packageName}
@ -498,6 +527,7 @@ let
if [ -f ${src}/package-lock.json ] if [ -f ${src}/package-lock.json ]
then then
cp ${src}/package-lock.json . cp ${src}/package-lock.json .
chmod 644 package-lock.json
fi fi
''} ''}
@ -520,7 +550,7 @@ let
buildNodeShell = buildNodeShell =
{ name { name
, packageName , packageName
, version , version ? null
, src , src
, dependencies ? [] , dependencies ? []
, buildInputs ? [] , buildInputs ? []
@ -536,9 +566,10 @@ let
let let
nodeDependencies = buildNodeDependencies args; nodeDependencies = buildNodeDependencies args;
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ];
in in
stdenv.mkDerivation { stdenv.mkDerivation ({
name = "node-shell-${name}-${version}"; name = "node-shell-${name}${if version == null then "" else "-${version}"}";
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
buildCommand = '' buildCommand = ''
@ -557,7 +588,7 @@ let
export NODE_PATH=${nodeDependencies}/lib/node_modules export NODE_PATH=${nodeDependencies}/lib/node_modules
export PATH="${nodeDependencies}/bin:$PATH" export PATH="${nodeDependencies}/bin:$PATH"
''; '';
}; } // extraArgs);
in in
{ {
buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist; buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,6 @@
{ fetchFromGitHub }: fetchFromGitHub { { fetchFromGitHub }: fetchFromGitHub {
owner = "cypress-io"; owner = "cypress-io";
repo = "cypress-example-kitchensink"; repo = "cypress-example-kitchensink";
rev = "1572887a2003c2f35ff46d14f5f1cdfef975c9be"; rev = "6fd2fbf1a561742acba3cc45c389928483aac7f8";
sha256 = "sha256-A7d95b9V707iOzlIg+3nItPPB8HNVVOjPhGqa8MXRPE="; sha256 = "sha256-2oqjYoGANudYzkYwEtAbO2P5fpGM5k5wC8/CCeyGjqk=";
} }

View file

@ -16,11 +16,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cypress"; pname = "cypress";
version = "10.2.0"; version = "10.3.1";
src = fetchzip { src = fetchzip {
url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
sha256 = "y34EnCoAmV9ib72LpT7D0eUxP1h80h+rKqvrn9TfsQg="; sha256 = "sha256-LfvTnvOGFFZn7tUQ150fCO0gw7TK6JJj+Ys75VjJJ2M=";
}; };
# don't remove runtime deps # don't remove runtime deps
@ -73,6 +73,6 @@ stdenv.mkDerivation rec {
sourceProvenance = with sourceTypes; [ binaryNativeCode ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.mit; license = licenses.mit;
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ tweber mmahut ]; maintainers = with maintainers; [ tweber mmahut Crafter ];
}; };
} }

View file

@ -0,0 +1,35 @@
{ lib, stdenv, fetchFromGitHub, kernel }:
stdenv.mkDerivation rec {
pname = "hid-ite8291r3";
version = "unstable-2022-06-01";
src = fetchFromGitHub {
owner = "pobrn";
repo = "hid-ite8291r3";
rev = "48e04cb96517f8574225ebabb286775feb942ef5";
hash = "sha256-/69vvVbAVULDW8rwDYSj5706vrqJ6t4s/T6s3vmG9wk=";
};
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags ++ [
"VERSION=${version}"
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
installPhase = ''
runHook preInstall
install -D hid-ite8291r3.ko -t $out/lib/modules/${kernel.modDirVersion}/extra
runHook postInstall
'';
meta = with lib; {
description = "Linux driver for the ITE 8291 RGB keyboard backlight controller";
homepage = "https://github.com/pobrn/hid-ite8291r3/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ aacebedo ];
platforms = platforms.linux;
broken = kernel.kernelOlder "5.9";
};
}

View file

@ -2,7 +2,7 @@
buildGoModule rec { buildGoModule rec {
pname = "telegraf"; pname = "telegraf";
version = "1.22.4"; version = "1.23.3";
excludedPackages = "test"; excludedPackages = "test";
@ -12,10 +12,10 @@ buildGoModule rec {
owner = "influxdata"; owner = "influxdata";
repo = "telegraf"; repo = "telegraf";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Cftxm+Lb3ekK8YZrklD/C+p0EpyEVU/xxVI5oiNgBxk="; sha256 = "sha256-RkyHEcz5T8BZoIeLK5OjrJVBNQg5rfFDcHpE52sNM6U=";
}; };
vendorSha256 = "sha256-VyNPIYRMAC51zp38BKoM5/bLbfwULtFEtRC3LQjVJK4="; vendorSha256 = "sha256-JvDX55JY5B7f+6GK7x6D1iSyM/h2l5MuAkH2YXodYdM=";
proxyVendor = true; proxyVendor = true;
ldflags = [ ldflags = [

View file

@ -1,24 +1,17 @@
{ lib { lib, stdenv, fetchFromGitHub
, stdenv , fontconfig, freetype, libX11, libXext, libXt, xorgproto
, fetchFromGitHub , Carbon, Cocoa, IOKit, Metal, QuartzCore, DarwinTools
, darwin ? null , perl # For building web manuals
, fontconfig ? null
, freetype ? null
, libX11
, libXext ? null
, libXt ? null
, perl ? null # For building web manuals
, which , which
, xorgproto ? null
}: }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
pname = "plan9port"; pname = "plan9port";
version = "2021-10-19"; version = "2021-10-19";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "9fans"; owner = "9fans";
repo = "plan9port"; repo = pname;
rev = "d0d440860f2000a1560abb3f593cdc325fcead4c"; rev = "d0d440860f2000a1560abb3f593cdc325fcead4c";
hash = "sha256-2aYXqPGwrReyFPrLDtEjgQd/RJjpOfI3ge/tDocYpRQ="; hash = "sha256-2aYXqPGwrReyFPrLDtEjgQd/RJjpOfI3ge/tDocYpRQ=";
}; };
@ -44,22 +37,20 @@ stdenv.mkDerivation {
--replace "case Kcmd+'v':" "case 0x16: case Kcmd+'v':" --replace "case Kcmd+'v':" "case 0x16: case Kcmd+'v':"
''; '';
buildInputs = [ buildInputs = [ perl ] ++ (if !stdenv.isDarwin then [
perl
] ++ lib.optionals (!stdenv.isDarwin) [
fontconfig fontconfig
freetype # fontsrv wants ft2build.h provides system fonts for acme and sam freetype # fontsrv wants ft2build.h
libX11 libX11
libXext libXext
libXt libXt
xorgproto xorgproto
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ] else [
Carbon Carbon
Cocoa Cocoa
IOKit IOKit
Metal Metal
QuartzCore QuartzCore
darwin.DarwinTools DarwinTools
]); ]);
builder = ./builder.sh; builder = ./builder.sh;
@ -100,6 +91,7 @@ stdenv.mkDerivation {
ehmry ehmry
ftrvxmtrx ftrvxmtrx
kovirobi kovirobi
ylh
]; ];
mainProgram = "9"; mainProgram = "9";
platforms = platforms.unix; platforms = platforms.unix;

View file

@ -9703,7 +9703,10 @@ with pkgs;
plantuml-server = callPackage ../tools/misc/plantuml-server { }; plantuml-server = callPackage ../tools/misc/plantuml-server { };
plan9port = callPackage ../tools/system/plan9port { }; plan9port = callPackage ../tools/system/plan9port {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit Metal QuartzCore;
inherit (darwin) DarwinTools;
};
platformioPackages = dontRecurseIntoAttrs (callPackage ../development/embedded/platformio { }); platformioPackages = dontRecurseIntoAttrs (callPackage ../development/embedded/platformio { });
platformio = platformioPackages.platformio-chrootenv; platformio = platformioPackages.platformio-chrootenv;
@ -27858,6 +27861,10 @@ with pkgs;
tiramisu = callPackage ../applications/misc/tiramisu { }; tiramisu = callPackage ../applications/misc/tiramisu { };
rlaunch = callPackage ../applications/misc/rlaunch {
inherit (xorg) libX11 libXft libXinerama;
};
rootbar = callPackage ../applications/misc/rootbar {}; rootbar = callPackage ../applications/misc/rootbar {};
waybar = callPackage ../applications/misc/waybar {}; waybar = callPackage ../applications/misc/waybar {};

View file

@ -501,6 +501,8 @@ in {
qc71_laptop = callPackage ../os-specific/linux/qc71_laptop { }; qc71_laptop = callPackage ../os-specific/linux/qc71_laptop { };
hid-ite8291r3 = callPackage ../os-specific/linux/hid-ite8291r3 { };
} // lib.optionalAttrs config.allowAliases { } // lib.optionalAttrs config.allowAliases {
ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18; ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18;
}); });