summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--pkgs/build-support/libredirect/libredirect.c14
-rw-r--r--pkgs/development/interpreters/bqn/cbqn/default.nix15
-rw-r--r--pkgs/development/python-modules/deezer-python/default.nix4
-rw-r--r--pkgs/development/python-modules/labgrid/default.nix5
-rw-r--r--pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js6
-rw-r--r--pkgs/misc/lilypond/with-fonts.nix5
-rw-r--r--pkgs/misc/screensavers/pipes-rs/default.nix6
-rw-r--r--pkgs/tools/admin/eksctl/default.nix4
-rw-r--r--pkgs/tools/package-management/nix-eval-jobs/default.nix41
-rw-r--r--pkgs/tools/text/mdbook-katex/default.nix24
-rw-r--r--pkgs/top-level/all-packages.nix6
11 files changed, 106 insertions, 24 deletions
diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c
index 5b0ef4856708..c7058ce123c5 100644
--- a/pkgs/build-support/libredirect/libredirect.c
+++ b/pkgs/build-support/libredirect/libredirect.c
@@ -279,3 +279,17 @@ int system(const char *command)
rewriteSystemCall(command, newCommand);
return _system(newCommand);
}
+
+int mkdir(const char *path, mode_t mode)
+{
+ int (*mkdir_real) (const char *path, mode_t mode) = dlsym(RTLD_NEXT, "mkdir");
+ char buf[PATH_MAX];
+ return mkdir_real(rewrite(path, buf), mode);
+}
+
+int mkdirat(int dirfd, const char *path, mode_t mode)
+{
+ int (*mkdirat_real) (int dirfd, const char *path, mode_t mode) = dlsym(RTLD_NEXT, "mkdirat");
+ char buf[PATH_MAX];
+ return mkdirat_real(dirfd, rewrite(path, buf), mode);
+}
diff --git a/pkgs/development/interpreters/bqn/cbqn/default.nix b/pkgs/development/interpreters/bqn/cbqn/default.nix
index 3a153977cd9b..4d414dc04e1d 100644
--- a/pkgs/development/interpreters/bqn/cbqn/default.nix
+++ b/pkgs/development/interpreters/bqn/cbqn/default.nix
@@ -19,13 +19,13 @@ assert genBytecode -> ((bqn-path != null) && (mbqn-source != null));
stdenv.mkDerivation rec {
pname = "cbqn" + lib.optionalString (!genBytecode) "-standalone";
- version = "0.pre+unstable=2021-10-05";
+ version = "0.pre+unstable=2021-10-09";
src = fetchFromGitHub {
owner = "dzaima";
repo = "CBQN";
- rev = "e23dab20daff9c0dacc2561c616174af72029a3e";
- hash = "sha256-amVKKD9hD5A+LbqglXHLKEsYqFSSztdXs1FCoNJyCJ4=";
+ rev = "debc4e2afe313a3c54133df9f26969c2927dc8aa";
+ hash = "sha256-ixFDmtq6hd2enmPbBT0JCv1bmxt84zle4zPQzz+rMCI=";
};
dontConfigure = true;
@@ -34,11 +34,12 @@ stdenv.mkDerivation rec {
sed -i '/SHELL =.*/ d' makefile
'';
- preBuild = ''
- # otherwise cbqn defaults to clang
- makeFlagsArray+=("CC=$CC")
+ makeFlags = [
+ "CC=${stdenv.cc.targetPrefix}cc"
+ ];
- # inform make we are providing the runtime ourselves
+ preBuild = ''
+ # Purity: avoids git downloading bytecode files
touch src/gen/customRuntime
'' + (if genBytecode then ''
${bqn-path} genRuntime ${mbqn-source}
diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix
index 332707504a94..2ff5127aef2c 100644
--- a/pkgs/development/python-modules/deezer-python/default.nix
+++ b/pkgs/development/python-modules/deezer-python/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "deezer-python";
- version = "2.4.0";
+ version = "3.1.0";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "browniebroke";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-4Jjkhlv3wK4j2uU8dT11WYuBttlFtg+/ZBrc57UVeao=";
+ sha256 = "1ln9hlix6rbyajgvwd2lk0i7nshvrbkvj9xx1i0q1z1caly9yl0g";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/labgrid/default.nix b/pkgs/development/python-modules/labgrid/default.nix
index 7aedf44d0676..238ba0571e4d 100644
--- a/pkgs/development/python-modules/labgrid/default.nix
+++ b/pkgs/development/python-modules/labgrid/default.nix
@@ -65,11 +65,6 @@ buildPythonPackage rec {
pytest-dependency
];
- disabledTests = [
- "docker"
- "sshmanager"
- ];
-
meta = with lib; {
description = "Embedded control & testing library";
homepage = "https://labgrid.org";
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js
index 7df4679a1308..c0ec1751ed15 100644
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js
+++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js
@@ -45,11 +45,13 @@ function fetchgit(fileName, url, rev, branch, builtinFetchGit) {
name = "${fileName}";
path =
let${builtinFetchGit ? `
- repo = builtins.fetchGit {
+ repo = builtins.fetchGit ({
url = "${url}";
ref = "${branch}";
rev = "${rev}";
- };
+ } // (if builtins.substring 0 3 builtins.nixVersion == "2.4" then {
+ allRefs = true;
+ } else {}));
` : `
repo = fetchgit {
url = "${url}";
diff --git a/pkgs/misc/lilypond/with-fonts.nix b/pkgs/misc/lilypond/with-fonts.nix
index 47cbb59f2f01..2cfd1519795d 100644
--- a/pkgs/misc/lilypond/with-fonts.nix
+++ b/pkgs/misc/lilypond/with-fonts.nix
@@ -1,4 +1,4 @@
-{ lib, lndir, symlinkJoin, makeWrapper
+{ lib, symlinkJoin, makeWrapper
, lilypond, openlilylib-fonts
}:
@@ -8,11 +8,10 @@ lib.appendToName "with-fonts" (symlinkJoin {
paths = [ lilypond ] ++ openlilylib-fonts.all;
nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ lndir ];
postBuild = ''
for p in $out/bin/*; do
- wrapProgram "$p" --set LILYPOND_DATADIR "$datadir"
+ wrapProgram "$p" --set LILYPOND_DATADIR "$out/share/lilypond/${lilypond.version}"
done
'';
})
diff --git a/pkgs/misc/screensavers/pipes-rs/default.nix b/pkgs/misc/screensavers/pipes-rs/default.nix
index 5e55f13c2b43..22443dc11732 100644
--- a/pkgs/misc/screensavers/pipes-rs/default.nix
+++ b/pkgs/misc/screensavers/pipes-rs/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "pipes-rs";
- version = "1.4.4";
+ version = "1.4.5";
src = fetchFromGitHub {
owner = "lhvy";
repo = pname;
rev = "v${version}";
- sha256 = "drqoKkju1EkcWGNnliEah37wVhtU2ddJSOZ5MnCNbuo=";
+ sha256 = "sha256-BC6QqSZ7siDVSO8oOH7DimTe6RFnCBygmvtPrQgsC/Q=";
};
- cargoSha256 = "0j6b5697ichw4ly7lsj3nbm0mw6bvjma81nd0fl7v1ra9kbmsysk";
+ cargoSha256 = "sha256-nctkc2vDE7WXm84g/EkGKc1/ju/Xy9d/nc8NPIVFl58=";
doInstallCheck = true;
diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix
index 79e0559eaaa8..9b318ec462fb 100644
--- a/pkgs/tools/admin/eksctl/default.nix
+++ b/pkgs/tools/admin/eksctl/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "eksctl";
- version = "0.68.0";
+ version = "0.69.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
- sha256 = "sha256-J4suRGr00mdgZv6q9Ar9x4HFZxk4gtUFF1TE3WyNlvE=";
+ sha256 = "sha256-mRY/czMf6KefYCqfCVRtcHuUuqAxyPUd8TJmx7vzOsk=";
};
vendorSha256 = "sha256-cUo+tcHhnbJbn3HS/I8lnkvfv+6+htIs1dMtKuEArQg=";
diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix
new file mode 100644
index 000000000000..0407ad4528de
--- /dev/null
+++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, boost
+, cmake
+, fetchFromGitHub
+, meson
+, ninja
+, nixUnstable
+, nlohmann_json
+, pkg-config
+, stdenv
+}:
+stdenv.mkDerivation rec {
+ pname = "nix-eval-jobs";
+ version = "0.0.1";
+ src = fetchFromGitHub {
+ owner = "nix-community";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-LTMW4356f8pvIyfYdOyZbF9yzU8MH9mryQgB4LrwZMI=";
+ };
+ buildInputs = [
+ boost
+ nixUnstable
+ nlohmann_json
+ ];
+ nativeBuildInputs = [
+ meson
+ ninja
+ pkg-config
+ # nlohmann_json can be only discovered via cmake files
+ cmake
+ ];
+
+ meta = {
+ description = "Hydra's builtin hydra-eval-jobs as a standalone";
+ homepage = "https://github.com/nix-community/nix-eval-jobs";
+ license = lib.licenses.gpl3;
+ maintainers = with lib.maintainers; [ adisbladis mic92 ];
+ platforms = lib.platforms.unix;
+ };
+}
diff --git a/pkgs/tools/text/mdbook-katex/default.nix b/pkgs/tools/text/mdbook-katex/default.nix
new file mode 100644
index 000000000000..a97e7ca89483
--- /dev/null
+++ b/pkgs/tools/text/mdbook-katex/default.nix
@@ -0,0 +1,24 @@
+{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "mdbook-katex";
+ version = "0.2.10";
+
+ src = fetchFromGitHub {
+ owner = "lzanini";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-5PzXX7icRxcHpzjp3x/9ssn2o0444uHrzBn1Ds1DEPM=";
+ };
+
+ cargoSha256 = "sha256-tqdpIBlKiyYSWFPYTnzVeDML2GM+mukbOHS3sNYUgdc=";
+
+ buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
+
+ meta = with lib; {
+ description = "A preprocessor for mdbook, rendering LaTeX equations to HTML at build time.";
+ homepage = "https://github.com/lzanini/${pname}";
+ license = [ licenses.mit ];
+ maintainers = with maintainers; [ lovesegfault ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9310e2c42b22..d9901bd4a35c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6800,6 +6800,10 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
+ mdbook-katex = callPackage ../tools/text/mdbook-katex {
+ inherit (darwin.apple_sdk.frameworks) CoreServices;
+ };
+
mdbook-mermaid = callPackage ../tools/text/mdbook-mermaid {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
@@ -32040,6 +32044,8 @@ with pkgs;
dnadd = callPackage ../tools/nix/dnadd { };
+ nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { };
+
nix-doc = callPackage ../tools/package-management/nix-doc { };
nix-bundle = callPackage ../tools/package-management/nix-bundle { };
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-28 17:00:17 +0000