diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-01-07 05:01:12 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-01-07 05:01:18 +0100 |
| commit | 1442bd4bc7b401ad5197941b267f838b834e938b (patch) | |
| tree | eba5ea72b896a75fa6eb4686f3c745e6b82d00dd /pkgs/applications/science/electronics | |
| parent | 01615700894221c282c42662eb73d2d0fc1989aa (diff) | |
| parent | f11c3b8ec114700bce8addca528acf919b7765b9 (diff) | |
| download | nixlib-1442bd4bc7b401ad5197941b267f838b834e938b.tar nixlib-1442bd4bc7b401ad5197941b267f838b834e938b.tar.gz nixlib-1442bd4bc7b401ad5197941b267f838b834e938b.tar.bz2 nixlib-1442bd4bc7b401ad5197941b267f838b834e938b.tar.lz nixlib-1442bd4bc7b401ad5197941b267f838b834e938b.tar.xz nixlib-1442bd4bc7b401ad5197941b267f838b834e938b.tar.zst nixlib-1442bd4bc7b401ad5197941b267f838b834e938b.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/applications/science/electronics')
| -rw-r--r-- | pkgs/applications/science/electronics/lepton-eda/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/applications/science/electronics/verilator/default.nix | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/applications/science/electronics/lepton-eda/default.nix b/pkgs/applications/science/electronics/lepton-eda/default.nix index 8d4217d0aba3..00b0961895d3 100644 --- a/pkgs/applications/science/electronics/lepton-eda/default.nix +++ b/pkgs/applications/science/electronics/lepton-eda/default.nix @@ -7,9 +7,9 @@ , autoreconfHook , guile , flex -, gtk2 +, gtk3 , glib -, gtkextra +, gtksheet , gettext , gawk , shared-mime-info @@ -19,19 +19,20 @@ stdenv.mkDerivation rec { pname = "lepton-eda"; - version = "1.9.17-20211219"; + version = "1.9.18-20220529"; src = fetchurl { url = "https://github.com/lepton-eda/lepton-eda/releases/download/${version}/lepton-eda-${builtins.head (lib.splitString "-" version)}.tar.gz"; - sha256 = "sha256-lOneKeJUcw6jOX/3iv9BDWOJ3xip/vGhzxHHNAbtsS8="; + hash = "sha256-X9yNuosNR1Jf3gYWQZeOnKdxzJLld29Sn9XYsPGWYYI="; }; nativeBuildInputs = [ pkg-config makeWrapper texinfo autoreconfHook ]; - propagatedBuildInputs = [ guile flex gtk2 glib gtkextra gettext gawk shared-mime-info groff libstroke ]; + propagatedBuildInputs = [ guile flex gtk3 glib gtksheet gettext gawk shared-mime-info groff libstroke ]; configureFlags = [ "--disable-update-xdg-database" + "--with-gtk3" ]; CFLAGS = [ diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 0c2adf0907e9..8d0fef289104 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "verilator"; - version = "5.018"; + version = "5.020"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-f06UzNw2MQ5me03EPrVFhkwxKum/GLDzQbDNTBsJMJs="; + hash = "sha256-7kxH/RPM+fjDuybwJgTYm0X6wpaqesGfu57plrExd8c="; }; enableParallelBuilding = true; |