diff options
| author | Artturi <Artturin@artturin.com> | 2022-02-04 18:30:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-04 18:30:41 +0200 |
| commit | 87d4910e46f78af710b72010106ec25cbd7619af (patch) | |
| tree | 06f825a7f81f2070a17ce7adfa25a44e050e4794 /pkgs/applications/accessibility | |
| parent | 993bc8bd772e9182d4a8644e78308eb4ece4cd74 (diff) | |
| parent | eccf4d0784d2ba2eafbbc617691bd6c7bc80bb32 (diff) | |
| download | nixpkgs-87d4910e46f78af710b72010106ec25cbd7619af.tar nixpkgs-87d4910e46f78af710b72010106ec25cbd7619af.tar.gz nixpkgs-87d4910e46f78af710b72010106ec25cbd7619af.tar.bz2 nixpkgs-87d4910e46f78af710b72010106ec25cbd7619af.tar.lz nixpkgs-87d4910e46f78af710b72010106ec25cbd7619af.tar.xz nixpkgs-87d4910e46f78af710b72010106ec25cbd7619af.tar.zst nixpkgs-87d4910e46f78af710b72010106ec25cbd7619af.zip | |
Merge pull request #153939 from tomfitzhenry/squeekboard-1.15
Diffstat (limited to 'pkgs/applications/accessibility')
| -rw-r--r-- | pkgs/applications/accessibility/squeekboard/default.nix | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/pkgs/applications/accessibility/squeekboard/default.nix b/pkgs/applications/accessibility/squeekboard/default.nix index 18bcb04c65c..db139ab39d0 100644 --- a/pkgs/applications/accessibility/squeekboard/default.nix +++ b/pkgs/applications/accessibility/squeekboard/default.nix @@ -19,14 +19,15 @@ stdenv.mkDerivation rec { pname = "squeekboard"; - version = "1.14.0"; + version = "1.16.0"; src = fetchFromGitLab { - domain = "source.puri.sm"; - owner = "Librem5"; + domain = "gitlab.gnome.org"; + group = "World"; + owner = "Phosh"; repo = pname; rev = "v${version}"; - sha256 = "1ayap40pgzcpmfydk5pbf3gwhh26m3cmbk6lyly4jihr9qw7dgb0"; + sha256 = "sha256-51Grkn6NSR6azTRuq1vdbDg7d3HuQQ+ZJCsM2mSrSHk="; }; cargoDeps = rustPlatform.fetchCargoTarball { @@ -35,18 +36,9 @@ stdenv.mkDerivation rec { cat Cargo.toml.in Cargo.deps > Cargo.toml ''; name = "${pname}-${version}"; - sha256 = "0148ynzmapxfrlccikf20ikmi0ssbkn9fl5wi6nh6azflv50pzzn"; + sha256 = "sha256-vQaiEENxaQxBGYP1br03wSkU7OGOYkJvMBUAOeb3jGk="; }; - patches = [ - # remove when updating from 1.14.0 - (fetchpatch { - name = "fix-rust-1.54-build.patch"; - url = "https://gitlab.gnome.org/World/Phosh/squeekboard/-/commit/9cd56185c59ace535a6af26384ef6beca4423816.patch"; - sha256 = "sha256-8rWcfhQmGiwlc2lpkRvJ95XQp1Xg7St+0K85x8nQ0mk="; - }) - ]; - nativeBuildInputs = [ meson ninja |