cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2023-05-16 06:01:40 +00:00 committed by GitHub
commit e0d185ce49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 389 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
nixos/modules/virtualisation/lxc-container.nix
View file

@ -161,6 +161,11 @@ in
extraCommands = "mkdir -p proc sys dev";
};
system.build.installBootLoader = pkgs.writeScript "install-lxd-sbin-init.sh" ''
#!${pkgs.runtimeShell}
ln -fs "$1/init" /sbin/init
'';
# Add the overrides from lxd distrobuilder
# https://github.com/lxc/distrobuilder/blob/05978d0d5a72718154f1525c7d043e090ba7c3e0/distrobuilder/main.go#L630
systemd.packages = [

6
pkgs/applications/misc/cobalt/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cobalt";
version = "0.18.3";
version = "0.18.4";
src = fetchFromGitHub {
owner = "cobalt-org";
repo = "cobalt.rs";
rev = "v${version}";
sha256 = "sha256-GUN/TgAlIl9/libhA+qqYDYHhc1ZDvDymR/Ac8Mev3c=";
sha256 = "sha256-O7qFpp7Xr6K82o/KUMP0J5y2B32op+QBGUXo9Q5R5LQ=";
};
cargoSha256 = "sha256-u6C19QA3gMzBZIRoNDnfu1p8zkirSQKjNSQrSb8+qvs=";
cargoHash = "sha256-ZBAF4BqQ+JMZ3Rpg2RxUhhVvPE5pN68qljVl0o2/VNA=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];

28
pkgs/applications/misc/nerd-font-patcher/default.nix
View file

@ -1,19 +1,13 @@
{ python3Packages, lib, fetchFromGitHub }:
{ python3Packages, lib, fetchzip }:
python3Packages.buildPythonApplication rec {
pname = "nerd-font-patcher";
version = "2.2.2";
version = "3.0.1";
# This uses a sparse checkout because the repo is >2GB without it
src = fetchFromGitHub {
owner = "ryanoasis";
repo = "nerd-fonts";
rev = "v${version}";
sparseCheckout = [
"font-patcher"
"/src/glyphs"
];
sha256 = "sha256-boZUd1PM8puc9BTgOwCJpkfk6VMdXLsIyp+fQmW/ZqI=";
src = fetchzip {
url = "https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/FontPatcher.zip";
sha256 = "sha256-kh3zQ0lXCmiO72ZXwvLm7LGUZu0hg8G8TG+pknkK1yo=";
stripRoot = false;
};
propagatedBuildInputs = with python3Packages; [ fontforge ];
@ -22,15 +16,19 @@ python3Packages.buildPythonApplication rec {
postPatch = ''
sed -i font-patcher \
-e 's,__dir__ + "/src,"'$out'/share/nerd-font-patcher,'
-e 's,__dir__ + "/src,"'$out'/share/,'
sed -i font-patcher \
-e 's,/bin/scripts/name_parser,/../lib/name_parser,'
'';
# Note: we cannot use $out for second substitution
dontBuild = true;
installPhase = ''
mkdir -p $out/bin $out/share/nerd-font-patcher
mkdir -p $out/bin $out/share $out/lib
install -Dm755 font-patcher $out/bin/nerd-font-patcher
cp -ra src/glyphs $out/share/nerd-font-patcher
cp -ra src/glyphs $out/share/
cp -ra bin/scripts/name_parser $out/lib/
'';
meta = with lib; {

6
pkgs/applications/misc/usql/default.nix
View file

@ -10,18 +10,18 @@
buildGoModule rec {
pname = "usql";
version = "0.14.5";
version = "0.14.6";
src = fetchFromGitHub {
owner = "xo";
repo = "usql";
rev = "v${version}";
hash = "sha256-WjQdRSucp9iwjUisaz4V/d4JVuFOmYwQA6f3DK5GskU=";
hash = "sha256-RxnxF+KzRNPQ5w5zsk9g1tr557vGe7bi32pSiGL2rK8=";
};
buildInputs = [ unixODBC icu ];
vendorHash = "sha256-kGq+IrdhyFEoaqUeXTKRXziQnFfzG49GIMAsljnWQPA=";
vendorHash = "sha256-66HQNh8GNPGYsA4PXIij2PMUnj/SxLSQ/+5junR22UE=";
proxyVendor = true;
# Exclude broken impala & hive driver

38
pkgs/applications/networking/cluster/terraform-providers/providers.json
View file

@ -437,24 +437,24 @@
"vendorHash": "sha256-SLFpH7isx4OM2X9bzWYYD4VlejlgckBovOxthg47OOQ="
},
"google": {
"hash": "sha256-0spzfAsinmWsdarpoxIfrQFIPGEV47H50IVw5Kfyqxs=",
"hash": "sha256-LJyKBoFkw93okFrLLBAW8bBuXtOf6/g310ZhJNXQpks=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v4.64.0",
"rev": "v4.65.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-rjLvmKymUiuAIwiZRpgivbYbP88MLVSBlrirlJxZpcw="
"vendorHash": "sha256-O7lg3O54PedUEwWL34H49SvSBXuGH1l5joqEXgkew5Q="
},
"google-beta": {
"hash": "sha256-VMJdTj9LUhoj0Qvmt9lUYh00sOJQctgEggem4ZRVsVw=",
"hash": "sha256-JI0GyEeCjKvoXlA+BzODQ9XArLVvf8Z6ajK5voIQ7IA=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
"rev": "v4.64.0",
"rev": "v4.65.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-rjLvmKymUiuAIwiZRpgivbYbP88MLVSBlrirlJxZpcw="
"vendorHash": "sha256-O7lg3O54PedUEwWL34H49SvSBXuGH1l5joqEXgkew5Q="
},
"googleworkspace": {
"hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=",
@ -484,13 +484,13 @@
"vendorHash": null
},
"hcloud": {
"hash": "sha256-B6XL9izArnbkI7TWbuB/m/UgGK+YlrpaQEJ+etWQBJk=",
"hash": "sha256-aqx6oMIqMUgpVMInZPxGFPT9i+pBdU3ufjM6YUSiOss=",
"homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud",
"owner": "hetznercloud",
"repo": "terraform-provider-hcloud",
"rev": "v1.38.2",
"rev": "v1.39.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-gz96b+GOE7AgXzEL4odneYA01wZv4oXwz//Yyu9rg3E="
"vendorHash": "sha256-qa6DUmzL+JB/WTJM+a5VDvBCsrbt8gq/LeqzdAHLm0Q="
},
"helm": {
"hash": "sha256-X9keFjAmV86F/8ktxiv/VrnkHOazP9e/aOC9aRw1A48=",
@ -665,13 +665,13 @@
"vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg="
},
"linode": {
"hash": "sha256-G6+xplMymxziIVof67ONtVMLAaQc33A0pLscchNi8kc=",
"hash": "sha256-4cUmKscy0KrhG3CbQo/Uz0BI3tq/MUyDtzNqeXwUtxg=",
"homepage": "https://registry.terraform.io/providers/linode/linode",
"owner": "linode",
"repo": "terraform-provider-linode",
"rev": "v2.1.1",
"rev": "v2.2.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-om6Onp+Go74YfA8J2DALhJy1c+s5GbXYMpUM9a28bdI="
"vendorHash": "sha256-MsVYFt8u9czVs1vGCqBrw3BZ5C4OFNrEuZZ57GEVBqE="
},
"linuxbox": {
"hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=",
@ -882,11 +882,11 @@
"vendorHash": null
},
"pagerduty": {
"hash": "sha256-ff8zit1Lo5ipz2P4i8Nmv4Up6Td2gRi6y6BDhBKK4yg=",
"hash": "sha256-Vp4kNvG+37MR/0Es0sFxkWfl0dNc8ZIbm0VpSX416Pk=",
"homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
"owner": "PagerDuty",
"repo": "terraform-provider-pagerduty",
"rev": "v2.14.4",
"rev": "v2.14.5",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -963,13 +963,13 @@
"vendorHash": null
},
"scaleway": {
"hash": "sha256-cC3On9bqSchxibUWxkqBHHQlN6ZqrOmtBvSEk9J4Uuc=",
"hash": "sha256-ZZu8rePMIuQArXI3P/S9rGxw7LU8g3qbJYFpSJ32KJQ=",
"homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
"owner": "scaleway",
"repo": "terraform-provider-scaleway",
"rev": "v2.18.0",
"rev": "v2.19.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-iFZIhQhC5IWAmUqohvBzq4VIheWKqEahwSKM712lUCg="
"vendorHash": "sha256-TTQXAX8M9w0RUDVevt4OpPB32R2GFjsvCn1j+SJgZZs="
},
"secret": {
"hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=",
@ -1071,11 +1071,11 @@
"vendorHash": "sha256-fgvNdBwkz+YHOrLRQSe1D+3/VUhttKkJGzV6cg57g8s="
},
"sumologic": {
"hash": "sha256-sJo3dGGtKT+hPo9qVA+2BYkJhNY9N9FrgKpHqdTYrUQ=",
"hash": "sha256-iFN4dP9erg1NoYxyu6U4DTRvGUWTo63ZmxMu7Wxr0UI=",
"homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic",
"owner": "SumoLogic",
"repo": "terraform-provider-sumologic",
"rev": "v2.22.0",
"rev": "v2.22.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-iNBM4Y24vDGPKyb5cppSogk145F0/pAFmOzEeiWgfLI="
},

6
pkgs/applications/version-management/gitoxide/default.nix
View file

@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "gitoxide";
version = "0.23.0";
version = "0.25.0";
src = fetchFromGitHub {
owner = "Byron";
repo = "gitoxide";
rev = "v${version}";
sha256 = "sha256-HmynsnlTj08vwYwckFdq+0u1nquC7bDOGcq2vCeqdhA=";
sha256 = "sha256-3U/gQz/tJ/IrDd7ZIusJWDEB4nlpTM4miYfTEeEonv4=";
};
cargoHash = "sha256-5JvDqp3dZ9rcOS17YzwgNwJYQGQ021cpd0ClrR+1+5Y=";
cargoHash = "sha256-VPOivxdqEWQdFYYhSZVe5ji8CS0dKQeElKPeHxfwg4A=";
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ curl ] ++ (if stdenv.isDarwin

22
pkgs/desktops/xfce/applications/mousepad/default.nix
View file

@ -1,16 +1,30 @@
{ lib, mkXfceDerivation, gobject-introspection, gtk3, gtksourceview4, gspell }:
{ lib
, mkXfceDerivation
, gobject-introspection
, glib
, gtk3
, gtksourceview4
, gspell
, polkit
}:
mkXfceDerivation {
category = "apps";
pname = "mousepad";
version = "0.6.0";
version = "0.6.1";
odd-unstable = false;
sha256 = "sha256-VmpCjR8/3rsCGkVGhT+IdC6kaQkGz8G2ktFhJk32DeQ=";
sha256 = "sha256-MLdexhIsQa4XuVaLgtQ2aVJ00+pwkhAP3qMj0XXPqh0=";
nativeBuildInputs = [ gobject-introspection ];
buildInputs = [ gtk3 gtksourceview4 gspell ];
buildInputs = [
glib
gtk3
gtksourceview4
gspell
polkit # optional polkit support
];
# Use the GSettings keyfile backend rather than DConf
configureFlags = [ "--enable-keyfile-settings" ];

4
pkgs/desktops/xfce/applications/ristretto/default.nix
View file

@ -11,10 +11,10 @@
mkXfceDerivation {
category = "apps";
pname = "ristretto";
version = "0.13.0";
version = "0.13.1";
odd-unstable = false;
sha256 = "sha256-K1cC5NnRv/C5ZiwMAmaQ8qxvlxHRsJ4F1TgR9CN8Qgc=";
sha256 = "sha256-Tor4mA0uSpVCdK6mla1L0JswgURnGPOfkYBR2N1AbL0=";
buildInputs = [
glib

4
pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
View file

@ -12,10 +12,10 @@
mkXfceDerivation {
category = "apps";
pname = "xfce4-screenshooter";
version = "1.10.3";
version = "1.10.4";
odd-unstable = false;
sha256 = "sha256-L+qlxzNgjsoMi+VsbOFG7L/IITbF1iqMWqujhk0rAcA=";
sha256 = "sha256-jikvMHpmBLTqwDjTxx4AMU8CnfrtSExFauq+gcTX2E8=";
buildInputs = [
exo

4
pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/default.nix
View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "xfce4-i3-workspaces-plugin";
version = "1.4.0";
version = "1.4.1";
src = fetchFromGitHub {
owner = "denesb";
repo = "xfce4-i3-workspaces-plugin";
rev = version;
sha256 = "sha256-+tjxMr0UbE3BLdxBwNr2mZqKSQOOtw69FmN4rk4loyA=";
sha256 = "sha256-Ss3uUmNvBqiu7hUaSy98+YYrWs64LFGbV4DMAV+xkvA=";
};
nativeBuildInputs = [

5
pkgs/development/interpreters/clisp/default.nix
View file

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
inherit libsigsegv gettext coreutils;
ffcallAvailable = libffcall != null;
ffcallAvailable = stdenv.isLinux && (libffcall != null);
buildInputs = [libsigsegv]
++ lib.optional (gettext != null) gettext
@ -101,7 +101,8 @@ stdenv.mkDerivation rec {
homepage = "http://clisp.cons.org";
maintainers = lib.teams.lisp.members;
platforms = lib.platforms.unix;
broken = stdenv.hostPlatform.isAarch64;
# problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062
broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64;
license = lib.licenses.gpl2;
};
}

3
pkgs/development/interpreters/clisp/hg.nix
View file

@ -93,7 +93,6 @@ stdenv.mkDerivation rec {
homepage = "http://clisp.cons.org";
maintainers = lib.teams.lisp.members;
# problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062
platforms = lib.platforms.unix;
broken = stdenv.hostPlatform.isDarwin;
platforms = lib.platforms.linux;
};
}

4
pkgs/development/libraries/example-robot-data/default.nix
View file

@ -8,14 +8,14 @@
stdenv.mkDerivation rec {
pname = "example-robot-data";
version = "4.0.5";
version = "4.0.6";
src = fetchFromGitHub {
owner = "Gepetto";
repo = pname;
rev = "v${version}";
fetchSubmodules = true;
sha256 = "sha256-KE+wmYlgETt6RtyN/BMApgS075/WtuhY+rM7YFkBH0E=";
hash = "sha256-X1BQGM7MMe753RMb/rVYv7kNnjk/q30u/VJARAXiTAI=";
};
strictDeps = true;

24
pkgs/development/libraries/libphonenumber/build-reproducibility.patch Normal file
View file

@ -0,0 +1,24 @@
diff --git a/tools/cpp/src/cpp-build/generate_geocoding_data.cc b/tools/cpp/src/cpp-build/generate_geocoding_data.cc
index 205947e831..1e628e2cd2 100644
--- a/tools/cpp/src/cpp-build/generate_geocoding_data.cc
+++ b/tools/cpp/src/cpp-build/generate_geocoding_data.cc
@@ -97,7 +97,8 @@ class DirEntry {
DirEntryKinds kind_;
};
-// Lists directory entries in path. "." and ".." are excluded. Returns true on
+// Lists directory entries in path. "." and ".." are excluded. Entries are
+// returned in a consistent order to ensure reproducibility. Returns true on
// success.
bool ListDirectory(const string& path, vector<DirEntry>* entries) {
entries->clear();
@@ -135,6 +136,9 @@ bool ListDirectory(const string& path, vector<DirEntry>* entries) {
}
entries->push_back(DirEntry(entry->d_name, kind));
}
+ std::sort(
+ entries->begin(), entries->end(),
+ [](const DirEntry& a, const DirEntry& b) { return a.name() < b.name(); });
}
// Returns true if s ends with suffix.

5
pkgs/development/libraries/libphonenumber/default.nix
View file

@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
sha256 = "sha256-xLxadSxVY3DjFDQrqj3BuOvdMaKdFSLjocfzovJCBB0=";
};
patches = [
# Submitted upstream: https://github.com/google/libphonenumber/pull/2921
./build-reproducibility.patch
];
nativeBuildInputs = [
cmake
pkg-config

29
pkgs/development/tools/database/mermerd/default.nix
View file

@ -1,30 +1,45 @@
{ buildGoModule
{ lib
, buildGoModule
, fetchFromGitHub
, lib
, testers
, mermerd
}:
buildGoModule rec {
pname = "mermerd";
version = "0.7.0";
version = "0.7.1";
src = fetchFromGitHub {
owner = "KarnerTh";
repo = "mermerd";
rev = "refs/tags/v${version}";
hash = "sha256-nlertvmuP9Fiuc4uVrgKzfxjOY/sE9udKZLe51t0GEY=";
hash = "sha256-15eaZ7EwKysRjXGbS0okMUkmwSxtb+CP08JWLoj/L8c=";
};
vendorHash = "sha256-RSCpkQymvUvY2bOkjhsyKnDa3vezUjC33Nwv0+O4OOQ=";
ldflags = [
"-s"
"-w"
"-X=main.version=${version}"
"-X=main.commit=${src.rev}"
];
# the tests expect a database to be running
doCheck = false;
passthru.tests = {
version = testers.testVersion {
package = mermerd;
command = "mermerd version";
};
};
meta = with lib; {
description = "Create Mermaid-Js ERD diagrams from existing tables";
homepage = "https://github.com/KarnerTh/mermerd";
license = licenses.mit;
maintainers = with lib.maintainers; [ austin-artificial ];
changelog = "https://github.com/KarnerTh/mermerd/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ austin-artificial ];
};
}

6
pkgs/development/tools/ddosify/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ddosify";
version = "0.16.7";
version = "1.0.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-AWYUJalXggNJonYE71c9uH+ebAms1LJTLcYgHzmUzR0=";
sha256 = "sha256-QinC03SdJ0V2t69LJYsoV+KV13D+OcTkLetFe8vLF3Y=";
};
vendorHash = "sha256-/kxHK3dX1RXB3Z5suSKsTHF7xaklCoyzUTbU1lcYwwg=";
vendorHash = "sha256-cGhMhX+SEv9fejViLZrEwXg584o204OQ5iR6AkxKnXo=";
ldflags = [
"-s" "-w"

108
pkgs/development/tools/misc/unixbench/common.patch Normal file
View file

@ -0,0 +1,108 @@
diff --git a/UnixBench/Run b/UnixBench/Run
index 34d2c72..130b56e 100755
--- a/UnixBench/Run
+++ b/UnixBench/Run
@@ -81,23 +81,23 @@ my $longIterCount = 10;
my $shortIterCount = 3;
# C compiler to use in compilation tests.
-my $cCompiler = 'gcc';
+my $cCompiler = 'cc -w';
# Establish full paths to directories. These need to be full pathnames
# (or do they, any more?). They can be set in env.
# variable names are the first parameter to getDir() below.
# Directory where the test programs live.
-my $BINDIR = getDir('UB_BINDIR', $FindBin::Bin . "/pgms");
+my $BINDIR = getDir('UB_BINDIR', '@out@/libexec/pgms');
# Temp directory, for temp files.
-my $TMPDIR = getDir('UB_TMPDIR', $FindBin::Bin . "/tmp");
+my $TMPDIR = getDir('UB_TMPDIR', "$ENV{'PWD'}/unixbench/temp");
# Directory to put results in.
-my $RESULTDIR = getDir('UB_RESULTDIR', $FindBin::Bin . "/results");
+my $RESULTDIR = getDir('UB_RESULTDIR', "$ENV{'PWD'}/unixbench/results");
# Directory where the tests are executed.
-my $TESTDIR = getDir('UB_TESTDIR', $FindBin::Bin . "/testdir");
+my $TESTDIR = getDir('UB_TESTDIR', '@out@/share/testdir');
############################################################################
@@ -330,19 +330,19 @@ my $testParams = {
"logmsg" => "Shell Scripts (1 concurrent)",
"cat" => 'system',
"prog" => "${BINDIR}/looper",
- "options" => "60 \"${BINDIR}/multi.sh\" 1",
+ "options" => "60 \"${BINDIR}/multi.sh\" 1 ${TMPDIR} ${TESTDIR}",
},
"shell8" => {
"logmsg" => "Shell Scripts (8 concurrent)",
"cat" => 'system',
"prog" => "${BINDIR}/looper",
- "options" => "60 \"${BINDIR}/multi.sh\" 8",
+ "options" => "60 \"${BINDIR}/multi.sh\" 8 ${TMPDIR} ${TESTDIR}",
},
"shell16" => {
"logmsg" => "Shell Scripts (16 concurrent)",
"cat" => 'system',
"prog" => "${BINDIR}/looper",
- "options" => "60 \"${BINDIR}/multi.sh\" 16",
+ "options" => "60 \"${BINDIR}/multi.sh\" 16 ${TMPDIR} ${TESTDIR}",
},
##########################
@@ -434,7 +434,7 @@ my $testParams = {
"logmsg" => "C Compiler Throughput ($cCompiler)",
"cat" => 'misc',
"prog" => "${BINDIR}/looper",
- "options" => "60 $cCompiler cctest.c",
+ "options" => "60 $cCompiler $TESTDIR/cctest.c -o $TMPDIR/cctest",
},
"arithoh" => {
"logmsg" => "Arithoh",
@@ -873,16 +873,6 @@ sub preChecks {
# Set the language.
$ENV{'LANG'} = $language;
- # Check that the required files are in the proper places.
- my $make = $ENV{MAKE} || "make";
- system("$make check");
- if ($? != 0) {
- system("$make all");
- if ($? != 0) {
- abortRun("\"$make all\" failed");
- }
- }
-
# Create a script to kill this run.
system("echo \"kill -9 $$\" > \"${TMPDIR}/kill_run\"");
chmod(0755, $TMPDIR . "/kill_run");
@@ -923,7 +913,10 @@ sub parseArgs {
$params->{'copies'} = [ ];
}
push(@{$params->{'copies'}}, shift(@words));
- } else {
+ } elsif ($word eq "--help" || $word eq "-h") {
+ print "Run: please see ubench(1) for available options\n";
+ exit 0;
+ }else {
die("Run: unknown option $word\n");
}
}
diff --git a/UnixBench/pgms/multi.sh b/UnixBench/pgms/multi.sh
index 72e8716..d2f5f48 100755
--- a/UnixBench/pgms/multi.sh
+++ b/UnixBench/pgms/multi.sh
@@ -15,7 +15,8 @@
###############################################################################
ID="@(#)multi.sh:3.4 -- 5/15/91 19:30:24";
instance=1
-sort_src=sort.src
+sort_src=$3/sort.src
+cd $2
work_factor=${MULTI_SH_WORK_FACTOR:-1}
if [ $work_factor -gt 1 ]; then
inputs=

109
pkgs/development/tools/misc/unixbench/default.nix Normal file
View file

@ -0,0 +1,109 @@
{ lib
, stdenv
, fetchFromGitHub
, makeWrapper
, pandoc
, installShellFiles
, perl
, xorg
, libGL
, coreutils
, unixtools
, targetPackages
, gnugrep
, gawk
, withGL? true
, withX11perf? true
}:
stdenv.mkDerivation rec {
pname = "unixbench";
version = "unstable-2023-02-27";
src = fetchFromGitHub {
owner = "kdlucas";
repo = "byte-unixbench";
rev = "a07fcc03264915c624f0e4818993c5b4df3fa703";
hash = "sha256-gmRWAqE9/HBb0S9rK0DXoaCoiGbtat0gmdeozhbv0NI=";
};
patches = [
./common.patch
];
patchFlags = [ "-p2" ];
sourceRoot = "source/UnixBench";
postPatch = ''
substituteInPlace Makefile \
--replace "-Wa,-q" ""
'';
nativeBuildInputs = [
makeWrapper
pandoc
installShellFiles
];
buildInputs = [ perl ] ++ lib.optionals withGL [
xorg.libX11
xorg.libXext
libGL
];
runtimeDependencies = [
coreutils
unixtools.nettools
unixtools.locale
targetPackages.stdenv.cc
gnugrep
gawk
] ++ lib.optionals withX11perf [
xorg.x11perf
];
makeFlags = [
"CC=${stdenv.cc.targetPrefix}cc"
] ++ lib.optionals withGL [
"GRAPHIC_TESTS=defined"
];
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,libexec,share}
install -D Run $out/bin/ubench
cp -r pgms $out/libexec/
cp -r testdir $out/share/
runHook postInstall
'';
postInstall = ''
substituteInPlace USAGE \
--replace 'Run"' 'ubench"' \
--replace './Run' 'ubench' \
--replace 'Run ' 'ubench '
pandoc -f rst -t man USAGE -o ubench.1
installManPage ubench.1
'';
preFixup = ''
substituteInPlace $out/libexec/pgms/multi.sh \
--replace '/bin/sh "$' '${targetPackages.runtimeShell} "$'
substituteInPlace $out/bin/ubench \
--subst-var out
wrapProgram $out/bin/ubench \
--prefix PATH : ${lib.makeBinPath runtimeDependencies}
'';
meta = with lib; {
description = "A basic indicator of the performance of a Unix-like system";
homepage = "https://github.com/kdlucas/byte-unixbench";
license = licenses.gpl2Plus;
mainProgram = "ubench";
maintainers = with maintainers; [ aleksana ];
platforms = platforms.unix;
};
}

6
pkgs/development/tools/toast/default.nix
View file

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "toast";
version = "0.47.1";
version = "0.47.2";
src = fetchFromGitHub {
owner = "stepchowfun";
repo = pname;
rev = "v${version}";
sha256 = "sha256-CW7rPylP3Swyv+rxwbeooUC6XEkmGCCpGEqM7zNG1b4=";
sha256 = "sha256-SWypxCtgVORYGOAiepfAfqnB4JjMwCC3e8lFZ/9tiCM=";
};
cargoHash = "sha256-yO0wcijM8q81g/HSmouHduUb12kaNVRIv4pECs8XyFw=";
cargoHash = "sha256-OaPh3/Z9mF56NeHpCehsuJHU6ClzE+beRsAG/lWIwp0=";
checkFlags = [ "--skip=format::tests::code_str_display" ]; # fails

6
pkgs/development/tools/wasm-pack/default.nix
View file

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "wasm-pack";
version = "0.11.0";
version = "0.11.1";
src = fetchFromGitHub {
owner = "rustwasm";
repo = "wasm-pack";
rev = "v${version}";
sha256 = "sha256-3iwXoYnmrZsbwFUR41uI/4jnCF0OjeRO7UqVDaGJJbQ=";
sha256 = "sha256-oIMS0kln+HCW9kFfLU+Vi0/4EYKYzzlA1BQHZNQkJMI=";
};
cargoHash = "sha256-Z0hmJ4/o9DNYz3JVXGgaDfw1JNcvvTCLngmhIDiVR6E=";
cargoHash = "sha256-l6zn714DMQ+frU9Mppz4LuGY6Zf9qmxZ9MuwIvYvQMU=";
nativeBuildInputs = [ pkg-config ];

6
pkgs/development/web/deno/default.nix
View file

@ -12,15 +12,15 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "1.33.2";
version = "1.33.3";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
hash = "sha256-YXOo3YrycsZ8Njxx20B4ySjyfI5jiDCZenYr4ONC9fM=";
hash = "sha256-E1Usmj4f3jvzllKIrItzOIe4kf0DRQWwobVGuN291Ys=";
};
cargoHash = "sha256-dQwcY8OnzW6xcmQPbteN18uqgxlq52tVZWynTv6Ci9E=";
cargoHash = "sha256-8L9UrFQTpwG2Gw4V72NvqdqQicG0HPRdmNJPhkWqj4s=";
postPatch = ''
# upstream uses lld on aarch64-darwin for faster builds

10
pkgs/development/web/deno/librusty_v8.nix
View file

@ -11,11 +11,11 @@ let
};
in
fetch_librusty_v8 {
version = "0.71.0";
version = "0.71.1";
shas = {
x86_64-linux = "sha256-52usT7MsLme3o3tjxcRJ0U3iX0fKtnvEvyKJeuL1Bvc=";
aarch64-linux = "sha256-E7CjpBO1cV5wFtLTIPPltGAyX1OEPjfhnVUQ4u3Mzxs=";
x86_64-darwin = "sha256-+Vj0SgvenrCuHPSYKFoxXTyfWDFbnUgHtWibNnXwbVk=";
aarch64-darwin = "sha256-p7BaC2nkZ+BGRPSXogpHshBblDe3ZDMGV93gA4sqpUc=";
x86_64-linux = "sha256-QCqCJdNaOLXggIGQhLOV/NvbMebfA3g1iyiBtkPDS9A=";
aarch64-linux = "sha256-r9/1086GQolGfc3iqIxZzTmoC7G/1vK4QG4Qvm0zUOo=";
x86_64-darwin = "sha256-kMpB9F2sTxjqnplOznvv20fa7AhdnEeIb3yb4qa72e0=";
aarch64-darwin = "sha256-jWjPJa3bWynoMUmccASggvu25NaHpn/AsTnC/JMyr8o=";
};
}

8
pkgs/games/flightgear/default.nix
View file

@ -6,7 +6,7 @@
}:
let
version = "2020.3.17";
version = "2020.3.18";
shortVersion = builtins.substring 0 6 version;
data = stdenv.mkDerivation rec {
pname = "flightgear-data";
@ -14,7 +14,7 @@ let
src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.txz";
sha256 = "sha256-Kl66K5rmejaRKFgzps4/a73z8gIp9YcdfJQOFR1U2Og=";
sha256 = "sha256-U8lsHrw40Xo6a3jZw6GiPnOALvvg9PdecVAdkZewUjg=";
};
dontUnpack = true;
@ -27,12 +27,12 @@ let
in
stdenv.mkDerivation rec {
pname = "flightgear";
# inheriting data for `nix-prefetch-url -A pkgs.flightgear.data.src`
# inheriting data for `nix-prefetch-url -A pkgs.flightgear.data.src`
inherit version data;
src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2";
sha256 = "sha256-ZnDe3qyiaDrKd/nwa/nR2AYq4yoqVFnd3IqgmJxfGFQ=";
sha256 = "sha256-OajjGj/Bgqg8H/6PjXkwJHwbSQqtzbQ1b3Xwk3aI3jc=";
};
# Of all the files in the source and data archives, there doesn't seem to be

4
pkgs/os-specific/linux/power-profiles-daemon/default.nix
View file

@ -27,7 +27,7 @@
stdenv.mkDerivation rec {
pname = "power-profiles-daemon";
version = "0.12";
version = "0.13";
outputs = [ "out" "devdoc" ];
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
owner = "hadess";
repo = "power-profiles-daemon";
rev = version;
sha256 = "sha256-2eMFPGVLwTBIlaB1zM3BzHrhydgBEm+kvx+VIZdUDPM=";
sha256 = "sha256-ErHy+shxZQ/aCryGhovmJ6KmAMt9OZeQGDbHIkC0vUE=";
};
nativeBuildInputs = [

11
pkgs/servers/ldap/lldap/default.nix
View file

@ -15,15 +15,6 @@
let
# version of wasm-opt, with https://github.com/rustwasm/wasm-pack/pull/1257 backported
wasm-pack-git = wasm-pack.overrideAttrs (oldAttrs: {
version = oldAttrs.version + "-git";
patches = [(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/rustwasm/wasm-pack/pull/1257.patch";
sha256 = "sha256-npi9ewh0NaD67crTcje9AYxaLLOJOMzqjqEJXZF2LbQ=";
})];
});
# replace with upstream wasm rustc, after resolution of
# https://github.com/NixOS/nixpkgs/issues/89426
rustc-wasm = (rustc.override {
@ -74,7 +65,7 @@ let
pname = commonDerivationAttrs.pname + "-frontend";
nativeBuildInputs = [
wasm-pack-git wasm-bindgen-cli binaryen which rustc-wasm rustc-wasm.llvmPackages.lld
wasm-pack wasm-bindgen-cli binaryen which rustc-wasm rustc-wasm.llvmPackages.lld
];
buildPhase = ''

4
pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
View file

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "check_ssl_cert";
version = "2.68.0";
version = "2.69.0";
src = fetchFromGitHub {
owner = "matteocorti";
repo = "check_ssl_cert";
rev = "refs/tags/v${version}";
hash = "sha256-yigg2C1FkdS/O+GCAkbQhXwARO0583V8MREzVCNsoGA=";
hash = "sha256-85bm/CvD5Kp9HKpf9czkqSEDYwmm8W+zd/uc88fWzPQ=";
};
nativeBuildInputs = [

17
pkgs/tools/graphics/pngcheck/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, zlib }:
{ lib, stdenv, fetchurl, zlib, installShellFiles }:
stdenv.mkDerivation rec {
pname = "pngcheck";
@ -11,22 +11,27 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace Makefile.unx --replace "gcc" "clang"
postPatch = ''
substituteInPlace $makefile \
--replace "gcc" "$CC"
'';
makefile = "Makefile.unx";
makeFlags = [ "ZPATH=${zlib.static}/lib" ];
nativeBuildInputs = [ installShellFiles ];
buildInputs = [ zlib ];
installPhase = ''
mkdir -p $out/bin/
cp pngcheck $out/bin/pngcheck
runHook preInstall
install -Dm555 -t $out/bin/ pngcheck
installManPage $pname.1
runHook postInstall
'';
meta = with lib; {
homepage = "http://pmt.sourceforge.net/pngcrush";
homepage = "https://pmt.sourceforge.net/pngcrush";
description = "Verifies the integrity of PNG, JNG and MNG files";
license = licenses.free;
platforms = platforms.unix;

4
pkgs/tools/misc/dumptorrent/default.nix
View file

@ -9,9 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "073h03bmpfdy15qh37lvppayld2747i4acpyk0pm5nf2raiak0zm";
};
patchPhase = ''
postPatch = ''
substituteInPlace Makefile \
--replace "gcc" "cc"
--replace "gcc" "$CC"
'';
installPhase = ''

6
pkgs/tools/system/dog/default.nix
View file

@ -9,16 +9,18 @@ stdenv.mkDerivation rec {
sha256 = "3ef25907ec5d1dfb0df94c9388c020b593fbe162d7aaa9bd08f35d2a125af056";
};
patchPhase = ''
postPatch = ''
substituteInPlace Makefile \
--replace "gcc" "cc"
--replace "gcc" "$CC"
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin
mkdir -p $out/man/man1
cp dog.1 $out/man/man1
cp dog $out/bin
runHook postInstall
'';
meta = with lib; {

2
pkgs/top-level/all-packages.nix
View file

@ -13290,6 +13290,8 @@ with pkgs;
unfs3 = callPackage ../servers/unfs3 { };
unixbench = callPackage ../development/tools/misc/unixbench { };
unoconv = callPackage ../tools/text/unoconv { };
unrtf = callPackage ../tools/text/unrtf { };