diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-09-27 18:40:33 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-09-27 18:40:41 +0000 |
| commit | 030c5028b07afcedce7c5956015c629486cc79d9 (patch) | |
| tree | 4c3cb9c6cff0e30919a97fc0c1d3203446696f4e /pkgs/applications/science/electronics | |
| parent | 4b852f7ef3cb92277f212ba7dc168da1073e65cc (diff) | |
| parent | 04c0744afbab2369baf4f134c544db3f24164d80 (diff) | |
| download | nixpkgs-030c5028b07afcedce7c5956015c629486cc79d9.tar nixpkgs-030c5028b07afcedce7c5956015c629486cc79d9.tar.gz nixpkgs-030c5028b07afcedce7c5956015c629486cc79d9.tar.bz2 nixpkgs-030c5028b07afcedce7c5956015c629486cc79d9.tar.lz nixpkgs-030c5028b07afcedce7c5956015c629486cc79d9.tar.xz nixpkgs-030c5028b07afcedce7c5956015c629486cc79d9.tar.zst nixpkgs-030c5028b07afcedce7c5956015c629486cc79d9.zip | |
Rebase onto c1a53897ad4290a1cbfa02fbe6f3869577b93744
Signed-off-by: Alyssa Ross <hi@alyssa.is>
Diffstat (limited to 'pkgs/applications/science/electronics')
| -rw-r--r-- | pkgs/applications/science/electronics/librepcb/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/applications/science/electronics/nvc/default.nix | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix index bd824ac2888..dfd679d4d53 100644 --- a/pkgs/applications/science/electronics/librepcb/default.nix +++ b/pkgs/applications/science/electronics/librepcb/default.nix @@ -1,21 +1,22 @@ { stdenv, lib, fetchFromGitHub -, qtbase, qttools, cmake, wrapQtAppsHook +, qtbase, qttools, qtquickcontrols2, opencascade-occt, libGLU, libSM, freeimage, cmake, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "librepcb"; - version = "0.1.7"; + version = "1.0.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-zqvvc3CHqdRWVUFt4BkH5Vq50/FKNvMNW2NvGyfWwFM="; + sha256 = "sha256-2o2Gue/RnDWxe8jk/Ehx9CM+B3ac5rEQn0H7yodUEZ8="; fetchSubmodules = true; }; - nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; + nativeBuildInputs = [ cmake qttools wrapQtAppsHook qtquickcontrols2 opencascade-occt libGLU ]; buildInputs = [ qtbase ]; + propagatedBuildInputs = [ libSM freeimage ]; meta = with lib; { description = "A free EDA software to develop printed circuit boards"; diff --git a/pkgs/applications/science/electronics/nvc/default.nix b/pkgs/applications/science/electronics/nvc/default.nix index dde8f05d623..94e0741f79a 100644 --- a/pkgs/applications/science/electronics/nvc/default.nix +++ b/pkgs/applications/science/electronics/nvc/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "nvc"; - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; rev = "r${version}"; - hash = "sha256-sAr51+8hFnpIq0jDd8dB5uiy00N09ufkFgWkFtW7ErU="; + hash = "sha256-0KLya2B+gs7aoOvkQdHuJuQtCHLUeSYATToBfIDhm/c="; }; nativeBuildInputs = [ |