From efcfeb4cd9ffc26a5b639be01e027f067bed641a Mon Sep 17 00:00:00 2001 From: sudosubin Date: Sun, 3 Jul 2022 23:49:11 +0900 Subject: check-jsonschema: init at 0.16.2 --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/top-level/all-packages.nix') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ead24e0eab..396c5c13879 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14761,6 +14761,8 @@ with pkgs; pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/cpython/docs {}); + check-jsonschema = callPackage ../development/tools/check-jsonschema {}; + pypi2nix = callPackage ../development/tools/pypi2nix {}; pypi-mirror = callPackage ../development/tools/pypi-mirror {}; -- cgit 1.4.1 From cf19e96438c4b772ed7f4600d35348ccca90ccae Mon Sep 17 00:00:00 2001 From: ranfdev Date: Sat, 2 Jul 2022 10:26:59 +0200 Subject: edgedb: init at unstable-2022-06-27 I can't init at 1.1.2 because there's an issue while vendoring the packages. v1.1.2 seem to require two different version of the same package, causing an issue similar to https://github.com/NixOS/nixpkgs/issues/30742. --- .../0001-dynamically-patchelf-binaries.patch | 34 +++++++++++++ pkgs/tools/networking/edgedb/default.nix | 55 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 93 insertions(+) create mode 100644 pkgs/tools/networking/edgedb/0001-dynamically-patchelf-binaries.patch create mode 100644 pkgs/tools/networking/edgedb/default.nix (limited to 'pkgs/top-level/all-packages.nix') diff --git a/pkgs/tools/networking/edgedb/0001-dynamically-patchelf-binaries.patch b/pkgs/tools/networking/edgedb/0001-dynamically-patchelf-binaries.patch new file mode 100644 index 00000000000..ec2dccfc359 --- /dev/null +++ b/pkgs/tools/networking/edgedb/0001-dynamically-patchelf-binaries.patch @@ -0,0 +1,34 @@ +diff --git a/src/portable/install.rs b/src/portable/install.rs +index dc0d932..5394fc1 100644 +--- a/src/portable/install.rs ++++ b/src/portable/install.rs +@@ -133,8 +133,16 @@ fn unpack_package(cache_file: &Path, target_dir: &Path) + for entry in arch.entries()? { + let mut entry = entry?; + let path = entry.path()?; ++ let is_inside_bin = { ++ let mut path_iter = path.iter(); ++ path_iter.next(); // discards first folder ++ path_iter.as_path().starts_with("bin") ++ }; + if let Some(path) = build_path(&target_dir, &*path)? { +- entry.unpack(path)?; ++ entry.unpack(&path)?; ++ if is_inside_bin { ++ nix_patchelf_if_needed(&path); ++ } + } + } + bar.finish_and_clear(); +@@ -203,3 +211,11 @@ pub fn package(pkg_info: &PackageInfo) -> anyhow::Result { + + Ok(info) + } ++ ++fn nix_patchelf_if_needed(dest_path: &Path) { ++ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf") ++ .arg("--set-interpreter") ++ .arg("@dynamicLinker@") ++ .arg(dest_path) ++ .output(); ++} diff --git a/pkgs/tools/networking/edgedb/default.nix b/pkgs/tools/networking/edgedb/default.nix new file mode 100644 index 00000000000..9fe04ee70da --- /dev/null +++ b/pkgs/tools/networking/edgedb/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, lib +, runCommand +, patchelf +, fetchFromGitHub +, rustPlatform +, makeWrapper +, pkg-config +, curl +, Security +, CoreServices +, libiconv +, xz +, perl +, substituteAll +}: + +rustPlatform.buildRustPackage rec { + pname = "edgedb"; + version = "unstable-2022-06-27"; + + src = fetchFromGitHub { + owner = "edgedb"; + repo = "edgedb-cli"; + rev = "3c65c8bf0a09988356ad477d0ae234182f809b0a"; + sha256 = "sha256-UqoRa5ZbPJEHo9wyyygrN1ssorgY3cLw/mMrCDXr4gw="; + }; + + cargoSha256 = "sha256-6HJkkem44+dat5bmVEM+7GSJFjCz1dYZeRIPEoEwNlI="; + + nativeBuildInputs = [ makeWrapper pkg-config perl ]; + + buildInputs = [ + curl + ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security libiconv xz ]; + + checkFeatures = [ ]; + + patches = [ + (substituteAll { + src = ./0001-dynamically-patchelf-binaries.patch; + inherit patchelf; + dynamicLinker = stdenv.cc.bintools.dynamicLinker; + }) + ]; + + doCheck = false; + + meta = with lib; { + description = "EdgeDB cli"; + homepage = "https://www.edgedb.com/docs/cli/index"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = [ maintainers.ranfdev ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b90623b29f3..f512e44cede 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -406,6 +406,10 @@ with pkgs; eclipse-mat = callPackage ../development/tools/eclipse-mat { }; + edgedb = callPackage ../tools/networking/edgedb { + inherit (darwin.apple_sdk.frameworks) CoreServices Security; + }; + efficient-compression-tool = callPackage ../tools/compression/efficient-compression-tool { }; evans = callPackage ../development/tools/evans { }; -- cgit 1.4.1 From 8aaed36df32bcff840489b7083b4cb077a7cf97a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 4 Jul 2022 08:20:07 +0100 Subject: archimedes: use latest toolchain, not gcc-6 Without the change archimedes fails to build with latest toolchains as: ld: archimedes.c:(.text+0xdac7): undefined reference to `rnd' ld: archimedes.c:(.text+0xdeab): undefined reference to `rnd' ld: archimedes.c:(.text+0xdf13): undefined reference to `rnd' ld: archimedes.c:(.text+0xe3ef): undefined reference to `rnd' ld: archimedes.o:archimedes.c:(.text+0xe456): more undefined references to `rnd' follow ld: archimedes.o: in function `EMC': archimedes.c:(.text+0xf11b): undefined reference to `creation' ld: archimedes.c:(.text+0xf5f5): undefined reference to `creation' ld: archimedes.c:(.text+0xf826): undefined reference to `creation' ld: archimedes.c:(.text+0xf9ce): undefined reference to `creation' The change happens to fix build against clang as well. --- pkgs/applications/science/electronics/archimedes/default.nix | 12 +++++++++++- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 12 insertions(+), 4 deletions(-) (limited to 'pkgs/top-level/all-packages.nix') diff --git a/pkgs/applications/science/electronics/archimedes/default.nix b/pkgs/applications/science/electronics/archimedes/default.nix index 8bceed08e1d..631f44e8063 100644 --- a/pkgs/applications/science/electronics/archimedes/default.nix +++ b/pkgs/applications/science/electronics/archimedes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { pname = "archimedes"; @@ -9,6 +9,16 @@ stdenv.mkDerivation rec { sha256 = "0jfpnd3pns5wxcxbiw49v5sgpmm5b4v8s4q1a5292hxxk2hzmb3z"; }; + patches = [ + # Pull patch pending upstream inclusion to support c99 toolchains: + # https://savannah.gnu.org/bugs/index.php?62703 + (fetchpatch { + name = "c99.patch"; + url = "https://savannah.gnu.org/bugs/download.php?file_id=53393"; + sha256 = "1xmy1w4ln1gynldk3srdi2h0fxpx465dsa1yxc3rzrrjpxh6087f"; + }) + ]; + meta = { description = "GNU package for semiconductor device simulations"; homepage = "https://www.gnu.org/software/archimedes"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed03cb2a9aa..a781d005836 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33156,9 +33156,7 @@ with pkgs; astral = callPackage ../applications/science/biology/astral { }; - archimedes = callPackage ../applications/science/electronics/archimedes { - stdenv = gcc6Stdenv; - }; + archimedes = callPackage ../applications/science/electronics/archimedes { }; bayescan = callPackage ../applications/science/biology/bayescan { }; -- cgit 1.4.1 From 62e5acd0a7573c0001c92cb36e38de0b247ccc01 Mon Sep 17 00:00:00 2001 From: Juan Ibiapina Date: Mon, 4 Jul 2022 11:57:06 +0200 Subject: ruby: Expose generic builder (#173390) To avoid duplicating the ruby compilation code, this change exposes two functions `mkRubyVersion` and `mkRuby`, which can be used in an overlay to build any past or current ruby version. An example overlay: ```nix self: super: { ruby_2_7_6 = super.mkRuby { version = super.mkRubyVersion "2" "7" "6" ""; sha256 = "042xrdk7hsv4072bayz3f8ffqh61i8zlhvck10nfshllq063n877"; }; ruby_3_1_2 = super.mkRuby { version = super.mkRubyVersion "3" "1" "2" ""; sha256 = "0gm84ipk6mrfw94852w5h7xxk2lqrxjbnlwb88svf0lz70933131"; }; } ``` --- pkgs/development/interpreters/ruby/default.nix | 3 +++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 5 insertions(+) (limited to 'pkgs/top-level/all-packages.nix') diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 4381e6b6ddd..db611f66ad6 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -260,6 +260,9 @@ let ) args; in self; in { + mkRubyVersion = rubyVersion; + mkRuby = generic; + ruby_2_7 = generic { version = rubyVersion "2" "7" "6" ""; sha256 = "042xrdk7hsv4072bayz3f8ffqh61i8zlhvck10nfshllq063n877"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bf344efccc..ab366a1d14f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14870,6 +14870,8 @@ with pkgs; inherit (darwin) libiconv libobjc libunwind; inherit (darwin.apple_sdk.frameworks) Foundation; }) + mkRubyVersion + mkRuby ruby_2_7 ruby_3_0 ruby_3_1; -- cgit 1.4.1 From ac8fadc7f35009bf0fd81e9306c92a4238b0fe4c Mon Sep 17 00:00:00 2001 From: tricktron Date: Mon, 4 Jul 2022 13:28:02 +0200 Subject: colima: 0.4.2 -> 0.4.4 (#179522) * colima: use updated Makefile in build and install phases * colima: use lima-unwrapped * colima: fix dynamic version * colima: 0.4.2 -> 0.4.3 * colima: delete .git folder in postfetch when `leaveDotGit = true` Otherwise it may lead to non-deterministic behaviour. Co-authored-by: j-k * colima: do not override default buildGoModule phases The colima Makefile does more or less the same as the `buildGoModule` implementation. Instead of overriding it and using the Makefile directly, we reproduce the behaviour desired behaviour by customising env variables, e.g. `ldflags` and `subPackages`. Co-authored-by: j-k * colima: use `buildGoModule = buildGo118Module;` Co-authored-by: j-k * colima: update meta.description Co-authored-by: j-k * colima: set `CGO_ENABLED = 1` to make VPN connections work See https://github.com/abiosoft/colima/issues/358 * colima: 0.4.3 -> 0.4.4 * colima: define all ldflags in preConfigure Co-authored-by: Atemu * colima: add version test * colima: add meta.mainProgram and meta.platforms * colima: remove unused runCommand input Co-authored-by: j-k * colima: cleanup meta Co-authored-by: Sandro * colima: drop meta.platforms because we use the default value of `platforms.darwin ++ platforms.linux` Co-authored-by: Sandro Co-authored-by: Atemu * Update pkgs/applications/virtualization/colima/default.nix Co-authored-by: j-k Co-authored-by: Atemu Co-authored-by: Sandro --- .../applications/virtualization/colima/default.nix | 35 ++++++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 23 insertions(+), 14 deletions(-) (limited to 'pkgs/top-level/all-packages.nix') diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index 4b756bb720a..6b6d1364f75 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -1,43 +1,47 @@ { lib -, buildGo118Module +, buildGoModule , fetchFromGitHub , installShellFiles , lima , makeWrapper +, qemu +, testers +, colima }: -buildGo118Module rec { +buildGoModule rec { pname = "colima"; - version = "0.4.2"; + version = "0.4.4"; src = fetchFromGitHub { owner = "abiosoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-66nKH5jxTzLB9bg2lH1E8Cc0GZ6C/N/+yPYhCVEKOBY="; - + sha256 = "bSBaSS+rVkFqTSdyegdE/F0X5u7yvF/nHslAO3xgD6I="; # We need the git revision leaveDotGit = true; postFetch = '' - git -C $out rev-parse HEAD > $out/.git-revision + git -C $out rev-parse --short HEAD > $out/.git-revision rm -rf $out/.git ''; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; - vendorSha256 = "sha256-91Ex3RPWxOHyZcR3Bo+bRdDAFw2mEGiC/uNKjdX2kuw="; + vendorSha256 = "sha256-jDzDwK7qA9lKP8CfkKzfooPDrHuHI4OpiLXmX9vOpOg="; - doCheck = false; + CGO_ENABLED = 1; preConfigure = '' - ldflags="-X github.com/abiosoft/colima/config.appVersion=${version} - -X github.com/abiosoft/colima/config.revision=$(cat .git-revision)" + ldflags="-s -w -X github.com/abiosoft/colima/config.appVersion=${version} \ + -X github.com/abiosoft/colima/config.revision=$(cat .git-revision)" ''; + subPackages = [ "cmd/colima" ]; + postInstall = '' wrapProgram $out/bin/colima \ - --prefix PATH : ${lib.makeBinPath [ lima ]} + --prefix PATH : ${lib.makeBinPath [ lima qemu ]} installShellCompletion --cmd colima \ --bash <($out/bin/colima completion bash) \ @@ -45,10 +49,15 @@ buildGo118Module rec { --zsh <($out/bin/colima completion zsh) ''; + passthru.tests.version = testers.testVersion { + package = colima; + command = "HOME=$(mktemp -d) colima version"; + }; + meta = with lib; { - description = "Container runtimes on MacOS with minimal setup"; + description = "Container runtimes with minimal setup"; homepage = "https://github.com/abiosoft/colima"; license = licenses.mit; - maintainers = with maintainers; [ aaschmid ]; + maintainers = with maintainers; [ aaschmid tricktron ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6414df64fe7..3770016107c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34527,7 +34527,7 @@ with pkgs; idsk = callPackage ../tools/filesystems/idsk { stdenv = gcc10StdenvCompat; }; - colima = callPackage ../applications/virtualization/colima { }; + colima = callPackage ../applications/virtualization/colima { buildGoModule = buildGo118Module; }; lima = callPackage ../applications/virtualization/lima { }; -- cgit 1.4.1