ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-19 02:44:17 +03:00
Code Issues Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-08-15 18:00:56 +00:00 committed by GitHub
commit 55a98e21e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
96 changed files with 313 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tests/maintainers.nix
View File

@ -61,9 +61,9 @@ let
missingGithubIds = lib.concatLists (lib.mapAttrsToList checkMaintainer lib.maintainers); missingGithubIds = lib.concatLists (lib.mapAttrsToList checkMaintainer lib.maintainers);
success = pkgs.runCommandNoCC "checked-maintainers-success" {} ">$out"; success = pkgs.runCommand "checked-maintainers-success" {} ">$out";
failure = pkgs.runCommandNoCC "checked-maintainers-failure" { failure = pkgs.runCommand "checked-maintainers-failure" {
nativeBuildInputs = [ pkgs.curl pkgs.jq ]; nativeBuildInputs = [ pkgs.curl pkgs.jq ];
outputHash = "sha256:${lib.fakeSha256}"; outputHash = "sha256:${lib.fakeSha256}";
outputHAlgo = "sha256"; outputHAlgo = "sha256";

2
lib/tests/release.nix
View File

@ -3,7 +3,7 @@
pkgs ? import ../.. {} // { lib = throw "pkgs.lib accessed, but the lib tests should use nixpkgs' lib path directly!"; } pkgs ? import ../.. {} // { lib = throw "pkgs.lib accessed, but the lib tests should use nixpkgs' lib path directly!"; }
}: }:
pkgs.runCommandNoCC "nixpkgs-lib-tests" { pkgs.runCommand "nixpkgs-lib-tests" {
buildInputs = [ buildInputs = [
pkgs.nix pkgs.nix
(import ./check-eval.nix) (import ./check-eval.nix)

2
nixos/lib/utils.nix
View File

@ -3,7 +3,7 @@ pkgs: with pkgs.lib;
rec { rec {
# Copy configuration files to avoid having the entire sources in the system closure # Copy configuration files to avoid having the entire sources in the system closure
copyFile = filePath: pkgs.runCommandNoCC (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) {} '' copyFile = filePath: pkgs.runCommand (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) {} ''
cp ${filePath} $out cp ${filePath} $out
''; '';

2
nixos/modules/config/ldap.nix
View File

@ -42,7 +42,7 @@ let
# nslcd normally reads configuration from /etc/nslcd.conf. # nslcd normally reads configuration from /etc/nslcd.conf.
# this file might contain secrets. We append those at runtime, # this file might contain secrets. We append those at runtime,
# so redirect its location to something more temporary. # so redirect its location to something more temporary.
nslcdWrapped = runCommandNoCC "nslcd-wrapped" { nativeBuildInputs = [ makeWrapper ]; } '' nslcdWrapped = runCommand "nslcd-wrapped" { nativeBuildInputs = [ makeWrapper ]; } ''
mkdir -p $out/bin mkdir -p $out/bin
makeWrapper ${nss_pam_ldapd}/sbin/nslcd $out/bin/nslcd \ makeWrapper ${nss_pam_ldapd}/sbin/nslcd $out/bin/nslcd \
--set LD_PRELOAD "${pkgs.libredirect}/lib/libredirect.so" \ --set LD_PRELOAD "${pkgs.libredirect}/lib/libredirect.so" \

2
nixos/modules/config/networking.nix
View File

@ -190,7 +190,7 @@ in
protocols.source = pkgs.iana-etc + "/etc/protocols"; protocols.source = pkgs.iana-etc + "/etc/protocols";
# /etc/hosts: Hostname-to-IP mappings. # /etc/hosts: Hostname-to-IP mappings.
hosts.source = pkgs.runCommandNoCC "hosts" {} '' hosts.source = pkgs.runCommand "hosts" {} ''
cat ${escapeShellArgs cfg.hostFiles} > $out cat ${escapeShellArgs cfg.hostFiles} > $out
''; '';

2
nixos/modules/services/backup/borgbackup.nix
View File

@ -102,7 +102,7 @@ let
mkWrapperDrv = { mkWrapperDrv = {
original, name, set ? {} original, name, set ? {}
}: }:
pkgs.runCommandNoCC "${name}-wrapper" { pkgs.runCommand "${name}-wrapper" {
buildInputs = [ pkgs.makeWrapper ]; buildInputs = [ pkgs.makeWrapper ];
} (with lib; '' } (with lib; ''
makeWrapper "${original}" "$out/bin/${name}" \ makeWrapper "${original}" "$out/bin/${name}" \

2
nixos/modules/services/misc/matrix-appservice-irc.nix
View File

@ -10,7 +10,7 @@ let
jsonType = (pkgs.formats.json {}).type; jsonType = (pkgs.formats.json {}).type;
configFile = pkgs.runCommandNoCC "matrix-appservice-irc.yml" { configFile = pkgs.runCommand "matrix-appservice-irc.yml" {
# Because this program will be run at build time, we need `nativeBuildInputs` # Because this program will be run at build time, we need `nativeBuildInputs`
nativeBuildInputs = [ (pkgs.python3.withPackages (ps: [ ps.pyyaml ps.jsonschema ])) ]; nativeBuildInputs = [ (pkgs.python3.withPackages (ps: [ ps.pyyaml ps.jsonschema ])) ];
preferLocalBuild = true; preferLocalBuild = true;

4
nixos/modules/services/misc/sourcehut/builds.nix
View File

@ -84,7 +84,7 @@ in
(rev: archs: (rev: archs:
lib.attrsets.mapAttrsToList lib.attrsets.mapAttrsToList
(arch: image: (arch: image:
pkgs.runCommandNoCC "buildsrht-images" { } '' pkgs.runCommand "buildsrht-images" { } ''
mkdir -p $out/${distro}/${rev}/${arch} mkdir -p $out/${distro}/${rev}/${arch}
ln -s ${image}/*.qcow2 $out/${distro}/${rev}/${arch}/root.img.qcow2 ln -s ${image}/*.qcow2 $out/${distro}/${rev}/${arch}/root.img.qcow2
'') '')
@ -97,7 +97,7 @@ in
"${pkgs.sourcehut.buildsrht}/lib/images" "${pkgs.sourcehut.buildsrht}/lib/images"
]; ];
}; };
image_dir = pkgs.runCommandNoCC "builds.sr.ht-worker-images" { } '' image_dir = pkgs.runCommand "builds.sr.ht-worker-images" { } ''
mkdir -p $out/images mkdir -p $out/images
cp -Lr ${image_dir_pre}/* $out/images cp -Lr ${image_dir_pre}/* $out/images
''; '';

4
nixos/modules/services/monitoring/prometheus/default.nix
View File

@ -10,7 +10,7 @@ let
# a wrapper that verifies that the configuration is valid # a wrapper that verifies that the configuration is valid
promtoolCheck = what: name: file: promtoolCheck = what: name: file:
if cfg.checkConfig then if cfg.checkConfig then
pkgs.runCommandNoCCLocal pkgs.runCommandLocal
"${name}-${replaceStrings [" "] [""] what}-checked" "${name}-${replaceStrings [" "] [""] what}-checked"
{ buildInputs = [ cfg.package ]; } '' { buildInputs = [ cfg.package ]; } ''
ln -s ${file} $out ln -s ${file} $out
@ -19,7 +19,7 @@ let
# Pretty-print JSON to a file # Pretty-print JSON to a file
writePrettyJSON = name: x: writePrettyJSON = name: x:
pkgs.runCommandNoCCLocal name {} '' pkgs.runCommandLocal name {} ''
echo '${builtins.toJSON x}' | ${pkgs.jq}/bin/jq . > $out echo '${builtins.toJSON x}' | ${pkgs.jq}/bin/jq . > $out
''; '';

2
nixos/modules/services/monitoring/thanos.nix
View File

@ -63,7 +63,7 @@ let
}; };
}; };
toYAML = name: attrs: pkgs.runCommandNoCC name { toYAML = name: attrs: pkgs.runCommand name {
preferLocalBuild = true; preferLocalBuild = true;
json = builtins.toFile "${name}.json" (builtins.toJSON attrs); json = builtins.toFile "${name}.json" (builtins.toJSON attrs);
nativeBuildInputs = [ pkgs.remarshal ]; nativeBuildInputs = [ pkgs.remarshal ];

2
nixos/modules/services/networking/cjdns.nix
View File

@ -39,7 +39,7 @@ let
}; };
# Additional /etc/hosts entries for peers with an associated hostname # Additional /etc/hosts entries for peers with an associated hostname
cjdnsExtraHosts = pkgs.runCommandNoCC "cjdns-hosts" {} '' cjdnsExtraHosts = pkgs.runCommand "cjdns-hosts" {} ''
exec >$out exec >$out
${concatStringsSep "\n" (mapAttrsToList (k: v: ${concatStringsSep "\n" (mapAttrsToList (k: v:
optionalString (v.hostname != "") optionalString (v.hostname != "")

4
nixos/modules/services/web-apps/keycloak.nix
View File

@ -281,7 +281,7 @@ in
createLocalPostgreSQL = databaseActuallyCreateLocally && cfg.database.type == "postgresql"; createLocalPostgreSQL = databaseActuallyCreateLocally && cfg.database.type == "postgresql";
createLocalMySQL = databaseActuallyCreateLocally && cfg.database.type == "mysql"; createLocalMySQL = databaseActuallyCreateLocally && cfg.database.type == "mysql";
mySqlCaKeystore = pkgs.runCommandNoCC "mysql-ca-keystore" {} '' mySqlCaKeystore = pkgs.runCommand "mysql-ca-keystore" {} ''
${pkgs.jre}/bin/keytool -importcert -trustcacerts -alias MySQLCACert -file ${cfg.database.caCert} -keystore $out -storepass notsosecretpassword -noprompt ${pkgs.jre}/bin/keytool -importcert -trustcacerts -alias MySQLCACert -file ${cfg.database.caCert} -keystore $out -storepass notsosecretpassword -noprompt
''; '';
@ -553,7 +553,7 @@ in
jbossCliScript = pkgs.writeText "jboss-cli-script" (mkJbossScript keycloakConfig'); jbossCliScript = pkgs.writeText "jboss-cli-script" (mkJbossScript keycloakConfig');
keycloakConfig = pkgs.runCommandNoCC "keycloak-config" { keycloakConfig = pkgs.runCommand "keycloak-config" {
nativeBuildInputs = [ cfg.package ]; nativeBuildInputs = [ cfg.package ];
} '' } ''
export JBOSS_BASE_DIR="$(pwd -P)"; export JBOSS_BASE_DIR="$(pwd -P)";

2
nixos/modules/services/web-apps/node-red.nix
View File

@ -6,7 +6,7 @@ let
cfg = config.services.node-red; cfg = config.services.node-red;
defaultUser = "node-red"; defaultUser = "node-red";
finalPackage = if cfg.withNpmAndGcc then node-red_withNpmAndGcc else cfg.package; finalPackage = if cfg.withNpmAndGcc then node-red_withNpmAndGcc else cfg.package;
node-red_withNpmAndGcc = pkgs.runCommandNoCC "node-red" { node-red_withNpmAndGcc = pkgs.runCommand "node-red" {
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.makeWrapper ];
} }
'' ''

2
nixos/modules/virtualisation/podman.nix
View File

@ -9,7 +9,7 @@ let
podmanPackage = (pkgs.podman.override { inherit (cfg) extraPackages; }); podmanPackage = (pkgs.podman.override { inherit (cfg) extraPackages; });
# Provides a fake "docker" binary mapping to podman # Provides a fake "docker" binary mapping to podman
dockerCompat = pkgs.runCommandNoCC "${podmanPackage.pname}-docker-compat-${podmanPackage.version}" { dockerCompat = pkgs.runCommand "${podmanPackage.pname}-docker-compat-${podmanPackage.version}" {
outputs = [ "out" "man" ]; outputs = [ "out" "man" ];
inherit (podmanPackage) meta; inherit (podmanPackage) meta;
} '' } ''

2
nixos/tests/hockeypuck.nix
View File

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ lib, pkgs, ... }: import ./make-test-python.nix ({ lib, pkgs, ... }:
let let
gpgKeyring = (pkgs.runCommandNoCC "gpg-keyring" { buildInputs = [ pkgs.gnupg ]; } '' gpgKeyring = (pkgs.runCommand "gpg-keyring" { buildInputs = [ pkgs.gnupg ]; } ''
mkdir -p $out mkdir -p $out
export GNUPGHOME=$out export GNUPGHOME=$out
cat > foo <<EOF cat > foo <<EOF

2
nixos/tests/pleroma.nix
View File

@ -162,7 +162,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
pleroma_ctl user new jamy jamy@nixos.test --password 'jamy-password' --moderator --admin -y pleroma_ctl user new jamy jamy@nixos.test --password 'jamy-password' --moderator --admin -y
''; '';
tls-cert = pkgs.runCommandNoCC "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' tls-cert = pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } ''
openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=pleroma.nixos.test' -days 36500 openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=pleroma.nixos.test' -days 36500
mkdir -p $out mkdir -p $out
cp key.pem cert.pem $out cp key.pem cert.pem $out

2
nixos/tests/slurm.nix
View File

@ -43,7 +43,7 @@ let
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
''; '';
in pkgs.runCommandNoCC "mpitest" {} '' in pkgs.runCommand "mpitest" {} ''
mkdir -p $out/bin mkdir -p $out/bin
${pkgs.openmpi}/bin/mpicc ${mpitestC} -o $out/bin/mpitest ${pkgs.openmpi}/bin/mpicc ${mpitestC} -o $out/bin/mpitest
''; '';

2
nixos/tests/unbound.nix
View File

@ -33,7 +33,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
}; };
}; };
cert = pkgs.runCommandNoCC "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' cert = pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } ''
openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=dns.example.local' openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=dns.example.local'
mkdir -p $out mkdir -p $out
cp key.pem cert.pem $out cp key.pem cert.pem $out

2
nixos/tests/xmpp/prosody.nix
View File

@ -1,5 +1,5 @@
let let
cert = pkgs: pkgs.runCommandNoCC "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' cert = pkgs: pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } ''
openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=example.com/CN=uploads.example.com/CN=conference.example.com' -days 36500 openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=example.com/CN=uploads.example.com/CN=conference.example.com' -days 36500
mkdir -p $out mkdir -p $out
cp key.pem cert.pem $out cp key.pem cert.pem $out

1
pkgs/applications/editors/neovim/neovide/default.nix
View File

@ -116,5 +116,6 @@ rustPlatform.buildRustPackage rec {
license = with licenses; [ mit ]; license = with licenses; [ mit ];
maintainers = with maintainers; [ ck3d ]; maintainers = with maintainers; [ ck3d ];
platforms = platforms.linux; platforms = platforms.linux;
mainProgram = "neovide";
}; };
} }

2
pkgs/applications/editors/uivonim/yarn.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { { fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
offline_cache = linkFarm "offline" packages; offline_cache = linkFarm "offline" packages;
packages = [ packages = [
{ {

2
pkgs/applications/networking/browsers/vieb/yarn.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { { fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
offline_cache = linkFarm "offline" packages; offline_cache = linkFarm "offline" packages;
packages = [ packages = [
{ {

2
pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { { fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
offline_cache = linkFarm "offline" packages; offline_cache = linkFarm "offline" packages;
packages = [ packages = [
{ {

2
pkgs/applications/networking/instant-messengers/element/keytar/yarn.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { { fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
offline_cache = linkFarm "offline" packages; offline_cache = linkFarm "offline" packages;
packages = [ packages = [
{ {

2
pkgs/applications/networking/instant-messengers/element/seshat/yarn.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { { fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
offline_cache = linkFarm "offline" packages; offline_cache = linkFarm "offline" packages;
packages = [ packages = [
{ {

2
pkgs/applications/networking/listadmin/default.nix
View File

@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
wrapProgram $out/bin/listadmin \ wrapProgram $out/bin/listadmin \
--prefix PERL5LIB : "${with perl.pkgs; makeFullPerlPath [ --prefix PERL5LIB : "${with perl.pkgs; makeFullPerlPath [
TextReform NetINET6Glue LWPProtocolhttps TextReform NetINET6Glue LWPProtocolHttps
]}" ]}"
''; '';

6
pkgs/applications/networking/nextdns/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "nextdns"; pname = "nextdns";
version = "1.11.0"; version = "1.35.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nextdns"; owner = "nextdns";
repo = "nextdns"; repo = "nextdns";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-gnWFgzfMMnn8O7zDN5LW3cMIz5/wmgEW9fI9aJBEah8="; sha256 = "sha256-AWbUtzh1kJayhg/ssJUqUX4ywIV2Oy1BgTorhb+x3Vg=";
}; };
vendorSha256 = "sha256-kmszMqkDMaL+Z6GcZmQyeRShKKS/VGdn9vabYPW/kCc="; vendorSha256 = "sha256-EEDRJj5Iaglk0Y86XL/U512OjipBNJzcAv8Tb09a0g0=";
doCheck = false; doCheck = false;

2
pkgs/applications/networking/powerdns-admin/yarndeps.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { { fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
offline_cache = linkFarm "offline" packages; offline_cache = linkFarm "offline" packages;
packages = [ packages = [
{ {

4
pkgs/applications/networking/sync/onedrive/default.nix
View File

@ -14,13 +14,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "onedrive"; pname = "onedrive";
version = "2.4.12"; version = "2.4.13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "abraunegg"; owner = "abraunegg";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-rG9W90+wGLnhnfhqJjUIFGP6ZcmaxGkrdhPxQVRyxoc="; sha256 = "sha256-v1GSHwcP9EQaADIEKO14yotJBEEatbKugVJOCsTLr2w=";
}; };
nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ]; nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ];

4
pkgs/applications/office/minetime/default.nix
View File

@ -1,4 +1,4 @@
{ appimageTools, fetchurl, lib, runCommandNoCC, stdenv, gsettings-desktop-schemas, gtk3, zlib }: { appimageTools, fetchurl, lib, runCommand, stdenv, gsettings-desktop-schemas, gtk3, zlib }:
let let
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -12,7 +12,7 @@ let
inherit name; inherit name;
src = appimage; src = appimage;
}; };
patched = runCommandNoCC "minetime-patchelf" {} '' patched = runCommand "minetime-patchelf" {} ''
cp -av ${extracted} $out cp -av ${extracted} $out
x=$out/resources/app.asar.unpacked/services/scheduling/dist/MinetimeSchedulingService x=$out/resources/app.asar.unpacked/services/scheduling/dist/MinetimeSchedulingService

4
pkgs/applications/system/glances/default.nix
View File

@ -9,14 +9,14 @@
buildPythonApplication rec { buildPythonApplication rec {
pname = "glances"; pname = "glances";
version = "3.2.2"; version = "3.2.3";
disabled = isPyPy; disabled = isPyPy;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nicolargo"; owner = "nicolargo";
repo = "glances"; repo = "glances";
rev = "v${version}"; rev = "v${version}";
sha256 = "13w7bxfizsfi3xyhharnindyn3dv3p9p54a4xwyhnnhczs8kqa8s"; sha256 = "1nc8bdzzrzaircq3myd32w6arpy2prn739886cq2h47cpinxmvpr";
}; };
# Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply): # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply):

4
pkgs/applications/terminal-emulators/foot/default.nix
View File

@ -3,7 +3,7 @@
, fetchFromGitea , fetchFromGitea
, fetchurl , fetchurl
, fetchpatch , fetchpatch
, runCommandNoCC , runCommand
, fcft , fcft
, freetype , freetype
, pixman , pixman
@ -54,7 +54,7 @@ let
''; '';
}; };
stimuliFile = runCommandNoCC "pgo-stimulus-file" { } '' stimuliFile = runCommand "pgo-stimulus-file" { } ''
${stimulusGenerator} \ ${stimulusGenerator} \
--rows=67 --cols=135 \ --rows=67 --cols=135 \
--scroll --scroll-region \ --scroll --scroll-region \

6
pkgs/applications/terminal-emulators/wezterm/default.nix
View File

@ -59,13 +59,13 @@ in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "wezterm"; pname = "wezterm";
version = "20210502-154244-3f7122cb"; version = "20210814-124438-54e29167";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wez"; owner = "wez";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "9HPhb7Vyy5DwBW1xeA6sEIBmmOXlky9lPShu6ZoixPw="; sha256 = "sha256-6HXTftgAs6JMzOMCY+laN74in8xfjE8yJc5xSl9PQCE=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -75,7 +75,7 @@ rustPlatform.buildRustPackage rec {
echo ${version} > .tag echo ${version} > .tag
''; '';
cargoSha256 = "sha256-cbZg2wc3G2ffMQBB6gd0vBbow5GRbXaj8Xh5ga1cMxU="; cargoSha256 = "sha256-yjTrWoqIKoRV4oZQ0mfTGrIGmm89AaKJd16WL1Ozhnw=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config

2
pkgs/applications/version-management/gitlab/yarnPkgs.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { { fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
offline_cache = linkFarm "offline" packages; offline_cache = linkFarm "offline" packages;
packages = [ packages = [
{ {

4
pkgs/applications/window-managers/wayfire/wrapper.nix
View File

@ -1,4 +1,4 @@
{ runCommandNoCC, lib, makeWrapper, wayfirePlugins }: { runCommand, lib, makeWrapper, wayfirePlugins }:
let let
inherit (lib) escapeShellArg makeBinPath; inherit (lib) escapeShellArg makeBinPath;
@ -17,7 +17,7 @@ let
plugins = choosePlugins wayfirePlugins; plugins = choosePlugins wayfirePlugins;
in in
runCommandNoCC "${application.name}-wrapped" { runCommand "${application.name}-wrapped" {
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
passthru = application.passthru // { passthru = application.passthru // {

4
pkgs/build-support/agda/default.nix
View File

@ -1,6 +1,6 @@
# Builder for Agda packages. # Builder for Agda packages.
{ stdenv, lib, self, Agda, runCommandNoCC, makeWrapper, writeText, ghcWithPackages, nixosTests }: { stdenv, lib, self, Agda, runCommand, makeWrapper, writeText, ghcWithPackages, nixosTests }:
with lib.strings; with lib.strings;
@ -15,7 +15,7 @@ let
''; '';
pname = "agdaWithPackages"; pname = "agdaWithPackages";
version = Agda.version; version = Agda.version;
in runCommandNoCC "${pname}-${version}" { in runCommand "${pname}-${version}" {
inherit pname version; inherit pname version;
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
passthru = { passthru = {

2
pkgs/build-support/docker/examples.nix
View File

@ -463,7 +463,7 @@ rec {
layeredStoreSymlink = layeredStoreSymlink =
let let
target = pkgs.writeTextDir "dir/target" "Content doesn't matter."; target = pkgs.writeTextDir "dir/target" "Content doesn't matter.";
symlink = pkgs.runCommandNoCC "symlink" {} "ln -s ${target} $out"; symlink = pkgs.runCommand "symlink" {} "ln -s ${target} $out";
in in
pkgs.dockerTools.buildLayeredImage { pkgs.dockerTools.buildLayeredImage {
name = "layeredstoresymlink"; name = "layeredstoresymlink";

13
pkgs/build-support/fetchzip/default.nix
View File

@ -13,10 +13,17 @@
, urls ? [] , urls ? []
, extraPostFetch ? "" , extraPostFetch ? ""
, name ? "source" , name ? "source"
, # Allows to set the extension for the intermediate downloaded
# file. This can be used as a hint for the unpackCmdHooks to select
# an appropriate unpacking tool.
extension ? null
, ... } @ args: , ... } @ args:
(fetchurl (let (fetchurl (let
basename = baseNameOf (if url != "" then url else builtins.head urls); tmpFilename =
if extension != null
then "download.${extension}"
else baseNameOf (if url != "" then url else builtins.head urls);
in { in {
inherit name; inherit name;
@ -30,7 +37,7 @@ in {
mkdir "$unpackDir" mkdir "$unpackDir"
cd "$unpackDir" cd "$unpackDir"
renamed="$TMPDIR/${basename}" renamed="$TMPDIR/${tmpFilename}"
mv "$downloadedFile" "$renamed" mv "$downloadedFile" "$renamed"
unpackFile "$renamed" unpackFile "$renamed"
'' ''
@ -56,7 +63,7 @@ in {
+ '' + ''
chmod 755 "$out" chmod 755 "$out"
''; '';
} // removeAttrs args [ "stripRoot" "extraPostFetch" ])).overrideAttrs (x: { } // removeAttrs args [ "stripRoot" "extraPostFetch" "extension" ])).overrideAttrs (x: {
# Hackety-hack: we actually need unzip hooks, too # Hackety-hack: we actually need unzip hooks, too
nativeBuildInputs = x.nativeBuildInputs ++ [ unzip ]; nativeBuildInputs = x.nativeBuildInputs ++ [ unzip ];
}) })

4
pkgs/build-support/nuget-to-nix/default.nix
View File

@ -1,5 +1,5 @@
{ runCommandNoCC }: { runCommand }:
runCommandNoCC "nuget-to-nix" { preferLocalBuild = true; } '' runCommand "nuget-to-nix" { preferLocalBuild = true; } ''
install -D -m755 ${./nuget-to-nix.sh} $out/bin/nuget-to-nix install -D -m755 ${./nuget-to-nix.sh} $out/bin/nuget-to-nix
'' ''

1
pkgs/build-support/rust/default.nix
View File

@ -8,7 +8,6 @@
, cargoSetupHook , cargoSetupHook
, fetchCargoTarball , fetchCargoTarball
, importCargoLock , importCargoLock
, runCommandNoCC
, rustPlatform , rustPlatform
, callPackage , callPackage
, remarshal , remarshal

7
pkgs/build-support/trivial-builders.nix
View File

@ -24,16 +24,13 @@ rec {
* `allowSubstitutes = false;` * `allowSubstitutes = false;`
* to a derivation’s attributes. * to a derivation’s attributes.
*/ */
runCommand = runCommandNoCC; runCommand = name: env: runCommandWith {
runCommandLocal = runCommandNoCCLocal;
runCommandNoCC = name: env: runCommandWith {
stdenv = stdenvNoCC; stdenv = stdenvNoCC;
runLocal = false; runLocal = false;
inherit name; inherit name;
derivationArgs = env; derivationArgs = env;
}; };
runCommandNoCCLocal = name: env: runCommandWith { runCommandLocal = name: env: runCommandWith {
stdenv = stdenvNoCC; stdenv = stdenvNoCC;
runLocal = true; runLocal = true;
inherit name; inherit name;

4
pkgs/data/fonts/powerline-symbols/default.nix
View File

@ -1,8 +1,8 @@
{ lib, runCommandNoCC, powerline }: { lib, runCommand, powerline }:
let let
inherit (powerline) version; inherit (powerline) version;
in runCommandNoCC "powerline-symbols-${version}" { in runCommand "powerline-symbols-${version}" {
meta = { meta = {
inherit (powerline.meta) license; inherit (powerline.meta) license;
priority = (powerline.meta.priority or 0) + 1; priority = (powerline.meta.priority or 0) + 1;

4
pkgs/desktops/xfce/applications/xfdashboard/default.nix
View File

@ -17,11 +17,11 @@
mkXfceDerivation { mkXfceDerivation {
category = "apps"; category = "apps";
pname = "xfdashboard"; pname = "xfdashboard";
version = "0.9.2"; version = "0.9.3";
rev-prefix = ""; rev-prefix = "";
odd-unstable = false; odd-unstable = false;
sha256 = "sha256-Q6r9FoPl+vvqZWP5paAjT3VX3M/6TvqzrrGKPCH8+xo="; sha256 = "sha256-xoeqVsfvBH2zzQqDUJGiA47hgVvEkvVf9bNYQmyiytk=";
buildInputs = [ buildInputs = [
clutter clutter

4
pkgs/development/beam-modules/erlang-ls/default.nix
View File

@ -1,6 +1,6 @@
{ fetchFromGitHub, fetchHex, rebar3Relx, buildRebar3, rebar3-proper, stdenv, lib }: { fetchFromGitHub, fetchHex, rebar3Relx, buildRebar3, rebar3-proper, stdenv, lib }:
let let
version = "0.17.0"; version = "0.18.0";
owner = "erlang-ls"; owner = "erlang-ls";
repo = "erlang_ls"; repo = "erlang_ls";
deps = import ./rebar-deps.nix { deps = import ./rebar-deps.nix {
@ -18,7 +18,7 @@ rebar3Relx {
inherit version; inherit version;
src = fetchFromGitHub { src = fetchFromGitHub {
inherit owner repo; inherit owner repo;
sha256 = "0szg9hx436cvy80sh94dzmf2rainnw3fjc84bv3hlzjwwzmxj9aw"; sha256 = "sha256-miCl04qqrirVPubOs558yWvXP3Sgs3bcDuGO9DZIsow=";
rev = version; rev = version;
}; };
releaseType = "escript"; releaseType = "escript";

2
pkgs/development/compilers/emscripten/yarn.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { { fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
offline_cache = linkFarm "offline" packages; offline_cache = linkFarm "offline" packages;
packages = [ packages = [
{ {

3
pkgs/development/interpreters/cling/default.nix
View File

@ -7,7 +7,6 @@
, fetchgit , fetchgit
, makeWrapper , makeWrapper
, runCommand , runCommand
, runCommandNoCC
, llvmPackages_5 , llvmPackages_5
, glibc , glibc
, ncurses , ncurses
@ -85,7 +84,7 @@ let
# https://github.com/root-project/cling/blob/v0.7/lib/Interpreter/CIFactory.cpp#L107:L111 # https://github.com/root-project/cling/blob/v0.7/lib/Interpreter/CIFactory.cpp#L107:L111
# Note: it would be nice to just put the compiler in Cling's PATH and let it do this by itself, but # Note: it would be nice to just put the compiler in Cling's PATH and let it do this by itself, but
# unfortunately passing -nostdinc/-nostdinc++ disables Cling's autodetection logic. # unfortunately passing -nostdinc/-nostdinc++ disables Cling's autodetection logic.
compilerIncludeFlags = runCommandNoCC "compiler-include-flags.txt" {} '' compilerIncludeFlags = runCommand "compiler-include-flags.txt" {} ''
export LC_ALL=C export LC_ALL=C
${stdenv.cc}/bin/c++ -xc++ -E -v /dev/null 2>&1 | sed -n -e '/^.include/,''${' -e '/^ \/.*++/p' -e '}' > tmp ${stdenv.cc}/bin/c++ -xc++ -E -v /dev/null 2>&1 | sed -n -e '/^.include/,''${' -e '/^ \/.*++/p' -e '}' > tmp
sed -e 's/^/-isystem /' -i tmp sed -e 's/^/-isystem /' -i tmp

4
pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix
View File

@ -1,4 +1,4 @@
{ interpreter, writeText, runCommandNoCC }: { interpreter, writeText, runCommand }:
let let
@ -19,7 +19,7 @@ let
print(s) print(s)
''; '';
in runCommandNoCC "${interpreter.name}-site-prefix-mypy-test" {} '' in runCommand "${interpreter.name}-site-prefix-mypy-test" {} ''
${pythonEnv}/bin/mypy ${pythonScript} ${pythonEnv}/bin/mypy ${pythonScript}
touch $out touch $out
'' ''

4
pkgs/development/libraries/embree/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "embree"; pname = "embree";
version = "3.13.0"; version = "3.13.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "embree"; owner = "embree";
repo = "embree"; repo = "embree";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-w93GYslQRg0rvguMKv/CuT3+JzIis2CRbY9jYUFKWOM="; sha256 = "sha256-6BL/NnveIMg+xD8Zsc3sidL0iw0YbJITgd8Zf4Mh28I=";
}; };
postPatch = '' postPatch = ''

4
pkgs/development/libraries/libyaml-cpp/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libyaml-cpp"; pname = "libyaml-cpp";
version = "0.6.3"; version = "0.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jbeder"; owner = "jbeder";
repo = "yaml-cpp"; repo = "yaml-cpp";
rev = "yaml-cpp-${version}"; rev = "yaml-cpp-${version}";
sha256 = "0ykkxzxcwwiv8l8r697gyqh1nl582krpvi7m7l6b40ijnk4pw30s"; sha256 = "sha256-2tFWccifn0c2lU/U1WNg2FHrBohjx8CXMllPJCevaNk=";
}; };
# implement https://github.com/jbeder/yaml-cpp/commit/52a1378e48e15d42a0b755af7146394c6eff998c # implement https://github.com/jbeder/yaml-cpp/commit/52a1378e48e15d42a0b755af7146394c6eff998c

4
pkgs/development/libraries/oneDNN/default.nix
View File

@ -5,13 +5,13 @@
# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "oneDNN"; pname = "oneDNN";
version = "2.2.1"; version = "2.3.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "oneapi-src"; owner = "oneapi-src";
repo = "oneDNN"; repo = "oneDNN";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-orsllgBt2EHuZOy9vkgDK3XT6BfbtyIPvO4REB9tAgs="; sha256 = "sha256-sfTcBthrnt7m9AnzdwWl9yLu1jRpwUp8i9s9DlA3IJo=";
}; };
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "dev" "doc" ];

4
pkgs/development/libraries/webkitgtk/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv { lib, stdenv
, runCommandNoCC , runCommand
, fetchurl , fetchurl
, fetchpatch , fetchpatch
, perl , perl
@ -172,7 +172,7 @@ stdenv.mkDerivation rec {
# (We pick just that one because using the other headers from `sdk` is not # (We pick just that one because using the other headers from `sdk` is not
# compatible with our C++ standard library. This header is already in # compatible with our C++ standard library. This header is already in
# the standard library on aarch64) # the standard library on aarch64)
runCommandNoCC "${pname}_headers" {} '' runCommand "${pname}_headers" {} ''
install -Dm444 "${lib.getDev apple_sdk.sdk}"/include/libproc.h "$out"/include/libproc.h install -Dm444 "${lib.getDev apple_sdk.sdk}"/include/libproc.h "$out"/include/libproc.h
'' ''
) ++ lib.optionals stdenv.isLinux [ ) ++ lib.optionals stdenv.isLinux [

4
pkgs/development/php-packages/couchbase/default.nix
View File

@ -1,7 +1,7 @@
{ lib, buildPecl, fetchFromGitHub, writeText, libcouchbase, zlib, php, substituteAll }: { lib, buildPecl, fetchFromGitHub, writeText, libcouchbase, zlib, php, substituteAll }:
let let
pname = "couchbase"; pname = "couchbase";
version = "3.1.2"; version = "3.2.0";
in in
buildPecl { buildPecl {
inherit pname version; inherit pname version;
@ -10,7 +10,7 @@ buildPecl {
owner = "couchbase"; owner = "couchbase";
repo = "php-couchbase"; repo = "php-couchbase";
rev = "v${version}"; rev = "v${version}";
sha256 = "0zm2jm5lzjjqlhkiivm4v5gr4286pwqaf5nar1ga816hhwnyhj42"; sha256 = "sha256-rvlyH28xWLIVwK3yqqdhkoD1h6kl8FDq3Byo7mhV3jM=";
}; };
configureFlags = [ "--with-couchbase" ]; configureFlags = [ "--with-couchbase" ];

2
pkgs/development/python-modules/apache-airflow/yarn.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { { fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
offline_cache = linkFarm "offline" packages; offline_cache = linkFarm "offline" packages;
packages = [ packages = [
{ {

4
pkgs/development/python-modules/identify/default.nix
View File

@ -7,14 +7,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "identify"; pname = "identify";
version = "2.2.11"; version = "2.2.13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pre-commit"; owner = "pre-commit";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-E95tUg1gglDXfeCTead2c1e0JOynKu+TBd4LKklrtAE="; sha256 = "sha256-lKdFHynKraN+eUeO1hFzoNsdMzRgmnBHQzPuKLH0Xvs=";
}; };
checkInputs = [ checkInputs = [

18
pkgs/development/python-modules/parsedatetime/default.nix
View File

@ -2,9 +2,8 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, isPy27 , isPy27
, pytest
, pytest-runner
, future , future
, pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -17,13 +16,24 @@ buildPythonPackage rec {
sha256 = "4cb368fbb18a0b7231f4d76119165451c8d2e35951455dfee97c62a87b04d455"; sha256 = "4cb368fbb18a0b7231f4d76119165451c8d2e35951455dfee97c62a87b04d455";
}; };
buildInputs = [ pytest pytest-runner ];
propagatedBuildInputs = [ future ]; propagatedBuildInputs = [ future ];
checkInputs = [ pytestCheckHook ];
pytestFlagsArray = [ "tests/Test*.py" ];
disabledTests = [
# https://github.com/bear/parsedatetime/issues/263
"testDate3ConfusedHourAndYear"
# https://github.com/bear/parsedatetime/issues/215
"testFloat"
];
pythonImportChecks = [ "parsedatetime" ];
meta = with lib; { meta = with lib; {
description = "Parse human-readable date/time text"; description = "Parse human-readable date/time text";
homepage = "https://github.com/bear/parsedatetime"; homepage = "https://github.com/bear/parsedatetime";
license = licenses.asl20; license = licenses.asl20;
}; };
} }

4
pkgs/development/python-modules/python-box/default.nix
View File

@ -11,14 +11,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-box"; pname = "python-box";
version = "5.3.0"; version = "5.4.0";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cdgriffith"; owner = "cdgriffith";
repo = "Box"; repo = "Box";
rev = version; rev = version;
sha256 = "0fhmkjdcacpwyg7fajqfvnv3n9xd9rxjdpvi8z3j73a1gls36gf4"; sha256 = "sha256-1eRuTpwANyLjnAK1guPOQmH2EW0ITvC7nvyFcEUErz8=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/pyvicare/default.nix
View File

@ -10,14 +10,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyvicare"; pname = "pyvicare";
version = "2.5.2"; version = "2.6";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "somm15"; owner = "somm15";
repo = "PyViCare"; repo = "PyViCare";
rev = version; rev = version;
sha256 = "sha256-Yur7ZtUBWmszo5KN4TDlLdSxzH5qL0mhJDFN74pH/ss="; sha256 = "sha256-qvP51HVIOcLDJKq8/hcJyXKsI2iUFwoPQQZvTKE28KU=";
}; };
SETUPTOOLS_SCM_PRETEND_VERSION = version; SETUPTOOLS_SCM_PRETEND_VERSION = version;

10
pkgs/development/tools/build-managers/scons/common.nix
View File

@ -1,8 +1,8 @@
{ version, sha256 }: { version, sha256 }:
{ fetchurl, python3Packages, lib }: { fetchurl, python, lib }:
python3Packages.buildPythonApplication rec { python.pkgs.buildPythonApplication rec {
pname = "scons"; pname = "scons";
inherit version; inherit version;
@ -29,6 +29,12 @@ python3Packages.buildPythonApplication rec {
mv "$out/"*.1 "$out/share/man/man1/" mv "$out/"*.1 "$out/share/man/man1/"
''; '';
passthru = {
# expose the used python version so tools using this (and extensing scos with other python modules)
# can use the exact same python version.
inherit python;
};
meta = with lib; { meta = with lib; {
description = "An improved, cross-platform substitute for Make"; description = "An improved, cross-platform substitute for Make";
longDescription = '' longDescription = ''

10
pkgs/development/tools/build-managers/scons/default.nix
View File

@ -1,16 +1,18 @@
{ callPackage, python2Packages }: { callPackage, python2, python3 }:
let let
mkScons = args: callPackage (import ./common.nix args) { }; mkScons = args: callPackage (import ./common.nix args) {
python = python3;
};
in { in {
scons_3_0_1 = (mkScons { scons_3_0_1 = (mkScons {
version = "3.0.1"; version = "3.0.1";
sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4"; sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4";
}).override { python3Packages = python2Packages; }; }).override { python = python3; };
scons_3_1_2 = (mkScons { scons_3_1_2 = (mkScons {
version = "3.1.2"; version = "3.1.2";
sha256 = "1yzq2gg9zwz9rvfn42v5jzl3g4qf1khhny6zfbi2hib55zvg60bq"; sha256 = "1yzq2gg9zwz9rvfn42v5jzl3g4qf1khhny6zfbi2hib55zvg60bq";
}).override { python3Packages = python2Packages; }; }).override { python = python2; };
scons_latest = mkScons { scons_latest = mkScons {
version = "4.1.0"; version = "4.1.0";
sha256 = "11axk03142ziax6i3wwy9qpqp7r3i7h5jg9y2xzph9i15rv8vlkj"; sha256 = "11axk03142ziax6i3wwy9qpqp7r3i7h5jg9y2xzph9i15rv8vlkj";

2
pkgs/development/tools/poetry2nix/poetry2nix/editable.nix
View File

@ -27,7 +27,7 @@ let
(lib.generators.toINI { } pyProject.tool.poetry.plugins); (lib.generators.toINI { } pyProject.tool.poetry.plugins);
# A python package that contains simple .egg-info and .pth files for an editable installation # A python package that contains simple .egg-info and .pth files for an editable installation
editablePackage = python.pkgs.toPythonModule (pkgs.runCommandNoCC "${name}-editable" editablePackage = python.pkgs.toPythonModule (pkgs.runCommand "${name}-editable"
{ } '' { } ''
mkdir -p "$out/${python.sitePackages}" mkdir -p "$out/${python.sitePackages}"
cd "$out/${python.sitePackages}" cd "$out/${python.sitePackages}"

13
pkgs/development/tools/sumneko-lua-language-server/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sumneko-lua-language-server"; pname = "sumneko-lua-language-server";
version = "1.20.2"; version = "2.3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sumneko"; owner = "sumneko";
repo = "lua-language-server"; repo = "lua-language-server";
rev = version; rev = version;
sha256 = "sha256-7Ishq/TonJsteHBGDTNjImIwGPdeRgPS1g60d8bhTYg="; sha256 = "sha256-iwmH4pbeKNkEYsaSd6I7ULSoEMwAtxOanF7vAutuW64=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -17,12 +17,19 @@ stdenv.mkDerivation rec {
makeWrapper makeWrapper
]; ];
postPatch = ''
# doesn't work on aarch64, already removed on master:
# https://github.com/actboy168/bee.lua/commit/fd5ee552c8cff2c48eff72edc0c8db5b7bf1ee2c
rm {3rd/luamake/,}3rd/bee.lua/test/test_platform.lua
sed /test_platform/d -i {3rd/luamake/,}3rd/bee.lua/test/test.lua
'';
preBuild = '' preBuild = ''
cd 3rd/luamake cd 3rd/luamake
''; '';
ninjaFlags = [ ninjaFlags = [
"-fninja/linux.ninja" "-fcompile/ninja/linux.ninja"
]; ];
postBuild = '' postBuild = ''

4
pkgs/development/tools/vultr-cli/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "vultr-cli"; pname = "vultr-cli";
version = "2.4.1"; version = "2.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vultr"; owner = "vultr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256:0qbsybs91v9vnkxj4kpwqhzk4hgpkq36wnixxjajg038x7slds4i"; sha256 = "sha256-3q0in41/ZGuZcMiu+5qT8AGttro2it89xp741RCxAYY=";
}; };
vendorSha256 = null; vendorSha256 = null;

4
pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js
View File

@ -57,7 +57,7 @@ function fetchgit(fileName, url, rev, branch, builtinFetchGit) {
sha256 = "${prefetchgit(url, rev)}"; sha256 = "${prefetchgit(url, rev)}";
}; };
`}in `}in
runCommandNoCC "${fileName}" { buildInputs = [gnutar]; } '' runCommand "${fileName}" { buildInputs = [gnutar]; } ''
# Set u+w because tar-fs can't unpack archives with read-only dirs # Set u+w because tar-fs can't unpack archives with read-only dirs
# https://github.com/mafintosh/tar-fs/issues/79 # https://github.com/mafintosh/tar-fs/issues/79
tar cf $out --mode u+w -C \${repo} . tar cf $out --mode u+w -C \${repo} .
@ -104,7 +104,7 @@ function fetchLockedDep(builtinFetchGit) {
} }
const HEAD = ` const HEAD = `
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { { fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
offline_cache = linkFarm "offline" packages; offline_cache = linkFarm "offline" packages;
packages = [ packages = [
`.trim() `.trim()

2
pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { { fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
offline_cache = linkFarm "offline" packages; offline_cache = linkFarm "offline" packages;
packages = [ packages = [
{ {

4
pkgs/games/xonotic/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchzip, makeWrapper, runCommandNoCC, makeDesktopItem { lib, stdenv, fetchurl, fetchzip, makeWrapper, runCommand, makeDesktopItem
, xonotic-data, copyDesktopItems , xonotic-data, copyDesktopItems
, # required for both , # required for both
unzip, libjpeg, zlib, libvorbis, curl unzip, libjpeg, zlib, libvorbis, curl
@ -130,7 +130,7 @@ in rec {
passthru.version = version; passthru.version = version;
}; };
xonotic = runCommandNoCC "xonotic${variant}-${version}" { xonotic = runCommand "xonotic${variant}-${version}" {
inherit xonotic-unwrapped; inherit xonotic-unwrapped;
nativeBuildInputs = [ makeWrapper copyDesktopItems ]; nativeBuildInputs = [ makeWrapper copyDesktopItems ];
desktopItems = [ desktopItem ]; desktopItems = [ desktopItem ];

82
pkgs/misc/vim-plugins/generated.nix
View File

@ -441,8 +441,8 @@ final: prev:
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ms-jpq"; owner = "ms-jpq";
repo = "chadtree"; repo = "chadtree";
rev = "26cad008b416c608c4bbcc4bc7ea0962ac5304a0"; rev = "64c2f6151d9794b83af47a26717973625587d8ef";
sha256 = "09gv2ik1jlki6gi1c0zipl48xnlic37gdn8ban78w8lgb4fgsiss"; sha256 = "1hysjkxd9g7lrwvsqw0c4ynnmshxijcbql4zl9mjww89fsz96i09";
}; };
meta.homepage = "https://github.com/ms-jpq/chadtree/"; meta.homepage = "https://github.com/ms-jpq/chadtree/";
}; };
@ -593,12 +593,12 @@ final: prev:
coc-nvim = buildVimPluginFrom2Nix { coc-nvim = buildVimPluginFrom2Nix {
pname = "coc-nvim"; pname = "coc-nvim";
version = "2021-08-09"; version = "2021-08-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neoclide"; owner = "neoclide";
repo = "coc.nvim"; repo = "coc.nvim";
rev = "6a9a0ee38d2d28fc978db89237cdceb40aea6de3"; rev = "9b224047e4596636cbc1e112d38d7b6bb48a2c15";
sha256 = "04ywmwbr8y86z6fgcx4w8w779rl0c9c3q8fazncmx24wmcmilhb5"; sha256 = "105dsskbxir7w5665dfs5m2dwn4l85jwvmwflkqfvgf75538hgsw";
}; };
meta.homepage = "https://github.com/neoclide/coc.nvim/"; meta.homepage = "https://github.com/neoclide/coc.nvim/";
}; };
@ -1544,6 +1544,18 @@ final: prev:
meta.homepage = "https://github.com/konfekt/fastfold/"; meta.homepage = "https://github.com/konfekt/fastfold/";
}; };
fcitx-vim = buildVimPluginFrom2Nix {
pname = "fcitx-vim";
version = "2021-08-15";
src = fetchFromGitHub {
owner = "lilydjwg";
repo = "fcitx.vim";
rev = "4042bbb29c50a592062563f5042951abec696702";
sha256 = "1y5c1nan5gajrz1l0zkqx0y3a8cpam6l62yd7x19z6dzn7m1b5yb";
};
meta.homepage = "https://github.com/lilydjwg/fcitx.vim/";
};
feline-nvim = buildVimPluginFrom2Nix { feline-nvim = buildVimPluginFrom2Nix {
pname = "feline-nvim"; pname = "feline-nvim";
version = "2021-07-30"; version = "2021-07-30";
@ -2664,12 +2676,12 @@ final: prev:
lightspeed-nvim = buildVimPluginFrom2Nix { lightspeed-nvim = buildVimPluginFrom2Nix {
pname = "lightspeed-nvim"; pname = "lightspeed-nvim";
version = "2021-08-10"; version = "2021-08-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ggandor"; owner = "ggandor";
repo = "lightspeed.nvim"; repo = "lightspeed.nvim";
rev = "889e6360c3026fb35101f5d81db630721c526a18"; rev = "a4a53a40eae92d9974efc5aaa73a628ff767cf06";
sha256 = "03klvjqk7n2ssji1di2w204py32h13lb0jv4d7h6c52y442k0q37"; sha256 = "1080wrf19vvjjfjkcag27rncic38lzl19vp6jxgr8vi5jppmnfd6";
}; };
meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";
}; };
@ -3288,12 +3300,12 @@ final: prev:
neoscroll-nvim = buildVimPluginFrom2Nix { neoscroll-nvim = buildVimPluginFrom2Nix {
pname = "neoscroll-nvim"; pname = "neoscroll-nvim";
version = "2021-07-23"; version = "2021-08-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "karb94"; owner = "karb94";
repo = "neoscroll.nvim"; repo = "neoscroll.nvim";
rev = "bc1dc90b6697931fca5e19fdc4c2fa43d944269f"; rev = "54879c6957ee5e833924064ff7fc17c144502ae9";
sha256 = "1ji348kp4w77dhw7byfqrdyv1z7xwn7dx54y1nvclpbbj36ya9wk"; sha256 = "0r5dxb2qh2nkchiq7ib7aqnr46gy82i9wpv21z3h0kdj03lb12sc";
}; };
meta.homepage = "https://github.com/karb94/neoscroll.nvim/"; meta.homepage = "https://github.com/karb94/neoscroll.nvim/";
}; };
@ -3540,12 +3552,12 @@ final: prev:
null-ls-nvim = buildVimPluginFrom2Nix { null-ls-nvim = buildVimPluginFrom2Nix {
pname = "null-ls-nvim"; pname = "null-ls-nvim";
version = "2021-08-14"; version = "2021-08-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jose-elias-alvarez"; owner = "jose-elias-alvarez";
repo = "null-ls.nvim"; repo = "null-ls.nvim";
rev = "809f33f91f5f2f25bf68b52017d008ec6a1bf6bc"; rev = "fcd3964ff7e28b7b441942ecf4f0c9d22d5b7bc9";
sha256 = "1d2yfcya0r11qgr3x28fgpgb3wzb5kjf3l5zxr7kqy103xfxcspf"; sha256 = "0zkb5sfchqc91w6gacb3c43cm2n4wxjp1npzslrl4n1x4bsddz5l";
}; };
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
}; };
@ -5922,12 +5934,12 @@ final: prev:
vim-android = buildVimPluginFrom2Nix { vim-android = buildVimPluginFrom2Nix {
pname = "vim-android"; pname = "vim-android";
version = "2021-07-25"; version = "2021-08-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hsanson"; owner = "hsanson";
repo = "vim-android"; repo = "vim-android";
rev = "aeea4d67e377659077d7db99cf3c582211e941eb"; rev = "e3e3fce70997a8d3ebd08f28b212d58c5daded11";
sha256 = "07lyyxhf79mwlwrkyp9yq61nfvj2mb2xhcf3gb60adwy7qxcfl2k"; sha256 = "0z1zcmry9vmagz03wh0y7smxfwsaf2fc2frhkza48clafx324rf0";
}; };
meta.homepage = "https://github.com/hsanson/vim-android/"; meta.homepage = "https://github.com/hsanson/vim-android/";
}; };
@ -6174,12 +6186,12 @@ final: prev:
vim-clap = buildVimPluginFrom2Nix { vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap"; pname = "vim-clap";
version = "2021-08-08"; version = "2021-08-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "liuchengxu"; owner = "liuchengxu";
repo = "vim-clap"; repo = "vim-clap";
rev = "865b453825f309a204909f13b5afa98d36f7369f"; rev = "7307a7bdae675d131d1e4ada2ea3dd84d2ffc303";
sha256 = "1zfbm81qnvz7rgi2awi29id5z0xr6qzv04pj0yaxyhyjmy7frjyk"; sha256 = "0nqv1mqzizwx27jr8jmqqbb2a0dpyvlgpgbmv2fqk6gfqi44hkj8";
}; };
meta.homepage = "https://github.com/liuchengxu/vim-clap/"; meta.homepage = "https://github.com/liuchengxu/vim-clap/";
}; };
@ -7544,12 +7556,12 @@ final: prev:
vim-jsdoc = buildVimPluginFrom2Nix { vim-jsdoc = buildVimPluginFrom2Nix {
pname = "vim-jsdoc"; pname = "vim-jsdoc";
version = "2021-08-12"; version = "2021-08-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "heavenshell"; owner = "heavenshell";
repo = "vim-jsdoc"; repo = "vim-jsdoc";
rev = "46bb2d31329290d36d7af88d89e6b4f8d82c6581"; rev = "85c248898f5ca66a865e917b30e0e75579fa5463";
sha256 = "0q7y661nifkmdqkq5hzbb4r1pz6n32hf2a4ac7x3k1lzcsh1ascq"; sha256 = "056v6g1fszw77nncbmrz8mv3zchp17g3d5cqmc1sawrfif131gyb";
}; };
meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; meta.homepage = "https://github.com/heavenshell/vim-jsdoc/";
}; };
@ -9454,12 +9466,12 @@ final: prev:
vim-ultest = buildVimPluginFrom2Nix { vim-ultest = buildVimPluginFrom2Nix {
pname = "vim-ultest"; pname = "vim-ultest";
version = "2021-08-09"; version = "2021-08-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rcarriga"; owner = "rcarriga";
repo = "vim-ultest"; repo = "vim-ultest";
rev = "3e28c3815c86637944e6425c444ab55cdd25528f"; rev = "64545fecb865f8cbe7160a5d7d1b8367cea1656c";
sha256 = "0b51mqizw4igzpjgs38pn9f0mn83hlalxv43swq3pkxray5vfav2"; sha256 = "1m8g6j2086x3fq99158m4g2wcsp8v1s00wim0hka7zhfwz0pd7zp";
}; };
meta.homepage = "https://github.com/rcarriga/vim-ultest/"; meta.homepage = "https://github.com/rcarriga/vim-ultest/";
}; };
@ -9586,12 +9598,12 @@ final: prev:
vim-wakatime = buildVimPluginFrom2Nix { vim-wakatime = buildVimPluginFrom2Nix {
pname = "vim-wakatime"; pname = "vim-wakatime";
version = "2020-12-29"; version = "2021-08-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wakatime"; owner = "wakatime";
repo = "vim-wakatime"; repo = "vim-wakatime";
rev = "45dfc28c30b44041183d749cf724e3dba9ac65ef"; rev = "37544a5d3f028d93f9ad8c4445cd1dc623d08c5e";
sha256 = "1ipdynpg9v5mll1zimyiaxw4zzj004myh5xjky32z783lgi0qlxl"; sha256 = "1s8q8hch38ydkfr2fd7259swgbpchs70shjharahl5vm3x72jpgy";
}; };
meta.homepage = "https://github.com/wakatime/vim-wakatime/"; meta.homepage = "https://github.com/wakatime/vim-wakatime/";
}; };
@ -9887,24 +9899,24 @@ final: prev:
vimtex = buildVimPluginFrom2Nix { vimtex = buildVimPluginFrom2Nix {
pname = "vimtex"; pname = "vimtex";
version = "2021-08-12"; version = "2021-08-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lervag"; owner = "lervag";
repo = "vimtex"; repo = "vimtex";
rev = "690a95cefcefa5be94dd7783721f510cbb41531a"; rev = "539742fdd56d13ada0aa3e9b0ab8690ca49b853f";
sha256 = "0mj942xk9ndxw96vmlw3fs9h1m9vfkln4rva67qnkjqb4v84p30n"; sha256 = "03q6c2mb7gkhfzw6bjl77jsxffr3kb0vcj9ky80c6wmpi3vzmb1k";
}; };
meta.homepage = "https://github.com/lervag/vimtex/"; meta.homepage = "https://github.com/lervag/vimtex/";
}; };
vimux = buildVimPluginFrom2Nix { vimux = buildVimPluginFrom2Nix {
pname = "vimux"; pname = "vimux";
version = "2021-08-11"; version = "2021-08-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "preservim"; owner = "preservim";
repo = "vimux"; repo = "vimux";
rev = "031cc6208ed93788ce8d8d71b83c9d81fdddeeb3"; rev = "89604a4464c3069dbe31f7bc8dd16a5fbc88a303";
sha256 = "1a5sgrnkyngwn2b771b8bm2awsq36yr5f17wclxg7fcms2y43lgv"; sha256 = "1lr7zqza29xxwbki9fgfazrak6ybyvm1a782kbs3v3zip10xmm3x";
}; };
meta.homepage = "https://github.com/preservim/vimux/"; meta.homepage = "https://github.com/preservim/vimux/";
}; };

10
pkgs/misc/vim-plugins/overrides.nix
View File

@ -214,6 +214,14 @@ self: super: {
dependencies = with self; [ vimproc-vim vimshell-vim self.self forms ]; dependencies = with self; [ vimproc-vim vimshell-vim self.self forms ];
}); });
fcitx-vim = super.fcitx-vim.overrideAttrs (old: {
passthru.python3Dependencies = ps: with ps; [ dbus-python ];
meta = {
description = "Keep and restore fcitx state when leaving/re-entering insert mode or search mode";
license = lib.licenses.mit;
};
});
forms = super.forms.overrideAttrs (old: { forms = super.forms.overrideAttrs (old: {
dependencies = with self; [ self.self ]; dependencies = with self; [ self.self ];
}); });
@ -284,7 +292,7 @@ self: super: {
dependencies = with self; [ plenary-nvim ]; dependencies = with self; [ plenary-nvim ];
}); });
plenary-nvim = super.toVimPlugin(luaPackages.plenary-nvim); # plenary-nvim = super.toVimPlugin(luaPackages.plenary-nvim);
gruvbox-nvim = super.gruvbox-nvim.overrideAttrs (old: { gruvbox-nvim = super.gruvbox-nvim.overrideAttrs (old: {
dependencies = with self; [ lush-nvim ]; dependencies = with self; [ lush-nvim ];

1
pkgs/misc/vim-plugins/vim-plugin-names
View File

@ -352,6 +352,7 @@ lifepillar/vim-gruvbox8
lifepillar/vim-mucomplete lifepillar/vim-mucomplete
lighttiger2505/deoplete-vim-lsp lighttiger2505/deoplete-vim-lsp
lilydjwg/colorizer lilydjwg/colorizer
lilydjwg/fcitx.vim@fcitx5
liuchengxu/vim-clap liuchengxu/vim-clap
liuchengxu/vim-which-key liuchengxu/vim-which-key
liuchengxu/vista.vim liuchengxu/vista.vim

14
pkgs/misc/vim-plugins/vim-utils.nix
View File

@ -3,6 +3,7 @@
, nix-prefetch-hg, nix-prefetch-git , nix-prefetch-hg, nix-prefetch-git
, fetchFromGitHub, runtimeShell , fetchFromGitHub, runtimeShell
, hasLuaModule , hasLuaModule
, python3
}: }:
/* /*
@ -210,13 +211,24 @@ let
# and can simply pass `null`. # and can simply pass `null`.
depsOfOptionalPlugins = lib.subtractLists opt (findDependenciesRecursively opt); depsOfOptionalPlugins = lib.subtractLists opt (findDependenciesRecursively opt);
startWithDeps = findDependenciesRecursively start; startWithDeps = findDependenciesRecursively start;
allPlugins = lib.unique (startWithDeps ++ depsOfOptionalPlugins);
python3Env = python3.withPackages (ps:
lib.flatten (builtins.map (plugin: (plugin.python3Dependencies or (_: [])) ps) allPlugins)
);
in in
[ "mkdir -p $out/pack/${packageName}/start" ] [ "mkdir -p $out/pack/${packageName}/start" ]
# To avoid confusion, even dependencies of optional plugins are added # To avoid confusion, even dependencies of optional plugins are added
# to `start` (except if they are explicitly listed as optional plugins). # to `start` (except if they are explicitly listed as optional plugins).
++ (builtins.map (x: link x packageName "start") (lib.unique (startWithDeps ++ depsOfOptionalPlugins))) ++ (builtins.map (x: link x packageName "start") allPlugins)
++ ["mkdir -p $out/pack/${packageName}/opt"] ++ ["mkdir -p $out/pack/${packageName}/opt"]
++ (builtins.map (x: link x packageName "opt") opt) ++ (builtins.map (x: link x packageName "opt") opt)
# Assemble all python3 dependencies into a single `site-packages` to avoid doing recursive dependency collection
# for each plugin.
# This directory is only for python import search path, and will not slow down the startup time.
++ [
"mkdir -p $out/pack/${packageName}/start/__python3_dependencies"
"ln -s ${python3Env}/${python3Env.sitePackages} $out/pack/${packageName}/start/__python3_dependencies/python3"
]
); );
packDir = (packages: packDir = (packages:
stdenv.mkDerivation { stdenv.mkDerivation {

4
pkgs/pkgs-lib/formats.nix
View File

@ -38,7 +38,7 @@ rec {
}; };
in valueType; in valueType;
generate = name: value: pkgs.runCommandNoCC name { generate = name: value: pkgs.runCommand name {
nativeBuildInputs = [ pkgs.jq ]; nativeBuildInputs = [ pkgs.jq ];
value = builtins.toJSON value; value = builtins.toJSON value;
passAsFile = [ "value" ]; passAsFile = [ "value" ];
@ -121,7 +121,7 @@ rec {
}; };
in valueType; in valueType;
generate = name: value: pkgs.runCommandNoCC name { generate = name: value: pkgs.runCommand name {
nativeBuildInputs = [ pkgs.remarshal ]; nativeBuildInputs = [ pkgs.remarshal ];
value = builtins.toJSON value; value = builtins.toJSON value;
passAsFile = [ "value" ]; passAsFile = [ "value" ];

2
pkgs/pkgs-lib/tests/formats.nix
View File

@ -14,7 +14,7 @@ let
}) [ def ]); }) [ def ]);
in formatSet.generate "test-format-file" config; in formatSet.generate "test-format-file" config;
runBuildTest = name: { drv, expected }: pkgs.runCommandNoCC name {} '' runBuildTest = name: { drv, expected }: pkgs.runCommand name {} ''
if diff -u '${builtins.toFile "expected" expected}' '${drv}'; then if diff -u '${builtins.toFile "expected" expected}' '${drv}'; then
touch "$out" touch "$out"
else else

2
pkgs/servers/gotify/yarndeps.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { { fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
offline_cache = linkFarm "offline" packages; offline_cache = linkFarm "offline" packages;
packages = [ packages = [
{ {

2
pkgs/servers/http/nginx/modules.nix
View File

@ -50,7 +50,7 @@ in
repo = "ngx_brotli"; repo = "ngx_brotli";
rev = "25f86f0bac1101b6512135eac5f93c49c63609e3"; rev = "25f86f0bac1101b6512135eac5f93c49c63609e3";
sha256 = "02hfvfa6milj40qc2ikpb9f95sxqvxk4hly3x74kqhysbdi06hhv"; sha256 = "02hfvfa6milj40qc2ikpb9f95sxqvxk4hly3x74kqhysbdi06hhv";
}; in pkgs.runCommandNoCC "ngx_brotli-src" {} '' }; in pkgs.runCommand "ngx_brotli-src" {} ''
cp -a ${gitsrc} $out cp -a ${gitsrc} $out
substituteInPlace $out/filter/config \ substituteInPlace $out/filter/config \
--replace '$ngx_addon_dir/deps/brotli/c' ${lib.getDev pkgs.brotli} --replace '$ngx_addon_dir/deps/brotli/c' ${lib.getDev pkgs.brotli}

2
pkgs/servers/mastodon/yarn.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { { fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
offline_cache = linkFarm "offline" packages; offline_cache = linkFarm "offline" packages;
packages = [ packages = [
{ {

6
pkgs/servers/matrix-appservice-discord/yarn-dependencies.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { { fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
offline_cache = linkFarm "offline" packages; offline_cache = linkFarm "offline" packages;
packages = [ packages = [
{ {
@ -683,7 +683,7 @@
sha256 = "1iy8as2ax50xqp1bkqb18dspkdjw6qdmvz803xaijp14bwx0shja"; sha256 = "1iy8as2ax50xqp1bkqb18dspkdjw6qdmvz803xaijp14bwx0shja";
}; };
in in
runCommandNoCC "git___github.com_Sorunome_better_discord.js.git" { buildInputs = [gnutar]; } '' runCommand "git___github.com_Sorunome_better_discord.js.git" { buildInputs = [gnutar]; } ''
# Set u+w because tar-fs can't unpack archives with read-only dirs # Set u+w because tar-fs can't unpack archives with read-only dirs
# https://github.com/mafintosh/tar-fs/issues/79 # https://github.com/mafintosh/tar-fs/issues/79
tar cf $out --mode u+w -C ${repo} . tar cf $out --mode u+w -C ${repo} .
@ -1291,7 +1291,7 @@
sha256 = "0p7hlgdyfcipfjjx5hxwkqd524cmys9yxgqx29wmqkgjxp8xgwhy"; sha256 = "0p7hlgdyfcipfjjx5hxwkqd524cmys9yxgqx29wmqkgjxp8xgwhy";
}; };
in in
runCommandNoCC "git___github.com_Sorunome_discord_markdown.git" { buildInputs = [gnutar]; } '' runCommand "git___github.com_Sorunome_discord_markdown.git" { buildInputs = [gnutar]; } ''
# Set u+w because tar-fs can't unpack archives with read-only dirs # Set u+w because tar-fs can't unpack archives with read-only dirs
# https://github.com/mafintosh/tar-fs/issues/79 # https://github.com/mafintosh/tar-fs/issues/79
tar cf $out --mode u+w -C ${repo} . tar cf $out --mode u+w -C ${repo} .

2
pkgs/servers/monitoring/grafana-image-renderer/yarn.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { { fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
offline_cache = linkFarm "offline" packages; offline_cache = linkFarm "offline" packages;
packages = [ packages = [
{ {

2
pkgs/servers/monitoring/prometheus/webui-yarndeps.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { { fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
offline_cache = linkFarm "offline" packages; offline_cache = linkFarm "offline" packages;
packages = [ packages = [
{ {

2
pkgs/servers/nosql/influxdb2/influx-ui-yarndeps.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { { fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
offline_cache = linkFarm "offline" packages; offline_cache = linkFarm "offline" packages;
packages = [ packages = [
{ {

7
pkgs/servers/nosql/mongodb/mongodb.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, sconsPackages, boost, gperftools, pcre-cpp, snappy, zlib, libyamlcpp { lib, stdenv, fetchurl, sconsPackages, boost, gperftools, pcre-cpp, snappy, zlib, libyamlcpp
, sasl, openssl, libpcap, python27, python38, curl, Security, CoreFoundation, cctools }: , sasl, openssl, libpcap, curl, Security, CoreFoundation, cctools }:
# Note: # Note:
# The command line tools are written in Go as part of a different package (mongodb-tools) # The command line tools are written in Go as part of a different package (mongodb-tools)
@ -12,17 +12,16 @@ with lib;
let let
variants = if versionAtLeast version "4.2" variants = if versionAtLeast version "4.2"
then { python = python38.withPackages (ps: with ps; [ pyyaml cheetah3 psutil setuptools ]); then rec { python = scons.python.withPackages (ps: with ps; [ pyyaml cheetah3 psutil setuptools ]);
scons = sconsPackages.scons_latest; scons = sconsPackages.scons_latest;
mozjsVersion = "60"; mozjsVersion = "60";
mozjsReplace = "defined(HAVE___SINCOS)"; mozjsReplace = "defined(HAVE___SINCOS)";
} }
else { python = python27.withPackages (ps: with ps; [ pyyaml typing cheetah ]); else rec { python = scons.python.withPackages (ps: with ps; [ pyyaml typing cheetah ]);
scons = sconsPackages.scons_3_1_2; scons = sconsPackages.scons_3_1_2;
mozjsVersion = "45"; mozjsVersion = "45";
mozjsReplace = "defined(HAVE_SINCOS)"; mozjsReplace = "defined(HAVE_SINCOS)";
}; };
python = python27.withPackages (ps: with ps; [ pyyaml typing cheetah ]);
system-libraries = [ system-libraries = [
"boost" "boost"
"pcre" "pcre"

4
pkgs/servers/web-apps/discourse/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, makeWrapper, runCommandNoCC, lib, nixosTests, writeShellScript { stdenv, makeWrapper, runCommand, lib, nixosTests, writeShellScript
, fetchFromGitHub, bundlerEnv, callPackage , fetchFromGitHub, bundlerEnv, callPackage
, ruby, replace, gzip, gnutar, git, cacert, util-linux, gawk , ruby, replace, gzip, gnutar, git, cacert, util-linux, gawk
@ -78,7 +78,7 @@ let
''; '';
}); });
rake = runCommandNoCC "discourse-rake" { rake = runCommand "discourse-rake" {
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
} '' } ''
mkdir -p $out/bin mkdir -p $out/bin

14
pkgs/servers/web-apps/hedgedoc/yarn.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { { fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
offline_cache = linkFarm "offline" packages; offline_cache = linkFarm "offline" packages;
packages = [ packages = [
{ {
@ -651,7 +651,7 @@
sha256 = "1pa8cqbr758vx1q2ymsmbkp9cz3b7bghxzi90zc4hfq1nzav5w85"; sha256 = "1pa8cqbr758vx1q2ymsmbkp9cz3b7bghxzi90zc4hfq1nzav5w85";
}; };
in in
runCommandNoCC "Idle.js" { buildInputs = [gnutar]; } '' runCommand "Idle.js" { buildInputs = [gnutar]; } ''
# Set u+w because tar-fs can't unpack archives with read-only dirs # Set u+w because tar-fs can't unpack archives with read-only dirs
# https://github.com/mafintosh/tar-fs/issues/79 # https://github.com/mafintosh/tar-fs/issues/79
tar cf $out --mode u+w -C ${repo} . tar cf $out --mode u+w -C ${repo} .
@ -2403,7 +2403,7 @@
sha256 = "0b6axzi9kwsd24pcqfk5rmy9nhsdyklpd3z8w9wiynd64435dilz"; sha256 = "0b6axzi9kwsd24pcqfk5rmy9nhsdyklpd3z8w9wiynd64435dilz";
}; };
in in
runCommandNoCC "CodeMirror.git" { buildInputs = [gnutar]; } '' runCommand "CodeMirror.git" { buildInputs = [gnutar]; } ''
# Set u+w because tar-fs can't unpack archives with read-only dirs # Set u+w because tar-fs can't unpack archives with read-only dirs
# https://github.com/mafintosh/tar-fs/issues/79 # https://github.com/mafintosh/tar-fs/issues/79
tar cf $out --mode u+w -C ${repo} . tar cf $out --mode u+w -C ${repo} .
@ -3531,7 +3531,7 @@
sha256 = "0hlv66cxrqih7spnissl44jd8f8x9dyvzc68fn0g2fwwrnpjjib7"; sha256 = "0hlv66cxrqih7spnissl44jd8f8x9dyvzc68fn0g2fwwrnpjjib7";
}; };
in in
runCommandNoCC "diff-match-patch.git" { buildInputs = [gnutar]; } '' runCommand "diff-match-patch.git" { buildInputs = [gnutar]; } ''
# Set u+w because tar-fs can't unpack archives with read-only dirs # Set u+w because tar-fs can't unpack archives with read-only dirs
# https://github.com/mafintosh/tar-fs/issues/79 # https://github.com/mafintosh/tar-fs/issues/79
tar cf $out --mode u+w -C ${repo} . tar cf $out --mode u+w -C ${repo} .
@ -6203,7 +6203,7 @@
sha256 = "0d2zf62fmad760rg9hrkyhp03k5apms3fm0mf64yy8q6p3iw7jvw"; sha256 = "0d2zf62fmad760rg9hrkyhp03k5apms3fm0mf64yy8q6p3iw7jvw";
}; };
in in
runCommandNoCC "js-sequence-diagrams.git" { buildInputs = [gnutar]; } '' runCommand "js-sequence-diagrams.git" { buildInputs = [gnutar]; } ''
# Set u+w because tar-fs can't unpack archives with read-only dirs # Set u+w because tar-fs can't unpack archives with read-only dirs
# https://github.com/mafintosh/tar-fs/issues/79 # https://github.com/mafintosh/tar-fs/issues/79
tar cf $out --mode u+w -C ${repo} . tar cf $out --mode u+w -C ${repo} .
@ -6923,7 +6923,7 @@
sha256 = "036v1a9z79mc961xxx0rw8p6n2w1z8bnqpapgfg2kbw8f87jfxyi"; sha256 = "036v1a9z79mc961xxx0rw8p6n2w1z8bnqpapgfg2kbw8f87jfxyi";
}; };
in in
runCommandNoCC "lz-string.git" { buildInputs = [gnutar]; } '' runCommand "lz-string.git" { buildInputs = [gnutar]; } ''
# Set u+w because tar-fs can't unpack archives with read-only dirs # Set u+w because tar-fs can't unpack archives with read-only dirs
# https://github.com/mafintosh/tar-fs/issues/79 # https://github.com/mafintosh/tar-fs/issues/79
tar cf $out --mode u+w -C ${repo} . tar cf $out --mode u+w -C ${repo} .
@ -7323,7 +7323,7 @@
sha256 = "1rgmap95akwf9z72msxpqcfy95h8pqz9c8vn9xvvibfb5jf46lv0"; sha256 = "1rgmap95akwf9z72msxpqcfy95h8pqz9c8vn9xvvibfb5jf46lv0";
}; };
in in
runCommandNoCC "meta-marked" { buildInputs = [gnutar]; } '' runCommand "meta-marked" { buildInputs = [gnutar]; } ''
# Set u+w because tar-fs can't unpack archives with read-only dirs # Set u+w because tar-fs can't unpack archives with read-only dirs
# https://github.com/mafintosh/tar-fs/issues/79 # https://github.com/mafintosh/tar-fs/issues/79
tar cf $out --mode u+w -C ${repo} . tar cf $out --mode u+w -C ${repo} .

2
pkgs/servers/web-apps/plausible/yarn.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { { fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
offline_cache = linkFarm "offline" packages; offline_cache = linkFarm "offline" packages;
packages = [ packages = [
{ {

16
pkgs/test/texlive/default.nix
View File

@ -1,7 +1,7 @@
{ lib, runCommandNoCC, fetchurl, file, texlive, writeShellScript }: { lib, runCommand, fetchurl, file, texlive, writeShellScript }:
{ {
chktex = runCommandNoCC "texlive-test-chktex" { chktex = runCommand "texlive-test-chktex" {
nativeBuildInputs = [ nativeBuildInputs = [
(with texlive; combine { inherit scheme-infraonly chktex; }) (with texlive; combine { inherit scheme-infraonly chktex; })
]; ];
@ -18,7 +18,7 @@
dvipng = lib.recurseIntoAttrs { dvipng = lib.recurseIntoAttrs {
# https://github.com/NixOS/nixpkgs/issues/75605 # https://github.com/NixOS/nixpkgs/issues/75605
basic = runCommandNoCC "texlive-test-dvipng-basic" { basic = runCommand "texlive-test-dvipng-basic" {
nativeBuildInputs = [ file texlive.combined.scheme-medium ]; nativeBuildInputs = [ file texlive.combined.scheme-medium ];
input = fetchurl { input = fetchurl {
name = "test_dvipng.tex"; name = "test_dvipng.tex";
@ -40,7 +40,7 @@
''; '';
# test dvipng's limited capability to render postscript specials via GS # test dvipng's limited capability to render postscript specials via GS
ghostscript = runCommandNoCC "texlive-test-ghostscript" { ghostscript = runCommand "texlive-test-ghostscript" {
nativeBuildInputs = [ file (with texlive; combine { inherit scheme-small dvipng; }) ]; nativeBuildInputs = [ file (with texlive; combine { inherit scheme-small dvipng; }) ];
input = builtins.toFile "postscript-sample.tex" '' input = builtins.toFile "postscript-sample.tex" ''
\documentclass{minimal} \documentclass{minimal}
@ -81,7 +81,7 @@
}; };
# https://github.com/NixOS/nixpkgs/issues/75070 # https://github.com/NixOS/nixpkgs/issues/75070
dvisvgm = runCommandNoCC "texlive-test-dvisvgm" { dvisvgm = runCommand "texlive-test-dvisvgm" {
nativeBuildInputs = [ file texlive.combined.scheme-medium ]; nativeBuildInputs = [ file texlive.combined.scheme-medium ];
input = builtins.toFile "dvisvgm-sample.tex" '' input = builtins.toFile "dvisvgm-sample.tex" ''
\documentclass{article} \documentclass{article}
@ -106,7 +106,7 @@
mv document*.svg "$out"/ mv document*.svg "$out"/
''; '';
texdoc = runCommandNoCC "texlive-test-texdoc" { texdoc = runCommand "texlive-test-texdoc" {
nativeBuildInputs = [ nativeBuildInputs = [
(with texlive; combine { (with texlive; combine {
inherit scheme-infraonly luatex texdoc; inherit scheme-infraonly luatex texdoc;
@ -121,7 +121,7 @@
''; '';
# test that language files are generated as expected # test that language files are generated as expected
hyphen-base = runCommandNoCC "texlive-test-hyphen-base" { hyphen-base = runCommand "texlive-test-hyphen-base" {
hyphenBase = lib.head texlive.hyphen-base.pkgs; hyphenBase = lib.head texlive.hyphen-base.pkgs;
schemeFull = texlive.combined.scheme-full; schemeFull = texlive.combined.scheme-full;
schemeInfraOnly = texlive.combined.scheme-infraonly; schemeInfraOnly = texlive.combined.scheme-infraonly;
@ -154,7 +154,7 @@
''; '';
# test that fmtutil.cnf is fully regenerated on scheme-full # test that fmtutil.cnf is fully regenerated on scheme-full
fmtutilCnf = runCommandNoCC "texlive-test-fmtutil.cnf" { fmtutilCnf = runCommand "texlive-test-fmtutil.cnf" {
kpathsea = lib.head texlive.kpathsea.pkgs; kpathsea = lib.head texlive.kpathsea.pkgs;
schemeFull = texlive.combined.scheme-full; schemeFull = texlive.combined.scheme-full;
} '' } ''

2
pkgs/tools/admin/meshcentral/yarn.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { { fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
offline_cache = linkFarm "offline" packages; offline_cache = linkFarm "offline" packages;
packages = [ packages = [
{ {

4
pkgs/tools/archivers/wimlib/default.nix
View File

@ -8,7 +8,7 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.13.2"; version = "1.13.4";
pname = "wimlib"; pname = "wimlib";
nativeBuildInputs = [ pkg-config makeWrapper ]; nativeBuildInputs = [ pkg-config makeWrapper ];
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://wimlib.net/downloads/${pname}-${version}.tar.gz"; url = "https://wimlib.net/downloads/${pname}-${version}.tar.gz";
sha256 = "0id9ym3hzij4kpdrk0sz3ijxp5r0z1md5jch83pml9hdy1zbx5bj"; sha256 = "sha256-S4fdCtnMGljO5XIa/ruYAR2rVJ5y8rVVM/MV8Isu3hI=";
}; };
preBuild = '' preBuild = ''

4
pkgs/tools/filesystems/mtools/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mtools"; pname = "mtools";
version = "4.0.34"; version = "4.0.35";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/mtools/${pname}-${version}.tar.bz2"; url = "mirror://gnu/mtools/${pname}-${version}.tar.bz2";
sha256 = "1aqc6qncpd8dlndwk05vgrnjh7pa151n6hpfsi059zhg3gml79dd"; sha256 = "sha256-NHaeFzdR0vDYkaCMdsgEJ+kpuO5DQ4AZuGZsw9ekR0k=";
}; };
patches = lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; patches = lib.optional stdenv.isDarwin ./UNUSED-darwin.patch;

2
pkgs/tools/graphics/puppeteer-cli/yarn.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { { fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
offline_cache = linkFarm "offline" packages; offline_cache = linkFarm "offline" packages;
packages = [ packages = [
{ {

6
pkgs/tools/misc/neo-cowsay/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "neo-cowsay"; pname = "neo-cowsay";
version = "1.0.1"; version = "1.0.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Code-Hex"; owner = "Code-Hex";
repo = "Neo-cowsay"; repo = "Neo-cowsay";
rev = "v${version}"; rev = "v${version}";
sha256 = "0c6lygdqi26mczij41sn8ckc3g6qaakkkh3iasf10a4d07amxci1"; sha256 = "sha256-n01C6Z9nV2DDbSqgbOIZTqZAWXo6h4/NJdyFiOCh79A=";
}; };
vendorSha256 = "1clar59x2dvn7yj4fbylby9nrzy8kdixi48hkbmrv8g5l8n0wdl2"; vendorSha256 = "sha256-4qMsyNFD2MclsseE+IAaNm5r0wHWdcwLLPsZ0JJ3qpw=";
doCheck = false; doCheck = false;

29
pkgs/tools/misc/wimboot/default.nix
View File

@ -1,38 +1,17 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, libbfd, zlib, libiberty }: { lib, stdenv, fetchFromGitHub, libbfd, zlib, libiberty }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wimboot"; pname = "wimboot";
version = "2.6.0"; version = "2.7.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ipxe"; owner = "ipxe";
repo = "wimboot"; repo = "wimboot";
rev = "v${version}"; rev = "v${version}";
sha256 = "134wqqr147az5vbj4szd0xffwa99b4rar7w33zm3119zsn7sd79k"; sha256 = "12c677agkmiqs35qfpqfj7c4kxkizhbk9l6hig36dslzp4fwpl70";
}; };
NIX_CFLAGS_COMPILE = "-Wno-address-of-packed-member"; # Fails on gcc9 sourceRoot = "source/src";
patches = [
# Fixes for newer binutils
# Add R_X86_64_PLT32 as known reloc target
(fetchpatch {
url = "https://github.com/ipxe/wimboot/commit/91be50c17d4d9f463109d5baafd70f9fdadd86db.patch";
sha256 = "113448n49hmk8nz1dxbhxiciwl281zwalvb8z5p9xfnjvibj8274";
})
# Fix building with binutils 2.34 (bfd_get_section_* removed in favour of bfd_section_*)
(fetchpatch {
url = "https://github.com/ipxe/wimboot/commit/2f97e681703d30b33a4d5032a8025ab8b9f2de75.patch";
sha256 = "0476mp74jaq3k099b654al6yi2yhgn37d9biz0wv3ln2q1gy94yf";
})
];
# We cannot use sourceRoot because the patch wouldn't apply
postPatch = ''
cd src
'';
hardeningDisable = [ "pic" ];
buildInputs = [ libbfd zlib libiberty ]; buildInputs = [ libbfd zlib libiberty ];
makeFlags = [ "wimboot.x86_64.efi" ]; makeFlags = [ "wimboot.x86_64.efi" ];

4
pkgs/tools/misc/you-get/default.nix
View File

@ -2,7 +2,7 @@
buildPythonApplication rec { buildPythonApplication rec {
pname = "you-get"; pname = "you-get";
version = "0.4.1500"; version = "0.4.1536";
# Tests aren't packaged, but they all hit the real network so # Tests aren't packaged, but they all hit the real network so
# probably aren't suitable for a build environment anyway. # probably aren't suitable for a build environment anyway.
@ -10,7 +10,7 @@ buildPythonApplication rec {
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "5a6cc0d661fe0cd4210bf467d6c89afd8611609e402690254722c1415736da92"; sha256 = "78c9a113950344e06d18940bd11fe9a2f78b9d0bc8963cde300017ac1ffcef09";
}; };
meta = with lib; { meta = with lib; {

46
pkgs/tools/networking/cbftp/default.nix Normal file
View File

@ -0,0 +1,46 @@
{ lib
, stdenv
, fetchurl
, ncurses
, openssl
}:
stdenv.mkDerivation rec {
pname = "cbftp";
version = "1173";
src = fetchurl {
url = "https://cbftp.eu/${pname}-r${version}.tar.gz";
hash = "sha256-DE6fnLzWsx6Skz2LRJAaijjIqrYFB8/HPp45P5CcEc8=";
};
buildInputs = [
ncurses
openssl
];
dontConfigure = true;
installPhase = ''
runHook preInstall
install -D bin/* -t $out/bin/
install -D API README -t $out/share/doc/${pname}/
runHook postInstall
'';
meta = with lib; {
homepage = "https://cbftp.eu/";
description = " An advanced multi-purpose FTP/FXP client";
longDescription = ''
Cbftp is an advanced multi-purpose FTP/FXP client that focuses on
efficient large-scale data spreading, while also supporting most regular
FTP/FXP use cases in a modern way. It runs in a terminal and provides a
semi-graphical user interface through ncurses.
'';
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; unix;
};
}

6
pkgs/tools/networking/oneshot/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "oneshot"; pname = "oneshot";
version = "1.4.1"; version = "1.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "raphaelreyna"; owner = "raphaelreyna";
repo = "oneshot"; repo = "oneshot";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-UD67xYBb1rvGMSPurte5z2Hcd7+JtXDPbgp3BVBdLuk="; sha256 = "sha256-LxLMETZzoeu7qEHpUFmo/h+7sdly+R5ZWsNhyttcbpA=";
}; };
vendorSha256 = "sha256-d+YE618OywSDOWiiULHENFEqzRmFVUFKPuPXnL1JubM="; vendorSha256 = "sha256-rL/NWIIggvngTrdTDm1g1uH3vC55JF3cWllPc6Yb5jc=";
doCheck = false; doCheck = false;

4
pkgs/tools/networking/openssh/copyid.nix
View File

@ -1,6 +1,6 @@
{ runCommandNoCC, openssh }: { runCommand, openssh }:
runCommandNoCC "ssh-copy-id-${openssh.version}" { runCommand "ssh-copy-id-${openssh.version}" {
meta = openssh.meta // { meta = openssh.meta // {
description = "A tool to copy SSH public keys to a remote machine"; description = "A tool to copy SSH public keys to a remote machine";
priority = (openssh.meta.priority or 0) - 1; priority = (openssh.meta.priority or 0) - 1;

2
pkgs/top-level/aliases.nix
View File

@ -728,6 +728,8 @@ mapAliases ({
rubyPackages_2_5 = throw "rubyPackages_2_5 was deprecated in 2021-02: use a newer version of rubyPackages instead"; rubyPackages_2_5 = throw "rubyPackages_2_5 was deprecated in 2021-02: use a newer version of rubyPackages instead";
rubygems = throw "rubygems was deprecated on 2016-03-02: rubygems is now bundled with ruby"; rubygems = throw "rubygems was deprecated on 2016-03-02: rubygems is now bundled with ruby";
rubyMinimal = throw "rubyMinimal was removed due to being unused"; rubyMinimal = throw "rubyMinimal was removed due to being unused";
runCommandNoCC = runCommand;
runCommandNoCCLocal = runCommandLocal;
runwayml = throw "runwayml is now a webapp"; # added 2021-04-17 runwayml = throw "runwayml is now a webapp"; # added 2021-04-17
rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02 rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02
rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02 rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02

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

@ -2234,6 +2234,8 @@ with pkgs;
croc = callPackage ../tools/networking/croc { }; croc = callPackage ../tools/networking/croc { };
cbftp = callPackage ../tools/networking/cbftp { };
cddl = callPackage ../development/tools/cddl { }; cddl = callPackage ../development/tools/cddl { };
cedille = callPackage ../applications/science/logic/cedille cedille = callPackage ../applications/science/logic/cedille

2
pkgs/top-level/nixpkgs-basic-release-checks.nix
View File

@ -34,6 +34,7 @@ pkgs.runCommand "nixpkgs-release-checks" { src = nixpkgs; buildInputs = [nix]; }
nix-env -f $src \ nix-env -f $src \
--show-trace --argstr system "$platform" \ --show-trace --argstr system "$platform" \
--arg config '{ allowAliases = false; }' \
-qa --drv-path --system-filter \* --system \ -qa --drv-path --system-filter \* --system \
"''${opts[@]}" 2>&1 >/dev/null | tee eval-warnings.log "''${opts[@]}" 2>&1 >/dev/null | tee eval-warnings.log
@ -45,6 +46,7 @@ pkgs.runCommand "nixpkgs-release-checks" { src = nixpkgs; buildInputs = [nix]; }
nix-env -f $src \ nix-env -f $src \
--show-trace --argstr system "$platform" \ --show-trace --argstr system "$platform" \
--arg config '{ allowAliases = false; }' \
-qa --drv-path --system-filter \* --system --meta --xml \ -qa --drv-path --system-filter \* --system --meta --xml \
"''${opts[@]}" > /dev/null "''${opts[@]}" > /dev/null
done done