Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9f4cd47a0d19
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 11ab3049e92d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 23, 2020

  1. josm: 17084 → 17329

    @sikmir
    sikmir committed Nov 23, 2020
    Copy the full SHA
    f54fa91 View commit details

Commits on Nov 24, 2020

  1. Merge pull request #104711 from sikmir/josm 

    josm: 17084 → 17329
    @SuperSandro2000
    SuperSandro2000 authored Nov 24, 2020
    Copy the full SHA
    11ab304 View commit details
Showing with 4 additions and 3 deletions.
  1. +4 −3 pkgs/applications/misc/josm/default.nix
7 changes: 4 additions & 3 deletions pkgs/applications/misc/josm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{ stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm }:
let
pname = "josm";
version = "17084";
version = "17329";
srcs = {
jar = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
sha256 = "0avzpzmvv371jpbph9xpq0ia2nikha2aib9v10hr2f9q7vka9zx4";
sha256 = "0hra146akadqz9acj1xa2vzrmipfzf8li7sgsmk169xr991y653k";
};
macosx = fetchurl {
url = "https://josm.openstreetmap.de/download/macosx/josm-macosx-${version}.zip";
sha256 = "1vd2r4sshjpd6ic460cdil75skrm6f6q48lm6n3g1ywkn4mx63p1";
sha256 = "0i09jnfqbcirmic9vayrp78lnyk4mfh7ax3v3cs8kyqhk930pscf";
};
pkg = fetchsvn {
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
@@ -43,6 +43,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "An extensible editor for OpenStreetMap";
homepage = "https://josm.openstreetmap.de/";
changelog = "https://josm.openstreetmap.de/wiki/Changelog";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ rycee sikmir ];
platforms = platforms.all;