diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-03-30 13:30:47 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-31 10:13:20 +0000 |
| commit | f2e61678de300336b3666afd19af7565efb0c4cf (patch) | |
| tree | 49f6906c9d557f7fdd58257ff85ec17fc4495f31 /nixpkgs/pkgs/development/embedded | |
| parent | f920d5e07c29a9aa1b77d9b88bd604cf1a1f3664 (diff) | |
| parent | 00e27c78d3d2de6964096ceee8d70e5b487365e3 (diff) | |
| download | nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.gz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.bz2 nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.lz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.xz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.zst nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.zip | |
Merge commit '00e27c78d3d2de6964096ceee8d70e5b487365e3'
Conflicts: nixpkgs/nixos/modules/system/boot/systemd.nix nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/pink.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/embedded')
| -rw-r--r-- | nixpkgs/pkgs/development/embedded/bossa/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/embedded/bossa/default.nix b/nixpkgs/pkgs/development/embedded/bossa/default.nix index 4e35ff35f660..fbb1b4c1fd40 100644 --- a/nixpkgs/pkgs/development/embedded/bossa/default.nix +++ b/nixpkgs/pkgs/development/embedded/bossa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, wxGTK, libX11, readline }: +{ lib, stdenv, fetchFromGitHub, wxGTK, libX11, readline }: let # BOSSA needs a "bin2c" program to embed images. @@ -13,14 +13,15 @@ let }; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "bossa"; version = "1.8"; - src = fetchgit { - url = "https://github.com/shumatech/BOSSA"; - rev = "3be622ca0aa6214a2fc51c1ec682c4a58a423d62"; - sha256 = "19ik86qbffcb04cgmi4mnascbkck4ynfj87ha65qdk6fmp5q35vm"; + src = fetchFromGitHub { + owner = "shumatech"; + repo = "BOSSA"; + rev = version; + sha256 = "sha256-dZeBy63OzIaLUfAg6awnk83FtLKVxPoYAYs5t7BBM6Y="; }; patches = [ ./bossa-no-applet-build.patch ]; |