diff options
1261 files changed, 4698 insertions, 3319 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 7a5a7c25494..a4386b067b5 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -92,6 +92,7 @@ skeidel = "Sven Keidel <svenkeidel@gmail.com>"; smironov = "Sergey Mironov <ierton@gmail.com>"; sprock = "Roger Mason <rmason@mun.ca>"; + tailhook = "Paul Colomiets <paul@colomiets.name>"; thammers = "Tobias Hammerschmidt <jawr@gmx.de>"; the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>"; thoughtpolice = "Austin Seipp <aseipp@pobox.com>"; diff --git a/maintainers/scripts/sort-attrs.str b/maintainers/scripts/sort-attrs.str deleted file mode 100644 index b67b6ee2a57..00000000000 --- a/maintainers/scripts/sort-attrs.str +++ /dev/null @@ -1,146 +0,0 @@ -/* Tool to sort attribute sets. Primarily useful for keeping - all-packages.nix tidy. - - To compile: - - $ strc -i ../../maintainers/scripts/sort-attrs.str -la stratego-lib - - Typical invocation: - - $ sglr -m -p ~/Dev/nix/src/libexpr/nix.tbl -i all-packages.nix \ - | implode-asfix --lex \ - | ../../maintainers/scripts/sort-attrs \ - | asfix-yield -*/ - -module sort-attrs - -imports - libstratego-lib - libstratego-sglr - - -strategies - - no-wsp = !appl(prod([], cf(opt(layout())), no-attrs()), []) - - -rules - - list-sep(s): [] -> [] - list-sep(s): [x | xs] -> [[x | before] | <list-sep(s)> [split | after]] - where - <split-fetch-keep(s)> xs => (before, split, after) - list-sep(s): [x | xs] -> [[x | xs]] - where - <not(split-fetch-keep(s))> xs - - list-sep-end(s): xs -> [<conc> (before, [split]) | <list-sep-end(s)> after] - where - <split-fetch-keep(s)> xs => (before, split, after) - list-sep-end(s): xs -> [xs] - where - <not(split-fetch-keep(s))> xs - - - sort-attrs: - appl(p@prod(_, _, attrs([term(cons("Attrs"))])), - [ lit("{") - , ws1 - , appl(p2@list(cf(iter-star(sort("Bind")))), attrs) - , ws2 - , lit("}") - ] - ) -> - appl(p, [lit("{"), <no-wsp>, appl(p2, <concat> attrs'), ws2, lit("}")]) - where - <debug> "found it"; - <attach-wsp> [ws1 | attrs] => withWSP; - <list-sep(starts-section)> withWSP => groups; - <length; debug> groups; - <map({x', x'', x''', xs', starts, starts': \[x | xs] -> [x''' | xs'] - where - <remove-section-start> x => (x', starts); - <map(regularise-empty-lines); if !starts; debug; sortable-section; debug then qsort(compare-attrs) else id end> [x' | xs] => [x'' | xs']; - <[] <+ \x -> ["\n\n\n" | x]\ > starts => starts'; - <prepend-layout> (starts', x'') => x''' - \ })> groups => attrs'; - <debug> "did it" - - - attach-wsp: [a, b | cs] -> [(a, b) | <attach-wsp> cs] - attach-wsp: [] -> [] - - -strategies - - starts-section = - ?x@(appl(prod([cf(layout())], cf(opt(layout())), no-attrs()), cs), attr); - <implode-string; is-substring(!"###")> cs; - !x - -rules - - - sortable-section = ?[s]; !s; explode-string; not(fetch({x: ?x; !(x, 97); geq})) - - - remove-section-start: - (appl(prod([cf(layout())], cf(opt(layout())), no-attrs()), cs), attr) -> - ((appl(prod([cf(layout())], cf(opt(layout())), no-attrs()), cs'), attr), starts) - where - !cs; - list-sep-end(?10); // separate into lines, keeping the \n - map(implode-string); - partition(where(is-substring(!"###"))) => (starts, rest); - <map(explode-string); concat> rest => cs' - - - regularise-empty-lines: - (appl(prod([cf(layout())], cf(opt(layout())), no-attrs()), cs), attr) -> - (appl(prod([cf(layout())], cf(opt(layout())), no-attrs()), cs''), attr) - where - // separate into lines, keeping the \n - // last whitespace is significant, keep - <list-sep-end(?10); split-init-last> cs => (init, last); - <regularise-empty-lines'> init => cs'; // remove whitespace-only lines - <concat> [<explode-string> "\n\n", <concat> cs', last] => cs'' // add one empty line - - /* Dirty hack: *do* keep the first empty line following a non-empty line. !!! order matters */ - regularise-empty-lines': [] -> [] - - regularise-empty-lines': [x, y | xs] -> [x, y | <regularise-empty-lines'> xs] - where - <fetch-elem(not(?10 <+ ?32))> x; - <not(fetch-elem(not(?10 <+ ?32)))> y - - regularise-empty-lines': [x | xs] -> [x | <regularise-empty-lines'> xs] - where <fetch-elem(not(?10 <+ ?32))> x - - regularise-empty-lines': [x | xs] -> <regularise-empty-lines'> xs - where <not(fetch-elem(not(?10 <+ ?32)))> x - - - prepend-layout: - (text, (appl(prod([cf(layout())], cf(opt(layout())), no-attrs()), cs), attr)) -> - (appl(prod([cf(layout())], cf(opt(layout())), no-attrs()), cs''), attr) - where - <implode-string> cs => cs'; - <conc-strings; explode-string> (<concat-strings> text, cs') => cs'' - - - compare-attrs: - x@ - ( (_, appl(p1@prod(_, _, attrs([term(cons("Bind"))])), [id1 | xs1])) - , (_, appl(p2@prod(_, _, attrs([term(cons("Bind"))])), [id2 | xs2])) - ) - -> x - where - <string-lt> (id1, id2) - - -strategies - - main = io-wrap( - oncetd(sort-attrs) - ) diff --git a/nixos/doc/manual/configuration.xml b/nixos/doc/manual/configuration.xml index 98686a19f1e..051f0fb8c1e 100644 --- a/nixos/doc/manual/configuration.xml +++ b/nixos/doc/manual/configuration.xml @@ -1036,21 +1036,22 @@ users.extraUsers.alice = { createHome = true; home = "/home/alice"; description = "Alice Foobar"; - extraGroups = [ "wheel" ]; + extraGroups = [ "wheel" "networkmanager" ]; useDefaultShell = true; openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; }; </programlisting> Note that <literal>alice</literal> is a member of the -<literal>wheel</literal> group, which allows her to use -<command>sudo</command> to execute commands as -<literal>root</literal>. Also note the SSH public key that allows -remote logins with the corresponding private key. Users created in -this way do not have a password by default, so they cannot log in via -mechanisms that require a password. However, you can use the -<command>passwd</command> program to set a password, which is retained -across invocations of <command>nixos-rebuild</command>.</para> +<literal>wheel</literal> and <literal>networkmanager</literal> groups, +which allows her to use <command>sudo</command> to execute commands as +<literal>root</literal> and to configure the network, respectively. +Also note the SSH public key that allows remote logins with the +corresponding private key. Users created in this way do not have a +password by default, so they cannot log in via mechanisms that require +a password. However, you can use the <command>passwd</command> program +to set a password, which is retained across invocations of +<command>nixos-rebuild</command>.</para> <para>A user ID (uid) is assigned automatically. You can also specify a uid manually by adding @@ -1277,6 +1278,28 @@ services.xserver.synaptics.twoFingerScroll = true; <section xml:id="sec-networking"><title>Networking</title> +<section xml:id="sec-networkmanager"><title>NetworkManager</title> + +<para>To facilitate network configuration, some desktop environments +use NetworkManager. You can enable NetworkManager by setting: + +<programlisting> +services.networkmanager.enable = true; +</programlisting> + +Some desktop managers (e.g., GNOME) enable NetworkManager +automatically for you.</para> + +<para>All users that should have permission to change network settings +must belong to the <code>networkmanager</code> group.</para> + +<note><para><code>services.networkmanager</code> and +<code>services.wireless</code> can not be enabled at the same time: +you can still connect to the wireless networks using +NetworkManager.</para></note> + +</section> + <section xml:id="sec-ssh"><title>Secure shell access</title> <para>Secure shell (SSH) access to your machine can be enabled by @@ -1399,6 +1422,11 @@ always allowed.)</para> <section xml:id="sec-wireless"><title>Wireless networks</title> +<para>For a desktop installation using NetworkManager (e.g., GNOME), +you just have to make sure the user is in the +<code>networkmanager</code> group and you can skip the rest of this +section on wireless networks.</para> + <para> NixOS will start wpa_supplicant for you if you enable this setting: diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 063b9bf6c7a..0e23fc5d187 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -117,7 +117,7 @@ rec { report = releaseTools.gcovReport { coverageRuns = [ test ]; }; - in (if makeCoverageReport then report else test) // { inherit driver test; }; + in (if makeCoverageReport then report else test) // { inherit nodes driver test; }; runInMachine = diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 28c42d64f6f..d43fa220381 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -179,7 +179,6 @@ in fileSystems."/" = { fsType = "tmpfs"; - device = "none"; options = "mode=0755"; }; @@ -192,6 +191,8 @@ in noCheck = true; }; + # In stage 1, mount a tmpfs on top of /nix/store (the squashfs + # image) to make this a live CD. fileSystems."/nix/.ro-store" = { fsType = "squashfs"; device = "/iso/nix-store.squashfs"; @@ -201,23 +202,20 @@ in fileSystems."/nix/.rw-store" = { fsType = "tmpfs"; - device = "none"; options = "mode=0755"; neededForBoot = true; }; + fileSystems."/nix/store" = + { fsType = "unionfs-fuse"; + device = "unionfs"; + options = "allow_other,cow,nonempty,chroot=/mnt-root,max_files=32768,hide_meta_files,dirs=/nix/.rw-store=rw:/nix/.ro-store=ro"; + }; + boot.initrd.availableKernelModules = [ "squashfs" "iso9660" ]; boot.initrd.kernelModules = [ "loop" ]; - # In stage 1, mount a tmpfs on top of /nix/store (the squashfs - # image) to make this a live CD. - boot.initrd.postMountCommands = - '' - mkdir -p $targetRoot/nix/store - unionfs -o allow_other,cow,nonempty,chroot=$targetRoot,max_files=32768 /nix/.rw-store=RW:/nix/.ro-store=RO $targetRoot/nix/store - ''; - # Closures to be copied to the Nix store on the CD, namely the init # script and the top-level system configuration directory. isoImage.storeContents = @@ -313,8 +311,8 @@ in ''; # Add vfat support to the initrd to enable people to copy the - # contents of the CD to a bootable USB stick. Need unionfs-fuse for union mounts - boot.initrd.supportedFilesystems = [ "vfat" "unionfs-fuse" ]; + # contents of the CD to a bootable USB stick. + boot.initrd.supportedFilesystems = [ "vfat" ]; }; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index a71f5152bd1..4ba81dadb31 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -137,6 +137,7 @@ gitolite = 127; znc = 128; polipo = 129; + mopidy = 130; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -248,6 +249,8 @@ firebird = 127; znc = 128; polipo = 129; + mopidy = 130; + docker = 131; # When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399! diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 68971551d89..2cbda50ba29 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -79,6 +79,7 @@ ./services/audio/alsa.nix ./services/audio/fuppes.nix ./services/audio/mpd.nix + ./services/audio/mopidy.nix ./services/backup/almir.nix ./services/backup/bacula.nix ./services/backup/mysql-backup.nix @@ -296,6 +297,7 @@ ./services/x11/xserver.nix ./system/activation/activation-script.nix ./system/activation/top-level.nix + ./system/boot/emergency-mode.nix ./system/boot/kernel.nix ./system/boot/kexec.nix ./system/boot/loader/efi.nix @@ -311,15 +313,17 @@ ./system/boot/stage-1.nix ./system/boot/stage-2.nix ./system/boot/systemd.nix + ./system/boot/tmp.nix ./system/etc/etc.nix ./system/upstart/upstart.nix ./tasks/cpu-freq.nix ./tasks/encrypted-devices.nix + ./tasks/filesystems.nix ./tasks/filesystems/btrfs.nix + ./tasks/filesystems/cifs.nix ./tasks/filesystems/ext.nix ./tasks/filesystems/f2fs.nix ./tasks/filesystems/nfs.nix - ./tasks/filesystems.nix ./tasks/filesystems/reiserfs.nix ./tasks/filesystems/unionfs-fuse.nix ./tasks/filesystems/vfat.nix @@ -334,6 +338,7 @@ ./testing/service-runner.nix ./virtualisation/container-config.nix ./virtualisation/containers.nix + ./virtualisation/docker.nix ./virtualisation/libvirtd.nix #./virtualisation/nova.nix ./virtualisation/virtualbox-guest.nix diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index 562419b3fac..6f9e3002f29 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -7,7 +7,6 @@ # Include some utilities that are useful for installing or repairing # the system. environment.systemPackages = [ - pkgs.subversion # for nixos-checkout pkgs.w3m # needed for the manual anyway pkgs.testdisk # useful for repairing boot problems pkgs.mssys # for writing Microsoft boot sectors / MBRs diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix index dd4b0c529e5..8e653cd4284 100644 --- a/nixos/modules/security/ca.nix +++ b/nixos/modules/security/ca.nix @@ -13,8 +13,9 @@ with lib; ]; environment.sessionVariables = - { OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; - CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; + { SSL_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; + # FIXME: unneeded - remove eventually. + OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; GIT_SSL_CAINFO = "/etc/ssl/certs/ca-bundle.crt"; }; diff --git a/nixos/modules/services/audio/mopidy.nix b/nixos/modules/services/audio/mopidy.nix new file mode 100644 index 00000000000..df3837d47f2 --- /dev/null +++ b/nixos/modules/services/audio/mopidy.nix @@ -0,0 +1,107 @@ +{ config, lib, pkgs, ... }: + +with pkgs; +with lib; + +let + + uid = config.ids.uids.mopidy; + gid = config.ids.gids.mopidy; + cfg = config.services.mopidy; + + mopidyConf = writeText "mopidy.conf" cfg.configuration; + + mopidyLauncher = stdenv.mkDerivation { + name = "mopidy-launcher"; + phases = [ "installPhase" ]; + buildInputs = [ makeWrapper python ]; + installPhase = '' + mkdir -p $out/bin + ln -s ${mopidy}/bin/mopidy $out/bin/mopidy + wrapProgram $out/bin/mopidy \ + --prefix PYTHONPATH : \ + "${concatStringsSep ":" (map (p: "$(toPythonPath ${p})") cfg.extensionPackages)}" + ''; + }; + +in { + + options = { + + services.mopidy = { + + enable = mkOption { + default = false; + type = types.bool; + description = '' + Whether to enable Mopidy, a music player daemon. + ''; + }; + + dataDir = mkOption { + default = "/var/lib/mopidy"; + type = types.str; + description = '' + The directory where Mopidy stores its state. + ''; + }; + + extensionPackages = mkOption { + default = []; + type = types.listOf types.package; + example = [ mopidy-spotify ]; + description = '' + Mopidy extensions that should be loaded by the service. + ''; + }; + + configuration = mkOption { + type = types.lines; + description = '' + The configuration that Mopidy should use. + ''; + }; + + extraConfigFiles = mkOption { + default = []; + type = types.listOf types.str; + description = '' + Extra config file read by Mopidy when the service starts. + Later files in the list overrides earlier configuration. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + systemd.services.mopidy = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "sound.target" ]; + description = "mopidy music player daemon"; + preStart = "mkdir -p ${cfg.dataDir} && chown -R mopidy:mopidy ${cfg.dataDir}"; + serviceConfig = { + ExecStart = "${mopidyLauncher}/bin/mopidy --config ${concatStringsSep ":" ([mopidyConf] ++ cfg.extraConfigFiles)}"; + User = "mopidy"; + PermissionsStartOnly = true; + }; + }; + + users.extraUsers.mopidy = { + inherit uid; + group = "mopidy"; + extraGroups = [ "audio" ]; + description = "Mopidy daemon user"; + home = "${cfg.dataDir}"; + }; + + users.extraGroups.mopidy.gid = gid; + + }; + +} diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 1ebd3c3643d..c98c0511b56 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -22,14 +22,11 @@ let nixConf = let - # Tricky: if we're using a chroot for builds, then we need - # /bin/sh in the chroot (our own compromise to purity). - # However, since /bin/sh is a symlink to some path in the - # Nix store, which furthermore has runtime dependencies on - # other paths in the store, we need the closure of /bin/sh - # in `build-chroot-dirs' - otherwise any builder that uses - # /bin/sh won't work. - binshDeps = pkgs.writeReferencesToFile config.system.build.binsh; + # If we're using a chroot for builds, then provide /bin/sh in + # the chroot as a bind-mount to bash. This means we also need to + # include the entire closure of bash. + sh = pkgs.stdenv.shell; + binshDeps = pkgs.writeReferencesToFile sh; in pkgs.runCommand "nix.conf" {extraOptions = cfg.extraOptions; } '' extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done) @@ -40,7 +37,7 @@ let build-users-group = nixbld build-max-jobs = ${toString (cfg.maxJobs)} build-use-chroot = ${if cfg.useChroot then "true" else "false"} - build-chroot-dirs = ${toString cfg.chrootDirs} $(echo $extraPaths) + build-chroot-dirs = ${toString cfg.chrootDirs} /bin/sh=${sh} $(echo $extraPaths) binary-caches = ${toString cfg.binaryCaches} trusted-binary-caches = ${toString cfg.trustedBinaryCaches} $extraOptions @@ -253,8 +250,6 @@ in config = { - nix.chrootDirs = [ "/bin" ]; - environment.etc."nix/nix.conf".source = nixConf; # List of machines for distributed Nix builds in the format diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index c99d1e22967..b74ef4370d7 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -122,9 +122,8 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" ]; environment = { ES_HOME = cfg.dataDir; }; - path = [ pkgs.elasticsearch ]; serviceConfig = { - ExecStart = "elasticsearch -Des.path.conf=${configDir} ${toString cfg.extraCmdLineOptions}"; + ExecStart = "${pkgs.elasticsearch}/bin/elasticsearch -Des.path.conf=${configDir} ${toString cfg.extraCmdLineOptions}"; User = "elasticsearch"; PermissionsStartOnly = true; }; diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 729825681b5..78f3cf2b7e4 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -387,7 +387,7 @@ let ''; - enablePHP = any (svc: svc.enablePHP) allSubservices; + enablePHP = mainCfg.enablePHP || any (svc: svc.enablePHP) allSubservices; # Generate the PHP configuration file. Should probably be factored @@ -531,6 +531,12 @@ in ''; }; + enablePHP = mkOption { + type = types.bool; + default = false; + description = "Whether to enable the PHP module."; + }; + phpOptions = mkOption { type = types.lines; default = ""; diff --git a/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix b/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix index b2cd53ae55c..a883bb2b343 100644 --- a/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix +++ b/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix @@ -29,6 +29,14 @@ ${extraWorkersProperties} ''; in { + + options = { + extraWorkersProperties = lib.mkOption { + default = ""; + description = "Additional configuration for the workers.properties file."; + }; + }; + extraModules = [ { name = "jk"; path = "${pkgs.tomcat_connectors}/modules/mod_jk.so"; } ]; diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index 1de3d40165e..c2f464014ae 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -77,6 +77,11 @@ in description = "Whether to enable logging per virtual host."; }; + jdk = mkOption { + default = pkgs.jdk; + description = "Which JDK to use."; + }; + axis2 = { enable = mkOption { @@ -332,13 +337,13 @@ in ''; script = '' - ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${tomcat}/bin/startup.sh' + ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${cfg.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${tomcat}/bin/startup.sh' ''; postStop = '' echo "Stopping tomcat..." - CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c ${tomcat}/bin/shutdown.sh + CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${cfg.jdk} ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c ${tomcat}/bin/shutdown.sh ''; }; diff --git a/nixos/modules/services/x11/desktop-managers/e18.nix b/nixos/modules/services/x11/desktop-managers/e18.nix index cb717eea909..faafd21b07d 100644 --- a/nixos/modules/services/x11/desktop-managers/e18.nix +++ b/nixos/modules/services/x11/desktop-managers/e18.nix @@ -1,6 +1,6 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: -with pkgs.lib; +with lib; let diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix index f2227a34a20..f5b394b6d98 100644 --- a/nixos/modules/services/x11/hardware/synaptics.nix +++ b/nixos/modules/services/x11/hardware/synaptics.nix @@ -41,16 +41,19 @@ in { }; accelFactor = mkOption { + type = types.nullOr types.string; default = "0.001"; description = "Cursor acceleration (how fast speed increases from minSpeed to maxSpeed)."; }; minSpeed = mkOption { + type = types.nullOr types.string; default = "0.6"; description = "Cursor speed factor for precision finger motion."; }; maxSpeed = mkOption { + type = types.nullOr types.string; default = "1.0"; description = "Cursor speed factor for highest-speed finger motion."; }; @@ -120,9 +123,9 @@ in { MatchIsTouchpad "on" ${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''} Driver "synaptics" - Option "MinSpeed" "${cfg.minSpeed}" - Option "MaxSpeed" "${cfg.maxSpeed}" - Option "AccelFactor" "${cfg.accelFactor}" + ${optionalString (cfg.minSpeed != null) ''Option "MinSpeed" "${cfg.minSpeed}"''} + ${optionalString (cfg.maxSpeed != null) ''Option "MaxSpeed" "${cfg.maxSpeed}"''} + ${optionalString (cfg.accelFactor != null) ''Option "AccelFactor" "${cfg.accelFactor}"''} ${optionalString cfg.tapButtons tapConfig} Option "ClickFinger1" "${builtins.elemAt cfg.buttonsMap 0}" Option "ClickFinger2" "${builtins.elemAt cfg.buttonsMap 1}" diff --git a/nixos/modules/system/boot/emergency-mode.nix b/nixos/modules/system/boot/emergency-mode.nix new file mode 100644 index 00000000000..9cdab841619 --- /dev/null +++ b/nixos/modules/system/boot/emergency-mode.nix @@ -0,0 +1,37 @@ +{ config, lib, ... }: + +with lib; + +{ + + ###### interface + + options = { + + systemd.enableEmergencyMode = mkOption { + default = true; + type = types.bool; + description = '' + Whether to enable emergency mode, which is an + <command>sulogin</command> shell started on the console if + mounting a filesystem fails. Since some machines (like EC2 + instances) have no console of any kind, emergency mode doesn't + make sense, and it's better to continue with the boot insofar + as possible. + ''; + }; + + }; + + ###### implementation + + config = { + + systemd.additionalUpstreamSystemUnits = optionals + config.systemd.enableEmergencyMode [ + "emergency.target" "emergency.service" + ]; + + }; + +} \ No newline at end of file diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix index 7b214cd1e1f..652eb046f50 100644 --- a/nixos/modules/system/boot/modprobe.nix +++ b/nixos/modules/system/boot/modprobe.nix @@ -68,20 +68,15 @@ with lib; config = mkIf (!config.boot.isContainer) { - environment.etc = [ - { source = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; - target = "modprobe.d/ubuntu.conf"; - } - { source = pkgs.writeText "modprobe.conf" - '' - ${flip concatMapStrings config.boot.blacklistedKernelModules (name: '' - blacklist ${name} - '')} - ${config.boot.extraModprobeConfig} - ''; - target = "modprobe.d/nixos.conf"; - } - ]; + environment.etc."modprobe.d/ubuntu.conf".source = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; + + environment.etc."modprobe.d/nixos.conf".text = + '' + ${flip concatMapStrings config.boot.blacklistedKernelModules (name: '' + blacklist ${name} + '')} + ${config.boot.extraModprobeConfig} + ''; environment.systemPackages = [ config.system.sbin.modprobe pkgs.kmod ]; diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 7adb932aba7..1b51c11e351 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -4,7 +4,8 @@ targetRoot=/mnt-root console=tty1 export LD_LIBRARY_PATH=@extraUtils@/lib -export PATH=@extraUtils@/bin:@extraUtils@/sbin +export PATH=@extraUtils@/bin +ln -s @extraUtils@/bin /bin fail() { @@ -262,6 +263,13 @@ mountFS() { checkFS "$device" "$fsType" + # Create backing directories for unionfs-fuse. + if [ "$fsType" = unionfs-fuse ]; then + for i in $(IFS=:; echo ${options##*,dirs=}); do + mkdir -m 0700 -p /mnt-root"${i%=*}" + done + fi + echo "mounting $device on $mountPoint..." mkdir -p "/mnt-root$mountPoint" || true diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index f894f5bfbc1..6a069c5d054 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -23,22 +23,6 @@ let }; - needsCifsUtils = kernelPackages.kernel ? features - && kernelPackages.kernel.features ? needsCifsUtils - && kernelPackages.kernel.features.needsCifsUtils - && any (fs: fs.fsType == "cifs") fileSystems; - - busybox = - if needsCifsUtils - then pkgs.busybox.override { - extraConfig = '' - CONFIG_FEATURE_MOUNT_CIFS n - CONFIG_FEATURE_MOUNT_HELPERS y - ''; - } - else pkgs.busybox; - - # Some additional utilities needed in stage 1, like mount, lvm, fsck # etc. We don't want to bring in all of those packages, so we just # copy what we need. Instead of using statically linked binaries, @@ -51,6 +35,7 @@ let } '' mkdir -p $out/bin $out/lib + ln -s $out/bin $out/sbin # Copy what we need from Glibc. cp -pv ${pkgs.glibc}/lib/ld*.so.? $out/lib @@ -62,11 +47,10 @@ let cp -pv ${pkgs.gcc.gcc}/lib*/libgcc_s.so.* $out/lib # Copy BusyBox. - cp -rvd ${busybox}/{bin,sbin} $out/ - chmod -R u+w $out + cp -pvd ${pkgs.busybox}/bin/* ${pkgs.busybox}/sbin/* $out/bin/ # Copy some utillinux stuff. - cp -v ${pkgs.utillinux}/sbin/blkid $out/bin + cp -vf ${pkgs.utillinux}/sbin/blkid $out/bin cp -pdv ${pkgs.utillinux}/lib/libblkid*.so.* $out/lib cp -pdv ${pkgs.utillinux}/lib/libuuid*.so.* $out/lib @@ -89,12 +73,7 @@ let # Copy modprobe. cp -v ${pkgs.kmod}/bin/kmod $out/bin/ - ln -s kmod $out/bin/modprobe - - # Maybe copy cifs utils - ${optionalString needsCifsUtils '' - cp -v ${pkgs.cifs_utils}/sbin/mount.cifs $out/bin - ''} + ln -sf kmod $out/bin/modprobe ${config.boot.initrd.extraUtilsCommands} @@ -313,6 +292,13 @@ in example = "xz"; }; + boot.initrd.supportedFilesystems = mkOption { + default = [ ]; + example = [ "btrfs" ]; + type = types.listOf types.string; + description = "Names of supported filesystem types in the initial ramdisk."; + }; + fileSystems = mkOption { options.neededForBoot = mkOption { default = false; @@ -347,5 +333,7 @@ in # Prevent systemd from waiting for the /dev/root symlink. systemd.units."dev-root.device".text = ""; + boot.initrd.supportedFilesystems = map (fs: fs.fsType) fileSystems; + }; } diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index eff2fb583ba..bfc3c9b5da3 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -29,7 +29,7 @@ setPath "@path@" # Normally, stage 1 mounts the root filesystem read/writable. # However, in some environments, stage 2 is executed directly, and the # root is read-only. So make it writable here. -mount -n -o remount,rw / +mount -n -o remount,rw none / # Likewise, stage 1 mounts /proc, /dev and /sys, so if we don't have a @@ -98,12 +98,6 @@ mkdir -m 0755 -p /etc/nixos rm -rf /var/run /var/lock rm -f /etc/{group,passwd,shadow}.lock -if test -n "@cleanTmpDir@"; then - echo -n "cleaning \`/tmp'..." - find /tmp -maxdepth 1 -mindepth 1 -print0 | xargs -0r rm -rf --one-file-system - echo " done" -fi - # Also get rid of temporary GC roots. rm -rf /nix/var/nix/gcroots/tmp /nix/var/nix/temproots diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix index f53c3b8b8e7..6155bb37cc5 100644 --- a/nixos/modules/system/boot/stage-2.nix +++ b/nixos/modules/system/boot/stage-2.nix @@ -17,7 +17,7 @@ let src = ./stage-2-init.sh; shellDebug = "${pkgs.bashInteractive}/bin/bash"; isExecutable = true; - inherit (config.boot) devShmSize runSize cleanTmpDir; + inherit (config.boot) devShmSize runSize; inherit (config.nix) readOnlyStore; inherit (config.networking) useHostResolvConf; ttyGid = config.ids.gids.tty; @@ -26,8 +26,7 @@ let pkgs.utillinux pkgs.sysvtools pkgs.openresolv - ] ++ (optional config.boot.cleanTmpDir pkgs.findutils) - ++ optional config.nix.readOnlyStore readonlyMountpoint; + ] ++ optional config.nix.readOnlyStore readonlyMountpoint; postBootCommands = pkgs.writeText "local-cmds" '' ${config.boot.postBootCommands} @@ -81,15 +80,6 @@ in ''; }; - # FIXME: should replace this with something that uses systemd-tmpfiles. - cleanTmpDir = mkOption { - type = types.bool; - default = false; - description = '' - Whether to delete all files in <filename>/tmp</filename> during boot. - ''; - }; - }; }; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 14caa5d360d..455c40693b0 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -162,10 +162,7 @@ let "systemd-sysctl.service" ] - ++ optionals cfg.enableEmergencyMode [ - "emergency.target" - "emergency.service" - ]; + ++ cfg.additionalUpstreamSystemUnits; upstreamSystemWants = [ #"basic.target.wants" @@ -317,7 +314,9 @@ let '' [Service] ${let env = cfg.globalEnvironment // def.environment; - in concatMapStrings (n: "Environment=\"${n}=${getAttr n env}\"\n") (attrNames env)} + in concatMapStrings (n: + let s = "Environment=\"${n}=${getAttr n env}\"\n"; + in if stringLength s >= 2048 then throw "The value of the environment variable ‘${n}’ in systemd service ‘${name}.service’ is too long." else s) (attrNames env)} ${if def.reloadIfChanged then '' X-ReloadIfChanged=true '' else if !def.restartIfChanged then '' @@ -635,19 +634,6 @@ in ''; }; - systemd.enableEmergencyMode = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable emergency mode, which is an - <command>sulogin</command> shell started on the console if - mounting a filesystem fails. Since some machines (like EC2 - instances) have no console of any kind, emergency mode doesn't - make sense, and it's better to continue with the boot insofar - as possible. - ''; - }; - systemd.tmpfiles.rules = mkOption { type = types.listOf types.str; default = []; @@ -690,6 +676,15 @@ in description = "Definition of systemd per-user socket units."; }; + systemd.additionalUpstreamSystemUnits = mkOption { + default = [ ]; + type = types.listOf types.str; + example = [ "debug-shell.service" "systemd-quotacheck.service" ]; + description = '' + Additional units shipped with systemd that shall be enabled. + ''; + }; + }; diff --git a/nixos/modules/system/boot/tmp.nix b/nixos/modules/system/boot/tmp.nix new file mode 100644 index 00000000000..5bf5e2eb2ec --- /dev/null +++ b/nixos/modules/system/boot/tmp.nix @@ -0,0 +1,39 @@ +{ config, lib, ... }: + +with lib; + +{ + + ###### interface + + options = { + + boot.cleanTmpDir = mkOption { + type = types.bool; + default = false; + description = '' + Whether to delete all files in <filename>/tmp</filename> during boot. + ''; + }; + + boot.tmpOnTmpfs = mkOption { + type = types.bool; + default = false; + description = '' + Whether to mount a tmpfs on <filename>/tmp</filename> during boot. + ''; + }; + + }; + + ###### implementation + + config = { + + systemd.additionalUpstreamSystemUnits = optional config.boot.tmpOnTmpfs "tmp.mount"; + + systemd.tmpfiles.rules = optional config.boot.cleanTmpDir "D! /tmp 1777 root root"; + + }; + +} \ No newline at end of file diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index d350bc1b5d0..64a20034f3c 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -9,7 +9,7 @@ let prioOption = prio: optionalString (prio !=null) " pri=${toString prio}"; - fileSystemOpts = { name, ... }: { + fileSystemOpts = { name, config, ... }: { options = { @@ -68,6 +68,7 @@ let config = { mountPoint = mkDefault name; + device = mkIf (config.fsType == "tmpfs") (mkDefault config.fsType); }; }; @@ -124,13 +125,6 @@ in description = "Names of supported filesystem types."; }; - boot.initrd.supportedFilesystems = mkOption { - default = [ ]; - example = [ "btrfs" ]; - type = types.listOf types.string; - description = "Names of supported filesystem types in the initial ramdisk."; - }; - }; @@ -140,15 +134,11 @@ in boot.supportedFilesystems = map (fs: fs.fsType) fileSystems; - boot.initrd.supportedFilesystems = - map (fs: fs.fsType) - (filter (fs: fs.mountPoint == "/" || fs.neededForBoot) fileSystems); - # Add the mount helpers to the system path so that `mount' can find them. system.fsPackages = [ pkgs.dosfstools ]; environment.systemPackages = - [ pkgs.ntfs3g pkgs.cifs_utils pkgs.fuse ] + [ pkgs.ntfs3g pkgs.fuse ] ++ config.system.fsPackages; environment.etc.fstab.text = @@ -157,7 +147,9 @@ in # Filesystems. ${flip concatMapStrings fileSystems (fs: - (if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") + (if fs.device != null then fs.device + else if fs.label != null then "/dev/disk/by-label/${fs.label}" + else throw "No device specified for mount point ‘${fs.mountPoint}’.") + " " + fs.mountPoint + " " + fs.fsType + " " + fs.options diff --git a/nixos/modules/tasks/filesystems/cifs.nix b/nixos/modules/tasks/filesystems/cifs.nix new file mode 100644 index 00000000000..c60f175db84 --- /dev/null +++ b/nixos/modules/tasks/filesystems/cifs.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + inInitrd = any (fs: fs == "cifs") config.boot.initrd.supportedFilesystems; + +in + +{ + config = { + + system.fsPackages = [ pkgs.cifs_utils ]; + + boot.initrd.availableKernelModules = mkIf inInitrd + [ "cifs" "nls_utf8" "hmac" "md4" "ecb" "des_generic" "sha256" ]; + + boot.initrd.extraUtilsCommands = mkIf inInitrd + '' + cp -v ${pkgs.cifs_utils}/sbin/mount.cifs $out/bin + ''; + + }; +} diff --git a/nixos/modules/tasks/filesystems/unionfs-fuse.nix b/nixos/modules/tasks/filesystems/unionfs-fuse.nix index 5b777718056..fe195e0db0b 100644 --- a/nixos/modules/tasks/filesystems/unionfs-fuse.nix +++ b/nixos/modules/tasks/filesystems/unionfs-fuse.nix @@ -2,14 +2,21 @@ { config = lib.mkMerge [ + (lib.mkIf (lib.any (fs: fs == "unionfs-fuse") config.boot.initrd.supportedFilesystems) { boot.initrd.kernelModules = [ "fuse" ]; - + boot.initrd.extraUtilsCommands = '' cp -v ${pkgs.fuse}/lib/libfuse* $out/lib + cp -v ${pkgs.fuse}/sbin/mount.fuse $out/bin cp -v ${pkgs.unionfs-fuse}/bin/unionfs $out/bin + substitute ${pkgs.unionfs-fuse}/sbin/mount.unionfs-fuse $out/bin/mount.unionfs-fuse \ + --replace '${pkgs.bash}/bin/bash' /bin/sh \ + --replace '${pkgs.fuse}/sbin' /bin \ + --replace '${pkgs.unionfs-fuse}/bin' /bin + chmod +x $out/bin/mount.unionfs-fuse ''; - + boot.initrd.postDeviceCommands = '' # Hacky!!! fuse hard-codes the path to mount mkdir -p /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin @@ -17,8 +24,10 @@ ln -s $(which umount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin ''; }) + (lib.mkIf (lib.any (fs: fs == "unionfs-fuse") config.boot.supportedFilesystems) { system.fsPackages = [ pkgs.unionfs-fuse ]; }) + ]; } diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix index 4be2c3eb4c4..d1c6f8ac156 100644 --- a/nixos/modules/tasks/trackpoint.nix +++ b/nixos/modules/tasks/trackpoint.nix @@ -46,21 +46,15 @@ with lib; config = mkIf config.hardware.trackpoint.enable { - jobs.trackpoint = - { description = "Initialize trackpoint"; - - startOn = "started udev"; - - task = true; - - script = '' - echo -n ${toString config.hardware.trackpoint.sensitivity} \ - > /sys/devices/platform/i8042/serio1/sensitivity - echo -n ${toString config.hardware.trackpoint.speed} \ - > /sys/devices/platform/i8042/serio1/speed - ''; - }; - + services.udev.extraRules = + '' + ACTION=="add|change", SUBSYSTEM=="input", ATTR{name}=="TPPS/2 IBM TrackPoint", ATTR{device/speed}="${toString config.hardware.trackpoint.speed}", ATTR{device/sensitivity}="${toString config.hardware.trackpoint.sensitivity}" + ''; + + system.activationScripts.trackpoint = + '' + ${config.systemd.package}/bin/udevadm trigger --attr-match=name="TPPS/2 IBM TrackPoint" + ''; }; } diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 7d6109f212a..e129e496fe3 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -172,7 +172,7 @@ in boot.initrd.extraUtilsCommands = '' # We need swapon in the initrd. - cp ${pkgs.utillinux}/sbin/swapon $out/bin + cp --remove-destination ${pkgs.utillinux}/sbin/swapon $out/bin ''; # Don't put old configurations in the GRUB menu. The user has no diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix new file mode 100644 index 00000000000..a0aa6135326 --- /dev/null +++ b/nixos/modules/virtualisation/docker.nix @@ -0,0 +1,109 @@ +# Systemd services for docker. + +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.virtualisation.docker; + +in + +{ + ###### interface + + options.virtualisation.docker = { + enable = + mkOption { + type = types.bool; + default = false; + description = + '' + This option enables docker, a daemon that manages + linux containers. Users in the "docker" group can interact with + the daemon (e.g. to start or stop containers) using the + <command>docker</command> command line tool. + ''; + }; + socketActivation = + mkOption { + type = types.bool; + default = false; + description = + '' + This option enables docker with socket activation. I.e. docker will + start when first called by client. + + Note: This is false by default because systemd lower than 214 that + nixos uses so far, doesn't support SocketGroup option, so socket + created by docker has root group now. This will likely be changed + in future. So set this option explicitly to false if you wish. + ''; + }; + extraOptions = + mkOption { + type = types.str; + default = ""; + description = + '' + The extra command-line options to pass to + <command>docker</command> daemon. + ''; + }; + + + }; + + ###### implementation + + config = mkIf cfg.enable (mkMerge [ + { environment.systemPackages = [ pkgs.docker ]; + } + (mkIf cfg.socketActivation { + + systemd.services.docker = { + description = "Docker Application Container Engine"; + after = [ "network.target" "docker.socket" ]; + requires = [ "docker.socket" ]; + serviceConfig = { + ExecStart = "${pkgs.docker}/bin/docker --daemon=true --host=fd:// --group=docker ${cfg.extraOptions}"; + # I'm not sure if that limits aren't too high, but it's what + # goes in config bundled with docker itself + LimitNOFILE = 1048576; + LimitNPROC = 1048576; + }; + }; + + systemd.sockets.docker = { + description = "Docker Socket for the API"; + wantedBy = [ "sockets.target" ]; + socketConfig = { + ListenStream = "/var/run/docker.sock"; + SocketMode = "0660"; + SocketUser = "root"; + SocketGroup = "docker"; + }; + }; + }) + (mkIf (!cfg.socketActivation) { + + systemd.services.docker = { + description = "Docker Application Container Engine"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + ExecStart = "${pkgs.docker}/bin/docker --daemon=true --group=docker ${cfg.extraOptions}"; + # I'm not sure if that limits aren't too high, but it's what + # goes in config bundled with docker itself + LimitNOFILE = 1048576; + LimitNPROC = 1048576; + }; + + # Presumably some containers are running we don't want to interrupt + restartIfChanged = false; + }; + }) + ]); + +} diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 9a4d11d550a..697423ac60b 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -121,19 +121,6 @@ in networking.usePredictableInterfaceNames = false; - systemd.services.wait-metadata-online = { - description = "Wait for GCE metadata server to become reachable"; - wantedBy = [ "network-online.target" ]; - before = [ "network-online.target" ]; - path = [ pkgs.netcat ]; - script = '' - # wait for the metadata server to become available for up to 60 seconds - for counter in {1..30}; do sleep 2 && nc -vzw 2 metadata 80 && break; done - ''; - serviceConfig.Type = "oneshot"; - serviceConfig.RemainAfterExit = true; - }; - systemd.services.fetch-ssh-keys = { description = "Fetch host keys and authorized_keys for root user"; @@ -142,14 +129,15 @@ in after = [ "network-online.target" ]; wants = [ "network-online.target" ]; - path = [ pkgs.curl ]; + path = [ pkgs.wget ]; script = '' + wget="wget --retry-connrefused -t 6 --waitretry=10" # Don't download the SSH key if it has already been downloaded if ! [ -e /root/.ssh/authorized_keys ]; then echo "obtaining SSH key..." mkdir -p /root/.ssh - curl -o /root/authorized-keys-metadata http://metadata/0.1/meta-data/authorized-keys + $wget -O /root/authorized-keys-metadata http://metadata/0.1/meta-data/authorized-keys if [ $? -eq 0 -a -e /root/authorized-keys-metadata ]; then cat /root/authorized-keys-metadata | cut -d: -f2- > /root/key.pub if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then @@ -162,7 +150,7 @@ in fi echo "obtaining SSH private host key..." - curl -o /root/ssh_host_ecdsa_key --retry-max-time 60 http://metadata/0.1/meta-data/attributes/ssh_host_ecdsa_key + $wget -O /root/ssh_host_ecdsa_key http://metadata/0.1/meta-data/attributes/ssh_host_ecdsa_key if [ $? -eq 0 -a -e /root/ssh_host_ecdsa_key ]; then mv -f /root/ssh_host_ecdsa_key /etc/ssh/ssh_host_ecdsa_key echo "downloaded ssh_host_ecdsa_key" @@ -170,7 +158,7 @@ in fi echo "obtaining SSH public host key..." - curl -o /root/ssh_host_ecdsa_key.pub --retry-max-time 60 http://metadata/0.1/meta-data/attributes/ssh_host_ecdsa_key_pub + $wget -O /root/ssh_host_ecdsa_key.pub http://metadata/0.1/meta-data/attributes/ssh_host_ecdsa_key_pub if [ $? -eq 0 -a -e /root/ssh_host_ecdsa_key.pub ]; then mv -f /root/ssh_host_ecdsa_key.pub /etc/ssh/ssh_host_ecdsa_key.pub echo "downloaded ssh_host_ecdsa_key.pub" @@ -179,7 +167,7 @@ in ''; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; + serviceConfig.StandardError = "journal+console"; + serviceConfig.StandardOutput = "journal+console"; }; - - } diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 16c3836887c..58386ce5cf5 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -275,12 +275,10 @@ in boot.loader.grub.device = mkVMOverride "/dev/vda"; - boot.initrd.supportedFilesystems = optional cfg.writableStore "unionfs-fuse"; - boot.initrd.extraUtilsCommands = '' # We need mke2fs in the initrd. - cp ${pkgs.e2fsprogs}/sbin/mke2fs $out/bin + cp -f ${pkgs.e2fsprogs}/sbin/mke2fs $out/bin ''; boot.initrd.postDeviceCommands = @@ -303,20 +301,6 @@ in chmod 1777 $targetRoot/tmp mkdir -p $targetRoot/boot - ${optionalString cfg.writableStore '' - mkdir -p /unionfs-chroot/ro-store - mount --rbind $targetRoot/nix/store /unionfs-chroot/ro-store - - mkdir /unionfs-chroot/rw-store - ${if cfg.writableStoreUseTmpfs then '' - mount -t tmpfs -o "mode=755" none /unionfs-chroot/rw-store - '' else '' - mkdir $targetRoot/.nix-rw-store - mount --bind $targetRoot/.nix-rw-store /unionfs-chroot/rw-store - ''} - - unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot,max_files=32768,hide_meta_files /rw-store=RW:/ro-store=RO $targetRoot/nix/store - ''} ''; # After booting, register the closure of the paths in @@ -343,12 +327,13 @@ in # configuration, where the regular value for the `fileSystems' # attribute should be disregarded for the purpose of building a VM # test image (since those filesystems don't exist in the VM). - fileSystems = mkVMOverride + fileSystems = mkVMOverride ( { "/".device = "/dev/vda"; - "/nix/store" = + ${if cfg.writableStore then "/nix/.ro-store" else "/nix/store"} = { device = "store"; fsType = "9p"; options = "trans=virtio,version=9p2000.L,msize=1048576,cache=loose"; + neededForBoot = true; }; "/tmp/xchg" = { device = "xchg"; @@ -362,6 +347,18 @@ in options = "trans=virtio,version=9p2000.L,msize=1048576"; neededForBoot = true; }; + } // optionalAttrs cfg.writableStore + { "/nix/store" = + { fsType = "unionfs-fuse"; + device = "unionfs"; + options = "allow_other,cow,nonempty,chroot=/mnt-root,max_files=32768,hide_meta_files,dirs=/nix/.rw-store=rw:/nix/.ro-store=ro"; + }; + } // optionalAttrs (cfg.writableStore && cfg.writableStoreUseTmpfs) + { "/nix/.rw-store" = + { fsType = "tmpfs"; + options = "mode=0755"; + neededForBoot = true; + }; } // optionalAttrs cfg.useBootLoader { "/boot" = { device = "/dev/disk/by-label/boot"; @@ -369,7 +366,7 @@ in options = "ro"; noCheck = true; # fsck fails on a r/o filesystem }; - }; + }); swapDevices = mkVMOverride [ ]; boot.initrd.luks.devices = mkVMOverride []; diff --git a/nixos/tests/containers.nix b/nixos/tests/containers.nix index f7dc8eb491d..a582e23fda0 100644 --- a/nixos/tests/containers.nix +++ b/nixos/tests/containers.nix @@ -35,7 +35,7 @@ import ./make-test.nix { # multi-user.target, we should now be able to access it. my $ip = $machine->succeed("nixos-container show-ip webserver"); chomp $ip; - $machine->succeed("ping -c1 $ip"); + #$machine->succeed("ping -c1 $ip"); # FIXME $machine->succeed("curl --fail http://$ip/ > /dev/null"); # Stop the container. diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index c03db6c4335..e1830d95b41 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -12,8 +12,7 @@ import ./make-test.nix { services.nixosManual.enable = mkOverride 0 true; systemd.tmpfiles.rules = [ "d /tmp 1777 root root 10d" ]; fileSystems = mkVMOverride { "/tmp2" = - { device = "none"; - fsType = "tmpfs"; + { fsType = "tmpfs"; options = "mode=1777,noauto"; }; }; diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index 031b0fe93b5..1978fcf1874 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -61,7 +61,7 @@ in meta = { homepage = "http://lly.org/~rcw/abcde/page/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Command-line audio CD ripper"; longDescription = '' diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index afc2e49fc8a..62b88cbe077 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -47,6 +47,21 @@ stdenv.mkDerivation rec { mkdir -pv $out/gtk2/engines cp build/libs/clearlooks-newer/libclearlooks.so $out/gtk2/engines/ wrapProgram $out/bin/ardour3 --prefix GTK_PATH : $out/gtk2 + + # Install desktop file + mkdir -p "$out/share/applications" + cat > "$out/share/applications/ardour.desktop" << EOF + [Desktop Entry] + Name=Ardour 3 + GenericName=Digital Audio Workstation + Comment=Multitrack harddisk recorder + Exec=$out/bin/ardour3 + Icon=$out/share/ardour3/icons/ardour_icon_256px.png + Terminal=false + Type=Application + X-MultipleArgs=false + Categories=GTK;Audio;AudioVideoEditing;AudioVideo;Video; + EOF ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 890497b0c99..7308d84e098 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { description = "Sound editor with graphical UI"; homepage = http://audacity.sourceforge.net; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; diff --git a/pkgs/applications/audio/aumix/default.nix b/pkgs/applications/audio/aumix/default.nix index 1e19a3ac5c3..41edd51e5f2 100644 --- a/pkgs/applications/audio/aumix/default.nix +++ b/pkgs/applications/audio/aumix/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { the command line or a script. ''; homepage = http://www.jpj.net/~trevor/aumix.html; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix index c67830a94e7..1646f944a83 100644 --- a/pkgs/applications/audio/cd-discid/default.nix +++ b/pkgs/applications/audio/cd-discid/default.nix @@ -19,7 +19,7 @@ in meta = { homepage = http://lly.org/~rcw/cd-discid/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "cd-discid, a command-line utility to retrieve a disc's CDDB ID"; longDescription = '' diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 34950d1a343..775cf5ca606 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "drumkv1-${version}"; - version = "0.4.2"; + version = "0.5.0"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "18rvfgblynlmklk25azmppibn1bdjid97hipa323gnzmxgq0rfjq"; + sha256 = "16bjkp22hfpmzj5di98dddzslavgvhw5z7pgjzmjqz9dxvbqwq1k"; }; buildInputs = [ jack2 libsndfile lv2 qt4 ]; diff --git a/pkgs/applications/audio/espeak/default.nix b/pkgs/applications/audio/espeak/default.nix index d47d82497ab..0faf4841c71 100644 --- a/pkgs/applications/audio/espeak/default.nix +++ b/pkgs/applications/audio/espeak/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Compact open source software speech synthesizer"; homepage = http://espeak.sourceforge.net/; - license = "GPLv3+"; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix index 0e59a42614f..524a95bcca0 100644 --- a/pkgs/applications/audio/espeak/edit.nix +++ b/pkgs/applications/audio/espeak/edit.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Phoneme editor for espeak"; homepage = http://espeak.sourceforge.net/; - license = "GPLv3+"; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/gmu/default.nix b/pkgs/applications/audio/gmu/default.nix index e75be3e2c2b..f23ba66a3b5 100644 --- a/pkgs/applications/audio/gmu/default.nix +++ b/pkgs/applications/audio/gmu/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://wejp.k.vu/projects/gmu; description = "Open source music player for portable gaming consoles and handhelds"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index 90e27c12ce3..80a7cf52cd8 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -1,25 +1,43 @@ -{ stdenv, fetchurl, pkgconfig, libgpod, gtk, glib, gettext, perl, perlXMLParser -, libglade, flex, libid3tag, libvorbis, intltool }: +{ stdenv, fetchurl, pkgconfig, makeWrapper, intltool, libgpod, curl, flac, + gnome3_12, gtk3, glib, gettext, perl, perlXMLParser , libglade, flex, libid3tag, + libvorbis, hicolor_icon_theme, gdk_pixbuf }: -stdenv.mkDerivation { - name = "gtkpod-1.0.0"; +let + gnome = gnome3_12; + +in stdenv.mkDerivation rec { + version = "2.1.4"; + name = "gtkpod-${version}"; src = fetchurl { - url = mirror://sourceforge/gtkpod/gtkpod-1.0.0.tar.gz; - sha256 = "04jzybs55c27kyp7r9c58prcq0q4ssvj5iggva857f49s1ar826q"; + url = "mirror://sourceforge/gtkpod/${name}.tar.gz"; + sha256 = "ba12b35f3f24a155b68f0ffdaf4d3c5c7d1b8df04843a53306e1c83fc811dfaa"; }; - buildInputs = [ pkgconfig libgpod gettext perl perlXMLParser gtk libglade flex - libid3tag libvorbis intltool ]; + propagatedUserEnvPkgs = [ gnome.gnome_themes_standard ]; + + buildInputs = [ pkgconfig makeWrapper intltool curl gettext perl perlXMLParser + flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta + gnome.gdl gnome.gnome_icon_theme_symbolic gnome.gnome_icon_theme + hicolor_icon_theme ]; patchPhase = '' sed -i 's/which/type -P/' scripts/*.sh ''; - meta = { + preFixup = '' + wrapProgram "$out/bin/gtkpod" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { description = "GTK Manager for an Apple ipod"; homepage = http://gtkpod.sourceforge.net; - license = "GPLv2+"; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.skeidel ]; }; } diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix index a7835f020d1..b96872c7ef0 100644 --- a/pkgs/applications/audio/id3v2/default.nix +++ b/pkgs/applications/audio/id3v2/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { meta = { description = "A command line editor for id3v2 tags"; homepage = http://id3v2.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix index 8557bc31c44..74d98184d9d 100644 --- a/pkgs/applications/audio/jackmeter/default.nix +++ b/pkgs/applications/audio/jackmeter/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Console jack loudness meter"; homepage = http://www.aelius.com/njh/jackmeter/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix index 4b8ba4dbc24..4b07c84b0be 100644 --- a/pkgs/applications/audio/lingot/default.nix +++ b/pkgs/applications/audio/lingot/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Not a Guitar-Only tuner"; homepage = http://www.nongnu.org/lingot/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix index a86e09278c3..f38ff469731 100644 --- a/pkgs/applications/audio/mikmod/default.nix +++ b/pkgs/applications/audio/mikmod/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "Tracker music player for the terminal"; homepage = http://mikmod.shlomifish.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/audio/mopidy-moped/default.nix b/pkgs/applications/audio/mopidy-moped/default.nix new file mode 100644 index 00000000000..8e3489a9122 --- /dev/null +++ b/pkgs/applications/audio/mopidy-moped/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pythonPackages, mopidy }: + +pythonPackages.buildPythonPackage rec { + name = "mopidy-moped-${version}"; + + version = "0.3.1"; + + src = fetchurl { + url = "https://github.com/martijnboland/moped/archive/v${version}.tar.gz"; + sha256 = "0sjp8vr4yfyjx233gamhg0p67zjnlpc9yq3szbw897igsh23j2yr"; + }; + + propagatedBuildInputs = [ mopidy ]; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/martijnboland/moped; + description = "A web client for Mopidy"; + license = licenses.mit; + maintainers = [ maintainers.rickynils ]; + hydraPlatforms = []; + }; +} diff --git a/pkgs/applications/audio/mopidy-spotify/default.nix b/pkgs/applications/audio/mopidy-spotify/default.nix index 5c78ef6ba14..6223ffb0d81 100644 --- a/pkgs/applications/audio/mopidy-spotify/default.nix +++ b/pkgs/applications/audio/mopidy-spotify/default.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonPackage rec { name = "mopidy-spotify-${version}"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { url = "https://github.com/mopidy/mopidy-spotify/archive/v${version}.tar.gz"; - sha256 = "09s6841qb24nrmlc2izb8vxbgv185ddra6ndskrsw907hfli2kl6"; + sha256 = "1fgxakylsx0nggis11v6bxfy8h3dl1n1v86liyfcj0xazb1mx69m"; }; propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ]; diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 65487bac823..10c7c1751ff 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -5,15 +5,15 @@ pythonPackages.buildPythonPackage rec { name = "mopidy-${version}"; - version = "0.18.3"; + version = "0.19.0"; src = fetchurl { url = "https://github.com/mopidy/mopidy/archive/v${version}.tar.gz"; - sha256 = "0b8ss6qjzj1pawd8469i5310ily3rad0ashfy87vdyj6xdyfyp0q"; + sha256 = "10cnc1bipr0brk7478201cgm71lp5bci3qiaadyxv9hhcn0nmn9b"; }; propagatedBuildInputs = with pythonPackages; [ - gst_python pygobject pykka cherrypy ws4py gst_plugins_base gst_plugins_good + gst_python pygobject pykka tornado gst_plugins_base gst_plugins_good ]; # There are no tests diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix index d5a8138a500..0f33726eaee 100644 --- a/pkgs/applications/audio/mp3info/default.nix +++ b/pkgs/applications/audio/mp3info/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { homepage = http://www.ibiblio.org/mp3info/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index ae6d9e0c7e6..54ae5476efd 100755 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "A minimalist command line interface to MPD"; homepage = http://www.musicpd.org/clients/mpc/; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.algorith ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix index 2f00638961c..cd4343b1beb 100644 --- a/pkgs/applications/audio/mpc123/default.nix +++ b/pkgs/applications/audio/mpc123/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "mpc123, a Musepack (.mpc) audio player"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index ffec1a5736c..e58397350cb 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "mpg321, a command-line MP3 player"; homepage = http://mpg321.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; }; diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 02a27bedb67..ca08624e98f 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { homepage = http://freedesktop.org/software/pulseaudio/pavucontrol/ ; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index c7a40bf85a7..86c68d087b7 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "Doing phonetics by computer"; homepage = http://www.fon.hum.uva.nl/praat/; - license = "GPLv2+"; # Has some 3rd-party code in it though + license = stdenv.lib.licenses.gpl2Plus; # Has some 3rd-party code in it though platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index e589adc0e41..4177dbeeb0c 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -3,12 +3,12 @@ , libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }: stdenv.mkDerivation rec { - version = "0.6.1"; + version = "0.6.2"; name = "qtractor-${version}"; src = fetchurl { url = "mirror://sourceforge/qtractor/${name}.tar.gz"; - sha256 = "09lyz1pn2dadr1ii2msyv3n13kq3mbgpcwcyfm0brm01c2fnh6wc"; + sha256 = "08cr4lgm8bkkmsvfljszcqij3i52n989s7ncrbrn17n61rmgf8yw"; }; buildInputs = diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 7d8d5fc04ab..0cbdfa6973d 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.4.2"; + version = "0.5.0"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "1vr6jbqnsgdq3v2h1ndp4pirnil3119dqwlq0k0kdscmcskvb9j4"; + sha256 = "02mm5y1yzklvs5bpxl86y3dqcg7migfybmin8llk91pws6rl9b41"; }; buildInputs = [ jack2 libsndfile lv2 qt4 ]; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 59bea8fc194..59b82d155da 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -8,14 +8,14 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; let version = if stdenv.system == "i686-linux" then "0.9.4.183.g644e24e.428" - else "0.9.10.17.g4129e1c.78"; + else "0.9.11.27.g2b1a638.81"; qt4webkit = if stdenv.system == "i686-linux" then fetchurl { name = "libqtwebkit4_2.3.2_i386.deb"; url = http://ie.archive.ubuntu.com/ubuntu/pool/main/q/qtwebkit-source/libqtwebkit4_2.3.2-0ubuntu7_i386.deb; - sha256 = "0hi6cwx2b2cwa4nv5phqqw526lc8p9x7kjkcza9x47ny3npw2924"; + sha256 = "0q4abhczx91ma57fjss0gn8j6nkfbfsbsh6kxhykzj88dih2s8rn"; } else fetchurl { @@ -73,7 +73,7 @@ stdenv.mkDerivation { else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}-1_amd64.deb"; - sha256 = "1a4vn2ij3nghnc0fq3nsyb95gwhaw4zabdq6jd52hxz8iv31pn1z"; + sha256 = "0yfljiw01kssj3qaz8m0ppgrpjs6xrhzlr2wccp64bsnmin7g4sg"; } else throw "Spotify not supported on this platform."; @@ -149,7 +149,7 @@ stdenv.mkDerivation { meta = { homepage = https://www.spotify.com/; description = "Spotify for Linux allows you to play music from the Spotify music service"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index 08c13243804..c6c464b9ad7 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "synthv1-${version}"; - version = "0.4.2"; + version = "0.5.0"; src = fetchurl { url = "mirror://sourceforge/synthv1/${name}.tar.gz"; - sha256 = "1r4fszbzwd0yfcch0mcsmh7781zw1317hiljn85w79721fs2m8hc"; + sha256 = "011kjccrdwb62rpck5gb8h4kvvm8rk6n77lj78ykxz4pxip5hf14"; }; buildInputs = [ qt4 jack2 lv2 ]; diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix index 5db7cc30cf8..e4e5b7ff81a 100644 --- a/pkgs/applications/audio/vorbis-tools/default.nix +++ b/pkgs/applications/audio/vorbis-tools/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation { files, notably the `ogg123' player and the `oggenc' encoder. ''; homepage = http://xiph.org/vorbis/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 497ab3ac78d..91142691055 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -6,11 +6,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.2.0"; + version = "1.2.2"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "0p4v39kxxzzfvaazzxarx54i164ghpfxq0ljkavlgr8fnix5v3mx"; + sha256 = "1w23ral1qrbg9gqx833giqmchx7952f18yaa52aya9shsdlla83c"; }; buildInputs = [ diff --git a/pkgs/applications/editors/bvi/default.nix b/pkgs/applications/editors/bvi/default.nix index 84b810bf460..e598fa19c5e 100644 --- a/pkgs/applications/editors/bvi/default.nix +++ b/pkgs/applications/editors/bvi/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { description = "Hex editor with vim style keybindings"; homepage = http://bvi.sourceforge.net/download.html; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index 88b539d29f5..d3e9a4c4679 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { full-screen editors such as GNU Emacs or GNU Moe. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/ed/; diff --git a/pkgs/applications/editors/emacs-modes/auto-complete/default.nix b/pkgs/applications/editors/emacs-modes/auto-complete/default.nix index 75f484d295b..40f172316ef 100644 --- a/pkgs/applications/editors/emacs-modes/auto-complete/default.nix +++ b/pkgs/applications/editors/emacs-modes/auto-complete/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Auto-complete extension for Emacs"; homepage = http://cx4a.org/software/auto-complete/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/calfw/default.nix b/pkgs/applications/editors/emacs-modes/calfw/default.nix index 3015865e3bf..c173684fab4 100644 --- a/pkgs/applications/editors/emacs-modes/calfw/default.nix +++ b/pkgs/applications/editors/emacs-modes/calfw/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "A calendar framework for Emacs"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ chaoflow ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/applications/editors/emacs-modes/cedet/default.nix b/pkgs/applications/editors/emacs-modes/cedet/default.nix index 779fc8a146e..e350dc08e71 100644 --- a/pkgs/applications/editors/emacs-modes/cedet/default.nix +++ b/pkgs/applications/editors/emacs-modes/cedet/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { Development Environment), and COGRE (COnnected GRaph Editor). ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://cedet.sourceforge.net/; }; diff --git a/pkgs/applications/editors/emacs-modes/coffee/default.nix b/pkgs/applications/editors/emacs-modes/coffee/default.nix index a0ba6143165..495b1aca4b5 100644 --- a/pkgs/applications/editors/emacs-modes/coffee/default.nix +++ b/pkgs/applications/editors/emacs-modes/coffee/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Emacs major mode for CoffeeScript, unfancy JavaScript"; homepage = https://github.com/defunkt/coffee-mode; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/color-theme/default.nix b/pkgs/applications/editors/emacs-modes/color-theme/default.nix index bad277d61ce..a3d76a307c7 100644 --- a/pkgs/applications/editors/emacs-modes/color-theme/default.nix +++ b/pkgs/applications/editors/emacs-modes/color-theme/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Emacs-lisp mode for skinning your Emacs"; homepage = http://www.nongnu.org/color-theme; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/darcsum/default.nix b/pkgs/applications/editors/emacs-modes/darcsum/default.nix index cf2bcc6e30b..349146dbdd8 100644 --- a/pkgs/applications/editors/emacs-modes/darcsum/default.nix +++ b/pkgs/applications/editors/emacs-modes/darcsum/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { description = "A pcl-cvs like interface for managing darcs patches."; homepage = "http://hub.darcs.net/simon/darcsum"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.falsifian ]; }; } diff --git a/pkgs/applications/editors/emacs-modes/ecb/default.nix b/pkgs/applications/editors/emacs-modes/ecb/default.nix index 33f0299f5f0..807bb91f850 100644 --- a/pkgs/applications/editors/emacs-modes/ecb/default.nix +++ b/pkgs/applications/editors/emacs-modes/ecb/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { navigation and overview. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://ecb.sourceforge.net/; diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix index b23c6da6123..af031a6e1a1 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix @@ -20,7 +20,6 @@ clangStdenv.mkDerivation { meta = { homepage = "https://github.com/Golevka/emacs-clang-complete-async"; description = "An emacs plugin to complete C and C++ code using libclang"; - license = "GPLv3+"; + license = clangStdenv.lib.licenses.gpl3Plus; }; } - diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix index 3ba848affc0..26f313f038d 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { developed a simple Emacs interface to w3m. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://emacs-w3m.namazu.org/; diff --git a/pkgs/applications/editors/emacs-modes/emms/default.nix b/pkgs/applications/editors/emacs-modes/emms/default.nix index d8bbb83c4e5..078907d7bb5 100644 --- a/pkgs/applications/editors/emacs-modes/emms/default.nix +++ b/pkgs/applications/editors/emacs-modes/emms/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/emms/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/editors/emacs-modes/gh/default.nix b/pkgs/applications/editors/emacs-modes/gh/default.nix index 28773e97c40..dca84a7936d 100644 --- a/pkgs/applications/editors/emacs-modes/gh/default.nix +++ b/pkgs/applications/editors/emacs-modes/gh/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "A (very early) GitHub client library for Emacs"; homepage = https://github.com/sigma/gh.el; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/gist/default.nix b/pkgs/applications/editors/emacs-modes/gist/default.nix index 21a2137dd39..08471247f08 100644 --- a/pkgs/applications/editors/emacs-modes/gist/default.nix +++ b/pkgs/applications/editors/emacs-modes/gist/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Emacs integration for gist.github.com"; homepage = https://github.com/sigma/gist.el; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/idris/default.nix b/pkgs/applications/editors/emacs-modes/idris/default.nix index 614a3703051..28375dcb68d 100644 --- a/pkgs/applications/editors/emacs-modes/idris/default.nix +++ b/pkgs/applications/editors/emacs-modes/idris/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Emacs major mode for Idris"; homepage = https://github.com/idris-hackers/idris-mode; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/jade/default.nix b/pkgs/applications/editors/emacs-modes/jade/default.nix index ab0e3512ef2..925fa54c735 100644 --- a/pkgs/applications/editors/emacs-modes/jade/default.nix +++ b/pkgs/applications/editors/emacs-modes/jade/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Emacs major mode for jade and stylus"; homepage = https://github.com/brianc/jade-mode; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/jdee/default.nix b/pkgs/applications/editors/emacs-modes/jdee/default.nix index 89d908826b1..4c347f27e68 100644 --- a/pkgs/applications/editors/emacs-modes/jdee/default.nix +++ b/pkgs/applications/editors/emacs-modes/jdee/default.nix @@ -89,7 +89,7 @@ in * Java source interpreter (Pat Neimeyer's BeanShell) ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/editors/emacs-modes/logito/default.nix b/pkgs/applications/editors/emacs-modes/logito/default.nix index 09161ec8067..a47f04472ec 100644 --- a/pkgs/applications/editors/emacs-modes/logito/default.nix +++ b/pkgs/applications/editors/emacs-modes/logito/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "tiny logging framework for Emacs"; homepage = https://github.com/sigma/logito; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix b/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix index 72086e54fec..b75c51d3bd7 100644 --- a/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix +++ b/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Insert dummy pseudo Latin text for Emacs"; homepage = http://www.emacswiki.org/emacs/LoremIpsum; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix index 4e2601cc106..076caf5235b 100644 --- a/pkgs/applications/editors/emacs-modes/magit/default.nix +++ b/pkgs/applications/editors/emacs-modes/magit/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/magit/magit"; description = "Magit, an Emacs interface to Git"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; longDescription = '' With Magit, you can inspect and modify your Git repositories with diff --git a/pkgs/applications/editors/emacs-modes/maude/default.nix b/pkgs/applications/editors/emacs-modes/maude/default.nix index b6b043fb7b8..57c2b2890be 100644 --- a/pkgs/applications/editors/emacs-modes/maude/default.nix +++ b/pkgs/applications/editors/emacs-modes/maude/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Emacs mode for the programming language Maude"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.simons ]; }; diff --git a/pkgs/applications/editors/emacs-modes/metaweblog/default.nix b/pkgs/applications/editors/emacs-modes/metaweblog/default.nix index 2a35c6ef695..77bfedf6274 100644 --- a/pkgs/applications/editors/emacs-modes/metaweblog/default.nix +++ b/pkgs/applications/editors/emacs-modes/metaweblog/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "an emacs library to access metaweblog based weblogs"; homepage = https://github.com/punchagan/metaweblog; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix index ba2437f1a2b..d5a7b0ded8a 100644 --- a/pkgs/applications/editors/emacs-modes/org/default.nix +++ b/pkgs/applications/editors/emacs-modes/org/default.nix @@ -2,11 +2,11 @@ , texLiveAggregationFun }: stdenv.mkDerivation rec { - name = "org-8.2.7b"; + name = "org-8.2.7c"; src = fetchurl { url = "http://orgmode.org/${name}.tar.gz"; - sha256 = "07hq2q126d967nj7xq46q4mkca5r2rw61bn8d6nzkhksghp8b2v1"; + sha256 = "0qqf58xqw1kkgjxm9z40s6h7xd209rx3933klla22lryv3yclc1k"; }; buildInputs = [ emacs ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { than that found in GNU Emacs. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ chaoflow pSub ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/editors/emacs-modes/org2blog/default.nix b/pkgs/applications/editors/emacs-modes/org2blog/default.nix index d2e9e305bff..5c1aec7e02b 100644 --- a/pkgs/applications/editors/emacs-modes/org2blog/default.nix +++ b/pkgs/applications/editors/emacs-modes/org2blog/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Publish directly from Emacs’ org-mode to WordPress blogs"; homepage = https://github.com/punchagan/org2blog; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/pcache/default.nix b/pkgs/applications/editors/emacs-modes/pcache/default.nix index c0aa0772678..f4dcf03dee8 100644 --- a/pkgs/applications/editors/emacs-modes/pcache/default.nix +++ b/pkgs/applications/editors/emacs-modes/pcache/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Persistent caching for Emacs"; homepage = https://github.com/sigma/pcache.el; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/4.2.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/4.2.nix index 0dea1a13977..c026d058b4e 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/4.2.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/4.2.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (rec { s|/sbin/install-info|install-info|g" - # Workaround for bug #458 + # Workaround for bug #458 # ProofGeneral 4.2 byte-compilation fails with Emacs 24.2.90 # http://proofgeneral.inf.ed.ac.uk/trac/ticket/458 sed -i "Makefile" \ @@ -48,7 +48,7 @@ stdenv.mkDerivation (rec { interactive theorem provers), based on the customizable text editor Emacs. ''; homepage = http://proofgeneral.inf.ed.ac.uk; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; # arbitrary choice }; }) diff --git a/pkgs/applications/editors/emacs-modes/quack/default.nix b/pkgs/applications/editors/emacs-modes/quack/default.nix index bef1ebe5859..95634a24ded 100644 --- a/pkgs/applications/editors/emacs-modes/quack/default.nix +++ b/pkgs/applications/editors/emacs-modes/quack/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "Enhanced Emacs support for editing and running Scheme code"; homepage = http://www.neilvandyke.org/quack/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; }; } diff --git a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix index 896dbdac71b..1f218439a5f 100644 --- a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix +++ b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Mark a rectangle of text with highlighting"; homepage = http://emacswiki.org/emacs/RectangleMark; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/remember/default.nix b/pkgs/applications/editors/emacs-modes/remember/default.nix index ea17a9b792a..7c0bc517755 100644 --- a/pkgs/applications/editors/emacs-modes/remember/default.nix +++ b/pkgs/applications/editors/emacs-modes/remember/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { ''; homepage = http://gna.org/projects/remember-el/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix index e942189714e..aa27e302e5d 100644 --- a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix +++ b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Two-pane file manager for Emacs based on Dired and inspired by MC"; homepage = http://www.emacswiki.org/emacs/Sunrise_Commander; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/writegood/default.nix b/pkgs/applications/editors/emacs-modes/writegood/default.nix index c6563605464..d196c3fee80 100644 --- a/pkgs/applications/editors/emacs-modes/writegood/default.nix +++ b/pkgs/applications/editors/emacs-modes/writegood/default.nix @@ -25,6 +25,6 @@ in stdenv.mkDerivation { homepage = https://github.com/bnbeckwith/writegood-mode; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.pSub ]; - license = "GPL3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix b/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix index cee0f0ca553..661430516b7 100644 --- a/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix +++ b/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Elisp implementation of clientside XML-RPC"; homepage = https://launchpad.net/xml-rpc-el; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix index a18bfd8b2c6..d9f62216fac 100644 --- a/pkgs/applications/editors/flpsed/default.nix +++ b/pkgs/applications/editors/flpsed/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "WYSIWYG PostScript annotator"; homepage = "http://http://flpsed.org/flpsed.html"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index 4d48ba69086..5ef19874531 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://gobby.0x539.de/; description = "A GTK-based collaborative editor supporting multiple documents in one session and a multi-user chat"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ maintainers.phreedom ]; platforms = platforms.all; }; diff --git a/pkgs/applications/editors/sublime/default.nix b/pkgs/applications/editors/sublime/default.nix index c7867ce22af..0c967e05ba1 100644 --- a/pkgs/applications/editors/sublime/default.nix +++ b/pkgs/applications/editors/sublime/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { meta = { description = "Sophisticated text editor for code, markup and prose"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index 088d76f4868..3ef557cef4b 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -57,7 +57,6 @@ in stdenv.mkDerivation { meta = { description = "Sophisticated text editor for code, markup and prose"; maintainers = stdenv.lib.maintainers.wmertens; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } - diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index 1c6d86a2f3d..ce863312251 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { collaborative authoring are planned for later. ''; homepage = http://texmacs.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; diff --git a/pkgs/applications/editors/zed/default.nix b/pkgs/applications/editors/zed/default.nix index 61abec29b47..585a3a58d5f 100644 --- a/pkgs/applications/editors/zed/default.nix +++ b/pkgs/applications/editors/zed/default.nix @@ -1,8 +1,10 @@ -{ stdenv, buildEnv, fetchurl, xlibs, glib, gtk2, atk, pango, gdk_pixbuf, +{ stdenv, buildEnv, fetchgit, xlibs, glib, gtk2, atk, pango, gdk_pixbuf, cairo, freetype, fontconfig, nss, nspr, gnome, alsaLib, expat, dbus, udev, - makeWrapper, writeScript, gnused }: + makeWrapper, writeScript, fetchurl, zip, pkgs, node_webkit }: let + name = "zed-${version}"; + version = "0.12"; rpath_env = buildEnv { name = "rpath_env"; @@ -13,25 +15,50 @@ let pathsToLink = [ "/lib" "/lib64" ]; }; - name = "zed-${version}"; - version = "0.12.0"; + # When upgrading node.nix / node packages: + # fetch package.json from Zed's repository + # run `npm2nix package.json node.nix` + # and replace node.nix with new one + nodePackages = import ../../../../pkgs/top-level/node-packages.nix { + inherit pkgs; + inherit (pkgs) stdenv nodejs fetchurl fetchgit; + neededNatives = [ pkgs.python ] ++ pkgs.lib.optional pkgs.stdenv.isLinux pkgs.utillinux; + self = nodePackages; + generated = ./node.nix; + }; + + node_env = buildEnv { + name = "node_env"; + paths = [ nodePackages.tar nodePackages.request ]; + pathsToLink = [ "/lib" ]; + }; zed = stdenv.mkDerivation rec { inherit name version; - src = if stdenv.system == "i686-linux" then fetchurl { - url = "http://download.zedapp.org/zed-linux32-v${version}.tar.gz"; - sha256 = "04cygfhaynlpl8jrf2r55qk5zz1ipad8l9m8q81lfly2q0h9fbxi"; - } else fetchurl { - url = "http://download.zedapp.org/zed-linux64-v${version}.tar.gz"; - sha256 = "0ng2v07fyglpbyl4pwm2bn5rbldw51kliw8rakbpcdia891hi6z1"; - }; + src = fetchgit { + url = "git://github.com/zedapp/zed"; + rev = "refs/tags/v${version}"; + sha256 = "1l1adj4p916km626vxg1lv0bapzay4z5nq005pxsbjbcycrhds59"; + }; - buildInputs = [ makeWrapper ]; + buildInputs = [ makeWrapper zip ]; + + dontBuild = true; installPhase = '' + export NWPATH="${node_webkit}/share/node-webkit"; + mkdir -p $out/zed - cp ./* $out/zed + + cd ${src}/app; zip -r $out/zed/app.nw *; cd .. + + cat $NWPATH/nw $out/zed/app.nw > $out/zed/zed-bin + cp $NWPATH/nw.pak $out/zed/ + cp nw/zed-linux $out/zed/zed + chmod +x $out/zed/zed* + cp Zed.desktop.tmpl Zed.svg Zed.png $out/zed + rm $out/zed/app.nw ''; postFixup = '' @@ -42,17 +69,18 @@ let ln -s ${udev}/lib/libudev.so.1 $out/lib/libudev.so.0 wrapProgram $out/zed/zed-bin \ - --prefix LD_LIBRARY_PATH : $out/lib + --prefix LD_LIBRARY_PATH : $out/lib \ + --prefix NODE_PATH : ${node_env}/lib/node_modules ''; }; - zed_installer = writeScript "zed-installer.sh" '' - mkdir -p ~/.zed - cp -rv ${zed}/zed/* ~/.zed - - ${gnused}/bin/sed -ri 's/DIR\=\$\(dirname\ \$0\)/DIR\=\~\/\.zed/' ~/.zed/zed - mkdir -p ~/bin - ln -sv ~/.zed/zed ~/bin/zed + zed_script = writeScript "zed.sh" '' + if [[ $1 == http://* ]] || [[ $1 == https://* ]]; then + PROJECT=$1 + elif [ "" != "$1" ]; then + PROJECT=$(readlink -f $1) + fi + ${zed}/zed/zed-bin $PROJECT ''; in stdenv.mkDerivation rec { @@ -62,7 +90,7 @@ in stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - ln -s ${zed_installer} $out/bin/zed-installer + ln -s ${zed_script} $out/bin/zed ''; meta = { diff --git a/pkgs/applications/editors/zed/node.nix b/pkgs/applications/editors/zed/node.nix new file mode 100644 index 00000000000..b4a7cec4269 --- /dev/null +++ b/pkgs/applications/editors/zed/node.nix @@ -0,0 +1,634 @@ +{ self, fetchurl, fetchgit ? null, lib }: + +{ + by-spec."asn1"."0.1.11" = + self.by-version."asn1"."0.1.11"; + by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage { + name = "node-asn1-0.1.11"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; + name = "asn1-0.1.11.tgz"; + sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; + }) + ]; + buildInputs = + (self.nativeDeps."asn1" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "asn1" ]; + }; + by-spec."assert-plus"."0.1.2" = + self.by-version."assert-plus"."0.1.2"; + by-version."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "node-assert-plus-0.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"; + name = "assert-plus-0.1.2.tgz"; + sha1 = "d93ffdbb67ac5507779be316a7d65146417beef8"; + }) + ]; + buildInputs = + (self.nativeDeps."assert-plus" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "assert-plus" ]; + }; + by-spec."async"."~0.9.0" = + self.by-version."async"."0.9.0"; + by-version."async"."0.9.0" = lib.makeOverridable self.buildNodePackage { + name = "node-async-0.9.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz"; + name = "async-0.9.0.tgz"; + sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7"; + }) + ]; + buildInputs = + (self.nativeDeps."async" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "async" ]; + }; + by-spec."aws-sign2"."~0.5.0" = + self.by-version."aws-sign2"."0.5.0"; + by-version."aws-sign2"."0.5.0" = lib.makeOverridable self.buildNodePackage { + name = "node-aws-sign2-0.5.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; + name = "aws-sign2-0.5.0.tgz"; + sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; + }) + ]; + buildInputs = + (self.nativeDeps."aws-sign2" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "aws-sign2" ]; + }; + by-spec."block-stream"."*" = + self.by-version."block-stream"."0.0.7"; + by-version."block-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage { + name = "node-block-stream-0.0.7"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"; + name = "block-stream-0.0.7.tgz"; + sha1 = "9088ab5ae1e861f4d81b176b4a8046080703deed"; + }) + ]; + buildInputs = + (self.nativeDeps."block-stream" or []); + deps = [ + self.by-version."inherits"."2.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "block-stream" ]; + }; + by-spec."boom"."0.4.x" = + self.by-version."boom"."0.4.2"; + by-version."boom"."0.4.2" = lib.makeOverridable self.buildNodePackage { + name = "node-boom-0.4.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; + name = "boom-0.4.2.tgz"; + sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; + }) + ]; + buildInputs = + (self.nativeDeps."boom" or []); + deps = [ + self.by-version."hoek"."0.9.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "boom" ]; + }; + by-spec."combined-stream"."~0.0.4" = + self.by-version."combined-stream"."0.0.5"; + by-version."combined-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "node-combined-stream-0.0.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz"; + name = "combined-stream-0.0.5.tgz"; + sha1 = "29ed76e5c9aad07c4acf9ca3d32601cce28697a2"; + }) + ]; + buildInputs = + (self.nativeDeps."combined-stream" or []); + deps = [ + self.by-version."delayed-stream"."0.0.5" + ]; + peerDependencies = [ + ]; + passthru.names = [ "combined-stream" ]; + }; + by-spec."cryptiles"."0.2.x" = + self.by-version."cryptiles"."0.2.2"; + by-version."cryptiles"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "node-cryptiles-0.2.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; + name = "cryptiles-0.2.2.tgz"; + sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; + }) + ]; + buildInputs = + (self.nativeDeps."cryptiles" or []); + deps = [ + self.by-version."boom"."0.4.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "cryptiles" ]; + }; + by-spec."ctype"."0.5.2" = + self.by-version."ctype"."0.5.2"; + by-version."ctype"."0.5.2" = lib.makeOverridable self.buildNodePackage { + name = "node-ctype-0.5.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"; + name = "ctype-0.5.2.tgz"; + sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d"; + }) + ]; + buildInputs = + (self.nativeDeps."ctype" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "ctype" ]; + }; + by-spec."delayed-stream"."0.0.5" = + self.by-version."delayed-stream"."0.0.5"; + by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "node-delayed-stream-0.0.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; + name = "delayed-stream-0.0.5.tgz"; + sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; + }) + ]; + buildInputs = + (self.nativeDeps."delayed-stream" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "delayed-stream" ]; + }; + by-spec."forever-agent"."~0.5.0" = + self.by-version."forever-agent"."0.5.2"; + by-version."forever-agent"."0.5.2" = lib.makeOverridable self.buildNodePackage { + name = "node-forever-agent-0.5.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; + name = "forever-agent-0.5.2.tgz"; + sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; + }) + ]; + buildInputs = + (self.nativeDeps."forever-agent" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "forever-agent" ]; + }; + by-spec."form-data"."~0.1.0" = + self.by-version."form-data"."0.1.4"; + by-version."form-data"."0.1.4" = lib.makeOverridable self.buildNodePackage { + name = "node-form-data-0.1.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; + name = "form-data-0.1.4.tgz"; + sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; + }) + ]; + buildInputs = + (self.nativeDeps."form-data" or []); + deps = [ + self.by-version."combined-stream"."0.0.5" + self.by-version."mime"."1.2.11" + self.by-version."async"."0.9.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "form-data" ]; + }; + by-spec."fstream"."~0.1.28" = + self.by-version."fstream"."0.1.29"; + by-version."fstream"."0.1.29" = lib.makeOverridable self.buildNodePackage { + name = "node-fstream-0.1.29"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/fstream/-/fstream-0.1.29.tgz"; + name = "fstream-0.1.29.tgz"; + sha1 = "34d04023ebc91a9df47bd31ab97e4704b4db413f"; + }) + ]; + buildInputs = + (self.nativeDeps."fstream" or []); + deps = [ + self.by-version."graceful-fs"."3.0.2" + self.by-version."inherits"."2.0.1" + self.by-version."mkdirp"."0.3.5" + self.by-version."rimraf"."2.2.8" + ]; + peerDependencies = [ + ]; + passthru.names = [ "fstream" ]; + }; + by-spec."graceful-fs"."~3.0.2" = + self.by-version."graceful-fs"."3.0.2"; + by-version."graceful-fs"."3.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-graceful-fs-3.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"; + name = "graceful-fs-3.0.2.tgz"; + sha1 = "2cb5bf7f742bea8ad47c754caeee032b7e71a577"; + }) + ]; + buildInputs = + (self.nativeDeps."graceful-fs" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "graceful-fs" ]; + }; + by-spec."hawk"."~1.0.0" = + self.by-version."hawk"."1.0.0"; + by-version."hawk"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-hawk-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz"; + name = "hawk-1.0.0.tgz"; + sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d"; + }) + ]; + buildInputs = + (self.nativeDeps."hawk" or []); + deps = [ + self.by-version."hoek"."0.9.1" + self.by-version."boom"."0.4.2" + self.by-version."cryptiles"."0.2.2" + self.by-version."sntp"."0.2.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "hawk" ]; + }; + by-spec."hoek"."0.9.x" = + self.by-version."hoek"."0.9.1"; + by-version."hoek"."0.9.1" = lib.makeOverridable self.buildNodePackage { + name = "node-hoek-0.9.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; + name = "hoek-0.9.1.tgz"; + sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; + }) + ]; + buildInputs = + (self.nativeDeps."hoek" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "hoek" ]; + }; + by-spec."http-signature"."~0.10.0" = + self.by-version."http-signature"."0.10.0"; + by-version."http-signature"."0.10.0" = lib.makeOverridable self.buildNodePackage { + name = "node-http-signature-0.10.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz"; + name = "http-signature-0.10.0.tgz"; + sha1 = "1494e4f5000a83c0f11bcc12d6007c530cb99582"; + }) + ]; + buildInputs = + (self.nativeDeps."http-signature" or []); + deps = [ + self.by-version."assert-plus"."0.1.2" + self.by-version."asn1"."0.1.11" + self.by-version."ctype"."0.5.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "http-signature" ]; + }; + by-spec."inherits"."2" = + self.by-version."inherits"."2.0.1"; + by-version."inherits"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-inherits-2.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + name = "inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }) + ]; + buildInputs = + (self.nativeDeps."inherits" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "inherits" ]; + }; + by-spec."inherits"."~2.0.0" = + self.by-version."inherits"."2.0.1"; + by-spec."json-stringify-safe"."~5.0.0" = + self.by-version."json-stringify-safe"."5.0.0"; + by-version."json-stringify-safe"."5.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-json-stringify-safe-5.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"; + name = "json-stringify-safe-5.0.0.tgz"; + sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e"; + }) + ]; + buildInputs = + (self.nativeDeps."json-stringify-safe" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "json-stringify-safe" ]; + }; + by-spec."mime"."~1.2.11" = + self.by-version."mime"."1.2.11"; + by-version."mime"."1.2.11" = lib.makeOverridable self.buildNodePackage { + name = "node-mime-1.2.11"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + name = "mime-1.2.11.tgz"; + sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; + }) + ]; + buildInputs = + (self.nativeDeps."mime" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "mime" ]; + }; + by-spec."mime"."~1.2.9" = + self.by-version."mime"."1.2.11"; + by-spec."mkdirp"."0.3" = + self.by-version."mkdirp"."0.3.5"; + by-version."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage { + name = "node-mkdirp-0.3.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + name = "mkdirp-0.3.5.tgz"; + sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + }) + ]; + buildInputs = + (self.nativeDeps."mkdirp" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "mkdirp" ]; + }; + by-spec."node-uuid"."~1.4.0" = + self.by-version."node-uuid"."1.4.1"; + by-version."node-uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-node-uuid-1.4.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; + name = "node-uuid-1.4.1.tgz"; + sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048"; + }) + ]; + buildInputs = + (self.nativeDeps."node-uuid" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "node-uuid" ]; + }; + by-spec."oauth-sign"."~0.3.0" = + self.by-version."oauth-sign"."0.3.0"; + by-version."oauth-sign"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-oauth-sign-0.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; + name = "oauth-sign-0.3.0.tgz"; + sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; + }) + ]; + buildInputs = + (self.nativeDeps."oauth-sign" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "oauth-sign" ]; + }; + by-spec."punycode".">=0.2.0" = + self.by-version."punycode"."1.3.0"; + by-version."punycode"."1.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-punycode-1.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/punycode/-/punycode-1.3.0.tgz"; + name = "punycode-1.3.0.tgz"; + sha1 = "7f5009ef539b9444be5c7a19abd2c3ca49e1731c"; + }) + ]; + buildInputs = + (self.nativeDeps."punycode" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "punycode" ]; + }; + by-spec."qs"."~0.6.0" = + self.by-version."qs"."0.6.6"; + by-version."qs"."0.6.6" = lib.makeOverridable self.buildNodePackage { + name = "node-qs-0.6.6"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; + name = "qs-0.6.6.tgz"; + sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107"; + }) + ]; + buildInputs = + (self.nativeDeps."qs" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "qs" ]; + }; + by-spec."request"."~2.34.0" = + self.by-version."request"."2.34.0"; + by-version."request"."2.34.0" = lib.makeOverridable self.buildNodePackage { + name = "node-request-2.34.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/request/-/request-2.34.0.tgz"; + name = "request-2.34.0.tgz"; + sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae"; + }) + ]; + buildInputs = + (self.nativeDeps."request" or []); + deps = [ + self.by-version."qs"."0.6.6" + self.by-version."json-stringify-safe"."5.0.0" + self.by-version."forever-agent"."0.5.2" + self.by-version."node-uuid"."1.4.1" + self.by-version."mime"."1.2.11" + self.by-version."tough-cookie"."0.12.1" + self.by-version."form-data"."0.1.4" + self.by-version."tunnel-agent"."0.3.0" + self.by-version."http-signature"."0.10.0" + self.by-version."oauth-sign"."0.3.0" + self.by-version."hawk"."1.0.0" + self.by-version."aws-sign2"."0.5.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "request" ]; + }; + "request" = self.by-version."request"."2.34.0"; + by-spec."rimraf"."2" = + self.by-version."rimraf"."2.2.8"; + by-version."rimraf"."2.2.8" = lib.makeOverridable self.buildNodePackage { + name = "rimraf-2.2.8"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; + name = "rimraf-2.2.8.tgz"; + sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; + }) + ]; + buildInputs = + (self.nativeDeps."rimraf" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "rimraf" ]; + }; + by-spec."sntp"."0.2.x" = + self.by-version."sntp"."0.2.4"; + by-version."sntp"."0.2.4" = lib.makeOverridable self.buildNodePackage { + name = "node-sntp-0.2.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; + name = "sntp-0.2.4.tgz"; + sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; + }) + ]; + buildInputs = + (self.nativeDeps."sntp" or []); + deps = [ + self.by-version."hoek"."0.9.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "sntp" ]; + }; + by-spec."tar"."~0.1.19" = + self.by-version."tar"."0.1.20"; + by-version."tar"."0.1.20" = lib.makeOverridable self.buildNodePackage { + name = "node-tar-0.1.20"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tar/-/tar-0.1.20.tgz"; + name = "tar-0.1.20.tgz"; + sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13"; + }) + ]; + buildInputs = + (self.nativeDeps."tar" or []); + deps = [ + self.by-version."block-stream"."0.0.7" + self.by-version."fstream"."0.1.29" + self.by-version."inherits"."2.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "tar" ]; + }; + "tar" = self.by-version."tar"."0.1.20"; + by-spec."tough-cookie".">=0.12.0" = + self.by-version."tough-cookie"."0.12.1"; + by-version."tough-cookie"."0.12.1" = lib.makeOverridable self.buildNodePackage { + name = "node-tough-cookie-0.12.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz"; + name = "tough-cookie-0.12.1.tgz"; + sha1 = "8220c7e21abd5b13d96804254bd5a81ebf2c7d62"; + }) + ]; + buildInputs = + (self.nativeDeps."tough-cookie" or []); + deps = [ + self.by-version."punycode"."1.3.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "tough-cookie" ]; + }; + by-spec."tunnel-agent"."~0.3.0" = + self.by-version."tunnel-agent"."0.3.0"; + by-version."tunnel-agent"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-tunnel-agent-0.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"; + name = "tunnel-agent-0.3.0.tgz"; + sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee"; + }) + ]; + buildInputs = + (self.nativeDeps."tunnel-agent" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "tunnel-agent" ]; + }; +} diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index 4166bc1e9e3..32d30cd4745 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/zile/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; }; diff --git a/pkgs/applications/graphics/autopanosiftc/default.nix b/pkgs/applications/graphics/autopanosiftc/default.nix index be3cfc5935c..6d26dafae62 100644 --- a/pkgs/applications/graphics/autopanosiftc/default.nix +++ b/pkgs/applications/graphics/autopanosiftc/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = http://hugin.sourceforge.net/; description = "Implementation in C of the autopano-sift algorithm for automatically stitching panoramas"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/graphics/comical/default.nix b/pkgs/applications/graphics/comical/default.nix index 68910e67e25..2796a5535a0 100644 --- a/pkgs/applications/graphics/comical/default.nix +++ b/pkgs/applications/graphics/comical/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Viewer of CBR and CBZ files, often used to store scanned comics"; homepage = http://comical.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index f832513a824..4ded807cb29 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://djvu.sourceforge.net/djview4.html; description = "A new portable DjVu viewer and browser plugin"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; inherit (qt4.meta) platforms; maintainers = [ stdenv.lib.maintainers.urkud ]; }; diff --git a/pkgs/applications/graphics/freecad/cmake.patch b/pkgs/applications/graphics/freecad/cmake.patch deleted file mode 100644 index 62efaf1e29d..00000000000 --- a/pkgs/applications/graphics/freecad/cmake.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -urN freecad-0.13.1830.old/cMake/FreeCadMacros.cmake freecad-0.13.1830/cMake/FreeCadMacros.cmake ---- freecad-0.13.1830.old/cMake/FreeCadMacros.cmake 2013-02-02 18:09:17.000000000 +0100 -+++ freecad-0.13.1830/cMake/FreeCadMacros.cmake 2014-04-20 10:52:17.293599913 +0200 -@@ -201,7 +201,7 @@ - #endmacro(fc_add_resources) - - MACRO (fc_add_resources outfiles ) -- QT4_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN}) -+ QT4_EXTRACT_OPTIONS(rcc_files rcc_options rcc_target ${ARGN}) - - FOREACH (it ${rcc_files}) - GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE) -diff -urN freecad-0.13.1830.old/CMakeLists.txt freecad-0.13.1830/CMakeLists.txt ---- freecad-0.13.1830.old/CMakeLists.txt 2013-02-02 18:09:17.000000000 +0100 -+++ freecad-0.13.1830/CMakeLists.txt 2014-04-20 10:28:41.782536753 +0200 -@@ -314,14 +314,14 @@ - macro(fc_wrap_cpp outfiles ) - # get include dirs - QT4_GET_MOC_FLAGS(moc_flags) -- QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN}) -+ QT4_EXTRACT_OPTIONS(moc_files moc_options moc_target ${ARGN}) - # fixes bug 0000585: bug with boost 1.48 - SET(moc_options ${moc_options} -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) - - foreach(it ${moc_files}) - get_filename_component(it ${it} ABSOLUTE) - QT4_MAKE_OUTPUT_FILE(${it} moc_ cpp outfile) -- QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}") -+ QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}" "") - set(${outfiles} ${${outfiles}} ${outfile}) - add_file_dependencies(${it} ${outfile}) - endforeach(it) diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 770a7ee8212..a7665177046 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts -, boost, zlib, python, swig, gfortran, soqt, libf2c , pyqt4, makeWrapper -, matplotlib, pycollada }: +, boost, zlib, python, swig, gfortran, soqt, libf2c, makeWrapper +, matplotlib, pycollada, pyside, pysideShiboken }: stdenv.mkDerivation rec { name = "freecad-${version}"; - version = "0.13.1830"; + version = "0.14.3702"; src = fetchurl { url = "mirror://sourceforge/free-cad/${name}.tar.gz"; - sha256 = "04rgww5y32asn4sx5j4wh79ggvb479pq56xfcfj6gkg44mid23jm"; + sha256 = "1jcx7d3mp2wxkd20qdvr4vlf7h5wb0jgab9dl63sicdz88swy97f"; }; buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost - zlib python swig gfortran soqt libf2c pyqt4 makeWrapper matplotlib - pycollada + zlib python swig gfortran soqt libf2c makeWrapper matplotlib + pycollada pyside pysideShiboken ]; enableParallelBuilding = true; @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { --set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1 ''; - patches = [ ./pythonpath.patch ./cmake.patch ]; + patches = [ ./pythonpath.patch ]; - meta = { - homepage = http://free-cad.sourceforge.net/; - license = [ "GPLv2+" "LGPLv2+" ]; + meta = with stdenv.lib; { description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + homepage = http://www.freecadweb.org/; + license = licenses.lgpl2Plus; + maintainers = [ maintainers.viric ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 44ca66ac5b9..b170b784aaa 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { initially based on GQview. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://geeqie.sourceforge.net; diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 3810006103d..7139bc71f3c 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -236,7 +236,7 @@ rec { homepage = http://lensfun.sebastiankraft.net/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; }; diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix index 8b2c45398d9..2e9d55a3f3f 100644 --- a/pkgs/applications/graphics/giv/default.nix +++ b/pkgs/applications/graphics/giv/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Cross platform image and hierarchical vector viewer based"; homepage = http://giv.sourceforge.net/giv/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index 15a8ab713db..919b9fcc4c3 100644 --- a/pkgs/applications/graphics/gocr/default.nix +++ b/pkgs/applications/graphics/gocr/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://jocr.sourceforge.net/"; description = "GPL Optical Character Recognition"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index a9ff7ef25c3..a98e60d6fea 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://hugin.sourceforge.net/; description = "Toolkit for stitching photographs and assembling panoramas, together with an easy to use graphical front end"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index df50dd5bd79..53df14f8704 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "An editor for drawing figures"; homepage = http://ipe7.sourceforge.net; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; longDescription = '' Ipe is an extensible drawing editor for creating figures in PDF and Postscript format. It supports making small figures for inclusion into LaTeX-documents diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix index 7629c57a2b8..c997f5c343f 100644 --- a/pkgs/applications/graphics/mcomix/default.nix +++ b/pkgs/applications/graphics/mcomix/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { homepage = http://mcomix.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 4e2075ff471..9352ae092be 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = { description = "System for the processing and editing of unstructured 3D triangular meshes"; homepage = http://meshlab.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/minidjvu/default.nix b/pkgs/applications/graphics/minidjvu/default.nix index e3c6deddb29..e354837f4b8 100644 --- a/pkgs/applications/graphics/minidjvu/default.nix +++ b/pkgs/applications/graphics/minidjvu/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = http://djvu.sourceforge.net/djview4.html; description = "Black-and-white djvu page encoder and decoder that use interpage information"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.viric ]; }; } diff --git a/pkgs/applications/graphics/mirage/default.nix b/pkgs/applications/graphics/mirage/default.nix index def22804bb6..20f7460f7a1 100644 --- a/pkgs/applications/graphics/mirage/default.nix +++ b/pkgs/applications/graphics/mirage/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { homepage = http://mirageiv.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix index 482b57d03d2..4c20a41061a 100644 --- a/pkgs/applications/graphics/ocrad/default.nix +++ b/pkgs/applications/graphics/ocrad/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { backend to other programs. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix index 17e1b2e8b14..8e5204ac638 100644 --- a/pkgs/applications/graphics/panotools/default.nix +++ b/pkgs/applications/graphics/panotools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://panotools.sourceforge.net/; description = "Free software suite for authoring and displaying virtual reality panoramas"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index b54d73b4964..6958c94f7e1 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.pinta-project.com/; description = "Drawing/editing program modeled after Paint.NET"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/applications/graphics/potrace/default.nix index 365f88b19b4..f58fe0e28c1 100644 --- a/pkgs/applications/graphics/potrace/default.nix +++ b/pkgs/applications/graphics/potrace/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { description = "A tool for tracing a bitmap, which means, transforming a bitmap into a smooth, scalable image"; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.pSub ]; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/graphics/qtpfsgui/default.nix b/pkgs/applications/graphics/qtpfsgui/default.nix index 95d7acca36c..cd8c76dc42c 100644 --- a/pkgs/applications/graphics/qtpfsgui/default.nix +++ b/pkgs/applications/graphics/qtpfsgui/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { aims to provide a workflow for high dynamic range (HDR) imaging. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/applications/graphics/sane/backends.nix b/pkgs/applications/graphics/sane/backends.nix index 3d95dcd81ee..28d2f1e200b 100644 --- a/pkgs/applications/graphics/sane/backends.nix +++ b/pkgs/applications/graphics/sane/backends.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.sane-project.org/"; description = "Scanner Access Now Easy"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix index 9e73a08e096..a0f6e5bac50 100644 --- a/pkgs/applications/graphics/sane/frontends.nix +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.sane-project.org/"; description = "Scanner Access Now Easy"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index 7b1ffb1f2be..221a4340dce 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.sane-project.org/; description = "Graphical scanning frontend for sane"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric simons]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix index 83f3c751029..083fde35902 100644 --- a/pkgs/applications/graphics/smartdeblur/default.nix +++ b/pkgs/applications/graphics/smartdeblur/default.nix @@ -25,9 +25,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/Y-Vladimir/SmartDeblur"; description = "Tool for restoring blurry and defocused images"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; }; } - diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index 8500fa9faba..30513577d04 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Simple X Image Viewer"; homepage = "https://github.com/muennich/sxiv"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix index e67d202dcae..eaf6dd4ba24 100644 --- a/pkgs/applications/graphics/tesseract/default.nix +++ b/pkgs/applications/graphics/tesseract/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = { description = "OCR engine"; homepage = http://code.google.com/p/tesseract-ocr/; - license = "Apache2.0"; + license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix index 070244d67d2..783832abd00 100644 --- a/pkgs/applications/graphics/ufraw/default.nix +++ b/pkgs/applications/graphics/ufraw/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { the camera's tone curves. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # needs GTK+ diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index aa09fb705f1..dd8e01298ff 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { in mind (follows Gnome HIG2). ''; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; homepage = http://xsisqox.github.com/Viewnior; diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index cddbc212c19..8387b3486d4 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -1,10 +1,10 @@ -a : -let +a : +let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "3.6" a; + version = a.lib.attrByPath ["version"] "3.6" a; buildInputs = with a; [ - aalib gsl libpng libX11 xproto libXext xextproto + aalib gsl libpng libX11 xproto libXext xextproto libXt zlib gettext intltool perl ]; in @@ -24,11 +24,11 @@ rec { sed -e s@/usr/@"$out/"@g -i configure $(find . -name 'Makefile*') mkdir -p $out/share/locale '') ["doUnpack" "minInit" "defEnsureDir"]; - + name = "xaos-" + version; meta = { homepage = http://xaos.sourceforge.net/; description = "XaoS - fractal viewer"; - license = "GPLv2+"; + license = a.stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/abook/default.nix b/pkgs/applications/misc/abook/default.nix index 3d187d92f5c..77e48e49dd8 100644 --- a/pkgs/applications/misc/abook/default.nix +++ b/pkgs/applications/misc/abook/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://abook.sourceforge.net/"; description = "Text-based addressbook program designed to use with mutt mail client"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.edwtjo ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index a186f5f5ee0..85bc89f7755 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { meta = { description = "Adobe Reader, a viewer for PDF documents"; homepage = http://www.adobe.com/products/reader; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix index a8dd26ab609..73cdbb37616 100644 --- a/pkgs/applications/misc/audio/soxr/default.nix +++ b/pkgs/applications/misc/audio/soxr/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "An audio resampling library"; homepage = http://soxr.sourceforge.net; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index cdaeb49f14c..1976ea5ce13 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "A Qt4 Bible study tool"; homepage = http://www.bibletime.info/; platforms = stdenv.lib.platforms.linux; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.piotr ]; }; } diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix index 118b56c55b0..1a25a233c0d 100644 --- a/pkgs/applications/misc/bitcoin/default.nix +++ b/pkgs/applications/misc/bitcoin/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.bitcoin.org/"; maintainers = [ stdenv.lib.maintainers.roconnor ]; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 764145e39d6..03faaa9ada4 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-1.46.0"; + name = "calibre-1.47.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "1mzw6cmnw1wk8jd2pkl6z7bgjhwn4j7lg0a33f07gk4xw94sbry2"; + sha256 = "1hmqynxh9h12whcjwcd5idgc6mdaggczsf4hm70ajhj7pfjp3szg"; }; inherit python; diff --git a/pkgs/applications/misc/d4x/default.nix b/pkgs/applications/misc/d4x/default.nix index 4eb4c441c99..d6ca3939d13 100644 --- a/pkgs/applications/misc/d4x/default.nix +++ b/pkgs/applications/misc/d4x/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { meta = { description = "Graphical download manager"; homepage = http://www.krasu.ru/soft/chuchelo/; - license = "Artistic"; + license = "perl"; }; } diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index 3fecddcb316..1ba3ee5268f 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -28,9 +28,8 @@ stdenv.mkDerivation rec { meta = { description = "a generic, highly customizable, and efficient menu for the X Window System"; homepage = http://tools.suckless.org/dmenu; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; } - diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix index 6941e8df626..d79162289c3 100644 --- a/pkgs/applications/misc/epdfview/default.nix +++ b/pkgs/applications/misc/epdfview/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { GTK+ libraries. The aim of ePDFView is to make a simple PDF document viewer, in the lines of Evince but without using the Gnome libraries. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/evopedia/default.nix b/pkgs/applications/misc/evopedia/default.nix index b070b629282..5ad82c9239c 100644 --- a/pkgs/applications/misc/evopedia/default.nix +++ b/pkgs/applications/misc/evopedia/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Offline Wikipedia Viewer"; homepage = http://www.evopedia.info; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix index f2dadd2e5e8..638f254364e 100644 --- a/pkgs/applications/misc/evtest/default.nix +++ b/pkgs/applications/misc/evtest/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple tool for input event debugging"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/applications/misc/freicoin/default.nix b/pkgs/applications/misc/freicoin/default.nix index 33d8585bb2d..65265fc07a5 100644 --- a/pkgs/applications/misc/freicoin/default.nix +++ b/pkgs/applications/misc/freicoin/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Peer-to-peer currency with demurrage fee"; homepage = "http://freicoi.in/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 4db4e4b1091..b25d347ec87 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk, gettext }: stdenv.mkDerivation rec { - name = "girara-0.2.0"; + name = "girara-0.2.2"; src = fetchurl { url = "http://pwmt.org/projects/girara/download/${name}.tar.gz"; - sha256 = "0k8p5sgazqw7r78ssqh8bm2hn98xjml5w76l9awa66yq0k5m8jyi"; + sha256 = "0lv6wqhx2avdxj6yx111jfs4j32r0xzmmkhy7pgzxpf73kgxz0k3"; }; buildInputs = [ pkgconfig gtk gettext ]; diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index 3b8f8b1cc68..81f74847c2f 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; homepage = http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index 08b868bca92..ea577beb592 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation { meta = { description = "A world sphere viewer"; homepage = http://earth.google.com; - license = "unfree"; + license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.viric ]; }; } diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index 29d5b1ee7cc..bf44f91056d 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { homepage = http://www.gpsbabel.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix index 141476a6b40..9a59329871e 100644 --- a/pkgs/applications/misc/gpscorrelate/default.nix +++ b/pkgs/applications/misc/gpscorrelate/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { one takes the GPS data in a different format. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://freefoote.dview.net/linux_gpscorr.html; }; diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index 0c2b957bc7c..39621536e68 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "GTK+-based audio CD player/ripper"; homepage = "http://nostatic.org/grip"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index efd9cf263e7..4867bef1f71 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { interface for the Ghostscript interpreter. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; diff --git a/pkgs/applications/misc/htmldoc/default.nix b/pkgs/applications/misc/htmldoc/default.nix index befa8d25210..e8274418ae1 100644 --- a/pkgs/applications/misc/htmldoc/default.nix +++ b/pkgs/applications/misc/htmldoc/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.htmldoc.org/; description = "Converts HTML files to indexed HTML, PS or PDF"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index b347f971ee0..fab492d5c09 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation { meta = { description = "Wiki compiler, storing pages and history in a RCS"; homepage = "http://ikiwiki.info/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix index fe4c0287fdd..d722367d1b4 100644 --- a/pkgs/applications/misc/jigdo/default.nix +++ b/pkgs/applications/misc/jigdo/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { meta = { description = "Download utility that can fetch files from several sources simultaneously"; homepage = http://atterer.net/jigdo/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/misc/kde-wacomtablet/default.nix b/pkgs/applications/misc/kde-wacomtablet/default.nix index 3e652c717ec..ee93f57eafc 100644 --- a/pkgs/applications/misc/kde-wacomtablet/default.nix +++ b/pkgs/applications/misc/kde-wacomtablet/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, kdelibs, gettext, xf86_input_wacom }: stdenv.mkDerivation rec { - name = "wacomtablet-2.0"; + name = "wacomtablet-2.0.2"; src = fetchurl { - url = "http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-2.0.tar.bz2"; - sha256 = "1vqdmkfl0awsjxl6p8bihz198hlc75d3zn7xwwryc674l76s25ax"; + url = "http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-2.0.2.tar.xz"; + sha256 = "13k5f5xpka5cbgl24a3j9khqcmp96x1vhynn9v558ag6dg9ch2hw"; }; buildInputs = [ kdelibs xf86_input_wacom ]; diff --git a/pkgs/applications/misc/librecad/2.0.nix b/pkgs/applications/misc/librecad/2.0.nix index f7743feddbb..8b7a9a40c87 100644 --- a/pkgs/applications/misc/librecad/2.0.nix +++ b/pkgs/applications/misc/librecad/2.0.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { description = "A 2D CAD package based upon Qt"; homepage = http://librecad.org; repositories.git = git://github.com/LibreCAD/LibreCAD.git; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index 6e368f6fb10..b2960e9f47d 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { description = "A 2D CAD package based upon Qt"; homepage = http://librecad.org; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 1ea4f06c927..36b2f84aab5 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "WYSIWYM frontend for LaTeX, DocBook"; homepage = "http://www.lyx.org"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.vcunat ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index e6636415b5e..932e5bb4830 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "An openstreetmap editor"; homepage = http://merkaartor.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric urkud]; inherit (qt4.meta) platforms; }; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index a56460827f5..aa7c14634d1 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { homepage = http://mupdf.com/; repositories.git = git://git.ghostscript.com/mupdf.git; description = "Lightweight PDF viewer and toolkit written in portable C"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; inherit version; diff --git a/pkgs/applications/misc/navipowm/default.nix b/pkgs/applications/misc/navipowm/default.nix index a526774d48e..6d990831a36 100644 --- a/pkgs/applications/misc/navipowm/default.nix +++ b/pkgs/applications/misc/navipowm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://navipowm.sourceforge.net/; description = "Car navigation system"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index ef1e777f55f..1be39c66642 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.navit-project.org/; description = "Car navigation system with routing engine using OSM maps"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/nc-indicators/default.nix b/pkgs/applications/misc/nc-indicators/default.nix index 026485c771b..3198333cce2 100644 --- a/pkgs/applications/misc/nc-indicators/default.nix +++ b/pkgs/applications/misc/nc-indicators/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "nc-indicators"; - version = "0.2"; - sha256 = "0z3h0d3cl0xapysq5sh1rnbp8fg8adlq0x3i4ql9xin9in29q27q"; + version = "0.3"; + sha256 = "0w5nddirsib9vz96dpan9bgdg1mag9gaz7w7ix51l44ls9r8yn3m"; isLibrary = false; isExecutable = true; buildDepends = [ attoparsec gtk hflags lens pipes stm ]; diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/applications/misc/openjump/default.nix index 74f657ee02a..8a68bd7ccfb 100644 --- a/pkgs/applications/misc/openjump/default.nix +++ b/pkgs/applications/misc/openjump/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = { description = "open source Geographic Information System (GIS) written in the Java programming language"; homepage = http://www.openjump.org/index.html; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/misc/qgis/default.nix b/pkgs/applications/misc/qgis/default.nix index d6711c82968..cc26a74802b 100644 --- a/pkgs/applications/misc/qgis/default.nix +++ b/pkgs/applications/misc/qgis/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "User friendly Open Source Geographic Information System"; homepage = http://www.qgis.org; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 88d6e7a7cf9..abf55aa22b9 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { temperature transitions smoothly from night to daytime temperature to allow your eyes to slowly adapt. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = "http://jonls.dk/redshift"; platforms = platforms.linux; maintainers = maintainers.mornfall; diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix index e1492a47691..151b8a077d5 100644 --- a/pkgs/applications/misc/sakura/default.nix +++ b/pkgs/applications/misc/sakura/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { terminals in one window and adds a contextual menu with some basic options. No more no less. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 9c57fbd19a7..1dcdf78456d 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://st.suckless.org/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = with maintainers; [viric]; platforms = with platforms; linux; }; diff --git a/pkgs/applications/misc/stardict/stardict.nix b/pkgs/applications/misc/stardict/stardict.nix index 9eb3e112342..1ca8ec045d6 100644 --- a/pkgs/applications/misc/stardict/stardict.nix +++ b/pkgs/applications/misc/stardict/stardict.nix @@ -39,8 +39,7 @@ stdenv.mkDerivation rec { meta = { description = "stardict"; homepage = "A international dictionary supporting fuzzy and glob style matching"; - license = "LGPL3"; + license = stdenv.lib.licenses.lgpl3; maintainers = with stdenv.lib.maintainers; [qknight]; }; } - diff --git a/pkgs/applications/misc/surf/default.nix b/pkgs/applications/misc/surf/default.nix index 651cfcca406..983fbde0c45 100644 --- a/pkgs/applications/misc/surf/default.nix +++ b/pkgs/applications/misc/surf/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { surf to another URI by setting its XProperties. ''; homepage = http://surf.suckless.org; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index d975d171518..8d914c26221 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -6,11 +6,11 @@ assert stdenv.isLinux -> cryptopp != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "synergy-1.4.17"; + name = "synergy-1.5.0"; src = fetchurl { - url = "http://fossfiles.com/synergy/${name}-r2055-Source.tar.gz"; - sha256 = "1mwaapvq9vsm0rdpq99fyzcw6wbp83rg6cylcqcgjjd21c6y9iwm"; + url = "http://synergy-project.org/files/packages/synergy-1.5.0-r2278-Source.tar.gz"; + sha256 = "097hk9v01lwzs7ly6ynadxmjh7ad68l5si7w4qmjn6z7l8b61gv6"; }; patches = optional stdenv.isLinux ./cryptopp.patch; diff --git a/pkgs/applications/misc/tangogps/default.nix b/pkgs/applications/misc/tangogps/default.nix index 609849166d1..aa1df2c9d1a 100644 --- a/pkgs/applications/misc/tangogps/default.nix +++ b/pkgs/applications/misc/tangogps/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { #homepage = http://www.tangogps.org/; # no longer valid, I couldn't find any other - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/applications/misc/taskjuggler/default.nix index 77acc511fe4..e1e04771460 100644 --- a/pkgs/applications/misc/taskjuggler/default.nix +++ b/pkgs/applications/misc/taskjuggler/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.taskjuggler.org"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; description = "Project management tool"; longDescription = '' TaskJuggler is a modern and powerful, Open Source project management diff --git a/pkgs/applications/misc/vanitygen/default.nix b/pkgs/applications/misc/vanitygen/default.nix index 99b0e70c898..6be2dc394cc 100644 --- a/pkgs/applications/misc/vanitygen/default.nix +++ b/pkgs/applications/misc/vanitygen/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { and will run about 30% faster. ''; homepage = "https://github.com/samr7/vanitygen"; - license = "AGPLv3"; + license = stdenv.lib.licenses.agpl3; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 70ac055db09..6508b12e1de 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation { homepage = http://viking.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/wmname/default.nix b/pkgs/applications/misc/wmname/default.nix index 417d4a5ae68..0f71a53075f 100644 --- a/pkgs/applications/misc/wmname/default.nix +++ b/pkgs/applications/misc/wmname/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "Prints or set the window manager name property of the root window"; homepage = "http://tools.suckless.org/wmname"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix index 9b1385d9d6a..9a35cef0824 100644 --- a/pkgs/applications/misc/xfe/default.nix +++ b/pkgs/applications/misc/xfe/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { Xfe aims to be the filemanager of choice for all the Unix addicts! ''; homepage = "http://sourceforge.net/projects/xfe/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bbenoist ]; platforms = stdenv.lib.platforms.mesaPlatforms; }; diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index 4f6e3342f58..cc08436fa03 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Utility for switching between keyboard layouts"; homepage = http://xneur.ru; - license = "GPL2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 933882c940b..5f44f79ebcd 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,23 +1,16 @@ { stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper, zathura_icon }: stdenv.mkDerivation rec { - version = "0.2.7"; + version = "0.2.9"; name = "zathura-core-${version}"; src = fetchurl { url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz"; - sha256 = "ef43be7705612937d095bfbe719a03503bf7e45493ea9409cb43a45cf96f0daf"; + sha256 = "17z05skjk95115ajp6459k1djadza1w8kck7jn1qnd697r01s1rc"; }; buildInputs = [ pkgconfig file gtk girara gettext makeWrapper ]; - # Bug in zathura build system: we should remove empty manfiles in order them - # to be compiled properly - preBuild = '' - rm zathura.1 - rm zathurarc.5 - ''; - makeFlags = [ "PREFIX=$(out)" "RSTTOMAN=${docutils}/bin/rst2man.py" "VERBOSE=1" ]; postInstall = '' diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 3aac5f9b17a..31125795271 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -79,7 +79,7 @@ let }; opusWithCustomModes = libopus.override { - withCustomModes = !versionOlder source.version "35.0.0.0"; + withCustomModes = true; }; defaultDependencies = [ @@ -132,19 +132,13 @@ let find -iname '*.gyp*' \( -type f -o -type l \) \ -exec sed -i -e 's|<(DEPTH)|'"$(pwd)"'|g' {} + \ -exec chmod u+w {} + - '' + optionalString (!versionOlder source.version "37.0.0.0") '' - python third_party/libaddressinput/chromium/tools/update-strings.py ''; - postPatch = let - toPatch = if versionOlder source.version "36.0.0.0" - then "content/browser/browser_main_loop.cc" - else "sandbox/linux/suid/client/setuid_sandbox_client.cc"; - in '' + postPatch = '' sed -i -e '/base::FilePath exe_dir/,/^ *} *$/c \ sandbox_binary = base::FilePath(getenv("CHROMIUM_SANDBOX_BINARY_PATH")); - ' ${toPatch} - '' + optionalString (!versionOlder source.version "36.0.0.0") '' + ' sandbox/linux/suid/client/setuid_sandbox_client.cc + sed -i -e '/module_path *=.*libexif.so/ { s|= [^;]*|= base::FilePath().AppendASCII("${libexif}/lib/libexif.so")| }' chrome/utility/media_galleries/image_metadata_extractor.cc @@ -165,6 +159,7 @@ let use_cups = cupsSupport; linux_sandbox_chrome_path="${libExecPath}/${packageName}"; werror = ""; + clang = false; # FIXME: In version 37, omnibox.mojom.js doesn't seem to be generated. use_mojo = versionOlder source.version "37.0.0.0"; diff --git a/pkgs/applications/networking/browsers/chromium/source/angle_build_37.patch b/pkgs/applications/networking/browsers/chromium/source/angle_build_37.patch deleted file mode 100644 index a3e8c91174a..00000000000 --- a/pkgs/applications/networking/browsers/chromium/source/angle_build_37.patch +++ /dev/null @@ -1,347 +0,0 @@ -commit 9c4b24a52e0ff478aa170d33e26c44acd8c68be3 -Author: Jamie Madill <jmadill@chromium.org> -Date: Thu Jun 12 13:41:17 2014 -0400 - - Use commit_id.py on Windows, and handle missing git. - - This allows us to delete the Windows batch file. - - Changes the commit_id script to take the working directory so that it - can be called from a different working directory than the angle - repository is in. - - Renames the generated commit header to angle_commit.h. This is being - written to the shared generated code directory for the entire build, - and "commit.h" is insufficiently unique. - - BUG=angle:669 - - Change-Id: I35e80411a7e8ba1e02ce3f6a4fc54ed4dbc918f3 - Reviewed-on: https://chromium-review.googlesource.com/202048 - Reviewed-by: Geoff Lang <geofflang@chromium.org> - Tested-by: Jamie Madill <jmadill@chromium.org> - [Removed and/or fixed up Windows specific hunks] - Signed-off-by: aszlig <aszlig@redmoonstudios.org> - -diff --git a/generate_projects b/generate_projects -index 6743254..8175277 100644 ---- a/generate_projects -+++ b/generate_projects -@@ -34,6 +34,7 @@ if __name__ == '__main__': - gyp_cmd += ' -D angle_build_tests=' + ('1' if build_tests else '0') - gyp_cmd += ' -D angle_build_samples=' + ('1' if build_samples else '0') - gyp_cmd += ' -D release_symbols=' + ('true' if release_symbols else 'false') -+ gyp_cmd += ' -D angle_use_commit_id=0' - gyp_cmd += ' ' + os.path.join(script_dir, 'all.gyp') - - print 'Generating projects to ' + generation_dir + ' from gyp files...' -diff --git a/projects/build/all.sln b/projects/build/all.sln -index 1aa0796..5862edd 100644 ---- a/projects/build/all.sln -+++ b/projects/build/all.sln -@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 11.00 - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "All", "All.vcxproj", "{D048EF6F-5312-AF41-8D8A-DB22CD8634E6}" - ProjectSection(ProjectDependencies) = postProject - {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} -- {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} - {C7BAF548-697D-2DCB-9DF3-9D1506A7B444} = {C7BAF548-697D-2DCB-9DF3-9D1506A7B444} - {276D20F5-2943-414C-0FF6-21F4723A5CF6} = {276D20F5-2943-414C-0FF6-21F4723A5CF6} - {C15697F6-5057-016E-BD29-422971875679} = {C15697F6-5057-016E-BD29-422971875679} - {19386E01-D811-FA3B-9F1E-122BB0C0E9F5} = {19386E01-D811-FA3B-9F1E-122BB0C0E9F5} -+ {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} - {22DC02D5-1598-943C-13E1-82185B469F81} = {22DC02D5-1598-943C-13E1-82185B469F81} - {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} - {FBAEE4F6-562A-588F-01F9-72DCABB3B061} = {FBAEE4F6-562A-588F-01F9-72DCABB3B061} -@@ -30,9 +30,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "All", "All.vcxproj", "{D048 - EndProjectSection - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commit_id", "..\src\commit_id.vcxproj", "{3B7F5656-177F-52EE-26B3-D6A75368D0A9}" -- ProjectSection(ProjectDependencies) = postProject -- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} -- EndProjectSection - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_compiler_dll", "..\src\copy_compiler_dll.vcxproj", "{22DC02D5-1598-943C-13E1-82185B469F81}" - ProjectSection(ProjectDependencies) = postProject -@@ -68,7 +65,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "..\src\libEGL.vcx - ProjectSection(ProjectDependencies) = postProject - {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} - {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} -- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} - EndProjectSection - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "..\src\libGLESv2.vcxproj", "{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}" -diff --git a/projects/samples/samples.sln b/projects/samples/samples.sln -index 53cec34..b927860 100644 ---- a/projects/samples/samples.sln -+++ b/projects/samples/samples.sln -@@ -1,9 +1,6 @@ - Microsoft Visual Studio Solution File, Format Version 11.00 - # Visual C++ Express 2010 - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commit_id", "..\src\commit_id.vcxproj", "{3B7F5656-177F-52EE-26B3-D6A75368D0A9}" -- ProjectSection(ProjectDependencies) = postProject -- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} -- EndProjectSection - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_compiler_dll", "..\src\copy_compiler_dll.vcxproj", "{22DC02D5-1598-943C-13E1-82185B469F81}" - ProjectSection(ProjectDependencies) = postProject -@@ -39,7 +36,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "..\src\libEGL.vcx - ProjectSection(ProjectDependencies) = postProject - {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} - {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} -- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} - EndProjectSection - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "..\src\libGLESv2.vcxproj", "{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}" -diff --git a/projects/src/angle.sln b/projects/src/angle.sln -index 0d6ec65..cdf9f53 100644 ---- a/projects/src/angle.sln -+++ b/projects/src/angle.sln -@@ -1,9 +1,6 @@ - Microsoft Visual Studio Solution File, Format Version 11.00 - # Visual C++ Express 2010 - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commit_id", "commit_id.vcxproj", "{3B7F5656-177F-52EE-26B3-D6A75368D0A9}" -- ProjectSection(ProjectDependencies) = postProject -- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} -- EndProjectSection - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_compiler_dll", "copy_compiler_dll.vcxproj", "{22DC02D5-1598-943C-13E1-82185B469F81}" - ProjectSection(ProjectDependencies) = postProject -@@ -16,7 +13,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "libEGL.vcxproj", - ProjectSection(ProjectDependencies) = postProject - {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} - {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} -- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} - EndProjectSection - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "libGLESv2.vcxproj", "{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}" -diff --git a/src/angle.gypi b/src/angle.gypi -index 5339369..ef16749 100644 ---- a/src/angle.gypi -+++ b/src/angle.gypi -@@ -7,6 +7,12 @@ - { - 'angle_code': 1, - 'angle_post_build_script%': 0, -+ 'angle_gen_path': '<(SHARED_INTERMEDIATE_DIR)/angle', -+ 'angle_id_script_base': 'commit_id.py', -+ 'angle_id_script': '<(angle_gen_path)/<(angle_id_script_base)', -+ 'angle_id_header_base': 'commit.h', -+ 'angle_id_header': '<(angle_gen_path)/id/<(angle_id_header_base)', -+ 'angle_use_commit_id%': '<!(python <(angle_id_script_base) check ..)', - }, - 'includes': - [ -@@ -23,57 +29,71 @@ - 'copies': - [ - { -- 'destination': '<(SHARED_INTERMEDIATE_DIR)', -- 'files': [ 'commit_id.bat', 'copy_compiler_dll.bat', 'commit_id.py' ], -+ 'destination': '<(angle_gen_path)', -+ 'files': [ 'copy_compiler_dll.bat', '<(angle_id_script_base)' ], - }, - ], - }, -- -+ ], -+ 'conditions': -+ [ -+ ['angle_use_commit_id!=0', - { -- 'target_name': 'commit_id', -- 'type': 'none', -- 'includes': [ '../build/common_defines.gypi', ], -- 'dependencies': [ 'copy_scripts', ], -- 'conditions': -+ 'targets': - [ -- ['OS=="win"', - { -+ 'target_name': 'commit_id', -+ 'type': 'none', -+ 'includes': [ '../build/common_defines.gypi', ], -+ 'dependencies': [ 'copy_scripts', ], - 'actions': - [ - { -- 'action_name': 'Generate Commit ID Header', -- 'message': 'Generating commit ID header...', -+ 'action_name': 'Generate ANGLE Commit ID Header', -+ 'message': 'Generating ANGLE Commit ID', -+ # reference the git index as an input, so we rebuild on changes to the index -+ 'inputs': [ '<(angle_id_script)', '<(angle_path)/.git/index' ], -+ 'outputs': [ '<(angle_id_header)' ], - 'msvs_cygwin_shell': 0, -- 'inputs': [ '<(SHARED_INTERMEDIATE_DIR)/commit_id.bat', '<(angle_path)/.git/index' ], -- 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/commit.h' ], -- 'action': [ '<(SHARED_INTERMEDIATE_DIR)/commit_id.bat', '<(SHARED_INTERMEDIATE_DIR)' ], -+ 'action': -+ [ -+ 'python', '<(angle_id_script)', 'gen', '<(angle_path)', '<(angle_id_header)' -+ ], - }, - ], -- }, -- { # OS != win -- 'actions': -+ 'direct_dependent_settings': -+ { -+ 'include_dirs': -+ [ -+ '<(angle_gen_path)', -+ ], -+ }, -+ } -+ ] -+ }, -+ { # angle_use_commit_id==0 -+ 'targets': -+ [ -+ { -+ 'target_name': 'commit_id', -+ 'type': 'none', -+ 'copies': - [ - { -- 'action_name': 'Generate Commit ID Header', -- 'message': 'Generating commit ID header...', -- 'inputs': [ '<(SHARED_INTERMEDIATE_DIR)/commit_id.py', '<(angle_path)/.git/index' ], -- 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/commit.h' ], -- 'action': [ 'python', '<(SHARED_INTERMEDIATE_DIR)/commit_id.py', '<(SHARED_INTERMEDIATE_DIR)/commit.h' ], -- }, -+ 'destination': '<(angle_gen_path)/id', -+ 'files': [ '<(angle_id_header_base)' ] -+ } - ], -- }], -- ], -- 'direct_dependent_settings': -- { -- 'include_dirs': -- [ -- '<(SHARED_INTERMEDIATE_DIR)', -- ], -- }, -- }, -- ], -- 'conditions': -- [ -+ 'direct_dependent_settings': -+ { -+ 'include_dirs': -+ [ -+ '<(angle_gen_path)', -+ ], -+ }, -+ } -+ ] -+ }], - ['OS=="win"', - { - 'targets': -@@ -93,7 +113,7 @@ - 'outputs': [ '<(PRODUCT_DIR)/D3DCompiler_46.dll' ], - 'action': - [ -- "<(SHARED_INTERMEDIATE_DIR)/copy_compiler_dll.bat", -+ "<(angle_gen_path)/copy_compiler_dll.bat", - "$(PlatformName)", - "<(windows_sdk_path)", - "<(PRODUCT_DIR)" -diff --git a/src/commit.h b/src/commit.h -new file mode 100644 -index 0000000..4c89a65 ---- /dev/null -+++ b/src/commit.h -@@ -0,0 +1,14 @@ -+// -+// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+// -+// commit.h: -+// This is a default commit hash header, when git is not available. -+// -+ -+#define ANGLE_COMMIT_HASH "unknown hash" -+#define ANGLE_COMMIT_HASH_SIZE 12 -+#define ANGLE_COMMIT_DATE "unknown date" -+ -+#define ANGLE_DISABLE_PROGRAM_BINARY_LOAD -diff --git a/src/commit_id.py b/src/commit_id.py -index 6339cca..7f711e7 100644 ---- a/src/commit_id.py -+++ b/src/commit_id.py -@@ -1,19 +1,35 @@ - import subprocess as sp - import sys -+import os - --def grab_output(*command): -- return sp.Popen(command, stdout=sp.PIPE).communicate()[0].strip() -+# Usage: commit_id.py check <angle_dir> (checks if git is present) -+# Usage: commit_id.py gen <angle_dir> <file_to_write> (generates commit id) - -+def grab_output(command, cwd): -+ return sp.Popen(command, stdout=sp.PIPE, shell=True, cwd=cwd).communicate()[0].strip() -+ -+operation = sys.argv[1] -+cwd = sys.argv[2] -+ -+if operation == 'check': -+ index_path = os.path.join(cwd, '.git', 'index') -+ if os.path.exists(index_path): -+ print("1") -+ else: -+ print("0") -+ sys.exit(0) -+ -+output_file = sys.argv[3] - commit_id_size = 12 - - try: -- commit_id = grab_output('git', 'rev-parse', '--short=%d' % commit_id_size, 'HEAD') -- commit_date = grab_output('git', 'show', '-s', '--format=%ci', 'HEAD') -+ commit_id = grab_output('git rev-parse --short=%d HEAD' % commit_id_size, cwd) -+ commit_date = grab_output('git show -s --format=%ci HEAD', cwd) - except: - commit_id = 'invalid-hash' - commit_date = 'invalid-date' - --hfile = open(sys.argv[1], 'w') -+hfile = open(output_file, 'w') - - hfile.write('#define ANGLE_COMMIT_HASH "%s"\n' % commit_id) - hfile.write('#define ANGLE_COMMIT_HASH_SIZE %d\n' % commit_id_size) -diff --git a/src/common/version.h b/src/common/version.h -index b9781d7..d9148d1 100644 ---- a/src/common/version.h -+++ b/src/common/version.h -@@ -1,4 +1,4 @@ --#include "commit.h" -+#include "id/commit.h" - - #define ANGLE_MAJOR_VERSION 2 - #define ANGLE_MINOR_VERSION 1 -diff --git a/src/libGLESv2/ProgramBinary.cpp b/src/libGLESv2/ProgramBinary.cpp -index 8525ffb..e3ffa47 100644 ---- a/src/libGLESv2/ProgramBinary.cpp -+++ b/src/libGLESv2/ProgramBinary.cpp -@@ -1018,6 +1018,9 @@ bool ProgramBinary::linkVaryings(InfoLog &infoLog, FragmentShader *fragmentShade - - bool ProgramBinary::load(InfoLog &infoLog, const void *binary, GLsizei length) - { -+#ifdef ANGLE_DISABLE_PROGRAM_BINARY_LOAD -+ return false; -+#else - BinaryInputStream stream(binary, length); - - int format = stream.readInt<int>(); -@@ -1260,6 +1263,7 @@ bool ProgramBinary::load(InfoLog &infoLog, const void *binary, GLsizei length) - initializeUniformStorage(); - - return true; -+#endif // #ifdef ANGLE_DISABLE_PROGRAM_BINARY_LOAD - } - - bool ProgramBinary::save(void* binary, GLsizei bufSize, GLsizei *length) diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index 0d8a4156703..d7ccc412fa4 100644 --- a/pkgs/applications/networking/browsers/chromium/source/default.nix +++ b/pkgs/applications/networking/browsers/chromium/source/default.nix @@ -22,9 +22,7 @@ stdenv.mkDerivation { prePatch = "patchShebangs ."; - patches = if (versionOlder version "36.0.0.0") - then singleton ./sandbox_userns_31.patch - else singleton ./sandbox_userns_36.patch; + patches = singleton ./sandbox_userns_36.patch; postPatch = '' sed -i -r \ @@ -32,14 +30,13 @@ stdenv.mkDerivation { -e 's|/bin/echo|echo|' \ -e "/python_arch/s/: *'[^']*'/: '""'/" \ build/common.gypi chrome/chrome_tests.gypi + '' + optionalString (versionOlder version "38.0.0.0") '' sed -i -e '/not RunGN/,+1d' -e '/import.*depot/d' build/gyp_chromium sed -i -e 's|/usr/bin/gcc|gcc|' \ third_party/WebKit/Source/build/scripts/scripts.gypi \ third_party/WebKit/Source/build/scripts/preprocessor.pm '' + optionalString useOpenSSL '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl - '' + optionalString (!versionOlder version "37.0.0.0") '' - patch -p1 -d third_party/angle < "${./angle_build_37.patch}" ''; outputs = [ "out" "sandbox" "bundled" "main" ]; diff --git a/pkgs/applications/networking/browsers/chromium/source/sandbox_userns_31.patch b/pkgs/applications/networking/browsers/chromium/source/sandbox_userns_31.patch deleted file mode 100644 index 490c1a9cebe..00000000000 --- a/pkgs/applications/networking/browsers/chromium/source/sandbox_userns_31.patch +++ /dev/null @@ -1,297 +0,0 @@ -commit ff4e8b4af04c58fc4c58ee7ed108aefcdc26a960 -Author: aszlig <aszlig@redmoonstudios.org> -Date: Thu May 16 14:17:56 2013 +0200 - - zygote: Add support for user namespaces on Linux. - - The implementation is done by patching the Zygote host to execute the sandbox - binary with CLONE_NEWUSER and setting the uid and gid mapping so that the child - process is using uid 0 and gid 0 which map to the current user of the parent. - Afterwards, the sandbox will continue as if it was called as a setuid binary. - - In addition, this adds new_user_namespace as an option in process_util in order - to set the UID and GID mapping correctly. The reason for this is that just - passing CLONE_NEWUSER to clone_flags doesn't help in LaunchProcess(), because - without setting the mappings exec*() will clear the process's capability sets. - - If the kernel doesn't support unprivileged user namespaces and the sandbox - binary doesn't have the setuid flag, the Zygote main process will run without a - sandbox. This is to mimic the behaviour if no SUID sandbox binary path is set. - - Signed-off-by: aszlig <aszlig@redmoonstudios.org> - -diff --git a/base/process/launch.cc b/base/process/launch.cc -index 1329a5a..ec28fdf 100644 ---- a/base/process/launch.cc -+++ b/base/process/launch.cc -@@ -24,6 +24,7 @@ LaunchOptions::LaunchOptions() - new_process_group(false) - #if defined(OS_LINUX) - , clone_flags(0) -+ , new_user_namespace(false) - #endif // OS_LINUX - #if defined(OS_CHROMEOS) - , ctrl_terminal_fd(-1) -diff --git a/base/process/launch.h b/base/process/launch.h -index ac2df5e..34a3851 100644 ---- a/base/process/launch.h -+++ b/base/process/launch.h -@@ -100,6 +100,9 @@ struct BASE_EXPORT LaunchOptions { - #if defined(OS_LINUX) - // If non-zero, start the process using clone(), using flags as provided. - int clone_flags; -+ -+ // If true, start the process in a new user namespace. -+ bool new_user_namespace; - #endif // defined(OS_LINUX) - - #if defined(OS_CHROMEOS) -diff --git a/base/process/launch_posix.cc b/base/process/launch_posix.cc -index de6286d..9333494 100644 ---- a/base/process/launch_posix.cc -+++ b/base/process/launch_posix.cc -@@ -37,6 +37,13 @@ - #include "base/threading/platform_thread.h" - #include "base/threading/thread_restrictions.h" - -+#if defined(OS_LINUX) -+#include <sched.h> -+#if !defined(CLONE_NEWUSER) -+#define CLONE_NEWUSER 0x10000000 -+#endif -+#endif -+ - #if defined(OS_CHROMEOS) - #include <sys/ioctl.h> - #endif -@@ -294,13 +301,23 @@ bool LaunchProcess(const std::vector<std::string>& argv, - - pid_t pid; - #if defined(OS_LINUX) -- if (options.clone_flags) { -+ int map_pipe_fd[2]; -+ int flags = options.clone_flags; -+ -+ if (options.new_user_namespace) { -+ flags |= CLONE_NEWUSER; -+ if (pipe(map_pipe_fd) < 0) { -+ DPLOG(ERROR) << "user namespace pipe"; -+ return false; -+ } -+ } -+ -+ if (options.clone_flags || options.new_user_namespace) { - // Signal handling in this function assumes the creation of a new - // process, so we check that a thread is not being created by mistake - // and that signal handling follows the process-creation rules. -- RAW_CHECK( -- !(options.clone_flags & (CLONE_SIGHAND | CLONE_THREAD | CLONE_VM))); -- pid = syscall(__NR_clone, options.clone_flags, 0, 0, 0); -+ RAW_CHECK(!(flags & (CLONE_SIGHAND | CLONE_THREAD | CLONE_VM))); -+ pid = syscall(__NR_clone, flags, 0, 0, 0); - } else - #endif - { -@@ -318,6 +335,21 @@ bool LaunchProcess(const std::vector<std::string>& argv, - } else if (pid == 0) { - // Child process - -+#if defined(OS_LINUX) -+ if (options.new_user_namespace) { -+ // Close the write end of the pipe so we get an EOF when the parent closes -+ // the FD. This is to avoid race conditions when the UID/GID mappings are -+ // written _after_ execvp(). -+ close(map_pipe_fd[1]); -+ -+ char dummy; -+ if (HANDLE_EINTR(read(map_pipe_fd[0], &dummy, 1)) != 0) { -+ RAW_LOG(ERROR, "Unexpected input in uid/gid mapping pipe."); -+ _exit(127); -+ } -+ } -+#endif -+ - // DANGER: fork() rule: in the child, if you don't end up doing exec*(), - // you call _exit() instead of exit(). This is because _exit() does not - // call any previously-registered (in the parent) exit handlers, which -@@ -433,6 +465,40 @@ bool LaunchProcess(const std::vector<std::string>& argv, - _exit(127); - } else { - // Parent process -+#if defined(OS_LINUX) -+ if (options.new_user_namespace) { -+ // We need to write UID/GID mapping here to map the current user outside -+ // the namespace to the root user inside the namespace in order to -+ // correctly "fool" the child process. -+ char buf[256]; -+ int map_fd, map_len; -+ -+ snprintf(buf, sizeof(buf), "/proc/%d/uid_map", pid); -+ map_fd = open(buf, O_RDWR); -+ DPCHECK(map_fd >= 0); -+ snprintf(buf, sizeof(buf), "0 %d 1", geteuid()); -+ map_len = strlen(buf); -+ if (write(map_fd, buf, map_len) != map_len) { -+ RAW_LOG(WARNING, "Can't write to uid_map."); -+ } -+ close(map_fd); -+ -+ snprintf(buf, sizeof(buf), "/proc/%d/gid_map", pid); -+ map_fd = open(buf, O_RDWR); -+ DPCHECK(map_fd >= 0); -+ snprintf(buf, sizeof(buf), "0 %d 1", getegid()); -+ map_len = strlen(buf); -+ if (write(map_fd, buf, map_len) != map_len) { -+ RAW_LOG(WARNING, "Can't write to gid_map."); -+ } -+ close(map_fd); -+ -+ // Close the pipe on the parent, so the child can continue doing the -+ // execvp() call. -+ close(map_pipe_fd[1]); -+ } -+#endif -+ - if (options.wait) { - // While this isn't strictly disk IO, waiting for another process to - // finish is the sort of thing ThreadRestrictions is trying to prevent. -diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc -index fea43b5..95cbe07 100644 ---- a/content/browser/zygote_host/zygote_host_impl_linux.cc -+++ b/content/browser/zygote_host/zygote_host_impl_linux.cc -@@ -121,25 +121,31 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) { - - sandbox_binary_ = sandbox_cmd.c_str(); - -- // A non empty sandbox_cmd means we want a SUID sandbox. -- using_suid_sandbox_ = !sandbox_cmd.empty(); -+ bool userns_sandbox = false; -+ const std::vector<std::string> cmd_line_unwrapped(cmd_line.argv()); - -- if (using_suid_sandbox_) { -+ if (!sandbox_cmd.empty()) { - struct stat st; - if (stat(sandbox_binary_.c_str(), &st) != 0) { - LOG(FATAL) << "The SUID sandbox helper binary is missing: " - << sandbox_binary_ << " Aborting now."; - } - -- if (access(sandbox_binary_.c_str(), X_OK) == 0 && -- (st.st_uid == 0) && -- (st.st_mode & S_ISUID) && -- (st.st_mode & S_IXOTH)) { -+ if (access(sandbox_binary_.c_str(), X_OK) == 0) { -+ using_suid_sandbox_ = true; -+ - cmd_line.PrependWrapper(sandbox_binary_); - - scoped_ptr<sandbox::SetuidSandboxClient> - sandbox_client(sandbox::SetuidSandboxClient::Create()); - sandbox_client->SetupLaunchEnvironment(); -+ -+ if (!((st.st_uid == 0) && -+ (st.st_mode & S_ISUID) && -+ (st.st_mode & S_IXOTH))) { -+ userns_sandbox = true; -+ sandbox_client->SetNoSuid(); -+ } - } else { - LOG(FATAL) << "The SUID sandbox helper binary was found, but is not " - "configured correctly. Rather than run without sandboxing " -@@ -163,7 +169,19 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) { - base::ProcessHandle process = -1; - base::LaunchOptions options; - options.fds_to_remap = &fds_to_map; -+ if (userns_sandbox) -+ options.new_user_namespace = true; - base::LaunchProcess(cmd_line.argv(), options, &process); -+ -+ if (process == -1 && userns_sandbox) { -+ LOG(ERROR) << "User namespace sandbox failed to start, running without " -+ << "sandbox! You need at least kernel 3.8.0 with CONFIG_USER_NS " -+ << "enabled in order to use the sandbox without setuid bit."; -+ using_suid_sandbox_ = false; -+ options.new_user_namespace = false; -+ base::LaunchProcess(cmd_line_unwrapped, options, &process); -+ } -+ - CHECK(process != -1) << "Failed to launch zygote process"; - - if (using_suid_sandbox_) { -diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc -index 567b305..1089233 100644 ---- a/content/zygote/zygote_main_linux.cc -+++ b/content/zygote/zygote_main_linux.cc -@@ -426,6 +426,13 @@ static bool EnterSuidSandbox(LinuxSandbox* linux_sandbox, - *has_started_new_init = true; - } - -+ // Don't set non-dumpable, as it causes trouble when the host tries to find -+ // the zygote process (XXX: Not quite sure why this happens with user -+ // namespaces). Fortunately, we also have the seccomp filter sandbox which -+ // should disallow the use of ptrace. -+ if (setuid_sandbox->IsNoSuid()) -+ return true; -+ - #if !defined(OS_OPENBSD) - // Previously, we required that the binary be non-readable. This causes the - // kernel to mark the process as non-dumpable at startup. The thinking was -diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.cc b/sandbox/linux/suid/client/setuid_sandbox_client.cc -index 34231d4..36e3201 100644 ---- a/sandbox/linux/suid/client/setuid_sandbox_client.cc -+++ b/sandbox/linux/suid/client/setuid_sandbox_client.cc -@@ -166,6 +166,10 @@ bool SetuidSandboxClient::IsInNewNETNamespace() const { - return env_->HasVar(kSandboxNETNSEnvironmentVarName); - } - -+bool SetuidSandboxClient::IsNoSuid() const { -+ return env_->HasVar(kSandboxNoSuidVarName); -+} -+ - bool SetuidSandboxClient::IsSandboxed() const { - return sandboxed_; - } -@@ -175,5 +179,9 @@ void SetuidSandboxClient::SetupLaunchEnvironment() { - SetSandboxAPIEnvironmentVariable(env_); - } - -+void SetuidSandboxClient::SetNoSuid() { -+ env_->SetVar(kSandboxNoSuidVarName, "1"); -+} -+ - } // namespace sandbox - -diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.h b/sandbox/linux/suid/client/setuid_sandbox_client.h -index a9f6536..2e8113a 100644 ---- a/sandbox/linux/suid/client/setuid_sandbox_client.h -+++ b/sandbox/linux/suid/client/setuid_sandbox_client.h -@@ -39,6 +39,8 @@ class SetuidSandboxClient { - bool IsInNewPIDNamespace() const; - // Did the setuid helper create a new network namespace ? - bool IsInNewNETNamespace() const; -+ // Is sandboxed without SUID binary ? -+ bool IsNoSuid() const; - // Are we done and fully sandboxed ? - bool IsSandboxed() const; - -@@ -46,6 +48,8 @@ class SetuidSandboxClient { - // helper. - void SetupLaunchEnvironment(); - -+ void SetNoSuid(); -+ - private: - // Holds the environment. Will never be NULL. - base::Environment* env_; -diff --git a/sandbox/linux/suid/common/sandbox.h b/sandbox/linux/suid/common/sandbox.h -index aad4ff8..bd710d5 100644 ---- a/sandbox/linux/suid/common/sandbox.h -+++ b/sandbox/linux/suid/common/sandbox.h -@@ -18,6 +18,7 @@ static const char kAdjustLowMemMarginSwitch[] = "--adjust-low-mem"; - - static const char kSandboxDescriptorEnvironmentVarName[] = "SBX_D"; - static const char kSandboxHelperPidEnvironmentVarName[] = "SBX_HELPER_PID"; -+static const char kSandboxNoSuidVarName[] = "SBX_NO_SUID"; - - static const long kSUIDSandboxApiNumber = 1; - static const char kSandboxEnvironmentApiRequest[] = "SBX_CHROME_API_RQ"; diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index 965328d43a4..4a610827913 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -1,21 +1,21 @@ # This file is autogenerated from update.sh in the parent directory. { dev = { - version = "37.0.2054.3"; - sha256 = "1sly1fb9wh10m36crikahn7wgsq7j090jaga4l8zk4kihzprcnj2"; - sha256bin32 = "0242ypzgzskkmsw3iyirxzlm1gbng94lv723ffcr018grq9yg4gs"; - sha256bin64 = "17kzb7k0vn96wa6a4xfx05885li1qjg8bp6y3ngs2i0wws9ypfd9"; + version = "38.0.2107.3"; + sha256 = "0zb1mj3xgvvs5ijix4b52vj9dlymqkipn8srfzvhwl7g4hx5ss3v"; + sha256bin32 = "12lvvmg3bqacb0qw72bwlxm2m57s39mz2810agngdgzv0hd835cv"; + sha256bin64 = "1vw36s8nlvdsl8pjbh4gny00kvcizn1i2lznzqzysicz2rz7ncrh"; }; beta = { - version = "36.0.1985.84"; - sha256 = "02hhqx5m4hxmnf8l3a2ah9k39bpz35sll6gv89vz27vdgb6mza0j"; - sha256bin32 = "1jjxzknyiw6d5p0bcb7c9d0siffg55wmm34lq1phz1jlqq6hz6zy"; - sha256bin64 = "1jr9a386arfmd8rskns9bmlczzr3xzcw9ykv7xf23iz86qqp723r"; + version = "37.0.2062.58"; + sha256 = "0jck4s6nrizj9wmifsjviin9ifnviihs21fi05wzljyfnbgc4byl"; + sha256bin32 = "1cm1r8bqy66gvdhbrgn9pdc11i72dca96ab5j3m3349p6728jbgk"; + sha256bin64 = "0cpb189pn5jiplldkgy8lfbcwvfik66kjjf6y2i708xa5ggfpwfi"; }; stable = { - version = "35.0.1916.153"; - sha256 = "03p7wmlvbrgd8m94344z4azkhrffwrr5c76dm8c4jcxs0x1yn318"; - sha256bin32 = "0xm34xwdai8ns6bkq5dshh4izls70rwgvya23md4vxq6iv78sykn"; - sha256bin64 = "1x2cm1i8v8d69856b42anms33clv63adzpqy58in6i9vba13swif"; + version = "36.0.1985.125"; + sha256 = "08shkm89qzzdlrjg0rg5qiszbk6ziginsicyxqyk353y76jx10hp"; + sha256bin32 = "1ahazz56k127xncgl1lzwsmydbh0vcxq0hzrb9cm9zzdkzqjzg03"; + sha256bin64 = "0qx5316cd8l9g8w389aqi5m3csmr5s8hs7sivlk02mbs0jzi8ppc"; }; } diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 61db2656a40..0e4fd4db1ba 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { meta = { description = "Full-featured text-mode web browser"; homepage = http://elinks.or.cz; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index b8e3124f185..969ced923b3 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -38,184 +38,186 @@ }: let - version = "30.0"; + version = "31.0"; sources = [ - { locale = "ach"; arch = "linux-i686"; sha256 = "44d2fc9d491b6c001e35cff6e5f1c38c8561d24f8fe2dfb4d79365bcabe965ea"; } - { locale = "ach"; arch = "linux-x86_64"; sha256 = "e9fb52a3b82a1434b7fa3bae606749819672c96ce8678c51f1fdbc68520e26bf"; } - { locale = "af"; arch = "linux-i686"; sha256 = "bfce74c891ea370ce4e0fe43d578c3c0050d2655fff7372806ed6be338b2c438"; } - { locale = "af"; arch = "linux-x86_64"; sha256 = "18408a9c3f3b8c4d9f8cfe067ac23ddcdd3d3a7a22892ba8d74de5679a064db6"; } - { locale = "an"; arch = "linux-i686"; sha256 = "601efbf7944408ba1ac35831eaa92c4910cd904bfadc32895ff8d756c70ae934"; } - { locale = "an"; arch = "linux-x86_64"; sha256 = "0ba4c272ebac9ecafe5dbfb7fbba1cd2790d126f5b1756ab9a323c94b644df0b"; } - { locale = "ar"; arch = "linux-i686"; sha256 = "23ea3168aea75b044fa217b78b01a2dc8c9dd92171d726c4a78c23cffc474469"; } - { locale = "ar"; arch = "linux-x86_64"; sha256 = "dae2c1634e17b8c3e276e4c758c4d4c3b1b0d6006adac8e420c13b6f09a6cf53"; } - { locale = "as"; arch = "linux-i686"; sha256 = "7d36bd4589556374822f2ab5dd102d557257b5e0b529d1c963f96e9ab6a08850"; } - { locale = "as"; arch = "linux-x86_64"; sha256 = "c13ccf3546bafcfeb41c33762e41af249306d4bcfd3ad7fc957db481372be0dc"; } - { locale = "ast"; arch = "linux-i686"; sha256 = "853310674d7011956d760883af15b8e343250f8fc3acb3067e0f5a3d978c06ff"; } - { locale = "ast"; arch = "linux-x86_64"; sha256 = "2b938081e8672ed5ae16c40c6300e585a26f54da278726f48b98f3ca3e065662"; } - { locale = "be"; arch = "linux-i686"; sha256 = "b9acce210f2adf188ba9a3d92774a846a263baa5e076bb9452b89ca5609d6ac8"; } - { locale = "be"; arch = "linux-x86_64"; sha256 = "dd2a33ee1ed8c848454b6e64a0c1527f193d070e4d867c4f13fa84f39c9bfecd"; } - { locale = "bg"; arch = "linux-i686"; sha256 = "ee060cd395ef28bbad4be74aa42e2a51e7ad866183d139bffbcc7634dc94d738"; } - { locale = "bg"; arch = "linux-x86_64"; sha256 = "11a5dd807083da8c3132d9d6518dc674642418eff1fccf68e451ac67b90f141a"; } - { locale = "bn-BD"; arch = "linux-i686"; sha256 = "339d286f7f8f469bb6f9f85a8b21a745ecc42717dc91c21c7db88822e9be661a"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "fc3f06743a84a7684e43cd4efedb02a126dd119f6141da49c6120f1bbcdf9392"; } - { locale = "bn-IN"; arch = "linux-i686"; sha256 = "c585982368f258a8a728f782c37428311f0b6a6512231c077a439dd93645c3a2"; } - { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "00b9af4425050ec42b4a45a3c4a16700edcc66297331b601950fb81421ef8eb4"; } - { locale = "br"; arch = "linux-i686"; sha256 = "b86d944592f16f5f0e558106e3464248e3d686f45527a40fb64aaa79d9f73422"; } - { locale = "br"; arch = "linux-x86_64"; sha256 = "b894c12508f0b0a892154ea61fb2bb01947929041a63518f7c405ed976cc4d3f"; } - { locale = "bs"; arch = "linux-i686"; sha256 = "f7da0fead608f63c4a5be92fed9e0109fbe7288948d15dde05e10bba80b47743"; } - { locale = "bs"; arch = "linux-x86_64"; sha256 = "1cb090f9b16bcae95055377bc14a531697c480ad50e3a098dbd572770924d558"; } - { locale = "ca"; arch = "linux-i686"; sha256 = "0b36330715f8909e1515c535a06f4e3fdd7660de11b3424b4ce88f336561935f"; } - { locale = "ca"; arch = "linux-x86_64"; sha256 = "c6e9e545d09e589fd5fbfd2c6482a5ef366c470e294823b3ba05c5e728bca2c2"; } - { locale = "cs"; arch = "linux-i686"; sha256 = "ff1ca239be0e99b923c63c5bbc425dd2989bc40dbdc82dd731d7173fd539406a"; } - { locale = "cs"; arch = "linux-x86_64"; sha256 = "fe8472d6a4bf9fcda3caef51449fc3e20e1fbadbb772b330a012ffa7219afae3"; } - { locale = "csb"; arch = "linux-i686"; sha256 = "db1b7dbc7b0cd564a04b3a37827e8d77277cd7ba6a59403c45115d34e637f463"; } - { locale = "csb"; arch = "linux-x86_64"; sha256 = "023dd75e02f41a2ce9991fb40a8a46767f1a10da876a390035a084c5b97bd9d2"; } - { locale = "cy"; arch = "linux-i686"; sha256 = "9a6ac60099b03bdeb71c1a7739dafeff4b1682ffc43997191196e1f590421afa"; } - { locale = "cy"; arch = "linux-x86_64"; sha256 = "a5f2030fb08c0dd6dff95310209ed7c6ee613680dd500f00e30e26c547f9c249"; } - { locale = "da"; arch = "linux-i686"; sha256 = "99a893ac19b0ca28177c8957d7296e6deef9ddb36a6b5b17823cb1e6fc9ec683"; } - { locale = "da"; arch = "linux-x86_64"; sha256 = "69f29e795f203fe47e22daf1259c2ecfb39c362babefbbccb31405f4632f236b"; } - { locale = "de"; arch = "linux-i686"; sha256 = "925aac0800ce63a88fadc945da40b00ed6dde327637821518a372d7affb6e450"; } - { locale = "de"; arch = "linux-x86_64"; sha256 = "d86c5d2102a95ff5a6e580a1ca7af25c2f470211182ef70e988b29b195be6dd4"; } - { locale = "el"; arch = "linux-i686"; sha256 = "af07fac82dea32d33bd6bc440e2a645eb160d196cf0d4883b878d3d2c584f81a"; } - { locale = "el"; arch = "linux-x86_64"; sha256 = "fcc96c25422837f19f9ff6cde02c81c4a5a3b7c8e6809b90c8761519571db1f6"; } - { locale = "en-GB"; arch = "linux-i686"; sha256 = "758f7bb669743d6067e416c26f43806b16ddd16511a6818373e70960cbbd7151"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "d46ba3d642bf43fca46dfb29efb5d08a15f114eb9facc868e86c31f7c9c98014"; } - { locale = "en-US"; arch = "linux-i686"; sha256 = "4bca44a1ba94bf5616f7ea650e37cd3e5a719546def9e4a08ee88aedbc3a4db6"; } - { locale = "en-US"; arch = "linux-x86_64"; sha256 = "3303cc600153d0198dace9826b6883aa510d4e380aa985b092b1da67ad865625"; } - { locale = "en-ZA"; arch = "linux-i686"; sha256 = "13736870573863aab644bf2be2219fe4b5c6bde4bd79b84f22e12d39e7cda6e0"; } - { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "7e88fa9f355f6787d38e75d86d5b592a1a2cec208255f276887f53a12beb9e97"; } - { locale = "eo"; arch = "linux-i686"; sha256 = "ae4446e223c0169dd0b56db58760fdb323a2bec8135e45c79d385d895b64cee8"; } - { locale = "eo"; arch = "linux-x86_64"; sha256 = "202f61dd8e5506594ae70bbee9150d86c8037887f8345871dc5c1c9e498b1d66"; } - { locale = "es-AR"; arch = "linux-i686"; sha256 = "8fb276ed26fd46fceb029fbade706cb6e55d2958f03400ec1290784c533888c4"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "78130525d30d7c592bb63d7cedf3ab5db804d457c4d127d90b93d94501ad7b3c"; } - { locale = "es-CL"; arch = "linux-i686"; sha256 = "ef6bf393a681f4a08031eeda61bba3614ebfab222fed43f9f8b21cfa8eb3862e"; } - { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "e56224bca0ebfab9eedecafafd792e48cb67e3f8741c4d5a94c8f74f634cecf6"; } - { locale = "es-ES"; arch = "linux-i686"; sha256 = "9e007e6aa0f8aa3d1fac5dc13e98f81c23e6ff1e574545c021f8f7feeff86ce2"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "d4ff94f46fd086300992a30a1c4a8aa97ad7164d6cd26e82b20b5d0680b38169"; } - { locale = "es-MX"; arch = "linux-i686"; sha256 = "9db42a0557838b23ac4937adfec407804e624e679e9ffd6da739d17cdfbaab78"; } - { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "d42d619d6da78d0bbcb32b0a93a2eaa623eadb3a5af43e5b8b14400e6e969779"; } - { locale = "et"; arch = "linux-i686"; sha256 = "5947822f3f02bd4ba530ad978de1a9d237981e3abdf1598e44095c650794d1ff"; } - { locale = "et"; arch = "linux-x86_64"; sha256 = "7521a4db287bb928f50b64817f3631e96ea4cead81b1a84ab7c3b930b3450e86"; } - { locale = "eu"; arch = "linux-i686"; sha256 = "44095e98e74205fa012a2c0c636de3fe9cfb79d5729abf15214c1e7734946014"; } - { locale = "eu"; arch = "linux-x86_64"; sha256 = "2032dfbc82a9aca1a2f4cf67e6089400bf305d13906f048c5c9b906a7201a9fb"; } - { locale = "fa"; arch = "linux-i686"; sha256 = "469b8008287c93e152e762e82fb61644384c1e2631a6c45033503652daed09b1"; } - { locale = "fa"; arch = "linux-x86_64"; sha256 = "61ea0d8941d22083f918d014d56a613788d1f4f549e5a62d50a1f9071439a36f"; } - { locale = "ff"; arch = "linux-i686"; sha256 = "81a0083e5e4136e3ab3e6db0e2adcedfae7572722655a9cb8b9ca388c6057342"; } - { locale = "ff"; arch = "linux-x86_64"; sha256 = "0efe16da918288754a3af816d72448a73690eb71b110cf3ff0586ee7505b9735"; } - { locale = "fi"; arch = "linux-i686"; sha256 = "a0ee069e7c3100b921aab7c54c5d32741df4e058f52cb7f42acb2643bd534b30"; } - { locale = "fi"; arch = "linux-x86_64"; sha256 = "55c84d504603d648e7d72a2fb8badb0bc9148cb376bb0cc6054f091867cb2613"; } - { locale = "fr"; arch = "linux-i686"; sha256 = "9c9abea13db23ef5ef8c9a3ccb5a0702b44a8db2402f43f01a478eb61e7ddf34"; } - { locale = "fr"; arch = "linux-x86_64"; sha256 = "ce26fc67cbc2031880ffa3529a59ca4122016258ab1c023e23247c26308b6a3e"; } - { locale = "fy-NL"; arch = "linux-i686"; sha256 = "4a734880ed65a207d98630647a341644df4f68149c50ce5e683bb21b5c27f2c6"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "bace955c686456d7894ca7bc1cf854eb158d6183050318efc73768e232c9a413"; } - { locale = "ga-IE"; arch = "linux-i686"; sha256 = "4801f40ebd820b8f229cfcd04a04351fcee9f78268af1c9863089ef6c64d736a"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "c417c0182e6f706473bc4b7cf8c14aec96f96e21c17b8593b71ff38c97f7e9d2"; } - { locale = "gd"; arch = "linux-i686"; sha256 = "15a9d316d472d2918eff0c6f02600e40a8f62d7ef53ab14c57537fdda0b5257a"; } - { locale = "gd"; arch = "linux-x86_64"; sha256 = "8fcdcf093148222865a905586774dae5d805ef22c01afadeaabe3f0c7b315dba"; } - { locale = "gl"; arch = "linux-i686"; sha256 = "83b0ccfe7cf7166899d17b2c9b1ea8effda9cf02024698f8db8f943a388bb3dc"; } - { locale = "gl"; arch = "linux-x86_64"; sha256 = "550026595e6e59405b5869183af056ba5a60a303270f1a176ef25e3db1c70289"; } - { locale = "gu-IN"; arch = "linux-i686"; sha256 = "7e7dc86fa805808931ba57455b99c9273a4b0aa60998affce3c4b06f0ae7fc70"; } - { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "e0f35d7fe7875785e3749131cf86c5cbea5cbd7b3abd2c2c69f5f8376d3e53d7"; } - { locale = "he"; arch = "linux-i686"; sha256 = "5c200c8da3209c2120a8576c30ab609331b52807d0640daaa1a70f665c776969"; } - { locale = "he"; arch = "linux-x86_64"; sha256 = "6923a64d1ac5453453f148d38f116faca41be5b1d0a13d4f128bb73db67cb8e2"; } - { locale = "hi-IN"; arch = "linux-i686"; sha256 = "6a7e5d06169d6dd87e505012604c93a28440156a3f81e6fe24d567f9c2b2a919"; } - { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "56801593b9dd5ecefed8d7eaf438879dd23006ffff9a31c543861259dedf8263"; } - { locale = "hr"; arch = "linux-i686"; sha256 = "4573cd0269639d122496bcaf842d8c741f4d54e8f57d0690b97d8e7e86ee7e74"; } - { locale = "hr"; arch = "linux-x86_64"; sha256 = "753984384829229601fbe55d0b6615f3432fdf9babe908fb642f6ac79c749727"; } - { locale = "hu"; arch = "linux-i686"; sha256 = "c330478e6e77eff117bce58e17661b83a30308f0a680f648fbf06d1c00f3883c"; } - { locale = "hu"; arch = "linux-x86_64"; sha256 = "9d118ba236aa7a9b517278c375aa4e4fa65f85c71b8bea9c41702f6ae7b815cb"; } - { locale = "hy-AM"; arch = "linux-i686"; sha256 = "48c1691073b6ede77f5c5d5ae07af7372f17b9f52fd92950c2cca0a01b3b340e"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "beda26cefeeeeee59ea52fdd28e1e3025ca4cc3124541fc6825100a61eb398d8"; } - { locale = "id"; arch = "linux-i686"; sha256 = "8cf6d0bc2d4bcc68a5ddc935c3bd6ed19a63284dc3227e849be729645a6171d4"; } - { locale = "id"; arch = "linux-x86_64"; sha256 = "8be5900b83840871ffb6faba08fea9b35f9f396cae08b228c68e333719fb819f"; } - { locale = "is"; arch = "linux-i686"; sha256 = "7c167389105063b84d507b09c689fa18bf854fd695010c8273b9711b21a24034"; } - { locale = "is"; arch = "linux-x86_64"; sha256 = "c79321c83c9e654f6eaf96ddf5d24f279d517fbf35dfdf923acf026124919598"; } - { locale = "it"; arch = "linux-i686"; sha256 = "a3eb17e0eda3cbf8ffbbd1ecd1716929ac87a801f060dd8ed5291298667775a9"; } - { locale = "it"; arch = "linux-x86_64"; sha256 = "3742453f0748911b393fed804e5827f014cc595a9df4516438dfa163d5050411"; } - { locale = "ja"; arch = "linux-i686"; sha256 = "fa030c64e04766ae5200370586c08b2f25627343586cd8a0486e583f345c466e"; } - { locale = "ja"; arch = "linux-x86_64"; sha256 = "fddeae03ffdfef0f6cc999807e001ea931c15b1833da48655bcb5845f1e017a3"; } - { locale = "kk"; arch = "linux-i686"; sha256 = "39d94b10fa751faf7423e5d43cd07ef4485ff26e21e47d106d2268058e2f33d9"; } - { locale = "kk"; arch = "linux-x86_64"; sha256 = "1dc7138dd5c08088479c5e7e8054d7ed640504860a0043ecea2c8b0c9c1892f9"; } - { locale = "km"; arch = "linux-i686"; sha256 = "0d12a305de4a63fc6c6394bd4044f44ca3626cbc41ca9ef1adad6d5041f6f1fd"; } - { locale = "km"; arch = "linux-x86_64"; sha256 = "7710091695dd100b7f33585fce58c54fec462a96540a7d791f1935088f21fadf"; } - { locale = "kn"; arch = "linux-i686"; sha256 = "b039e6a1114522ccae10b89ab794a222966fbf0914513b3c14f05c082a78b922"; } - { locale = "kn"; arch = "linux-x86_64"; sha256 = "cf82965b25d3990a57d861d688f1bd69e5b069fe281937274060ebe36ddbb8a6"; } - { locale = "ko"; arch = "linux-i686"; sha256 = "8b9378d39d7b42852c2bb537b0e85312760c343e6485826ed949ab4617293025"; } - { locale = "ko"; arch = "linux-x86_64"; sha256 = "4b946a0cbedad2b8d0c3598c04eeb058cea05d6d7e6388e4cfa3146a40f7c449"; } - { locale = "ku"; arch = "linux-i686"; sha256 = "11950c4a54c6a165e924fb6e68bcc46d63b5fddfcd2561c58a0ce401c0146d36"; } - { locale = "ku"; arch = "linux-x86_64"; sha256 = "37a07a4e059580c31433b419bcd61d928ad1db7e607cf8443378472d54b61b78"; } - { locale = "lij"; arch = "linux-i686"; sha256 = "c0efca49f31800a3773b0d05add56b195d1cbea287108803bb1ef5249a0dc94f"; } - { locale = "lij"; arch = "linux-x86_64"; sha256 = "6e4b2d8c5e9942bc469f722110ba310b2ccdc4dda6e3baee93ae54012ae658a2"; } - { locale = "lt"; arch = "linux-i686"; sha256 = "acde9010aa815f6645868b03f3d68d9a24c450ed830f063e2846ac1219ee628b"; } - { locale = "lt"; arch = "linux-x86_64"; sha256 = "c2491cd3e5d11c302d7ec3191d646e2073c46f69966fc382901a93d16fb0c902"; } - { locale = "lv"; arch = "linux-i686"; sha256 = "7411de62c4d8c01c8bb15b3f2dfc2e2ed17755e2f9856ead8e5e0fd05971ffd5"; } - { locale = "lv"; arch = "linux-x86_64"; sha256 = "e8e57e629396eb180e0041a50ae98ecb2292f514d423423748e4d4cebc54fb59"; } - { locale = "mai"; arch = "linux-i686"; sha256 = "26a053e48f4e6f04e4856a0dcb26e577a6ddb99afc883786d9c260d57e5e4a6d"; } - { locale = "mai"; arch = "linux-x86_64"; sha256 = "86be2c736aa5ccf926d44f24afdb2d40c28444b5bd6cf090f9a847199b38b492"; } - { locale = "mk"; arch = "linux-i686"; sha256 = "dcf7759bcde70158298ad9e2434e37d4e8240e00589a83dd8dbba53c35466a58"; } - { locale = "mk"; arch = "linux-x86_64"; sha256 = "056297d6404794a8da78aeceb620b0ebbcb38a693ee1079cc02e4d0411e40ec3"; } - { locale = "ml"; arch = "linux-i686"; sha256 = "2d632b3a5b60f18955906adca80b7ac7af3bfa39d03afd308efd1136cfc8971d"; } - { locale = "ml"; arch = "linux-x86_64"; sha256 = "b54a9d47cadeae4f92d22a362ca887a18a16ef64500149ac8eb9355dbbe5971b"; } - { locale = "mr"; arch = "linux-i686"; sha256 = "e66b22488bf2c772fa6d29cf43f3e9c1aa2a1a867620a1144af8cb92c2647651"; } - { locale = "mr"; arch = "linux-x86_64"; sha256 = "da982205e9b659dd66ab05ca815324642bed2117e668e67ad620bb2d87c5d1c8"; } - { locale = "ms"; arch = "linux-i686"; sha256 = "ad39ffa6d6d765c1e983d885f5d139a28e481d536068d517b4807137fa8d3036"; } - { locale = "ms"; arch = "linux-x86_64"; sha256 = "fb1b6ed5e2e7247beb69f3d0ad937f76ce7c1107ccdad742ff5085d4b3a8da98"; } - { locale = "nb-NO"; arch = "linux-i686"; sha256 = "5220da4627863f9fa1c11886e9c19c315547afafa96c98b22a1a4359c75f1056"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "5f9d60faadc7b76b010cd9cf35922b1881377b535e8afc5d9b974651156df866"; } - { locale = "nl"; arch = "linux-i686"; sha256 = "357b28841ea861b8297a4986460d1d265b27202c37bb296dcc69224f9b07fc51"; } - { locale = "nl"; arch = "linux-x86_64"; sha256 = "9a8505da2fe045ab6c2a2277d2d043374a26f106a5966b00f42e22fb26cf929a"; } - { locale = "nn-NO"; arch = "linux-i686"; sha256 = "f115bb50d1e052584caf7363db875ae222ee37449fa151e2f313c157a6274d76"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "2e7829a8a20c946bddce13b7b3d1b3600f90d90d2438f3eb69188d47203b264d"; } - { locale = "or"; arch = "linux-i686"; sha256 = "9ad48bdf2b7f1deedb05bdcc49740d5075ebf6ec228d82a7ed455c6bb36d7cb0"; } - { locale = "or"; arch = "linux-x86_64"; sha256 = "a007bc73fb1ea7765016e9faebac2c4f5e0111a45b3d75d1e55f4de8931796a2"; } - { locale = "pa-IN"; arch = "linux-i686"; sha256 = "8a38d2b1516ed4b58e36d266cd25a5bd10548f9e412076c9b4f1f27256c98c2a"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "664fa562261532d0f6bad10b84e15d47b69073768c2d12986c8d776eb1af8ddd"; } - { locale = "pl"; arch = "linux-i686"; sha256 = "3bb8963f1e3dcdb22cc55feebb2583fefd6f3760f4e6f2cc754174079d4ca07f"; } - { locale = "pl"; arch = "linux-x86_64"; sha256 = "710f1d86d2974d6ad3c63ebc0873518fd59f218ba07b27d06fb75c83af2c632e"; } - { locale = "pt-BR"; arch = "linux-i686"; sha256 = "cd2fafbd2291bad8481c4086db3c2973a7869b28a5e68a5ff199079814c6b3fc"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "f0ba5dc2366757841afb9c9f7799c40667304c36efe7da284202e8e7a45aa1fc"; } - { locale = "pt-PT"; arch = "linux-i686"; sha256 = "051af14810ad0cee4487757833f1f5b4a6f6f903f3cecf00d00410c1324d9ce4"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "82102b33dc1989bc3aa49da3915baf7e4012afe6e4bd7f80a301dfe847f3dbbe"; } - { locale = "rm"; arch = "linux-i686"; sha256 = "02051668e46d98f4e2e5becc3192f6173dfdf3a48cc82264c5821be06c5e12a0"; } - { locale = "rm"; arch = "linux-x86_64"; sha256 = "9600c1d272785b946058ffac9e57a8b1701d065f24fa940ad22e4b5aec2efad9"; } - { locale = "ro"; arch = "linux-i686"; sha256 = "7f17cbd3041396135eee08eac597c8c6a936e5a33d67d2b5de8ae157a56719ad"; } - { locale = "ro"; arch = "linux-x86_64"; sha256 = "ba1de85abe53a7d66f6311d6a202d91f86e871bace168cf60a759ab0e17eccdb"; } - { locale = "ru"; arch = "linux-i686"; sha256 = "9dcd0c2b5671fc5849b01f2932504a7217fca9a4b4eca8e9b6ff8f5a146517e2"; } - { locale = "ru"; arch = "linux-x86_64"; sha256 = "725214900968e4e648d3d13635bf72d34910eb31a30b83a3e7ba9c5c4085c2d7"; } - { locale = "si"; arch = "linux-i686"; sha256 = "d22ed75aa727351efcdba1cffe8e24ff305943c9a3072cac08b004677cf6a028"; } - { locale = "si"; arch = "linux-x86_64"; sha256 = "89d60c682413949a6dad4b7fd49cc4508c4e067fe5847c5f21d5e25a953f195f"; } - { locale = "sk"; arch = "linux-i686"; sha256 = "4ecbc58df00eaf4fafb1c33a93493bdd3e544562a67c60e2d4d93da90d369261"; } - { locale = "sk"; arch = "linux-x86_64"; sha256 = "75baa2c5153e282e2671d6222b7fc8c3b9cfc2b9ee0a595a4451fd314a928fb4"; } - { locale = "sl"; arch = "linux-i686"; sha256 = "53e2ae3525d0bd2005a86bf7ed3f27ca66906ddfceb85a738bd60e46ba2df773"; } - { locale = "sl"; arch = "linux-x86_64"; sha256 = "2dcc5592a49767dc3f2a7d40387bb550fd36724419ff567f9d107e32b2cf2d6d"; } - { locale = "son"; arch = "linux-i686"; sha256 = "d3b7372c59b21d0393768197517b3666ab78705b04a6e84a3345da031bad3776"; } - { locale = "son"; arch = "linux-x86_64"; sha256 = "fc017e7a18701880c7a54c23a0f77a6521aae17880dbc562e2b37167ba918fa0"; } - { locale = "sq"; arch = "linux-i686"; sha256 = "7f9c9100c559ebfbfff35adc694199079930f4bf9f1f6a820c0e17d80ea0e12b"; } - { locale = "sq"; arch = "linux-x86_64"; sha256 = "0f3fcddabab8263eb4c238942c45c0b5efc20c169948da24c56ed401a85209dc"; } - { locale = "sr"; arch = "linux-i686"; sha256 = "6281e2f849b3c530ff383cfd4cdc4ab06115362c3d57ba8133a9f799af08e815"; } - { locale = "sr"; arch = "linux-x86_64"; sha256 = "368ca83faa5ef3640f71d977916614369ebac1622681e828b75e9abf6ebeb425"; } - { locale = "sv-SE"; arch = "linux-i686"; sha256 = "9f77f497fc3e8c585bd546c0bb95c92f9f37d683e092c0762b3fe0022b6d39b5"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "0aa21764f0ca58591e3cfebba75196edd51a8fdbadb738f036994178c9612a67"; } - { locale = "ta"; arch = "linux-i686"; sha256 = "463ce70405d84945c201cca56c84171e097e6a0420d38cd453a0836fad82f09c"; } - { locale = "ta"; arch = "linux-x86_64"; sha256 = "db7e78bc1f4bcb573474806d19324eca58f42008fb0b0fa856f701f1430aeefd"; } - { locale = "te"; arch = "linux-i686"; sha256 = "18643daf675f8ef9785a0039d012c3a8ce96f4d228426651c5f09c292cbfb335"; } - { locale = "te"; arch = "linux-x86_64"; sha256 = "d9f8a260fc47b608fd523c61e9c6981776997f4b7fc247e794be32d177abfbc0"; } - { locale = "th"; arch = "linux-i686"; sha256 = "e03b80d55d2a545ab3219c5e88ed6b7d6974945e32321a2fc96039a6996638f6"; } - { locale = "th"; arch = "linux-x86_64"; sha256 = "0416fd2b7e7ddde59a101fcba8258622a83b739effb327984fa8405e634c2121"; } - { locale = "tr"; arch = "linux-i686"; sha256 = "75a49ce141c9a04254185b62af72c7e8c214e19e5257ff308b294aee6ac49a28"; } - { locale = "tr"; arch = "linux-x86_64"; sha256 = "0845a554b299b848d35894144d3ba5c7e0b808bcc9b2732e904463258ca73cb7"; } - { locale = "uk"; arch = "linux-i686"; sha256 = "a89f58c0f20a3ff7e609f572a4786f06b48886b7e2d303824417f42af49c8df2"; } - { locale = "uk"; arch = "linux-x86_64"; sha256 = "b45768588aaf80917c8ad40d62835cc96c3dadf97715234e66542b96eeb8db8e"; } - { locale = "vi"; arch = "linux-i686"; sha256 = "3fc35e59ecbbdf1b76b5b66e962a60eb724d9514d622879108725bcf7881fd1e"; } - { locale = "vi"; arch = "linux-x86_64"; sha256 = "88116edeeecbfe1ac03af0da26aff84bc3aa5ba00574e899ec08e0d68243f509"; } - { locale = "xh"; arch = "linux-i686"; sha256 = "a3afd3ac14049c72a9be28fb9a0849e4d3c5c2f13cb160c480988c4231679329"; } - { locale = "xh"; arch = "linux-x86_64"; sha256 = "569587e9cc4cd99899d2939367d56f2e4e9ae333b583064a648f05a8b0b58e2c"; } - { locale = "zh-CN"; arch = "linux-i686"; sha256 = "358e44998142e56356b839a51dff97fe85e6293424bd0c148decf61f01b6125b"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "7b5a84dbbe361a775aaadad8fd328e24f6cf2e336297f1d5906f51ff5d3dfae7"; } - { locale = "zh-TW"; arch = "linux-i686"; sha256 = "cf2cb9bed37dffe178a524ef5fe983e0e8b18f17c999e98474ae13e012da54da"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "aa0f1c5fb96dc4585e70fbcc291c6842be25e5d59be8bf39e8dc0232e9f1a76c"; } - { locale = "zu"; arch = "linux-i686"; sha256 = "775f6507ae8d6c2ef6e29e6b4d00453dcf9a0c9651eb9da482c78b5ebe64f2cd"; } - { locale = "zu"; arch = "linux-x86_64"; sha256 = "603510372a52497a8e41468dbc193afa25b0615f504f4548201deb89f27bd354"; } + { locale = "ach"; arch = "linux-i686"; sha256 = "8372c1227b75486e297fd914bac530a45b22b789e627638e010d4c25337f350f"; } + { locale = "ach"; arch = "linux-x86_64"; sha256 = "e01412aa570a462a3bb1ba851cd7133014b3299c0ad349c15534edc35c6d6397"; } + { locale = "af"; arch = "linux-i686"; sha256 = "e75bd2d41de60483ed1eadcf03d9cd57146210ff9fdfe04e984404ce4bca29f7"; } + { locale = "af"; arch = "linux-x86_64"; sha256 = "32697271215a0e63b7d0b25398d27772da5d53e88d020df24f170ebc341e5394"; } + { locale = "an"; arch = "linux-i686"; sha256 = "3a590702183a86283e4de415eefdeed6f95f1e5d48c64456c4d6db8f84dcfb68"; } + { locale = "an"; arch = "linux-x86_64"; sha256 = "98d35a6a2f0875a9723ed9511f3bea65f58da3196db3f75aaf7420d45bde33ad"; } + { locale = "ar"; arch = "linux-i686"; sha256 = "e632f104442b725cf8e0e25c9a924b166289e1fab601a70aee0a81394632423c"; } + { locale = "ar"; arch = "linux-x86_64"; sha256 = "603a054ceb36645881f52042e556572252e898bfa78cec04811e65f27b9db026"; } + { locale = "as"; arch = "linux-i686"; sha256 = "05e64b9113f450bfbfa1b99c9580dbb2442af35d6cc20dec0c7af379dd5d37db"; } + { locale = "as"; arch = "linux-x86_64"; sha256 = "85b57a101afd0c4aae040bb1f3523ddda3079d46ac8abe9cad826939fd274353"; } + { locale = "ast"; arch = "linux-i686"; sha256 = "5df5eb0db623b42d9a2c9be58807ec66f43a26dd1365d44202d4b0db50d6a6f0"; } + { locale = "ast"; arch = "linux-x86_64"; sha256 = "6faac3f3637bd68d6c20c73dd84c554afdaa136c4e142c26eb8142b7ab00895f"; } + { locale = "be"; arch = "linux-i686"; sha256 = "4a87051df26ddb3fd2cf7c2beabc2d403cbc4d2f2e7e0802fb11566722171b57"; } + { locale = "be"; arch = "linux-x86_64"; sha256 = "8194b851ed7f9559b78f63711df598ed094783eb2cc288fbd1e880d53118dde5"; } + { locale = "bg"; arch = "linux-i686"; sha256 = "f6f903529d3276d1aa55968d4978fe5977d45076db0ee99d87199d59a9441ad5"; } + { locale = "bg"; arch = "linux-x86_64"; sha256 = "bce34ee8ec314db0f7abfeddf491d15642dcedea125dc9bb7d7dda3915054940"; } + { locale = "bn-BD"; arch = "linux-i686"; sha256 = "9bd0e37ddf9a222263ca90308245e2078f45d754d8a2b0bc1e4dea13a5e7b581"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "debb3a9983e4219b6632cdfd09d04ab95314ba4e0bd7ff36fd89f0a748d25cdd"; } + { locale = "bn-IN"; arch = "linux-i686"; sha256 = "ea2c9d29f4a3dfe8e0f146979c47ccba835b81cb1f1ed6e95124a837918590fa"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "b2bf8e36ac1ca1afeae463bf95a289db7cf2d2fa303083ab405497cca2993b57"; } + { locale = "br"; arch = "linux-i686"; sha256 = "b4b9d2828e5387a65d0f63b2149400626cd47fc81b97b912eda11b3fe31d4604"; } + { locale = "br"; arch = "linux-x86_64"; sha256 = "c3af78f1215ffc1e9b6c193ba87d17e2f08e1a24856ee68aabf95b3ee7804ea9"; } + { locale = "bs"; arch = "linux-i686"; sha256 = "7930f10d5d43e4504b9f347bcb2a2ef451be4418cee86c199b3e98c38587a20d"; } + { locale = "bs"; arch = "linux-x86_64"; sha256 = "ee31279d2acf7286c9a59c99e68fdd1692b96247585230df20ea2bea5ee30ba2"; } + { locale = "ca"; arch = "linux-i686"; sha256 = "f22f7964180ad27a122e56f070c6a2a0e3b044fe15ec5046b04db03877a3b7c7"; } + { locale = "ca"; arch = "linux-x86_64"; sha256 = "84e8675f9613d1a8a49a760ee46d4625b88092cfc542e6b750384d0d5a0a465f"; } + { locale = "cs"; arch = "linux-i686"; sha256 = "bed550a83c763a8147ef862cca7ca36106bfc5b34ea81f008c94886b86a3dde2"; } + { locale = "cs"; arch = "linux-x86_64"; sha256 = "8bf76f388c6286a1b91cf460325b98c2dd08842031288617d9141b1368b5f62c"; } + { locale = "csb"; arch = "linux-i686"; sha256 = "2420bf49ff3429b3f186b17555b8b3250d44579b5ff7ce616914af646b5996be"; } + { locale = "csb"; arch = "linux-x86_64"; sha256 = "a0ee304a61b12ec1dd3caf5d876acbd9d2ad4443f9b96e73ecc1de8a1e16206f"; } + { locale = "cy"; arch = "linux-i686"; sha256 = "603a66c237e95534d2dbd004e7fd77b69d5b99b73cba797c7825aaca6d849c61"; } + { locale = "cy"; arch = "linux-x86_64"; sha256 = "69f68c024d6e9999b5a846d12c5a61ca63d962f6bd21737769d1fe5519916dad"; } + { locale = "da"; arch = "linux-i686"; sha256 = "da8ed391e8ae9729cf2af35700aff3f6900af208fee9eab6a6bd0fcb303abd09"; } + { locale = "da"; arch = "linux-x86_64"; sha256 = "7e3cc63eb61289e1006f683581345caaffe3ae39f7a636ff4f451b1e77a8ffb6"; } + { locale = "de"; arch = "linux-i686"; sha256 = "f191e74047cdddd43fa72242b1dce15a28160f62b4b8eae08ad117f4b27d6e0f"; } + { locale = "de"; arch = "linux-x86_64"; sha256 = "a81165d446cab525645ca2b18ef28cf253c6ee6267086d692a3904c79f7e5be0"; } + { locale = "el"; arch = "linux-i686"; sha256 = "eb0757aafd2a1c4bb9abeab01a3960d3ac21b92879f8dc7d24f485a43d305957"; } + { locale = "el"; arch = "linux-x86_64"; sha256 = "900f64bad286393f6d96f0ff00c6e78ae6cce998046cf506e2b3ec7a7b8e76c0"; } + { locale = "en-GB"; arch = "linux-i686"; sha256 = "99284b229b7bfcc44cce3ebeee523e49bd5d9c7d860345ad3e242af4f9848683"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "9a4e003441556422375d4bede21da27a03d31b5ec452ff467abcfffdfe363f4a"; } + { locale = "en-US"; arch = "linux-i686"; sha256 = "13b4297db52ef851b38f292eba2b2136e4c2f1453e004012fe8b1fbcf000abce"; } + { locale = "en-US"; arch = "linux-x86_64"; sha256 = "ce87f081c4867b9968a2695341001854aa6c1f4f19073d13f54f333cfed236fc"; } + { locale = "en-ZA"; arch = "linux-i686"; sha256 = "849584baf4c6dd330bf9c798e3e8923004a3a381642d4f684b5de3fb5b4fd895"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "635d0cb43a2b5f7f0401f961fd88fc0d6735223ad421ec0ef92a4ee16b29727f"; } + { locale = "eo"; arch = "linux-i686"; sha256 = "91da9571212dc82f5d7140e4de073189018f7f895a3b263a4f8840401b4b10bb"; } + { locale = "eo"; arch = "linux-x86_64"; sha256 = "77f39ab0168efe9070ecd881dbd2884fe5f35eeea17a63ad8d957398f6eef40d"; } + { locale = "es-AR"; arch = "linux-i686"; sha256 = "f4ec6f07e67195981c12b5cbc3a6289a6e9d29539014c034039bd498a40f9301"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "3f24135fd1a6fd2207bf1d80fc79cb34536b109e195e43a3a13eba0b68548c0e"; } + { locale = "es-CL"; arch = "linux-i686"; sha256 = "de3672a512473cc6edc48bb775bc9a405d0c9effccdb0cd46af5ce2593d67613"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "770134c2bd8bc9f2e629e355b8e3b0949f67dd2ecd1b3a1d513bff364e53b734"; } + { locale = "es-ES"; arch = "linux-i686"; sha256 = "4eeb5854427cde599468b90af70ae3e04eb9aff5132659f6e1ddb2f859f0be74"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "eb91e2e9b80cab85e6ab75e78a9b206a18bb647ffb247c0d5ed324ee219dccd9"; } + { locale = "es-MX"; arch = "linux-i686"; sha256 = "0aa0c85a51a50adb9eca5e5a1eda0ca11ddc15ad12b2d930ebe769f10d535433"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "3f340072c80c95283b17e797bf4fdbde9d1de55b5f10f1c9e8193f8426c6157d"; } + { locale = "et"; arch = "linux-i686"; sha256 = "4719961e58e755ea2d9b94ff7439e1f9e858b0dacbd8631f98fadebca36c72a1"; } + { locale = "et"; arch = "linux-x86_64"; sha256 = "70aa1a76414c50b00fc85be87a07b936c7f60d83037f13716862e8491ec8d609"; } + { locale = "eu"; arch = "linux-i686"; sha256 = "ea450d11b0cd3b4381797bf6ca48d74fb18d661864eccb365bc2d51b872b101a"; } + { locale = "eu"; arch = "linux-x86_64"; sha256 = "d543e7fdd4c27875d30a1d527219e257296c6010e80dc0d5529722aa82cc666f"; } + { locale = "fa"; arch = "linux-i686"; sha256 = "4b8aaf0d27f10474c6ec4eeec1418ffb08338475c5433199ac2db79aab5273b2"; } + { locale = "fa"; arch = "linux-x86_64"; sha256 = "df10d71c7a762696ee682ca705052b15031dc7e84aa396f67fa26463e3dcd353"; } + { locale = "ff"; arch = "linux-i686"; sha256 = "acdfec7656b48e5502692c408cd8c7543add80181130bdd2e0ec66ac44219a06"; } + { locale = "ff"; arch = "linux-x86_64"; sha256 = "a9a0041cba2f80b09a2f22da6f1e9bfdfc1cbf0f5c324a427a1758174901fc27"; } + { locale = "fi"; arch = "linux-i686"; sha256 = "304e90020134af5564d5c90c5d9fee6264aa871e82419408f5b0e9d97f8f8ff1"; } + { locale = "fi"; arch = "linux-x86_64"; sha256 = "bfb86547ea4e0a5650a152070a7651a7f63b0df366fa4aed7f890033332e64a5"; } + { locale = "fr"; arch = "linux-i686"; sha256 = "1ccef0f95df1571b9e378d97122303982f93251bd3ed70d0af93babc3459bad2"; } + { locale = "fr"; arch = "linux-x86_64"; sha256 = "93ffcc3bbba8b7e0941fe674f6a67ed378e75b37c3e52debbef2434ea75f2b09"; } + { locale = "fy-NL"; arch = "linux-i686"; sha256 = "20ae7baa888fdcb467388313fa51104f8ba77ca31b2bcd731e2d65a46ff75c3f"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "33a028be0c63dc892efc93bd03375c8c4f9be38acb96a2bc516300c204086b3d"; } + { locale = "ga-IE"; arch = "linux-i686"; sha256 = "ddf134c692d321744bd787b7833ccc9b06ef130865c8f8ee816d35ff55c344a7"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "e76e18b18a7468ee6a550e837abf04b79833ae084210f723d0781f2b81e3077e"; } + { locale = "gd"; arch = "linux-i686"; sha256 = "3c361e322be79ffaec9a382aacf3b9cc90f03fa664e35e283cd8572e66d3b8b0"; } + { locale = "gd"; arch = "linux-x86_64"; sha256 = "5e95305321ff373d9cc6eee522dbd5ee948e6c298f2fb38d655965ec1de448e0"; } + { locale = "gl"; arch = "linux-i686"; sha256 = "99b9dbf38f50f5385072d72d14684e980aead6125c4c91cfa8e69bd5c7f1aa0e"; } + { locale = "gl"; arch = "linux-x86_64"; sha256 = "372bf1395f96be3b41d05630267354f7a6c0706e90f5e21320ab5ebd5d411d41"; } + { locale = "gu-IN"; arch = "linux-i686"; sha256 = "0b8429553052c8e23d3aaf1210d53b51fac2250d1d526311a22757ebd85ca54f"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "da6a7d7292965a0c1eaf58564d9bf85192719831208e8762d06c7082ee9824d7"; } + { locale = "he"; arch = "linux-i686"; sha256 = "78ac97da0515eb5a94455dcbf4cbd9a8d1ddbf03d4b8d29bad7b9e8fdbf5ef12"; } + { locale = "he"; arch = "linux-x86_64"; sha256 = "c0d853c639cfa7b14ce10ee50776f3aebf0c84807bb59d9ec6e0e20554ae8ed2"; } + { locale = "hi-IN"; arch = "linux-i686"; sha256 = "82376fe3005c56d2e895e1ffa0e9233f3885700117a73d1c49d67d742e324752"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "0ed6234fa9c5d449437d133c83f572ceca3dd82df6cbee8573c9f137c50bcf9c"; } + { locale = "hr"; arch = "linux-i686"; sha256 = "10ff3539c27dc49763fe322e9540878d421bdf590d9a307fecc6c158472889c3"; } + { locale = "hr"; arch = "linux-x86_64"; sha256 = "f97d7e3b290b0fc6a9116198da7fc7eb32895da74a3ad572d29577e14ab12f20"; } + { locale = "hsb"; arch = "linux-i686"; sha256 = "bba1a949823e70d1b5f4a0bec27437b6fc11638fa67b2ca286a833a0d44f5ef8"; } + { locale = "hsb"; arch = "linux-x86_64"; sha256 = "5efaf3ec7f7b5d94df17d2fe0d5877a35442d33ccbf141fcf30e11351f9b4000"; } + { locale = "hu"; arch = "linux-i686"; sha256 = "88a86463f2a47e38886cd2e8b470702623c772086b71d55e61de80e1c1be4fb3"; } + { locale = "hu"; arch = "linux-x86_64"; sha256 = "967ff3bb62c8dbc93a25f75bec73803428b3fe5024841d3e2d97e444c1d27304"; } + { locale = "hy-AM"; arch = "linux-i686"; sha256 = "4bac63a8b8fea36c3dab794dff933972f9adff7f91a7d3957d4edc3c60534016"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "9c26a2438462429f96b2d8bb8c4566b1b1f7d03200ed68aaca4eb6602342c33c"; } + { locale = "id"; arch = "linux-i686"; sha256 = "e36cd7195d5cd21afd97f31a5108af5999ade8a97f92db3e00067f3cfc31cd72"; } + { locale = "id"; arch = "linux-x86_64"; sha256 = "191e47625a6764670bfbab673989e5b2e6ad45ad1c3a0544a129afe8cb963171"; } + { locale = "is"; arch = "linux-i686"; sha256 = "c839d21d4e16b05bd9aa995ff2124b6b8418ca1405a8f3bfc70fb65b5710488b"; } + { locale = "is"; arch = "linux-x86_64"; sha256 = "16d8df9867e6a13a2be7408f459e2c67d449a47105cf9709e4a743abed8229a9"; } + { locale = "it"; arch = "linux-i686"; sha256 = "7f9c3909cda97d9a40f2630af4f11e6dd8e29f45ab949348123c4334f6aee8fe"; } + { locale = "it"; arch = "linux-x86_64"; sha256 = "52f95491dbf4ee9a1f2ee552feb8a30b8196b6747064e45d5a98d0fecfa11f67"; } + { locale = "ja"; arch = "linux-i686"; sha256 = "6586fd1d792feea4e98442736f06eab15d7de526667db6a3ce7de1afac9fdaec"; } + { locale = "ja"; arch = "linux-x86_64"; sha256 = "0ef883bdf3d415a5795bd613af05b16a406b3af3415ac1c1ebc646dd76f76467"; } + { locale = "kk"; arch = "linux-i686"; sha256 = "39167c7ee9f0e9b62308fcaba0f061bda0eaac9d3bb707c6556f71085c7ddd54"; } + { locale = "kk"; arch = "linux-x86_64"; sha256 = "ec2c9ae1f5daba1e3b0c8a4f24737b0968bc818748b682418f02983e25302703"; } + { locale = "km"; arch = "linux-i686"; sha256 = "797747aa402ad42b6addd04d69995b0ea5c628da71f2cce15c8e612d15461189"; } + { locale = "km"; arch = "linux-x86_64"; sha256 = "fd75e5fbba75dd8a6cdafdb1c4983bfd4336f300df559518d3fff0e6e7e482d6"; } + { locale = "kn"; arch = "linux-i686"; sha256 = "fada07e5679bcf174078e0c596cd121301f72c307401922e5772c6fa79eeedbe"; } + { locale = "kn"; arch = "linux-x86_64"; sha256 = "d9cbb3dc02e3db54ea691dc09c882fcd65fd99bb1d0250e29e3d0a37df72179b"; } + { locale = "ko"; arch = "linux-i686"; sha256 = "22bd8b1dec10117579a267d5bb9b10f460c27c9419305aa1cc4456b09fcd7df5"; } + { locale = "ko"; arch = "linux-x86_64"; sha256 = "0e9da5e79ebb149a62606e002202b70908d329a26c213df35480962fb05a9f7c"; } + { locale = "ku"; arch = "linux-i686"; sha256 = "e5f55ab5112ca3a137c4df37460304ff7e33471e3e95e2709ace1cb32ef88084"; } + { locale = "ku"; arch = "linux-x86_64"; sha256 = "224385ae3a9da1fbbbc0d309eba0de6f64e29da4de29299cb1c778cb5a57c968"; } + { locale = "lij"; arch = "linux-i686"; sha256 = "e39f5edc61e25f490dcae7ea4fdc91033f5e868cbcaf848180c40bd920455f17"; } + { locale = "lij"; arch = "linux-x86_64"; sha256 = "f6e9725f368ce4df3be078a1ad268a29cfeba01e5606de85fbe2e375b3a5e263"; } + { locale = "lt"; arch = "linux-i686"; sha256 = "46b2c694c60540ded3d3f6cb504bc5b7a709cc0940ff6b3223f05d7b8e1f7309"; } + { locale = "lt"; arch = "linux-x86_64"; sha256 = "51d10f5c63e377b0f9e46d7ee12ea8552b8df57d6e8d9334555b7fbab617c8a4"; } + { locale = "lv"; arch = "linux-i686"; sha256 = "8e224c3efcca9864255332b7f7c089c0c04b0eb2dfe60cd04d7dd6a61d807852"; } + { locale = "lv"; arch = "linux-x86_64"; sha256 = "e53090be92e7557be5d38aed25ac0a2fb1006d15bb38d61141473f4b38c6e26c"; } + { locale = "mai"; arch = "linux-i686"; sha256 = "479795f542d17476bb721d3e7c7fef565617528016085976a63b9e5864b4dd31"; } + { locale = "mai"; arch = "linux-x86_64"; sha256 = "8daa2882e27a19894ded43885e868dd7203f506cb1bd25ede1d36328fffbbe0d"; } + { locale = "mk"; arch = "linux-i686"; sha256 = "78f6fa53d5fda46fbe54b9978acaa75faaf094d2d3b8e464539609253da07c52"; } + { locale = "mk"; arch = "linux-x86_64"; sha256 = "47a147a93dc7d1e683a57f0d7ddd7fbe3d944145932e0773be8dab6a7a0b4b01"; } + { locale = "ml"; arch = "linux-i686"; sha256 = "6ac6a36596db8bf675df76abc629fc99ff019455f8c08842668a08cb40b67e9a"; } + { locale = "ml"; arch = "linux-x86_64"; sha256 = "c4d4bed760c429c5db1d5c42682127794f81e20182aed0fc37f4c9aaf7bc582c"; } + { locale = "mr"; arch = "linux-i686"; sha256 = "a2fc483f2aca2cbb7bdff42e4b27b711fdf27f46bee707d1c6d664c391c95def"; } + { locale = "mr"; arch = "linux-x86_64"; sha256 = "5209926b3130b8b75d933287872af62ac752fc9e3fc170b540a2f0bc49d97bdf"; } + { locale = "ms"; arch = "linux-i686"; sha256 = "926944ef9a3807b3379bba4b2fff05d8c2776cc4e3239b0b2bd2e5424151e6ee"; } + { locale = "ms"; arch = "linux-x86_64"; sha256 = "20cf8557fa41119febc99bbc6de10ea7e97d3c1abc2245241db862ca8a735db1"; } + { locale = "nb-NO"; arch = "linux-i686"; sha256 = "5a2778d9e93ae4371ad29737904aaecacf494855b45e5e79cfe773410f6600f6"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "8cfe4c778ee258dcd511990fd71eefcda46ab73c4448705e3815c5c371ee6ea1"; } + { locale = "nl"; arch = "linux-i686"; sha256 = "350efbbaeb3ef9eee16a398ce482c2a3790f5b85dda6177857d7448de03af9e1"; } + { locale = "nl"; arch = "linux-x86_64"; sha256 = "6d1310f7e2ebe5fc846f966bfa930a2bf3cd0877260de40b01496cb860630c37"; } + { locale = "nn-NO"; arch = "linux-i686"; sha256 = "6447690e509ec0d1306bbfa484df82e62dd5909603b43440443c28bf2f489f24"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "6e71ad4fe85b02f8745e6b3b39a6f69f13fff45fd555704747d1f59fcf64447a"; } + { locale = "or"; arch = "linux-i686"; sha256 = "71866d15af41df9d98716544d25d8fc2069a9a8f92cdd8180731e3b3fb3c3492"; } + { locale = "or"; arch = "linux-x86_64"; sha256 = "22ace7c20948526f1011e16581c870a919c4d8002bd0c3210ae8f702d1f8a03f"; } + { locale = "pa-IN"; arch = "linux-i686"; sha256 = "12eabc66d39bd767c129c1a1777a6a13812efa0bc3df430dd7940908f53094ec"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "54501bca85e231e9fab0aa894a6e566966fdbd172fc45888d97eb828e248d105"; } + { locale = "pl"; arch = "linux-i686"; sha256 = "e16acf44c5ab2ee708ba0f74301106a5fc0c36cd65ebd302043af09803f30138"; } + { locale = "pl"; arch = "linux-x86_64"; sha256 = "a1532684d5d0e9e2091a5d42202dc6b49ee8c21df14600f0772e1f0f53f6d638"; } + { locale = "pt-BR"; arch = "linux-i686"; sha256 = "9827bfda689b01e795d4ddf7ab1169e25cc1728175af74e8a08fa3e8ef40e40c"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "bfe02180011d564fe8deff4d3f3f8e3a6bfde05469738b5b2f8849a2ee485ba8"; } + { locale = "pt-PT"; arch = "linux-i686"; sha256 = "83fcda599d09946da8a968d903fa12b93502a23337f019d3217cc80f81607fe7"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "533050be56e6dbf06a5631a5b7a7db2da4f5514f224cb787600671c79c020379"; } + { locale = "rm"; arch = "linux-i686"; sha256 = "62906af16b8e179be3015f6be9cf4b9481fcc506044c053373f9bc2e315729fa"; } + { locale = "rm"; arch = "linux-x86_64"; sha256 = "f968ed9ba8ed43d0d52b02db23b2badf6e6a2544d105f23d6b09b80a07a28ee3"; } + { locale = "ro"; arch = "linux-i686"; sha256 = "503fc4cf0de24ff5b1658d09264f8bb3b131c678f61c554ddf1006633ff2d336"; } + { locale = "ro"; arch = "linux-x86_64"; sha256 = "514625ffbf4af4519a7671896f2f2797a1b17057dea356f7c17fa52a17736358"; } + { locale = "ru"; arch = "linux-i686"; sha256 = "01521832ab38fd46751578691b82c0283d9c7a68459ab7225328afa285699b01"; } + { locale = "ru"; arch = "linux-x86_64"; sha256 = "16b780ed767ff0537ec4619453d8cd3ebdcf124704d03d1741b5501007078dee"; } + { locale = "si"; arch = "linux-i686"; sha256 = "35ee6cded95ea13c8c480a46ffc9398f50d172aff2030611d6713b04ddc1c54d"; } + { locale = "si"; arch = "linux-x86_64"; sha256 = "c4ad9cec257bacffbcf3b4c84c63ec52e1ce830754b5be0b622a44ab223919ad"; } + { locale = "sk"; arch = "linux-i686"; sha256 = "53a6bc5aebe5edf4bad34e163a54a3bed30a7c74ff883463caf057793ac3f58e"; } + { locale = "sk"; arch = "linux-x86_64"; sha256 = "5110806bb3f02317b542bb79ce34c6bffeef68982807a5e53614958fb9adc779"; } + { locale = "sl"; arch = "linux-i686"; sha256 = "3a58652b394fc2ffe1abcc1e89596f3e9357a2455cda8a0c76a44ff20331ada2"; } + { locale = "sl"; arch = "linux-x86_64"; sha256 = "fb733f327080e5b4e2ae079a5cdbdb645fde1c9388368c13fcc6af4d3d91da7a"; } + { locale = "son"; arch = "linux-i686"; sha256 = "56a262e4411404e94747312858ae1e7ca99ea48171361f03cdc660f8b0da0da2"; } + { locale = "son"; arch = "linux-x86_64"; sha256 = "db77a5cab885f96efcbaae8e9f284ad30ab78aae1a405a5f1c2ac7d4d2e43498"; } + { locale = "sq"; arch = "linux-i686"; sha256 = "fde7c85f09997ab3f7918072a9577f8d70947c5fafcc70782d684759146941bd"; } + { locale = "sq"; arch = "linux-x86_64"; sha256 = "9865054be5d0a3913e4fa16aafdacd345607955b1d733d978033a2825d926c32"; } + { locale = "sr"; arch = "linux-i686"; sha256 = "87f9f7d46a211b9205df5258f551b7c42264fdb81c70f836a37b3d5a821c4c03"; } + { locale = "sr"; arch = "linux-x86_64"; sha256 = "ed03914c382efdec2f218e87e8efdd2b761e16ad0cc2a646b02050f27503161b"; } + { locale = "sv-SE"; arch = "linux-i686"; sha256 = "1e28e39ac45177607a2ff3c71d3317b8b777679bc9e8dad2236991f05c6823ca"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "81c2fdc5ec9f338b1dc3cd5d2e8dd62cf106c4cf759826be8eb7f3f3f550c49e"; } + { locale = "ta"; arch = "linux-i686"; sha256 = "8e27ba1c8079745a93bebf6f7e4dbfa9ffc32b91d6dfa12975497466f3ec1550"; } + { locale = "ta"; arch = "linux-x86_64"; sha256 = "c244aeff11608d6f1a8513045ab53d4909af02915761b15ff34ddbbc9995dcbe"; } + { locale = "te"; arch = "linux-i686"; sha256 = "32e404eeeebeb521d909cc64fe1ba3c0b40130f7a4b4ae742a48ba61e8b668d4"; } + { locale = "te"; arch = "linux-x86_64"; sha256 = "83b5cefddc6308050c24d9fb30818fa1fb3c1d4ba9a2de9d8fc99878b01855b4"; } + { locale = "th"; arch = "linux-i686"; sha256 = "009cb39521635c1c89717b3d526a59c05e7ab82082ec31f0fd482800f01d3e8b"; } + { locale = "th"; arch = "linux-x86_64"; sha256 = "1fe31902ef44e7049e9efa4774098c00d3ecad0a4c4f585716cb4bec158e3b88"; } + { locale = "tr"; arch = "linux-i686"; sha256 = "e54ee04479b9891420af6fc1d639da121b677660a5bf1dfd8565792c9e1cdbdf"; } + { locale = "tr"; arch = "linux-x86_64"; sha256 = "bdfae1142a7714a0be9bd24b02582a9ab9913c17d130cf0b2928deb657f8bebc"; } + { locale = "uk"; arch = "linux-i686"; sha256 = "b2d6b518e86c3bae1068f7a6d7cdc975f3b0f99e514c5d3d18dbe5e62d15dbce"; } + { locale = "uk"; arch = "linux-x86_64"; sha256 = "71bd0518b69c911dbb21297cd676ed66231a3b7bc59090a9f6a85d6882263277"; } + { locale = "vi"; arch = "linux-i686"; sha256 = "390fb219da7169d69a7aca1df883750d56bf34f0f7b6b49781d6f3c6b8962962"; } + { locale = "vi"; arch = "linux-x86_64"; sha256 = "1c5af9f646ced5533223bca6dd36f364c0ca9d3f02ba93797aa8b091144cf7e2"; } + { locale = "xh"; arch = "linux-i686"; sha256 = "5d0d04c7c84ffc51b11f99205ae767954b78d98c3a2d18bfcceca1cb292fcd9a"; } + { locale = "xh"; arch = "linux-x86_64"; sha256 = "5fafe2b375ee0935da52ec9037c4f515d1be5cf783548215d289a300e06bb9de"; } + { locale = "zh-CN"; arch = "linux-i686"; sha256 = "1361b7cfc08d4d000107a244ec2a163ab27616b1d1db13917f34acc4d4167d34"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "66aa04a7b5240df285afd37608c816b7c09cb365c6d0cd5aa4dbe8a7be61d824"; } + { locale = "zh-TW"; arch = "linux-i686"; sha256 = "c0e3d9b584ba10e2a67a904253b2d93ab3546465e69619f932b566ad6b04a003"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "6a24f9f3631bc0bcc15de6a124c0f7dbcee6d0099e2f0b0622a18e54c04620a9"; } + { locale = "zu"; arch = "linux-i686"; sha256 = "7fa59f6ee26d48f992015b0bb667a0c230cea854eafa67d7c4e51d38e1a267d3"; } + { locale = "zu"; arch = "linux-x86_64"; sha256 = "4af969f1e0d0703e83d903fc2a30739ae2ab42cc3a24219be8bfd152490970c5"; } ]; arch = if stdenv.system == "i686-linux" diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 617d307b783..d39dfe3582e 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -89,6 +89,6 @@ stdenv.mkDerivation { description = "Adobe Flash Player browser plugin"; homepage = http://www.adobe.com/products/flashplayer/; maintainers = with stdenv.lib.maintainers; [ wizeman ]; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index e1bc4e977f6..afe0600d6f7 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.google.com/chat/video/; - license = "unfree"; + license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix index cf01a3c6d5f..07184bfd9f2 100644 --- a/pkgs/applications/networking/browsers/netsurf/default.nix +++ b/pkgs/applications/networking/browsers/netsurf/default.nix @@ -42,7 +42,7 @@ rec { meta = { description = "HTML5 compliant parsing library, written in C"; homepage = http://www.netsurf-browser.org/projects/hubbub/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [lib.maintainers.marcweber]; platforms = lib.platforms.linux; }; @@ -63,7 +63,7 @@ rec { meta = { description = "implementation of the W3C DOM, written in C"; homepage = http://www.netsurf-browser.org/projects/hubbub/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [lib.maintainers.marcweber]; platforms = lib.platforms.linux; }; diff --git a/pkgs/applications/networking/browsers/netsurf/libCSS.nix b/pkgs/applications/networking/browsers/netsurf/libCSS.nix index 7ad39ee4ec9..ede053aeca3 100644 --- a/pkgs/applications/networking/browsers/netsurf/libCSS.nix +++ b/pkgs/applications/networking/browsers/netsurf/libCSS.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "libCSS is a CSS parser and selection engine, written in C"; # used by netsurf homepage = http://www.netsurf-browser.org/projects/libcss/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix b/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix index fec93c39ab9..32bede76e43 100644 --- a/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix +++ b/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "LibParserUtils is a library for building efficient parsers, written in C"; homepage = http://www.netsurf-browser.org/projects/libparserutils/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; broken = true; diff --git a/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix index 462d532cb9c..9c16ff9b89c 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Libnsbmp is a decoding library for BMP and ICO image file formats"; # used by netsurf homepage = http://www.netsurf-browser.org/projects/libnsbmp/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix index 5894e5c1c03..a4502d2354d 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Libnsbmp is a decoding library for gif image file formats"; # used by netsurf homepage = http://www.netsurf-browser.org/projects/libnsgif/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; broken = true; diff --git a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix index a90e6fa193c..300e9965092 100644 --- a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix +++ b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "implementation of SVG Tiny, written in C"; homepage = http://www.netsurf-browser.org/projects/libsvgtiny/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix b/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix index c4e4a60fbd6..8d19d1c1ef2 100644 --- a/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix +++ b/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "LibWapcaplet is a string internment library, written in C"; homepage = http://www.netsurf-browser.org/projects/libwapcaplet/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index 92175bb23e9..36571809a37 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "Data AcQuisition library (DAQ), for packet I/O"; homepage = http://www.snort.org; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index b674f3a83fb..858e99c245b 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "Snort is an open source network intrusion prevention and detection system (IDS/IPS)"; homepage = http://www.snort.org; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index 457d3441b3a..ec614bf4b8c 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.bitlbee.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/networking/instant-messengers/centerim/default.nix b/pkgs/applications/networking/instant-messengers/centerim/default.nix index d746d54974a..54e2d813be8 100644 --- a/pkgs/applications/networking/instant-messengers/centerim/default.nix +++ b/pkgs/applications/networking/instant-messengers/centerim/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.centerim.org/; description = "Fork of CenterICQ, a curses instant messaging program"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/gtmess/default.nix b/pkgs/applications/networking/instant-messengers/gtmess/default.nix index 68973b4e47f..64021c93bc8 100644 --- a/pkgs/applications/networking/instant-messengers/gtmess/default.nix +++ b/pkgs/applications/networking/instant-messengers/gtmess/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Console MSN Messenger client for Linux and other unix systems"; homepage = http://gtmess.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix index 4e176ec56dc..be24878259f 100644 --- a/pkgs/applications/networking/instant-messengers/kadu/default.nix +++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { description = "An instant-messenger client for the gadu-gadu network (most popular polish IM network)"; homepage = http://www.kadu.net/w/English:Main_Page; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.piotr ]; }; diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index c3af0ad0e34..be12c7e8e2a 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.linphone.org/; description = "Open Source video SIP softphone"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix index cf42dd5700b..7cbc38ea0dc 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.cypherpunks.ca/otr; description = "Plugin for Pidgin 2.x which implements OTR Messaging"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix index 339e36321b3..a83589bf75e 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/novas0x2a/skype4pidgin; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; description = "Plugin to use a running skype account through pidgin"; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix index b87db662f45..348802fe16e 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://tox.dhs.org/; description = "Tox plugin for Pidgin / libpurple"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/applications/networking/instant-messengers/sflphone/default.nix b/pkgs/applications/networking/instant-messengers/sflphone/default.nix index a31a682abf8..fb14782ef9f 100644 --- a/pkgs/applications/networking/instant-messengers/sflphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/sflphone/default.nix @@ -14,7 +14,7 @@ let meta = { homepage = http://sflphone.org/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; description = "Free software enterprise-class softphone for GNU/Linux"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/pkgs/applications/networking/instant-messengers/silc-client/default.nix index a4035604168..4ce098e6ca4 100644 --- a/pkgs/applications/networking/instant-messengers/silc-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/silc-client/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { homepage = http://silcnet.org/; description = "Secure Internet Live Conferencing server"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix index 2fa82e1251b..713aa8f0374 100644 --- a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix +++ b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = http://atdot.ch/scr/; description = "Open source tool to record your Skype calls on Linux"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/applications/networking/instant-messengers/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix index f1ac1063934..32755306cc7 100644 --- a/pkgs/applications/networking/instant-messengers/skype/default.nix +++ b/pkgs/applications/networking/instant-messengers/skype/default.nix @@ -66,6 +66,6 @@ stdenv.mkDerivation rec { meta = { description = "A proprietary voice-over-IP (VoIP) client"; homepage = http://www.skype.com/; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix index 51639f6050d..b0302ba8e0b 100644 --- a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Command-line interface for Telegram messenger"; homepage = https://telegram.org/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index ded2bbf9250..b3e1ff74cfa 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, autoconf, libtool, automake, libsodium, ncurses -, libtoxcore, pkgconfig }: +, libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig }: let - version = "b308e19e6b"; - date = "20140224"; + version = "7566aa9d26"; + date = "20140728"; in stdenv.mkDerivation rec { name = "toxic-${date}-${version}"; @@ -11,29 +11,20 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/Tox/toxic/tarball/${version}"; name = "${name}.tar.gz"; - sha256 = "0fgkvnpy3dl2h378h796z9md0zg05b3174fgx17b919av6j9x4ma"; + sha256 = "13vns0qc0hxhab6rpz0irnzgv42mp3v1nrbwm90iymhf4xkc9nwa"; }; - preConfigure = '' - autoreconf -i - ''; + makeFlags = [ "-Cbuild" "VERSION=${version}" ]; + installFlags = [ "PREFIX=$(out)" ]; - NIX_LDFLAGS = "-lsodium"; - - configureFlags = [ - "--with-libtoxcore-headers=${libtoxcore}/include" - "--with-libtoxcore-libs=${libtoxcore}/lib" - "--with-libsodium-headers=${libtoxcore}/include" - "--with-libsodium-libs=${libtoxcore}/lib" + buildInputs = [ + autoconf libtool automake libtoxcore libsodium ncurses openal libvpx + freealut libconfig pkgconfig ]; - buildInputs = [ autoconf libtool automake libtoxcore libsodium ncurses pkgconfig ]; - - doCheck = true; - meta = { description = "Reference CLI for Tox"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix new file mode 100644 index 00000000000..823df5c27a2 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore, dbus, libvpx, libX11, openal, freetype, libv4l +, libXrender, fontconfig, libXext, libXft }: + + +stdenv.mkDerivation rec { + name = "utox-dev"; + + src = fetchFromGitHub { + owner = "notsecure"; + repo = "uTox"; + rev = "d70f9bfb4ff8a156ec35803da6226b0ac8c47961"; + sha256 = "10cvsg0phv0jsrdl3zkk339c4bzn3xc82q1x90h6gcnrbg4vzmp0"; + }; + + buildInputs = [ pkgconfig libtoxcore dbus libvpx libX11 openal freetype + libv4l libXrender fontconfig libXext libXft ]; + + doCheck = false; + + makeFlags = "DESTDIR=$(out)"; + + meta = with stdenv.lib; { + description = "Lightweight Tox client"; + license = licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ iElectric ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/networking/iptraf/default.nix b/pkgs/applications/networking/iptraf/default.nix index f0a6dbbe7e7..db1f2011f11 100644 --- a/pkgs/applications/networking/iptraf/default.nix +++ b/pkgs/applications/networking/iptraf/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://iptraf.seul.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Console-based network statistics utility for Linux"; }; } diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix index 537897c13b4..224f639cc15 100644 --- a/pkgs/applications/networking/irc/ii/default.nix +++ b/pkgs/applications/networking/irc/ii/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://tools.suckless.org/ii/; - license = "MIT"; + license = stdenv.lib.licenses.mit; description = "Irc it, simple FIFO based irc client"; }; } diff --git a/pkgs/applications/networking/irc/irssi/fish/default.nix b/pkgs/applications/networking/irc/irssi/fish/default.nix index 2471c4885af..64e3d216ac0 100644 --- a/pkgs/applications/networking/irc/irssi/fish/default.nix +++ b/pkgs/applications/networking/irc/irssi/fish/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/falsovsky/FiSH-irssi; - license = "unfree"; # I can't find any mention of license + license = stdenv.lib.licenses.unfree; # I can't find any mention of license maintainers = with stdenv.lib.maintainers; [viric]; }; } diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix index 988320dd61f..4841aa8070e 100644 --- a/pkgs/applications/networking/irc/irssi/otr/default.nix +++ b/pkgs/applications/networking/irc/irssi/otr/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/cryptodotis/irssi-otr; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 2a5be53619d..ba3d7b8c368 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -40,10 +40,15 @@ in with stdenv; mkDerivation rec { ++ edf ssl "WITH_OPENSSL" ++ edf previews "WITH_WEBKIT" ; - preFixup = '' - wrapProgram "$out/bin/quasselclient" \ - --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" - ''; + preFixup = + lib.optionalString client '' + wrapProgram "$out/bin/quasselclient" \ + --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" + '' + + lib.optionalString monolithic '' + wrapProgram "$out/bin/quassel" \ + --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" + ''; meta = with stdenv.lib; { homepage = http://quassel-irc.org/; @@ -55,10 +60,9 @@ in with stdenv; mkDerivation rec { combination of screen and a text-based IRC client such as WeeChat, but graphical (based on Qt4/KDE4). ''; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = [ maintainers.phreedom ]; repositories.git = https://github.com/quassel/quassel.git; inherit (qt4.meta) platforms; }; } - diff --git a/pkgs/applications/networking/irc/weechat/devel.nix b/pkgs/applications/networking/irc/weechat/devel.nix index 25cc8dd7660..34ca4b4d7c6 100644 --- a/pkgs/applications/networking/irc/weechat/devel.nix +++ b/pkgs/applications/networking/irc/weechat/devel.nix @@ -3,14 +3,14 @@ , pythonPackages, cacert, cmake, makeWrapper }: stdenv.mkDerivation rec { - rev = "70d2b0ad8eb7854932d24c007a05b8627f751205"; + rev = "124b2668fe4e97e3926caea85ed2c9f7082c4df9"; version = "1.0-rev${rev}"; name = "weechat-${version}"; src = fetchgit { inherit rev; url = "git://github.com/weechat/weechat.git"; - sha256 = "1k7kcrq46anq87r14sq3vrhij8acn6id7zxyhn0qnjj2wqgrjp5i"; + sha256 = "1xl5scyrxmyqaycpalhl3j50s65w2gjdm43vahd618yyykdffr8b"; }; buildInputs = diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index dbd5a41afd3..9c397f27c46 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -55,9 +55,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small but very powerful text-based mail client"; homepage = http://www.mutt.org; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ the-kenny ]; }; } - diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 3c7cfde231a..7a1eddfa869 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "notmuch-0.17"; + name = "notmuch-0.18.1"; src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "15dypk2damyvxgfc8dy6iiky1ayxnj5samd4v300pi9nwpky05fj"; + sha256 = "1pdp9l7yv71d3fjb30qyccva8h03hvg88q4a00yi50v2j70kvmgj"; }; buildInputs = [ bash emacs gdb glib gmime gnupg pkgconfig talloc xapian ]; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 13facc90690..15acd5af8df 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -38,118 +38,118 @@ }: let - version = "24.6.0"; + version = "31.0"; sources = [ - { locale = "id"; arch = "linux-i686"; sha256 = "e19f6f5b8f19178350ec68386afd2ab7e5900b8c1fdb7bf81928fedcfcea5cbe"; } - { locale = "id"; arch = "linux-x86_64"; sha256 = "ece7445451150b2776f5debc818e288b9037dac1f2da9c7f7db584b6d2b73d34"; } - { locale = "he"; arch = "linux-i686"; sha256 = "0ff30ffc7ffe087056b0e72d66d2bc264c1060e3abb65e0c4d53d976855f436f"; } - { locale = "he"; arch = "linux-x86_64"; sha256 = "dd41d433644f7790ace1f246ec6703c060456260716710fc4318ca834ecd758b"; } - { locale = "el"; arch = "linux-i686"; sha256 = "eb6d53c00a6cd912279b56c5322d65b94fdd2a021c9ea2c854f664e476ae89e2"; } - { locale = "el"; arch = "linux-x86_64"; sha256 = "b0fdf2dc2de7ba5296f69694908aef4954b24b4c3092bddbec8995bf838bb817"; } - { locale = "tr"; arch = "linux-i686"; sha256 = "71f4f7738540445dc64399368bb63bf48ede79f055d6647ba9ed4d274040d623"; } - { locale = "tr"; arch = "linux-x86_64"; sha256 = "2be714b598bf8f1a3c6c9a13141d370c4d29bfec3e4053eb6f1c8a6a7988a96b"; } - { locale = "ast"; arch = "linux-i686"; sha256 = "8b2c3b83f4f88e33ac31b07dfb64e83fd1b2cce9ad877c8bb5715a0e6299ce6f"; } - { locale = "ast"; arch = "linux-x86_64"; sha256 = "93cd2c5c6c2ac05af3bb55a723bf3f02234d55064b5ea7cba6289bd07cca7647"; } - { locale = "nl"; arch = "linux-i686"; sha256 = "2f11b85055fa21b4e2677b92fef34a769ed56bdbd877fefb86599edb5dd39932"; } - { locale = "nl"; arch = "linux-x86_64"; sha256 = "d47057633c0ec5e785a723c45c5b8b0168e3d3fabe4aaedb4ca1adbff29a4dcd"; } - { locale = "bn-BD"; arch = "linux-i686"; sha256 = "902274548b7308e75c465f71912a7d1e5539e92420ffa17c80a2ac20d02d8630"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "044494d6bfc07b9cbeaa325dab3c1f0c5e554a05f1a050d960c39fbe093d9482"; } - { locale = "eu"; arch = "linux-i686"; sha256 = "e453a06a64c35ed81e661c67fbd4241a7c5494b1f3d2bf5ace7543798feb338c"; } - { locale = "eu"; arch = "linux-x86_64"; sha256 = "e8006f0e89153424c809de41ec1a714b91011b5a2a9601c1893a6ff30dcbd2ac"; } - { locale = "fr"; arch = "linux-i686"; sha256 = "fed414783f8e9bba5be6d4cb90ef04f274aabab34f3b4351a329d5c5ae7ae8f0"; } - { locale = "fr"; arch = "linux-x86_64"; sha256 = "e8f0203bf90bc30c89380c417921139f7b92ef1d38b3d95d292acee3be4e93c3"; } - { locale = "br"; arch = "linux-i686"; sha256 = "0948d002df401b9aaedbf8e3277ce312edeb635baa57b1bdf5de87cc13dd36cb"; } - { locale = "br"; arch = "linux-x86_64"; sha256 = "733e09671f00c693e13a726fa597b4705822e693ddce8a0494c57fde1de3cb56"; } - { locale = "pa-IN"; arch = "linux-i686"; sha256 = "c160c17e4b9b0e3d579a01b5973d142c711d4f87b03fd542d073d816ced9a9c9"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "0c281e6430a233aca5c6130e907e08c7d05aed8851214063546aff5a5df82232"; } - { locale = "gd"; arch = "linux-i686"; sha256 = "5d85eb78f01e1d52e733d4abf8d33281ec2c4adf9a9c65f50c6d6e2b6acf3d1d"; } - { locale = "gd"; arch = "linux-x86_64"; sha256 = "a7bb71bb08ccfc01f8e91b47b6ee0ac4592976e964454304da493e0582d262d1"; } - { locale = "bg"; arch = "linux-i686"; sha256 = "a63e060eac9efb27b4166e05ff6a035afd51cd29d45ddf69e5226e08441ac53c"; } - { locale = "bg"; arch = "linux-x86_64"; sha256 = "8a5f45352e180e984c7f1bc37f0e7602cbc6085a3dcdcac2d74f493941fd9f0e"; } - { locale = "sv-SE"; arch = "linux-i686"; sha256 = "ef70e1ff3ff3ce2fd9ecbe62ed010c06e63b410b843cdc3aa3c93fda2bf56708"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "af33cba52556057abf17df0e92c11ecbf39382bbf92c66b137113e5503ae170b"; } - { locale = "ja"; arch = "linux-i686"; sha256 = "f87eac6641ebccf018c76275adcba03976b9c62b9fa51533ec67ab0d2a5a91b9"; } - { locale = "ja"; arch = "linux-x86_64"; sha256 = "009b53f10bd785a799026dab028fbb7fa46c154569eba98db2673af12f6c19c4"; } - { locale = "pt-BR"; arch = "linux-i686"; sha256 = "ae2243346546cc2c768a9c24fc296013a45459637ab65477537f9d08d5ae193c"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "5cb2af1ec854e12b91bdf7f2fe88b56bfb45bf7144cf5cc3f0e307259d767a43"; } - { locale = "is"; arch = "linux-i686"; sha256 = "bf3a2e4efd86b1e73ac38ef3dc880ce2cee3102d2844b17ebf31aa6528040a92"; } - { locale = "is"; arch = "linux-x86_64"; sha256 = "d36f8d321d2952310dcb19a288f36f6496ca24e7f49fb483882c270c1c96571d"; } - { locale = "es-AR"; arch = "linux-i686"; sha256 = "e05f63d1f978029169a91719551b6e399be0e0d37310921168904d188e41f50d"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "b8025a7a724a0d98c4f706e7ce59aae8c0f7bcd0082733ce6bee73a1d243feef"; } - { locale = "nn-NO"; arch = "linux-i686"; sha256 = "26ded9a3ebea58bcf80ca47759d4fdb86fe91aea8dcf56afdbaf7a32d548ee66"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "fd8321d5d6adaae042651d911df6ef587afda19ee82bdcfce98814144282b54d"; } - { locale = "sr"; arch = "linux-i686"; sha256 = "94b94517072901f34ab28b6cf3a2fd8852867f147ab4b47f34f7d9ae16fbd603"; } - { locale = "sr"; arch = "linux-x86_64"; sha256 = "e38f493ea1b8c0b183bad2f2627eb166e75e875a62b33704f50f8f831fd552ec"; } - { locale = "si"; arch = "linux-i686"; sha256 = "319ae8256ecf3d7623195e474040fffffff230cd612571872a38b52b608c0507"; } - { locale = "si"; arch = "linux-x86_64"; sha256 = "f776b8a9efad41f5c2f8770452a0bd053a3ba9ed4b74da3e3f24214c69e9779e"; } - { locale = "ro"; arch = "linux-i686"; sha256 = "f6aea954d3ba2334411a7ce9e7e1da926b0039935c5db3a5480f0fbda583b849"; } - { locale = "ro"; arch = "linux-x86_64"; sha256 = "9fef811764441b2b16e408808f4608e17cd21175cf45774162b3bce8b8612491"; } - { locale = "it"; arch = "linux-i686"; sha256 = "71df4de89a1eff632339dbaf48ce41182f7a20f7e55a223f6816ef86d3465443"; } - { locale = "it"; arch = "linux-x86_64"; sha256 = "076332c97a5c854b2313bd9f2138a6660d8e04fbddc3f8beb89acf071efd4c86"; } - { locale = "pl"; arch = "linux-i686"; sha256 = "1a45f7d1d8817f6c724dff556886edc3f2d0ee62ff45bea8d6b7ef63f7f92928"; } - { locale = "pl"; arch = "linux-x86_64"; sha256 = "8aa25320126052c9ebc3496e8731224e30fbd45ee2679f4d87f7f2050a01c312"; } - { locale = "sk"; arch = "linux-i686"; sha256 = "83a31a94eeb95e28612eeb1e696ed387b6793da350efda439de11833e0ea1173"; } - { locale = "sk"; arch = "linux-x86_64"; sha256 = "8c1647f8bfb210f7da8aa164777ef412bf3d4459ce53c95ee2211b4b5df440dc"; } - { locale = "vi"; arch = "linux-i686"; sha256 = "e5bb99de119fd6496674fb9cc8432f146e684afc652dec2861108d1ef20b49d7"; } - { locale = "vi"; arch = "linux-x86_64"; sha256 = "f35e62031154a32da68ea3d6960da8807f0de7ade7071526fafd6ace48c88976"; } - { locale = "rm"; arch = "linux-i686"; sha256 = "0826595dddc981b64d4f1a59cd71411c34ccd0aeac182925709abeedff8461fc"; } - { locale = "rm"; arch = "linux-x86_64"; sha256 = "b5b8d30251fc482861518e1c86001aa5eca6b53a65e14a8c6ff9e61eaf651044"; } - { locale = "ar"; arch = "linux-i686"; sha256 = "a9b2138cacc983142353ec09a5c4226fc731501da4c0200cc86026e6b28ca10c"; } - { locale = "ar"; arch = "linux-x86_64"; sha256 = "6c9a2ce8a8d3b4815475827caf89a3fee8371c422aa6c4984bb03f56728b682c"; } - { locale = "es-ES"; arch = "linux-i686"; sha256 = "813260cf5ab06e55c563e015e0172ce0192ccdd894a352ef6d4f439252032619"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "c879fe62db6952f91c51ec7c172bc67d5351f55e99ab6df5cdd8639206f3444a"; } - { locale = "fi"; arch = "linux-i686"; sha256 = "33888c19b7e5e57155748d7372ad2b0e61f522ee96913f8846c754c3361fcb4a"; } - { locale = "fi"; arch = "linux-x86_64"; sha256 = "d5487588cf07cbd2b02b1c566b6515d087cf8fe9d528890b1dd5a0de53ab1d8c"; } - { locale = "hu"; arch = "linux-i686"; sha256 = "72b3a36269de70bd627589bad817e7702a4c83fff9b460e4f787486fa4bf15c7"; } - { locale = "hu"; arch = "linux-x86_64"; sha256 = "d458ed4b62f65ce7c3787930549cbee42842ae87a846e5d1565c1881b3bc17e8"; } - { locale = "zh-CN"; arch = "linux-i686"; sha256 = "3155a71e847020b2806f6b31acbaa702ccf20f8bd805c2aedb0c9c415f75b88f"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "b56beb864d247685cd9ba6820e5a8a143be28ff95440e38670c8963d2c769738"; } - { locale = "uk"; arch = "linux-i686"; sha256 = "74b7059580a4f389278b1059d80308101ffcfd0a738c6d614e56560ce116db34"; } - { locale = "uk"; arch = "linux-x86_64"; sha256 = "a351421c230f6629de0125a30767ff10d541264f6249f6fa2568eae76189398f"; } - { locale = "ko"; arch = "linux-i686"; sha256 = "d26ba336a555276c36f9a003df9bc3e0df1c40dd4da7062d1cd8b3a6cba6d52c"; } - { locale = "ko"; arch = "linux-x86_64"; sha256 = "078e5878f823b2d19568af8bda095e6ab46097a680b209bae9242d7658377abf"; } - { locale = "cs"; arch = "linux-i686"; sha256 = "c9aaab25dabdba0708459a82882b926155b475314d72463633af10c27d9e5dfb"; } - { locale = "cs"; arch = "linux-x86_64"; sha256 = "9a9fc61875f0427c26107b96ee3a6f7d71717c0d4aa6e41cc7b1b56bff2131e7"; } - { locale = "be"; arch = "linux-i686"; sha256 = "afc862a2a1054f08cffa0ec4facb2e9098fb042f7e4dab85c2ace7f30a384426"; } - { locale = "be"; arch = "linux-x86_64"; sha256 = "50353005857df556840fab0b18e8784dc18cbcdc5c45f4fc1f68f6b78b58048c"; } - { locale = "ru"; arch = "linux-i686"; sha256 = "4876fcda18fd01b51f392a56085ebfcb97cefd69355666f42d58ffe53b9eb8e9"; } - { locale = "ru"; arch = "linux-x86_64"; sha256 = "ef90a31aa408c6c86f3103d7bc82e3e8b5ac7bc9956d431ef46e1f44156b7dbf"; } - { locale = "ta-LK"; arch = "linux-i686"; sha256 = "ee4a961e76e63a79d08118e2355e37b1b2a1e0260613532ac6dc7c9a9e86caf1"; } - { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "9a1233c0ee7a72f8b1c071a6cd507d870d34bd64c71f7f960c00cf2e840ea5b1"; } - { locale = "zh-TW"; arch = "linux-i686"; sha256 = "00bf471763ca98d7c7e0243f5bbc75230b6cf8cea9c5dab17464c47544d102de"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "61e474bd0c930b9d6bcc553a87c07e415e1fe037dd033a6a97f9137d4fc73f49"; } - { locale = "de"; arch = "linux-i686"; sha256 = "e93520901aa59938e1c51c9943225dded88c668a91da6660de9f41714114ac8b"; } - { locale = "de"; arch = "linux-x86_64"; sha256 = "008156ddb73f4eb91d801d8bc35685e517328b5e5f13a4ed39873df471d01c67"; } - { locale = "nb-NO"; arch = "linux-i686"; sha256 = "20b3b10e12238238737fa0da3dce5e2fdff1161594b415c5872dd7416001482b"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "79f854469ac1a6fb0768934dc20ebc511a01904c71f321ed31ebe400ab88f4d8"; } - { locale = "fy-NL"; arch = "linux-i686"; sha256 = "61cec7fef6e75ecd7d459e973b258c5b62af0dbfd175b7000484594e63ead2e4"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "83b3761bfd949e3890c7006ba9610e858fab25815cd6e2f3f293ca707086a78c"; } - { locale = "sq"; arch = "linux-i686"; sha256 = "f36321189ed80130b9e4a3a6e387531c48745f4c109f35afe928cf2d44e1b424"; } - { locale = "sq"; arch = "linux-x86_64"; sha256 = "81da71b2ce832788213ed60f801fd79e61205a98c44e9082a35f2195af314de8"; } - { locale = "ga-IE"; arch = "linux-i686"; sha256 = "b759d93d78964eb8b9ce5aaad37d652fa425cfb5d6049f58a31c2492e3aa475d"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "62b32a8a4e7455c42bbf8cc5029919a64ca2ff61e06f535dd628a8dd612a15d9"; } - { locale = "da"; arch = "linux-i686"; sha256 = "4ad6ede882e973b37627105812619d2e8c804d50d496d96f68554bf75ca093fe"; } - { locale = "da"; arch = "linux-x86_64"; sha256 = "9fd6ce0edef1a8c8eb7d811afa39600a2c946f9ed87610a9e98a971d4cf31b08"; } - { locale = "hr"; arch = "linux-i686"; sha256 = "35254ef736865d1a7c368e62c9cba68fa64b7f017aca4d9569aeb18b5f559717"; } - { locale = "hr"; arch = "linux-x86_64"; sha256 = "6ff8a5b4ebfb9217b37afdfc4d5cab01f1ce66387010d2105a51bed486eea52c"; } - { locale = "ca"; arch = "linux-i686"; sha256 = "eb4af3ff107f6827d0288bd68486b8eef174c5dc6e9b5313099d99b2e695db0d"; } - { locale = "ca"; arch = "linux-x86_64"; sha256 = "80a6bf800a53af0cc9445c632546ce7cefcf5bd819e6e5e35e662330d58d757c"; } - { locale = "en-US"; arch = "linux-i686"; sha256 = "ba35f578095f79582341e988ce7c5e07f489833f7a309756c80caf4f56367987"; } - { locale = "en-US"; arch = "linux-x86_64"; sha256 = "09c193e865e90b6d2c547c17d10add7d43e8b89b630a8a490323d4ed391c924d"; } - { locale = "pt-PT"; arch = "linux-i686"; sha256 = "57610296c564291a8432fdb9215bcfbab6f09792c47e5606c1619bb203c7f5de"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "c702acf69957ffd1c4774f42d4f28dc239a4c5bcf6e003c236952167bf9e7e9f"; } - { locale = "gl"; arch = "linux-i686"; sha256 = "56ae2d38af2988791163e6b118c781d55e2c545097aa5afccc72998705312888"; } - { locale = "gl"; arch = "linux-x86_64"; sha256 = "c5386f149831aa2f48b65391f31f8f2e0a9c3b7a8bcaae67420a5819e80315ec"; } - { locale = "lt"; arch = "linux-i686"; sha256 = "8409401c0b87be071d081c03eb34e3338cb62e80669045f5d268f8da60d96bce"; } - { locale = "lt"; arch = "linux-x86_64"; sha256 = "4f93e9b0688e30586b3d372944ae5579f7249220733d6045e6bca3830e7f121a"; } - { locale = "en-GB"; arch = "linux-i686"; sha256 = "ae1608b9e15862f82d15c5acbcd9f65775efc4368588bc685ebff523ff93e2d6"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "2466f020209de610f429315e0b090b43cf42c9ce540c6bc51e7ad11f5a3449f5"; } - { locale = "sl"; arch = "linux-i686"; sha256 = "76cbcf31388cbe72ebbf3fa3be66a0cfe20cd572febf062f3a58a9c50313aa03"; } - { locale = "sl"; arch = "linux-x86_64"; sha256 = "e4aa9dd8bb21f3d79ce5f9cfc907fc8a355fef349dcdec30403d534bf3cfbdf6"; } - { locale = "et"; arch = "linux-i686"; sha256 = "06561fa96d5166bfbe8eb492ebc08b3d2a768a8a7a251b357dec89ad33f3825e"; } - { locale = "et"; arch = "linux-x86_64"; sha256 = "85e663261cc6722c25dd36e1c0a15b7a82a3a6aaca54191effe8ea09ccb8c43e"; } - { locale = "hy-AM"; arch = "linux-i686"; sha256 = "d80f116d39e48b42a767fbda5b6e765be4bc3d210cf95d80bb014606785be3e6"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "c2e124736d63581a3034e60fe3d40bfef9458a712853ab5c8c5d391a9d3af6a9"; } + { locale = "nn-NO"; arch = "linux-i686"; sha256 = "a1e9954236de1d0581342fbb894b721528bc51a208d3bbedd4d8defbcc1cb50f"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "0fe9c22ad8cf575813ae8e476d985a3b951174df5beda67fd98e261f831252aa"; } + { locale = "lt"; arch = "linux-i686"; sha256 = "35fb5c44bc3ed25beec4f6172c44f75426579f27bd2302361870615bb1f62194"; } + { locale = "lt"; arch = "linux-x86_64"; sha256 = "3b04ffd5e1640c0138e5dab63a1059bd0342fff9f44547c6b34fbe6da810f911"; } + { locale = "ta-LK"; arch = "linux-i686"; sha256 = "2e8a1b96820216fda11c234d80a74d7326b49d7ac3f595f646aa10dccde61940"; } + { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "006f25951b4ac90b8d8d32491d260900dfcfb24c10cd4a10dbadf3840b4bcd4e"; } + { locale = "bn-BD"; arch = "linux-i686"; sha256 = "839e95de15a4e0287cfe36d70e07d1d40a1708016f615244a84553794ac76b4c"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "592a353df70c368c3c9855ead6d3b68433e7ebaaf42169108b9e74a83517230b"; } + { locale = "de"; arch = "linux-i686"; sha256 = "890bc1ee046ebf67079bd39ecb761a78fbf8cee8f72b32958ad18a0c3184b23b"; } + { locale = "de"; arch = "linux-x86_64"; sha256 = "7b52dfc2cea5bedae2ccfe11b0ec2d66edb81b76c2272c60f4bb247970384c9f"; } + { locale = "rm"; arch = "linux-i686"; sha256 = "6ab1e46650ff296719e498a1b9e5dad5c2f32e6be9d6fec12d1ab917a5f76872"; } + { locale = "rm"; arch = "linux-x86_64"; sha256 = "fdb170e3f546de759ef8a8aa85f6c3bf5152e121739cc27797c3065f4f85c183"; } + { locale = "nl"; arch = "linux-i686"; sha256 = "208be79ce95d45f4f69d8bf53d4e2f457410653a81117b4bd4d42bf14a1485dc"; } + { locale = "nl"; arch = "linux-x86_64"; sha256 = "2e562f9f59457d484ccfb1beb0129e2ca3ba4e5cbf5c955a65480836dc2e6567"; } + { locale = "sv-SE"; arch = "linux-i686"; sha256 = "07c7836bac31fa835c244dbe5eff19bad5dc5a9339cb8a94bd07d88f8590c867"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "7124de1e3cff7a5c17506f8e175aab1aaf96d4c9fd57824d6c0af110f47b1fbc"; } + { locale = "fy-NL"; arch = "linux-i686"; sha256 = "5d4e7f1f82b53161e84abf45f4a7210f0304399efed2df621c2e24cd5f1e1db0"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "814798f7dd066228ae73ce6bfdf430db4f0c4e905ce8a6670c73f894865dbf4e"; } + { locale = "si"; arch = "linux-i686"; sha256 = "35727d874cdeca69e18cedc109b6c3540c8dbb7450b2158cb1209cf00272cc38"; } + { locale = "si"; arch = "linux-x86_64"; sha256 = "0aa2232adc0e06c0a841a11155c2cd8f317b2f12b0e02c239ebe6150ad3bc278"; } + { locale = "vi"; arch = "linux-i686"; sha256 = "b45871e531b18a35f60240dc0417e5a9f08f8c9e3ea762a36e938425505df8b0"; } + { locale = "vi"; arch = "linux-x86_64"; sha256 = "a32dd96a41ed33a81c240c60c3538db45c1c4357ceaf37c8482a378a526c5454"; } + { locale = "br"; arch = "linux-i686"; sha256 = "3162753876da622895175afb60cd89be1ee343a10a45f9ac3feb3b306e161838"; } + { locale = "br"; arch = "linux-x86_64"; sha256 = "7c8d26a07d239f18f94f14696036974317ac1186072ba4482c315d02dcb97e5f"; } + { locale = "da"; arch = "linux-i686"; sha256 = "8cfaf98f3702b418bfd7692373b9f6e99a4b06e47a75a2df602e98d8f6acf761"; } + { locale = "da"; arch = "linux-x86_64"; sha256 = "6bd9ab36402f3391abc2e96f8786e16407736cf04d524e562736ac47279e2a26"; } + { locale = "fi"; arch = "linux-i686"; sha256 = "0a3e7c130197d4abcbf4d37eef51a946c11cf72707686f8c7a0caa9cc21e75c8"; } + { locale = "fi"; arch = "linux-x86_64"; sha256 = "8d4003960a8a7a496662b59834118c8712443761b867e5f54f3bf4a683715d22"; } + { locale = "he"; arch = "linux-i686"; sha256 = "5db77f9d117071feeddb5eadf74ea6332ccf9abaa441ba4d7b0a5f0f3781452d"; } + { locale = "he"; arch = "linux-x86_64"; sha256 = "46995a9f269f0385fc9ac9d31ee65d84e79ac81bd61892adaeb1afff991bcc82"; } + { locale = "zh-CN"; arch = "linux-i686"; sha256 = "73071beb9caa24aaac8eec9cfb01f7e333dc6ac438ab36e7f5afa7d850dbeb8e"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "a17cc26a51bbcff44837d74bdb35ba0ae10def6f4b536c4a67e9169221bd0afb"; } + { locale = "gl"; arch = "linux-i686"; sha256 = "4782b1f56c1f5fb1f802385d693a96b5013503e97e4d73e43fb90c3331aec839"; } + { locale = "gl"; arch = "linux-x86_64"; sha256 = "dbba59d0c697e6dc05bc2b554eed2c6040642cb1246a4119cd7c37b0451c6d4e"; } + { locale = "sl"; arch = "linux-i686"; sha256 = "b37a5eaf187d1c026990f55a3e993594a49bb689f1643d2f944c7f3c7cfd6819"; } + { locale = "sl"; arch = "linux-x86_64"; sha256 = "629132c5cc5f937fb504542662bb8aa7570eee1ae648087dbfb0c6dedadfa53c"; } + { locale = "cs"; arch = "linux-i686"; sha256 = "89e818736957569f91f7f329118b09a27b072c6d7c89f601eb02cd1d870c4088"; } + { locale = "cs"; arch = "linux-x86_64"; sha256 = "6a3a358227972a0eb60b1b531f322ebb2e604805bfb50b55d88cb8447b443105"; } + { locale = "ca"; arch = "linux-i686"; sha256 = "794b1e0be4bd6f8facebe3aa44f66a139a660d4fe75891f463adb5d7da7b32cb"; } + { locale = "ca"; arch = "linux-x86_64"; sha256 = "81b51a607844b229d026d9acec4ea1739c365a890857871260b6eca92a176e04"; } + { locale = "ar"; arch = "linux-i686"; sha256 = "924c5c47c76fc09f5a46176ef1a6e3466d783b8a4c08a5e660a03e0e84459116"; } + { locale = "ar"; arch = "linux-x86_64"; sha256 = "c46c2285a6f1c825e52ea6cd7dda31d6f67be15668ecf71883c55c9fa21a3fd5"; } + { locale = "tr"; arch = "linux-i686"; sha256 = "58a53bf3ad217b36beb9795f34349cfa3f10b7a39044f024c547be31b033ee28"; } + { locale = "tr"; arch = "linux-x86_64"; sha256 = "21d1f89810a284818c0a73e8abd5b51a9ea58b7db2b9bf6dd5e0119f4bfc13a3"; } + { locale = "ru"; arch = "linux-i686"; sha256 = "67cb3d38230d24c2a7615468ae2465e6f768904e3735ce31833dcba7b98023c5"; } + { locale = "ru"; arch = "linux-x86_64"; sha256 = "9e6b5351e96b9b2c57ce04fddaf9656adf84bc2a961a8ca614cec2f830d4e2a7"; } + { locale = "uk"; arch = "linux-i686"; sha256 = "80d0a09d93362f7eff9c7a20025080207a14c43e56b132c3962dd1d795d2a85c"; } + { locale = "uk"; arch = "linux-x86_64"; sha256 = "07d92405612e1000bc0b401481e94548877511ce224f19b23aa4fa192f21d489"; } + { locale = "fr"; arch = "linux-i686"; sha256 = "0d70e52c8dc5bf6f13c8ea2a5762cb94534ec54548c792ae181febc3d23c01cb"; } + { locale = "fr"; arch = "linux-x86_64"; sha256 = "2962de1886753b81684360ffbf97afa4d4371662a6f467ebc369e225d335745d"; } + { locale = "hr"; arch = "linux-i686"; sha256 = "6eacb202078be4de4a86c3fc957dbf482e32ab28805d719aa5d0d7f4fd832f48"; } + { locale = "hr"; arch = "linux-x86_64"; sha256 = "83ed10b7d9d74a28f9982a9d11840522f214ccb53ed599f9fce6ae26bd9d2298"; } + { locale = "el"; arch = "linux-i686"; sha256 = "227140594d1e12f2edf4e942327a8c64ab922796f7bda324eead8a299a6082ab"; } + { locale = "el"; arch = "linux-x86_64"; sha256 = "bc219c6795389fbdf20c4a84a61c350f376374285eff9aaedbc4893fdcbbdc24"; } + { locale = "et"; arch = "linux-i686"; sha256 = "4ac7de0edc1d2b084f38058f8c55e8c2fad0782a1f7f7ac69af5c6f28e2a71f9"; } + { locale = "et"; arch = "linux-x86_64"; sha256 = "cf026ebca03f6eb59b81073f754b9989f2023bb61d8dfaacbb28da3372abf43b"; } + { locale = "it"; arch = "linux-i686"; sha256 = "001f67664b02736aa757fa99ec00c8df023ead8f94113d1040092057031c4557"; } + { locale = "it"; arch = "linux-x86_64"; sha256 = "39fdd81738e0cea77c0f860f0e5253416daa6bd13f1e9feab4c6a52c6dd981f9"; } + { locale = "ja"; arch = "linux-i686"; sha256 = "0a5a830078e0774e81154f07055613d4b6dd6875be4ac976ac70883cfa0ed9cc"; } + { locale = "ja"; arch = "linux-x86_64"; sha256 = "a33890be6ac154862b7b80f864990b3bbad2db8adbf1d26bf2cd61b175db673e"; } + { locale = "bg"; arch = "linux-i686"; sha256 = "6f837f1c640c46dd99c4ab691ec6964e40b6d931830d4da604d4329c6d1ecde2"; } + { locale = "bg"; arch = "linux-x86_64"; sha256 = "a37294fbf0b358e5b9619aa36a20f92fc637a6b0697b8d607b958d256ce81225"; } + { locale = "nb-NO"; arch = "linux-i686"; sha256 = "2bbb5800b9a6d03545ca3dfc8f99f9f30c11e474ea360481f1f7e9610b0a87b0"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "e2a68f359f48a19437605b581bf9a8cf911feabfb2b15ec3724c60d1cbfe15ec"; } + { locale = "es-ES"; arch = "linux-i686"; sha256 = "976fbb88b1c75dc402b9eea76aef4d8a0886ee76bcf65d798a6ae8234b2b297a"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "190679f7638b3697b236d971014f0da938aa2d664afb93e7f4d1c0fb51bfb46e"; } + { locale = "ro"; arch = "linux-i686"; sha256 = "530b19e48b0e49047746b2f5dd486cfb19930b1064478c465ce2acb21eac66ba"; } + { locale = "ro"; arch = "linux-x86_64"; sha256 = "0fe30abe10b4c97aef9ee40550205e0f269c5cfe76c08a36c8cf886a5af78558"; } + { locale = "en-GB"; arch = "linux-i686"; sha256 = "3f2d2784e3aa75cbd3ca0579d660b50b31e488253e52fedbfefc7c5448803967"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "83e64293ed8d1ecf509e2617a71fed9583e4d4c3de3ae5b50175ad8c0f8322ae"; } + { locale = "gd"; arch = "linux-i686"; sha256 = "aa282b17eeeb185734f33d2ed9f287958d8a48ed82653d197426e3e3091ecba3"; } + { locale = "gd"; arch = "linux-x86_64"; sha256 = "c17db84f0cfd5525e4b8a08e300cabbbcd2bc45f59eb886e180eef0f8c4e45ef"; } + { locale = "be"; arch = "linux-i686"; sha256 = "909ae64789280db1a07b3b57dfa1a5d337fecd3bd59bacd3bab2eb72dbecb04f"; } + { locale = "be"; arch = "linux-x86_64"; sha256 = "9021a15bda3d4947e1ed6ee6666a252e3541b020d8d7eb58e854e426719f8d6d"; } + { locale = "pl"; arch = "linux-i686"; sha256 = "a3536d7e8bb429d562e7731fea8675dc9d442ca8e59cc72eb1b404da12d1d53a"; } + { locale = "pl"; arch = "linux-x86_64"; sha256 = "99cb049415e4837e615e1946409d1fd62966ae8eb843d89dfb61a6675b5b363f"; } + { locale = "pa-IN"; arch = "linux-i686"; sha256 = "06a17ca2ee8f44098252f24dae17589f32c80bd35e127a093c18161751a581fc"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "b8537b39f3e1242e3ed705ff919b01eb89ac72cf7c15ef0c44d258069c8ea317"; } + { locale = "ko"; arch = "linux-i686"; sha256 = "f2f1e9babb37f79121034f9b8cbc90fbf9f0fa1c152a7f0d7162aff6f6e33f1a"; } + { locale = "ko"; arch = "linux-x86_64"; sha256 = "60bc6bd468c820066e00f8108e0912df57a941b4150c06797a7958ec684c4969"; } + { locale = "sq"; arch = "linux-i686"; sha256 = "a88591a1850b56c68dd75b4ecff79a32d46dcb42f788d66bb46d45cd0f0d5672"; } + { locale = "sq"; arch = "linux-x86_64"; sha256 = "2bb7656dde363f3c3d3c8c8b4dbdb306f7e618491c917bc7c1b6e6f41d30fbf0"; } + { locale = "id"; arch = "linux-i686"; sha256 = "b396c752f7652e5ee31d6bec4bfb70b2d86438d966051f91e4d7a77ce5a924dc"; } + { locale = "id"; arch = "linux-x86_64"; sha256 = "1f0595e6953b0b6aa09577f180897760f8f85ba15e00e6ae3b12105c705cdac4"; } + { locale = "sk"; arch = "linux-i686"; sha256 = "4d3a4d283705889759dcb321e4b700896b132634005590e546bf6744e6187260"; } + { locale = "sk"; arch = "linux-x86_64"; sha256 = "456252e7bb5f29ef3c76afb2df0f406fcf93ef1c6df56d0f209bb85e91c8acce"; } + { locale = "en-US"; arch = "linux-i686"; sha256 = "ee93df33057576bd55bc80b71aeec7c6f487028f0fe52f679614811be5c71bae"; } + { locale = "en-US"; arch = "linux-x86_64"; sha256 = "7f7189250d76f970bfc1879b2ac6fe2d42bdcf3a652614fa4e080dcc636bbd4c"; } + { locale = "sr"; arch = "linux-i686"; sha256 = "cb389bd9712def87c06ffab3fc50b8fa58c773c6725fd0e0befec3e2ac957ef5"; } + { locale = "sr"; arch = "linux-x86_64"; sha256 = "8f9bf916357e7385dec5de9e4d58f6dfbe3c7fc6d2b66298304c3630189833e6"; } + { locale = "zh-TW"; arch = "linux-i686"; sha256 = "f89251f74b85c22a9f7b97b844a118e498698e205f733f1fb0d7a98787f973ee"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "019a15e1e83b6810de6a4d64deb3eba1a9c2a0c6f1c382582e356445e40d5bda"; } + { locale = "es-AR"; arch = "linux-i686"; sha256 = "ae1d03ddf4b424edc59e08c65a9fb20107311289e4faf8f06f14bc471b00d35f"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "a19dce910ba5be35c0fd51be50bd96be3b3db84587f749ed9a108a14a3b732b7"; } + { locale = "ast"; arch = "linux-i686"; sha256 = "8cb4cb6a99955209026224a4cbbcab7b37b0b9fc38147eeaa439631be7750c08"; } + { locale = "ast"; arch = "linux-x86_64"; sha256 = "4520a3ae24cc7056eb87d48280999c2c3da6aa76b9182c291512dc80363efb27"; } + { locale = "ga-IE"; arch = "linux-i686"; sha256 = "8803a9477f6ac963bdacfd82f6e6b8aabb217fa6c39b311645e461f38cda3757"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "c8eae521293986be6d626302d91abbb88a12855565fd41c3614f7a5d7534f0cd"; } + { locale = "pt-BR"; arch = "linux-i686"; sha256 = "9ea7f173533757c99a9c2dfdceab5cc58e583f929a2e7db95184823a00319a0a"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "6b9775f8142273d118870887da2728da4732609395897513739df7b352a4989c"; } + { locale = "is"; arch = "linux-i686"; sha256 = "bcaeea579405f015fcdb78e16cfd92e4c0895614c5966a1a7049a4fe310b1c46"; } + { locale = "is"; arch = "linux-x86_64"; sha256 = "7de3a89ece968819fcd7f438aaa2f5762f9d936b20fb3c364467ac123b24182e"; } + { locale = "eu"; arch = "linux-i686"; sha256 = "af7f04ef648264f56dcb62e7e473586f3c5b13d3ecd2918278962f335dda7966"; } + { locale = "eu"; arch = "linux-x86_64"; sha256 = "8477854792552b471e4eb11f71c79b14544cf438e795feae3082c0f3a31e0c8a"; } + { locale = "hu"; arch = "linux-i686"; sha256 = "21db7e27557670796db9282174e7da04afe3a0c89b31e042f7bbd3992e4e08be"; } + { locale = "hu"; arch = "linux-x86_64"; sha256 = "8f05b160d346b45308ba0c7dbe531bce043f22abffd2a4d1200628669a3b4aa0"; } + { locale = "hy-AM"; arch = "linux-i686"; sha256 = "5e77c23bdb52dba7b663b574520972e2b78588e5143922c1e1837c0e0bd71a86"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "35e663dad586cce929baa1ec501b149ff586df15a687eb41a8cc619c542a625c"; } + { locale = "pt-PT"; arch = "linux-i686"; sha256 = "211322939ab3b4bfc3e6f0548356c9479db5deb687e1e2232f527462017dcd2d"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "0d50802a6fd7d9256591076c267759d39af91f680025b03ec6925e21c20494e4"; } ]; arch = if stdenv.system == "i686-linux" diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 584fdcd170a..2b42a275d8c 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn }: stdenv.mkDerivation rec { - name = "msmtp-1.4.31"; + name = "msmtp-1.4.32"; src = fetchurl { url = "mirror://sourceforge/msmtp/${name}.tar.bz2"; - sha256 = "0pr29kb7qsz4q6yfw5wvmw1wm4axi8kc97qhhmp50bx2bylzjyi4"; + sha256 = "122z38pv4q03w3mbnhrhg4w85a51258sfdg2ips0b6cgwz3wbw1b"; }; buildInputs = [ openssl pkgconfig gnutls gsasl libidn ]; diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 0f2a3d93cdb..7b9396ff5ff 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { name = "mumble-" + version; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { url = "mirror://sourceforge/mumble/${name}.tar.gz"; - sha256 = "1zxnbwbd81p7lvscghlpkad8kynh9gbf1nhc092sp64pp37xwv47"; + sha256 = "0zjqkkdkcvgmqic6np87hj6b6f851lkzyd6y3cqj6zzacjvps31d"; }; patches = optional jackSupport ./mumble-jack-support.patch; diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index cb53f4b5aa3..4e705711677 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { meta = { description = "Decentralised and censorship-resistant network"; homepage = https://freenetproject.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index bcd0eb503f6..6c28840f7e5 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { homepage = http://gnunet.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ ludo viric ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/applications/networking/p2p/gnunet/svn.nix b/pkgs/applications/networking/p2p/gnunet/svn.nix index ed6c348706b..25a51b3c936 100644 --- a/pkgs/applications/networking/p2p/gnunet/svn.nix +++ b/pkgs/applications/networking/p2p/gnunet/svn.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { homepage = http://gnunet.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ ludo viric ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 5fa19c71d9a..5bc228f9a6b 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.tribler.org/; description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol"; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 558394199f4..4d08e1cc60a 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "SIP stack and media stack for presence, im, and multimedia communication"; homepage = http://pjsip.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 24bc20af652..8fb929d53e1 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = "http://remmina.sourceforge.net/"; description = "Remmina is a remote desktop client written in GTK+"; maintainers = []; diff --git a/pkgs/applications/networking/remote/ssvnc/default.nix b/pkgs/applications/networking/remote/ssvnc/default.nix index 619925354f0..f142395aa57 100644 --- a/pkgs/applications/networking/remote/ssvnc/default.nix +++ b/pkgs/applications/networking/remote/ssvnc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "VNC viewer that adds encryption security to VNC connections"; homepage = "http://www.karlrunge.com/x11vnc/ssvnc.html"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.edwtjo ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/networking/remote/teamviewer/8.nix b/pkgs/applications/networking/remote/teamviewer/8.nix index 440eb90390a..459ae9fab82 100644 --- a/pkgs/applications/networking/remote/teamviewer/8.nix +++ b/pkgs/applications/networking/remote/teamviewer/8.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.teamviewer.com"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; }; } diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 6802782bcb5..65ddd7305c8 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.teamviewer.com"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; }; } diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix index a51f65cbccb..f5104665562 100644 --- a/pkgs/applications/networking/sniffers/etherape/default.nix +++ b/pkgs/applications/networking/sniffers/etherape/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://etherape.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 744c8c01efa..4ac5e8300ca 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (rec { meta = { homepage = http://www.cis.upenn.edu/~bcpierce/unison/; description = "Bidirectional file synchronizer"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index 57afefd7dcd..6d4306044a4 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://humdi.net/vnstat/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Console-based network statistics utility for Linux"; }; } diff --git a/pkgs/applications/networking/yafc/default.nix b/pkgs/applications/networking/yafc/default.nix index 752a7824e6f..2e60b9aa322 100644 --- a/pkgs/applications/networking/yafc/default.nix +++ b/pkgs/applications/networking/yafc/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { description = "ftp/sftp client with readline, autocompletion and bookmarks"; homepage = http://www.yafc-ftp.com; maintainers = [ stdenv.lib.maintainers.page ]; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/office/eventlist/default.nix b/pkgs/applications/office/eventlist/default.nix index f126d6bfba6..c260220aad4 100644 --- a/pkgs/applications/office/eventlist/default.nix +++ b/pkgs/applications/office/eventlist/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { Incidences can be filtered, added, edited, deleted via context menu. ''; homepage = "http://kde-look.org/content/show.php/Eventlist?content=107779"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index ee0475d45ec..9c255f493d3 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { accounting principles to ensure balanced books and accurate reports. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnucash.org/; diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 014aa5bf0fd..2b2fd87cf43 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The GNOME Office Spreadsheet"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://projects.gnome.org/gnumeric/; platforms = platforms.linux; maintainers = [ maintainers.vcunat ]; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 5e5c98e8260..007e093378d 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Free, easy, personal accounting for everyone"; homepage = http://homebank.free.fr/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index de6517923b6..fad2167fb7a 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -71,7 +71,7 @@ in homepage = http://impressive.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.mesaPlatforms; diff --git a/pkgs/applications/office/keepnote/default.nix b/pkgs/applications/office/keepnote/default.nix index 419d761b095..409da36b264 100644 --- a/pkgs/applications/office/keepnote/default.nix +++ b/pkgs/applications/office/keepnote/default.nix @@ -17,6 +17,6 @@ buildPythonPackage { meta = { description = "Note taking application"; homepage = http://rasm.ods.org/keepnote; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index d56f4bed0ce..2940569ef65 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -28,7 +28,7 @@ in meta = { description = "Easy-to-use personal finance software"; homepage = http://www.codelathe.com/mmex; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index 250ce163e4f..4026031de08 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; description = "Desktop Publishing (DTP) and Layout program for Linux"; homepage = http://www.scribus.net; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index a2cc07b0a61..696890f95f1 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gravit.slowchop.com"; description = "A beautiful OpenGL-based gravity simulator"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' Gravit is a gravity simulator which runs under Linux, Windows and diff --git a/pkgs/applications/science/biology/plink/default.nix b/pkgs/applications/science/biology/plink/default.nix index fa6dcaa82ed..4396ab463c6 100644 --- a/pkgs/applications/science/biology/plink/default.nix +++ b/pkgs/applications/science/biology/plink/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "Whole genome association toolkit"; homepage = "http://pngu.mgh.harvard.edu/~purcell/plink/"; - license = "GNUv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/science/electronics/archimedes/default.nix b/pkgs/applications/science/electronics/archimedes/default.nix index 142519c30ed..a6a5f68755a 100644 --- a/pkgs/applications/science/electronics/archimedes/default.nix +++ b/pkgs/applications/science/electronics/archimedes/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU package for semiconductor device simulations"; homepage = http://www.gnu.org/software/archimedes; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix index d135fb09434..404ffc5010b 100644 --- a/pkgs/applications/science/electronics/caneda/default.nix +++ b/pkgs/applications/science/electronics/caneda/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "Open source EDA software focused on easy of use and portability"; homepage = http://caneda.tuxfamily.org; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 0bc6b60e721..c761f619642 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Wave viewer for Unix and Win32"; homepage = http://gtkwave.sourceforge.net; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 0e81616a006..1fc97abef92 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Free Software EDA Suite"; homepage = "http://www.kicad-pcb.org/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/science/electronics/qucs/default.nix b/pkgs/applications/science/electronics/qucs/default.nix index e434c97db2b..dd3eaecc744 100644 --- a/pkgs/applications/science/electronics/qucs/default.nix +++ b/pkgs/applications/science/electronics/qucs/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Integrated circuit simulator"; homepage = http://qucs.sourceforge.net; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix index 1feac0b31c1..30e882a7f38 100644 --- a/pkgs/applications/science/electronics/tkgate/1.x.nix +++ b/pkgs/applications/science/electronics/tkgate/1.x.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Event driven digital circuit simulator with a TCL/TK-based graphical editor"; homepage = "http://www.tkgate.org/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.simons ]; hydraPlatforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/science/electronics/tkgate/2.x.nix b/pkgs/applications/science/electronics/tkgate/2.x.nix index 25c6a309cf3..108986ddefe 100644 --- a/pkgs/applications/science/electronics/tkgate/2.x.nix +++ b/pkgs/applications/science/electronics/tkgate/2.x.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Event driven digital circuit simulator with a TCL/TK-based graphical editor"; homepage = "http://www.tkgate.org/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; broken = true; }; } diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix index f2c9d2e646f..e68d2a4ab91 100644 --- a/pkgs/applications/science/electronics/verilog/default.nix +++ b/pkgs/applications/science/electronics/verilog/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { description = "Icarus Verilog compiler"; repositories.git = https://github.com/steveicarus/iverilog.git; homepage = http://www.icarus.com; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [winden]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/science/electronics/xoscope/default.nix b/pkgs/applications/science/electronics/xoscope/default.nix index 54aae9e7d3b..df7d053d93b 100644 --- a/pkgs/applications/science/electronics/xoscope/default.nix +++ b/pkgs/applications/science/electronics/xoscope/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Oscilloscope through the sound card"; homepage = http://xoscope.sourceforge.net; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix index d14fa08bbb5..ddfb92def95 100644 --- a/pkgs/applications/science/geometry/tetgen/default.nix +++ b/pkgs/applications/science/geometry/tetgen/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator"; homepage = "http://tetgen.org/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix index 2fb9678b832..e03b33fa43c 100644 --- a/pkgs/applications/science/logic/iprover/default.nix +++ b/pkgs/applications/science/logic/iprover/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , ocaml, eprover , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -38,7 +38,7 @@ rec { echo -e "#! /bin/sh\\n$out/bin/iproveropt --clausifier \"${eprover}/bin/eprover\" --clausifier_options \" --tstp-format --silent --cnf \" \"\$@\"" > "$out"/bin/iprover chmod a+x "$out"/bin/iprover '') ["defEnsureDir" "minInit" "doMake"]; - + meta = { description = "An automated first-order logic theorem prover"; maintainers = with a.lib.maintainers; @@ -47,7 +47,8 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "GPLv3"; + license = with a.lib.licenses; + gpl3; }; passthru = { updateInfo = { @@ -55,4 +56,3 @@ rec { }; }; }) x - diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix index ab46efa9a96..c71ed73a992 100644 --- a/pkgs/applications/science/logic/logisim/default.nix +++ b/pkgs/applications/science/logic/logisim/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { meta = { homepage = "http://ozark.hendrix.edu/~burch/logisim"; description = "Educational tool for designing and simulating digital logic circuits"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/science/logic/matita/130312.nix b/pkgs/applications/science/logic/matita/130312.nix index f77e9d34a2a..9e98c8db394 100644 --- a/pkgs/applications/science/logic/matita/130312.nix +++ b/pkgs/applications/science/logic/matita/130312.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation { meta = { homepage = http://matita.cs.unibo.it/; description = "Matita is an experimental, interactive theorem prover"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/applications/science/logic/matita/default.nix b/pkgs/applications/science/logic/matita/default.nix index 0713ff09e92..f601f97de62 100644 --- a/pkgs/applications/science/logic/matita/default.nix +++ b/pkgs/applications/science/logic/matita/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { meta = { homepage = http://matita.cs.unibo.it/; description = "Matita is an experimental, interactive theorem prover"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/applications/science/logic/minisat/default.nix b/pkgs/applications/science/logic/minisat/default.nix index 1f29b3aa1a1..e91ff67fc9c 100644 --- a/pkgs/applications/science/logic/minisat/default.nix +++ b/pkgs/applications/science/logic/minisat/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , zlib , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -36,7 +36,7 @@ rec { setVars = a.fullDepEntry ('' export MROOT=$PWD/../ '') ["doUnpack"]; - + meta = { description = "A compact and readable SAT-solver"; maintainers = with a.lib.maintainers; @@ -45,7 +45,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "MIT"; + license = a.stdenv.lib.licenses.mit; homepage = "http://minisat.se/"; }; passthru = { @@ -54,4 +54,3 @@ rec { }; }; }) x - diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index 430537fd57f..2dc4b993429 100644 --- a/pkgs/applications/science/logic/opensmt/default.nix +++ b/pkgs/applications/science/logic/opensmt/default.nix @@ -3,9 +3,9 @@ x@{builderDefsPackage , gmpxx, flex, bison , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -30,7 +30,7 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["doAutotools" "doConfigure" "doMakeInstall"]; - + meta = { description = "A satisfiability modulo theory (SMT) solver"; maintainers = with a.lib.maintainers; @@ -39,7 +39,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "GPLv3"; + license = a.stdenv.lib.licenses.gpl3; homepage = "http://code.google.com/p/opensmt/"; }; passthru = { @@ -48,4 +48,3 @@ rec { }; }; }) x - diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix index 970daf739fc..6c2cce0ea4b 100644 --- a/pkgs/applications/science/logic/picosat/default.nix +++ b/pkgs/applications/science/logic/picosat/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://fmv.jku.at/picosat/; description = "SAT solver with proof and core support"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/applications/science/math/eukleides/default.nix index 55ea4c6216c..fdf5c1bd831 100644 --- a/pkgs/applications/science/math/eukleides/default.nix +++ b/pkgs/applications/science/math/eukleides/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Geometry Drawing Language"; homepage = "http://www.eukleides.org/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' Eukleides is a computer language devoted to elementary plane diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index e7766fab581..0700251c3a8 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -1,10 +1,10 @@ x@{builderDefsPackage - , pari ? null + , pari ? null , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -44,14 +44,14 @@ rec { tar xf "${pkgSrc}" -C "$out/share/gap/build-dir/pkg" - ${if a.pari != null then - ''sed -e '2iexport PATH=$PATH:${pari}/bin' -i "$out/share/gap/build-dir/bin/gap.sh" '' + ${if a.pari != null then + ''sed -e '2iexport PATH=$PATH:${pari}/bin' -i "$out/share/gap/build-dir/bin/gap.sh" '' else ""} - sed -e "/GAP_DIR=/aGAP_DIR='$out/share/gap/build-dir/'" -i "$out/share/gap/build-dir/bin/gap.sh" + sed -e "/GAP_DIR=/aGAP_DIR='$out/share/gap/build-dir/'" -i "$out/share/gap/build-dir/bin/gap.sh" ln -s "$out/share/gap/build-dir/bin/gap.sh" "$out/bin" '' ["doMake" "minInit" "defEnsureDir"]; - + meta = { description = "Computational discrete algebra system"; maintainers = with a.lib.maintainers; @@ -60,8 +60,8 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "GPLv2"; + license = with a.lib.licenses; + gpl2; homepage = "http://gap-system.org/"; }; }) x - diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 997080ee303..d4d352c95bb 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -119,6 +119,6 @@ stdenv.mkDerivation rec { meta = { description = "Wolfram Mathematica computational software system"; homepage = "http://www.wolfram.com/mathematica/"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 7123b476f35..096796a859d 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = { description = "Maxima computer algebra system"; homepage = "http://maxima.sourceforge.net"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' Maxima is a fairly complete computer algebra system written in diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index 5c5dfae8200..1afb510e994 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -3,9 +3,9 @@ x@{builderDefsPackage , coreutils , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -38,9 +38,9 @@ rec { rm -rf "$out/LIB" cp -r Singular/LIB "$out" mkdir -p "$out/bin" - ln -s "$out"/*/Singular "$out/bin" + ln -s "$out/"*/Singular "$out/bin" '') ["minInit" "defEnsureDir"]; - + meta = { description = "A CAS for polynomial computations"; maintainers = with a.lib.maintainers; @@ -49,7 +49,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "GPLv3"; # Or GPLv2 at your option - but not GPLv4 + license = a.stdenv.lib.licenses.gpl3; # Or GPLv2 at your option - but not GPLv4 homepage = "http://www.singular.uni-kl.de/index.php"; }; passthru = { @@ -58,4 +58,3 @@ rec { }; }; }) x - diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix index 8471c46c8d7..66609fa5834 100644 --- a/pkgs/applications/science/math/weka/default.nix +++ b/pkgs/applications/science/math/weka/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { meta = { homepage = "http://www.cs.waikato.ac.nz/ml/weka/"; description = "Collection of machine learning algorithms for data mining tasks"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 01be4ba7e6c..75448b6965c 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { description = "Cross platform GUI for the computer algebra system Maxima"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; homepage = http://wxmaxima.sourceforge.net; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/applications/science/math/yacas/default.nix index acc4740eb6b..2c9d63be1b4 100644 --- a/pkgs/applications/science/math/yacas/default.nix +++ b/pkgs/applications/science/math/yacas/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Easy to use, general purpose Computer Algebra System"; homepage = http://yacas.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index f4b79c8d236..7020de0bca8 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = http://boinc.berkeley.edu/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.linux; # arbitrary choice }; diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index a380f05b091..9d198cd5c7f 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -1,11 +1,11 @@ -x@{builderDefsPackage, +x@{builderDefsPackage, wxGTK, perl, python, zlib , ...}: builderDefsPackage -(a : -let +(a : +let s = import ./src-for-default.nix; - helperArgNames = ["builderDefsPackage"] ++ + helperArgNames = ["builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames)); @@ -26,7 +26,7 @@ rec { export NIX_LDFLAGS="$NIX_LDFLAGS -l$pythonLib" echo "Flags: $NIX_LDFLAGS" ''; - + meta = { description = "Cellular automata simulation program"; maintainers = with a.lib.maintainers; @@ -35,7 +35,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "GPLv2"; + license = with a.lib.licenses; + gpl2; }; }) x - diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 5fdede1abcd..d402a48c815 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { homepage = http://simgrid.gforge.inria.fr/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index e58183a4f40..da6e0cb2805 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = http://tulip.labri.fr/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/search/doodle/default.nix b/pkgs/applications/search/doodle/default.nix index a6b3ac7ccfd..3a9df150574 100644 --- a/pkgs/applications/search/doodle/default.nix +++ b/pkgs/applications/search/doodle/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://grothoff.org/christian/doodle/; description = "Tool to quickly index and search documents on a computer"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/version-management/cvsps/default.nix b/pkgs/applications/version-management/cvsps/default.nix index 1be797fea96..9bc4401e068 100644 --- a/pkgs/applications/version-management/cvsps/default.nix +++ b/pkgs/applications/version-management/cvsps/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { same time (using a single "cvs commit" command). ''; homepage = http://www.cobite.com/cvsps/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/pkgs/applications/version-management/git-and-tools/qgit/default.nix index d92b49b9ef6..a7e6a62ce5f 100644 --- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "qgit-2.5"; meta = { - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = "http://libre.tibirna.org/projects/qgit/wiki/QGit"; description = "Graphical front-end to Git"; inherit (qt.meta) platforms; diff --git a/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix b/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix index c3b3469ca1a..590e090de48 100644 --- a/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix +++ b/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "qgit-git"; meta = { - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = "http://digilander.libero.it/mcostalba/"; description = "Graphical front-end to Git"; }; diff --git a/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/pkgs/applications/version-management/git-and-tools/topgit/default.nix index 5290a12a54a..195f6f3a463 100644 --- a/pkgs/applications/version-management/git-and-tools/topgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/topgit/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/greenrd/topgit"; description = "TopGit manages large amount of interdependent topic branches"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ marcweber ludo simons ]; }; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 73b21728e16..29094f1efce 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Visual diff and merge tool"; homepage = http://meld.sourceforge.net; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 5fdafe8ac2a..fb3e115e125 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { meta = { description = "A fast, lightweight SCM system for very large distributed projects"; homepage = "http://www.selenic.com/mercurial/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix index e89cea6aadc..29fafc4db74 100644 --- a/pkgs/applications/version-management/mr/default.nix +++ b/pkgs/applications/version-management/mr/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { offline, so they can be retried when it comes back online. ''; homepage = http://joeyh.name/code/mr/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.antono ]; }; diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix index 264340b4826..843fe9ad323 100644 --- a/pkgs/applications/version-management/rapidsvn/default.nix +++ b/pkgs/applications/version-management/rapidsvn/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Multi-platform GUI front-end for the Subversion revision system"; homepage = http://rapidsvn.tigris.org/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.viric ]; }; } diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index 90bca9b0712..e71d23132ac 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { documentation, graphics, papers, and form letters. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ eelco simons ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/version-management/tkcvs/default.nix b/pkgs/applications/version-management/tkcvs/default.nix index 569c442f983..b3bfe8a22e6 100644 --- a/pkgs/applications/version-management/tkcvs/default.nix +++ b/pkgs/applications/version-management/tkcvs/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation meta = { homepage = http://www.twobarleycorns.net/tkcvs.html; description = "TCL/TK GUI for cvs and subversion"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix index 70dcad49c97..a9a2ec46397 100644 --- a/pkgs/applications/video/avxsynth/default.nix +++ b/pkgs/applications/video/avxsynth/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/avxsynth/avxsynth/wiki; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/video/bangarang/default.nix b/pkgs/applications/video/bangarang/default.nix index 1058243c0e0..f962b52dd62 100644 --- a/pkgs/applications/video/bangarang/default.nix +++ b/pkgs/applications/video/bangarang/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { media collection management, playlists and statistics. ''; homepage = http://bangarangkde.wordpress.com/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = [ maintainers.phreedom maintainers.urkud ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index ce8bbde2ecd..8287cb9121e 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation { description = "Video Editor"; homepage = http://www.cinelerra.org; maintainers = [ stdenv.lib.maintainers.marcweber ]; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix index f4be54ae23e..e3c28853403 100644 --- a/pkgs/applications/video/coriander/default.nix +++ b/pkgs/applications/video/coriander/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://damien.douxchamps.net/ieee1394/coriander/; description = "GUI for controlling a Digital Camera through the IEEE1394 bus"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/video/dvb-apps/default.nix b/pkgs/applications/video/dvb-apps/default.nix index 74e3d58553a..5e8e63564f4 100644 --- a/pkgs/applications/video/dvb-apps/default.nix +++ b/pkgs/applications/video/dvb-apps/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { description = "Linux DVB API applications and utilities"; homepage = http://linuxtv.org/; platforms = stdenv.lib.platforms.linux; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index 2e8b7e63cb8..06122619066 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { supports most SWF v7 features and some SWF v8 and v9. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index 30e0bdfb197..16bd57bef34 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -87,6 +87,6 @@ stdenv.mkDerivation { meta = { description = "Kino is a non-linear DV editor for GNU/Linux"; homepage = http://www.kinodv.org/; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/video/lxdvdrip/default.nix b/pkgs/applications/video/lxdvdrip/default.nix index 1b3acd2c2ff..6e7b874841f 100644 --- a/pkgs/applications/video/lxdvdrip/default.nix +++ b/pkgs/applications/video/lxdvdrip/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { meta = { description = "Command line tool to make a copy from a video DVD for private use"; homepage = http://sourceforge.net/projects/lxdvdrip; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 43482bd9762..bec9d85aefd 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { can always download the latest version from makemkv.com that will reset the expiration date. ''; - license = "unfree"; + license = stdenv.lib.licenses.unfree; homepage = http://makemkv.com; }; } diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 6a385786eff..f3cef6db69f 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -72,7 +72,7 @@ let cp -prv * $out ''; - meta.license = "unfree"; + meta.license = stdenv.lib.licenses.unfree; } else null; in diff --git a/pkgs/applications/video/mplayer2/default.nix b/pkgs/applications/video/mplayer2/default.nix index f0830f007d9..d8ada6372b1 100644 --- a/pkgs/applications/video/mplayer2/default.nix +++ b/pkgs/applications/video/mplayer2/default.nix @@ -60,7 +60,7 @@ let cp -prv * $out ''; - meta.license = "unfree"; + meta.license = stdenv.lib.licenses.unfree; } else null; in @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { meta = { description = "A movie player that supports many video formats (MPlayer fork)"; homepage = "http://mplayer2.org"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/video/ogmtools/default.nix b/pkgs/applications/video/ogmtools/default.nix index 11a16e3a79d..82077e4d3dd 100644 --- a/pkgs/applications/video/ogmtools/default.nix +++ b/pkgs/applications/video/ogmtools/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { tool for extracting chapter information from DVD. ''; homepage = http://www.bunkus.org/videotools/ogmtools/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/applications/video/omxplayer/default.nix index 6bc982efa12..3add2646ad9 100644 --- a/pkgs/applications/video/omxplayer/default.nix +++ b/pkgs/applications/video/omxplayer/default.nix @@ -79,6 +79,6 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/huceke/omxplayer; description = "Commandline OMX player for the Raspberry Pi"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/video/quvi/tool.nix b/pkgs/applications/video/quvi/tool.nix index 807e3954d6f..29bb439dcf6 100644 --- a/pkgs/applications/video/quvi/tool.nix +++ b/pkgs/applications/video/quvi/tool.nix @@ -17,9 +17,8 @@ stdenv.mkDerivation rec { meta = { description = "Web video downloader"; homepage = http://quvi.sf.net; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.mornfall ]; }; } - diff --git a/pkgs/applications/video/shotcut/CuteLogger.patch b/pkgs/applications/video/shotcut/CuteLogger.patch deleted file mode 100644 index 77b451cb437..00000000000 --- a/pkgs/applications/video/shotcut/CuteLogger.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git shotcut-14.07/CuteLogger/CuteLogger.pro shotcut-14.07/CuteLogger/CuteLogger.pro -index 501eddc..a5290b0 100644 ---- shotcut-14.07/CuteLogger/CuteLogger.pro -+++ shotcut-14.07/CuteLogger/CuteLogger.pro -@@ -42,7 +42,7 @@ unix:!symbian { - maemo5 { - target.path = /opt/usr/lib - } else { -- target.path = /usr/lib -+ target.path = $(INSTALL_ROOT)/usr/lib - } - INSTALLS += target - } diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 97c3720f7f9..51baa32f61e 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -2,18 +2,15 @@ stdenv.mkDerivation rec { name = "shotcut-${version}"; - version = "14.07"; + version = "14.08"; src = fetchurl { url = "https://github.com/mltframework/shotcut/archive/v${version}.tar.gz"; - sha256 = "05g0b3jhmmdv8qnlgmi8wsfi7l3c5zvjcrrb3q7ajfc3q7yf6k6a"; + sha256 = "0klcvpgp2l6xcdjy1gg7a5s8mx0mm347zdf26q6kk685pldlvkyj"; }; buildInputs = [ SDL frei0r gettext makeWrapper mlt pkgconfig qt5 ]; - # Fixed in git and can be removed for the next release - patches = [ ./CuteLogger.patch ]; - configurePhase = "qmake PREFIX=$out"; postInstall = '' diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 14ce5e9684b..4c58262a5f1 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "simplescreenrecorder-${version}"; - version = "0.2.2"; + version = "0.3.0"; src = fetchurl { url = "https://github.com/MaartenBaert/ssr/archive/${version}.tar.gz"; - sha256 = "0k1r1ilpk05qmwpnld95zxxk57qvyaq2r9f4i3la7y0xh9bz1gls"; + sha256 = "0caal8jq47d56ld57cdf2lr1ji350v09j5chgvgxv2pbqmqga4p5"; }; buildInputs = [ diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 4b42bcd2859..71db3d40a46 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz"; - sha256 = "1lymhbb2bns73qivdaqanhggjjhyc9fwfgf5ikhng0a74msnqmiy"; + sha256 = "0whzbn7ahn5maarcwl1yhk9lq10b0q0y9w5pjl9kh3frdjmncrbg"; }; buildInputs = diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix index 9d7f8a6ac99..83b5c778f86 100644 --- a/pkgs/applications/video/xvidcap/default.nix +++ b/pkgs/applications/video/xvidcap/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { meta = { description = "screencast video catpuring tool"; homepage = http://xvidcap.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index d951fe124c9..4a488a381ab 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -3,24 +3,21 @@ btrfsProgs, iptables, bash}: stdenv.mkDerivation rec { name = "docker-${version}"; - version = "0.10.0"; + version = "1.1.2"; src = fetchurl { url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz"; - sha256 = "14gmx119hd3j0c6rbks2mm83hk46s5wnnyvj8rhn25h0yp39pm5q"; + sha256 = "1pa6k3gx940ap3r96xdry6apzkm0ymqra92b2mrp25b25264cqcy"; }; - phases = ["unpackPhase" "preBuild" "buildPhase" "installPhase"]; - buildInputs = [ makeWrapper go sqlite lxc iproute bridge_utils devicemapper btrfsProgs iptables ]; - preBuild = '' - patchShebangs ./hack - ''; + dontStrip = true; buildPhase = '' + patchShebangs ./hack export AUTO_GOPATH=1 - export DOCKER_GITCOMMIT="867b2a90c228f62cdcd44907ceef279a2d8f1ac5" + export DOCKER_GITCOMMIT="d84a070" ./hack/make.sh dynbinary ''; @@ -41,7 +38,7 @@ stdenv.mkDerivation rec { homepage = http://www.docker.io/; description = "An open source project to pack, ship and run any application as a lightweight container"; license = licenses.asl20; - maintainers = with maintainers; [ offline ]; + maintainers = with maintainers; [ offline tailhook ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index 84600884e7b..8e2da5c3b76 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://virt-manager.org; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [qknight]; description = "Command line tool which provides an easy way to provision operating systems into virtual machines"; }; diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix index 5f149b05978..3cb16a6b442 100644 --- a/pkgs/applications/virtualization/xen/default.nix +++ b/pkgs/applications/virtualization/xen/default.nix @@ -136,6 +136,5 @@ stdenv.mkDerivation { description = "Xen hypervisor and management tools for Dom0"; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.eelco ]; - broken = true; }; } diff --git a/pkgs/applications/window-managers/awesome/3.4.nix b/pkgs/applications/window-managers/awesome/3.4.nix index b21f73ddc54..3db2bde6540 100644 --- a/pkgs/applications/window-managers/awesome/3.4.nix +++ b/pkgs/applications/window-managers/awesome/3.4.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://awesome.naquadah.org/; description = "Highly configurable, dynamic window manager for X"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix index 02b7b9987bd..b73d636aaa5 100644 --- a/pkgs/applications/window-managers/compiz/default.nix +++ b/pkgs/applications/window-managers/compiz/default.nix @@ -15,11 +15,11 @@ let s = # Generated upstream information rec { baseName="compiz"; - version="0.9.10.0"; + version="0.9.11.2"; name="${baseName}-${version}"; - hash="0kvjib0ns02cikpsjq5hlf746yjx2gkfh373pvrb25lzv3rs1qax"; - url="https://launchpad.net/compiz/0.9.10/0.9.10.0/+download/compiz-0.9.10.0.tar.bz2"; - sha256="0kvjib0ns02cikpsjq5hlf746yjx2gkfh373pvrb25lzv3rs1qax"; + hash="1czk4snv9j9l7b587nwf2y305lkn112zspm7f9l7yfk7jmkx1hqy"; + url="https://launchpad.net/compiz/0.9.11/0.9.11.2/+download/compiz-0.9.11.2.tar.bz2"; + sha256="1czk4snv9j9l7b587nwf2y305lkn112zspm7f9l7yfk7jmkx1hqy"; }; buildInputs = [cmake pkgconfig libXrender renderproto gtk libwnck pango cairo diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index b69dd9d8a49..626a0926a67 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { homepage = "www.suckless.org"; description = "Dynamic window manager for X"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix index 33acd000270..6830e3a1c01 100644 --- a/pkgs/applications/window-managers/fvwm/default.nix +++ b/pkgs/applications/window-managers/fvwm/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://fvwm.org"; description = "A multiple large virtual desktop window manager"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } - diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 17a287f8aae..b5869ccaf8d 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutil, xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, - xcb-util-cursor, coreutils, perl, pango }: + xcb-util-cursor, coreutils, perl, pango, perlPackages, xdummy }: stdenv.mkDerivation rec { name = "i3-${version}"; @@ -11,13 +11,25 @@ stdenv.mkDerivation rec { sha256 = "0sqvd8yqf9vwqrrvbpbf8k93b3qfa3q9289m82xq15r31wlk8b2h"; }; - buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil xcbutilwm - libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango ]; + buildInputs = [ + which pkgconfig libxcb xcbutilkeysyms xcbutil xcbutilwm + libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango + perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun + perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC + ]; - patchPhase = '' + postPatch = '' patchShebangs . ''; + doCheck = stdenv.system == "x86_64-linux"; + + checkPhase = '' + ln -sf "${xdummy}/bin/xdummy" testcases/Xdummy + (cd testcases && perl complete-run.pl -p 1) + ! grep -q '^not ok' testcases/latest/complete-run.log + ''; + configurePhase = "makeFlags=PREFIX=$out"; meta = with stdenv.lib; { diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index c37ed0d85f2..5af4519af03 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -2,11 +2,11 @@ pam, libX11, libev, cairo, libxkbcommon, libxkbfile }: stdenv.mkDerivation rec { - name = "i3lock-2.5"; + name = "i3lock-2.6"; src = fetchurl { url = "http://i3wm.org/i3lock/${name}.tar.bz2"; - sha256 = "0xqdklvfcn2accwdbzsly7add0f3rh9sxjnahawas4zwwk4p49xc"; + sha256 = "0aj0an8fwv66jhda499r3xa00546cc9ja1dk8xpc6sy6xygqjbf0"; }; buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11 diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/applications/window-managers/matchbox/default.nix index ed2637eff6e..08c1be9f963 100644 --- a/pkgs/applications/window-managers/matchbox/default.nix +++ b/pkgs/applications/window-managers/matchbox/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { description = "X window manager for non-desktop embedded systems"; homepage = http://matchbox-project.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix index 56a5f0e3e2c..fad5b8010ea 100644 --- a/pkgs/applications/window-managers/openbox/default.nix +++ b/pkgs/applications/window-managers/openbox/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { meta = { description = "X window manager for non-desktop embedded systems"; homepage = http://openbox.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix index d1419fc2225..65264c20db3 100644 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ b/pkgs/applications/window-managers/ratpoison/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.nongnu.org/ratpoison/"; description = "Ratpoison, a simple mouse-free tiling window manager"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; longDescription = '' Ratpoison is a simple window manager with no fat library diff --git a/pkgs/data/fonts/freefont-ttf/default.nix b/pkgs/data/fonts/freefont-ttf/default.nix index 92f61788892..e1d9e1614f3 100644 --- a/pkgs/data/fonts/freefont-ttf/default.nix +++ b/pkgs/data/fonts/freefont-ttf/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/freefont/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/data/fonts/source-han-sans/base.nix b/pkgs/data/fonts/source-han-sans/base.nix new file mode 100644 index 00000000000..d319f41f2e5 --- /dev/null +++ b/pkgs/data/fonts/source-han-sans/base.nix @@ -0,0 +1,26 @@ +{version ? "1.000", prefix, url, sha256, description}: + +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation rec { + inherit version; + name = "${prefix}-${version}"; + + src = fetchurl { + inherit url sha256; + }; + + buildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp $( find . -name '*.otf' ) $out/share/fonts/truetype + ''; + + meta = { + inherit description; + + homepage = http://sourceforge.net/adobe/source-han-sans/; + license = stdenv.lib.licenses.asl20; + }; +} diff --git a/pkgs/data/fonts/source-han-sans/japanese.nix b/pkgs/data/fonts/source-han-sans/japanese.nix new file mode 100644 index 00000000000..4aacdbf62e2 --- /dev/null +++ b/pkgs/data/fonts/source-han-sans/japanese.nix @@ -0,0 +1,6 @@ +import ./base.nix { + prefix = "source-han-sans-japanese"; + url = "mirror://sourceforge/source-han-sans.adobe/SourceHanSansJP-1.000.zip"; + sha256 = "c5930036660bea22ffceaa9e2df765776494800d330a59be7936ab3c763c4c82"; + description = "Japanese subset of an open source Pan-CJK typeface"; +} \ No newline at end of file diff --git a/pkgs/data/fonts/source-han-sans/korean.nix b/pkgs/data/fonts/source-han-sans/korean.nix new file mode 100644 index 00000000000..cf3ecd9e12e --- /dev/null +++ b/pkgs/data/fonts/source-han-sans/korean.nix @@ -0,0 +1,6 @@ +import ./base.nix { + prefix = "source-han-sans-korean"; + url = "mirror://sourceforge/source-han-sans.adobe/SourceHanSansKR-1.000.zip"; + sha256 = "8eed4ad092fcf640e44f73ba510e0ed1c1cabf79776f68d02820734bbba21cf8"; + description = "Korean subset of an open source Pan-CJK typeface"; +} \ No newline at end of file diff --git a/pkgs/data/fonts/source-han-sans/simplified-chinese.nix b/pkgs/data/fonts/source-han-sans/simplified-chinese.nix new file mode 100644 index 00000000000..8e920455e45 --- /dev/null +++ b/pkgs/data/fonts/source-han-sans/simplified-chinese.nix @@ -0,0 +1,6 @@ +import ./base.nix { + prefix = "source-han-sans-simplified-chinese"; + url = "mirror://sourceforge/source-han-sans.adobe/SourceHanSansCN-1.000.zip"; + sha256 = "88117aa8f8b4ab65d6f7a919a5e1b06d6c00f75b1abecccf120246536123754d"; + description = "Simplified Chinese subset of an open source Pan-CJK typeface"; +} \ No newline at end of file diff --git a/pkgs/data/fonts/source-han-sans/traditional-chinese.nix b/pkgs/data/fonts/source-han-sans/traditional-chinese.nix new file mode 100644 index 00000000000..b25db8a2515 --- /dev/null +++ b/pkgs/data/fonts/source-han-sans/traditional-chinese.nix @@ -0,0 +1,6 @@ +import ./base.nix { + prefix = "source-han-sans-traditional-chinese"; + url = "mirror://sourceforge/source-han-sans.adobe/SourceHanSansTWHK-1.000.zip"; + sha256 = "2371a726757a51322243b1ed7a9fde562621b0813b5e6d6443e06847ad7bbd20"; + description = "Traditional Chinese subset of an open source Pan-CJK typeface"; +} \ No newline at end of file diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index ac5beaeee81..7bb1e1d21d5 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "cacert-20131205"; + name = "cacert-20140704"; src = fetchurl { url = "http://tarballs.nixos.org/${name}.pem.bz2"; - sha256 = "049cm3nrhawkh9xpfjhgis6w58zji5ppi4d9yyjzrr7mpw0a34df"; + sha256 = "05ymb7lrxavscbpx5xywlbya9q66r26fbngfif6zrvfpf3qskiza"; }; unpackPhase = "true"; diff --git a/pkgs/data/misc/miscfiles/default.nix b/pkgs/data/misc/miscfiles/default.nix index e216f4b0278..db4d13b890f 100644 --- a/pkgs/data/misc/miscfiles/default.nix +++ b/pkgs/data/misc/miscfiles/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/miscfiles/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Collection of files not of crucial importance for sysadmins"; }; } diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix index 30c8bf07d41..5932caf9e97 100644 --- a/pkgs/desktops/gnome-2/desktop/vte/default.nix +++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { character set conversion, as well as emulating any terminal known to the system's terminfo database. ''; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/desktops/gnome-2/platform/gconfmm/default.nix b/pkgs/desktops/gnome-2/platform/gconfmm/default.nix index 371382b2607..045f60e8b60 100644 --- a/pkgs/desktops/gnome-2/platform/gconfmm/default.nix +++ b/pkgs/desktops/gnome-2/platform/gconfmm/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ wrappers for GConf"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index 55f0e0ae1a3..ee08975b9da 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { OpenGL drawing for standard and custom GTK+ widgets. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; }; diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix index 46218c8f601..4ce51844a51 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ wrappers for GtkGLExt"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.10/core/evince/default.nix b/pkgs/desktops/gnome-3/3.10/core/evince/default.nix index 4b50840534c..76cfacb0d77 100644 --- a/pkgs/desktops/gnome-3/3.10/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/evince/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { on the GNOME Desktop with a single simple application. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.vcunat ]; }; diff --git a/pkgs/desktops/gnome-3/3.10/core/folks/default.nix b/pkgs/desktops/gnome-3/3.10/core/folks/default.nix index 12518c634c4..47b958002a3 100644 --- a/pkgs/desktops/gnome-3/3.10/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/folks/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Projects/Folks; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ lethalman ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/desktops/gnome-3/3.10/core/vte/default.nix b/pkgs/desktops/gnome-3/3.10/core/vte/default.nix index c916be6c9a7..b9ffcffafbd 100644 --- a/pkgs/desktops/gnome-3/3.10/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/vte/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { versionMajor = "0.35"; versionMinor = "90"; moduleName = "vte"; - + name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { diff --git a/pkgs/desktops/gnome-3/3.10/misc/goffice/default.nix b/pkgs/desktops/gnome-3/3.10/misc/goffice/default.nix index 0390fc13368..fd16d2d4985 100644 --- a/pkgs/desktops/gnome-3/3.10/misc/goffice/default.nix +++ b/pkgs/desktops/gnome-3/3.10/misc/goffice/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { documents, undo/redo. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; }; diff --git a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix index ca983258d95..2a585d78f4e 100644 --- a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { on the GNOME Desktop with a single simple application. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.vcunat ]; }; diff --git a/pkgs/desktops/gnome-3/3.12/core/folks/default.nix b/pkgs/desktops/gnome-3/3.12/core/folks/default.nix index 12518c634c4..47b958002a3 100644 --- a/pkgs/desktops/gnome-3/3.12/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/folks/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Projects/Folks; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ lethalman ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix index 9ff7fdb1740..002e8e7f7ff 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix @@ -43,8 +43,6 @@ stdenv.mkDerivation rec { echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path ''; - enableParallelBuilding = true; - passthru = { mozillaPlugin = "/lib/mozilla/plugins"; }; diff --git a/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix index 5e2559899b7..5a8117528b6 100644 --- a/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libzapojit-0.0.3"; src = fetchurl { - url = "mirror://gnome/sources//3.10/${name}.tar.xz"; + url = "mirror://gnome/sources/libzapojit/0.0/${name}.tar.xz"; sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"; }; diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix index 70c860849e0..41597e47fa5 100644 --- a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { versionMajor = "0.36"; versionMinor = "2"; moduleName = "vte"; - + name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix index f3cd3f1b3c4..ee1724e1e25 100644 --- a/pkgs/desktops/gnome-3/3.12/default.nix +++ b/pkgs/desktops/gnome-3/3.12/default.nix @@ -211,6 +211,11 @@ rec { seahorse = callPackage ./apps/seahorse { }; +#### Dev http://ftp.gnome.org/pub/GNOME/devtools/ + + anjuta = callPackage ./devtools/anjuta { }; + + gdl = callPackage ./devtools/gdl { }; #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/ @@ -222,6 +227,8 @@ rec { gitg = callPackage ./misc/gitg { }; + libgda = callPackage ./misc/libgda { }; + libgit2-glib = callPackage ./misc/libgit2-glib { }; libmediaart = callPackage ./misc/libmediaart { }; diff --git a/pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix new file mode 100644 index 00000000000..79bfd895257 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool, + itstool, python }: + +let + major = "3.13"; + minor = "1"; + +in stdenv.mkDerivation rec { + version = "${major}.${minor}"; + name = "anjuta-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/anjuta/${major}/${name}.tar.xz"; + sha256 = "71bdad9a0e427d9481858eec40b9c1facef4b551d732023cc18a50019df4b78b"; + }; + + enableParallelBuilding = true; + + buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl + gnome3.libgda gnome3.gtksourceview intltool itstool python ]; + + meta = with stdenv.lib; { + description = "Software development studio"; + homepage = http://anjuta.org/; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix new file mode 100644 index 00000000000..1dae33cd4e9 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, intltool }: + +let + major = "3.12"; + minor = "0"; + +in stdenv.mkDerivation rec { + version = "${major}.${minor}"; + name = "gdl-${version}"; + + src = fetchurl { + url = "https://download.gnome.org/sources/gdl/${major}/${name}.tar.xz"; + sha256 = "4770f959f31ed5e616fe623c284e8dd6136e49902d19b6e37938d34be4f6b88d"; + }; + + buildInputs = [ pkgconfig libxml2 gtk3 intltool ]; + + meta = with stdenv.lib; { + description = "Gnome docking library"; + homepage = https://developer.gnome.org/gdl/; + license = [ licenses.gpl2 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix b/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix index 0390fc13368..fd16d2d4985 100644 --- a/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix +++ b/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { documents, undo/redo. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; }; diff --git a/pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix b/pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix new file mode 100644 index 00000000000..3944644a453 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3 }: + +let + major = "5.2"; + minor = "2"; + +in stdenv.mkDerivation rec { + version = "${major}.${minor}"; + name = "libgda-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/libgda/${major}/${name}.tar.xz"; + sha256 = "c9b8b1c32f1011e47b73c5dcf36649aaef2f1edaa5f5d75be20d9caadc2bc3e4"; + }; + + configureFlags = [ + "--enable-gi-system-install=no" + ]; + + enableParallelBuilding = true; + + buildInputs = [ pkgconfig intltool itstool libxml2 gtk3 ]; + + meta = with stdenv.lib; { + description = "Database access library"; + homepage = http://www.gnome-db.org/; + license = [ licenses.lgpl2 licenses.gpl2 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/kde-4.12/applications/kate.nix b/pkgs/desktops/kde-4.12/applications/kate.nix index 63bfa12c4bb..e7a6476dd6d 100644 --- a/pkgs/desktops/kde-4.12/applications/kate.nix +++ b/pkgs/desktops/kde-4.12/applications/kate.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, kactivities, qjson, pyqt4, sip, python, pykde4}: +{ stdenv, kde, kdelibs, kactivities, qjson, pyqt4, sip, python, pykde4}: kde { @@ -6,6 +6,6 @@ kde { meta = { description = "Kate, the KDE Advanced Text Editor, as well as KWrite"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/applications/konsole.nix b/pkgs/desktops/kde-4.12/applications/konsole.nix index 0db47fb2d7c..bd4e9e58cd0 100644 --- a/pkgs/desktops/kde-4.12/applications/konsole.nix +++ b/pkgs/desktops/kde-4.12/applications/konsole.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, kde_baseapps }: +{ stdenv, kde, kdelibs, kde_baseapps }: kde { @@ -6,6 +6,6 @@ kde { meta = { description = "Konsole, the KDE terminal emulator"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix index c2a25664678..a65f33e13de 100644 --- a/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix +++ b/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, htmlTidy, kactivities +{ stdenv, kde, kdelibs, htmlTidy, kactivities , nepomuk_core, nepomuk_widgets, libXt }: kde { @@ -6,6 +6,6 @@ kde { meta = { description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kde-workspace.nix b/pkgs/desktops/kde-4.12/kde-workspace.nix index 39e9c10a0fb..537beaac6ae 100644 --- a/pkgs/desktops/kde-4.12/kde-workspace.nix +++ b/pkgs/desktops/kde-4.12/kde-workspace.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, lm_sensors +{ stdenv, kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, lm_sensors , pciutils, libraw1394, libusb1, python, libqalculate, akonadi , xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison , libjpeg, pkgconfig, kactivities, qjson, udev, fetchurl @@ -15,7 +15,7 @@ kde { #todo: wayland, xmms, libusb isn't found buildInputs = - [ kdelibs qimageblitz libdbusmenu_qt xorg.libxcb xorg.xcbutilimage libjpeg + [ kdelibs qimageblitz libdbusmenu_qt xorg.libxcb xorg.xcbutilimage libjpeg xorg.xcbutilrenderutil xorg.xcbutilkeysyms xorg.libpthreadstubs xorg.libXdmcp xorg.libxkbfile xorg.libXcomposite xorg.libXtst xorg.libXdamage @@ -41,6 +41,6 @@ kde { meta = { description = "KDE workspace components such as Plasma, Kwin and System Settings"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix index a80574ff67a..5708d0f96eb 100644 --- a/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix +++ b/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix @@ -1,4 +1,4 @@ -{ kde, qt4, cmake }: +{ stdenv, kde, qt4, cmake }: kde { buildInputs = [ qt4 ]; @@ -8,6 +8,6 @@ kde { meta = { description = "C++ parser used to generate language bindings for Qt/KDE"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix b/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix index 72b267e43c5..494bc85e646 100644 --- a/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix +++ b/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix @@ -1,4 +1,4 @@ -{ kde, qt4, cmake, phonon, qimageblitz, smokegen }: +{ stdenv, kde, qt4, cmake, phonon, qimageblitz, smokegen }: kde { @@ -10,6 +10,6 @@ kde { meta = { description = "C++ parser used to generate language bindings for Qt/KDE"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix index b6fd701ac12..3ce9b3dcc78 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, exiv2, kde_baseapps, libkipi, nepomuk_core +{ stdenv, kde, kdelibs, exiv2, kde_baseapps, libkipi, nepomuk_core , libjpeg, pkgconfig, kactivities, lcms2 }: kde { @@ -10,6 +10,6 @@ kde { meta = { description = "Gwenview, the KDE image viewer"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix b/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix index 70904b17c23..d9aa11c54af 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs, libgphoto2 }: +{ stdenv, kde, kdelibs, libgphoto2 }: kde { buildInputs = [ kdelibs libgphoto2 ]; meta = { description = "KDE camera interface library"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix b/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix index 58528cb186b..e06c1b5d307 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs }: +{ stdenv, kde, kdelibs }: kde { buildInputs = [ kdelibs ]; meta = { description = "A small utility to select a color"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix index 2c2ba3796a2..e834762feb5 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs, okular }: +{ stdenv, kde, kdelibs, okular }: kde { buildInputs = [ kdelibs okular ]; meta = { description = "A collection of plugins to handle mobipocket files"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix index 35af39aa611..d9d35808ac5 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs, libtiff }: +{ stdenv, kde, kdelibs, libtiff }: kde { buildInputs = [ kdelibs libtiff ]; meta = { description = "Strigi analyzers for various graphics file formats"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix index 18c6534eb5c..d6207689512 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, libkexiv2, libkdcraw, pkgconfig }: +{ stdenv, kde, kdelibs, libkexiv2, libkdcraw, pkgconfig }: kde { @@ -8,6 +8,6 @@ kde { meta = { description = "Thumbnailers for various graphics file formats"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix b/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix index 28d9252187e..016312c199e 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs, libXxf86vm }: +{ stdenv, kde, kdelibs, libXxf86vm }: kde { buildInputs = [ kdelibs libXxf86vm ]; meta = { description = "KDE monitor calibration tool"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix b/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix index 5276ec09f46..ecf34e5ae9e 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs, qimageblitz }: +{ stdenv, kde, kdelibs, qimageblitz }: kde { buildInputs = [ kdelibs qimageblitz ]; meta = { description = "KDE paint program"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix b/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix index c5c2c6e05d7..209331d9e83 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs }: +{ stdenv, kde, kdelibs }: kde { buildInputs = [ kdelibs ]; meta = { description = "KDE screen ruler"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix b/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix index 1381ed7dd26..f541c4bdb4d 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs, libksane }: +{ stdenv, kde, kdelibs, libksane }: kde { buildInputs = [ kdelibs libksane ]; meta = { description = "A KScan plugin that implements the scanning through libksane"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix b/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix index f01a609e20d..a9897d270bb 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs, libkipi }: +{ stdenv, kde, kdelibs, libkipi }: kde { buildInputs = [ kdelibs libkipi ]; meta = { description = "KDE screenshot utility"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix index e7c01f98a8c..1d5c6e2fcb4 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, pkgconfig, libraw, lcms2 }: +{ stdenv, kde, kdelibs, pkgconfig, libraw, lcms2 }: kde { @@ -8,6 +8,6 @@ kde { meta = { description = "Library for decoding RAW images"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix b/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix index 096b0a6e957..46ec45fad01 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs, exiv2 }: +{ stdenv, kde, kdelibs, exiv2 }: kde { buildInputs = [ kdelibs exiv2 ]; meta = { description = "Exiv2 support library"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix b/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix index 6b16265e7a3..65e6c52bd44 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs }: +{ stdenv, kde, kdelibs }: kde { buildInputs = [ kdelibs ]; meta = { description = "Interface library to kipi-plugins"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix b/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix index b539eab3899..6c3543eef37 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs, saneBackends }: +{ stdenv, kde, kdelibs, saneBackends }: kde { buildInputs = [ kdelibs saneBackends ]; meta = { description = "An image scanning library that provides a QWidget that contains all the logic needed to interface a sacanner"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/okular.nix b/pkgs/desktops/kde-4.12/kdegraphics/okular.nix index aca1691eace..092833388a7 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/okular.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/okular.nix @@ -1,4 +1,4 @@ -{ chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2 +{ stdenv, chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2 , qimageblitz, libtiff, kactivities, pkgconfig, libkexiv2 }: kde { @@ -12,6 +12,6 @@ kde { meta = { description = "Okular, the KDE document viewer"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix b/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix index a344cc4b4b4..2fc0e373dbd 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs }: +{ stdenv, kde, kdelibs }: kde { buildInputs = [ kdelibs ]; meta = { description = "SVG KPart"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix index 7e29eebf3b7..d90e1455ce9 100644 --- a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix +++ b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, popplerQt4 +{ stdenv, kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, popplerQt4 , pkgconfig, doxygen, ebook_tools }: @@ -15,6 +15,6 @@ kde { meta = { description = "NEPOMUK core"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix index 0d29a4f97de..b0fc5ad8900 100644 --- a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix +++ b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, nepomuk_core }: +{ stdenv, kde, kdelibs, nepomuk_core }: kde { @@ -6,6 +6,6 @@ kde { meta = { description = "NEPOMUK Widgets"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/xfce/applications/mousepad.nix b/pkgs/desktops/xfce/applications/mousepad.nix index 5248d6567d2..1e1ef0cf846 100644 --- a/pkgs/desktops/xfce/applications/mousepad.nix +++ b/pkgs/desktops/xfce/applications/mousepad.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/; description = "A simple text editor for Xfce"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/desktops/xfce/applications/ristretto.nix b/pkgs/desktops/xfce/applications/ristretto.nix index a42e882710a..64e3c34453e 100644 --- a/pkgs/desktops/xfce/applications/ristretto.nix +++ b/pkgs/desktops/xfce/applications/ristretto.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://goodies.xfce.org/projects/applications/${p_name}"; description = "A fast and lightweight picture-viewer for the Xfce desktop environment"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/applications/terminal.nix b/pkgs/desktops/xfce/applications/terminal.nix index d891ad98fdc..15d90be3131 100644 --- a/pkgs/desktops/xfce/applications/terminal.nix +++ b/pkgs/desktops/xfce/applications/terminal.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/projects/terminal; description = "A modern terminal emulator primarily for the Xfce desktop environment"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/desktops/xfce/applications/xfce4-mixer.nix b/pkgs/desktops/xfce/applications/xfce4-mixer.nix index 972442dc56b..2b0f729c0a3 100644 --- a/pkgs/desktops/xfce/applications/xfce4-mixer.nix +++ b/pkgs/desktops/xfce/applications/xfce4-mixer.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/projects/xfce4-mixer; # referenced but inactive description = "A volume control application for the Xfce desktop environment"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix index d39778c9371..a447812f9a7 100644 --- a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix +++ b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://goodies.xfce.org/projects/applications/${p_name}"; description = "Notification daemon for Xfce"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix index 6e0d9d3e7e7..8181b809c83 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://goodies.xfce.org/projects/applications/xfce4-screenshooter; description = "Xfce screenshooter"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/desktops/xfce/core/exo.nix b/pkgs/desktops/xfce/core/exo.nix index 3131ea679b0..694db49f589 100644 --- a/pkgs/desktops/xfce/core/exo.nix +++ b/pkgs/desktops/xfce/core/exo.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.xfce.org/projects/${p_name}"; description = "Application library for the Xfce desktop environment"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/desktops/xfce/core/garcon.nix b/pkgs/desktops/xfce/core/garcon.nix index 33b64cd878e..44f5a95224e 100644 --- a/pkgs/desktops/xfce/core/garcon.nix +++ b/pkgs/desktops/xfce/core/garcon.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/; description = "Xfce menu support library"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix index 5004f2aaf47..360e4a0a250 100644 --- a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix +++ b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/; description = "GTK+ theme engine for Xfce"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/libxfce4ui.nix b/pkgs/desktops/xfce/core/libxfce4ui.nix index 5675c09fed8..cb2975d8214 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/; description = "Basic GUI library for Xfce"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/desktops/xfce/core/libxfcegui4.nix b/pkgs/desktops/xfce/core/libxfcegui4.nix index e30fcf22357..32a320c779b 100644 --- a/pkgs/desktops/xfce/core/libxfcegui4.nix +++ b/pkgs/desktops/xfce/core/libxfcegui4.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/; description = "Basic GUI library for Xfce"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/desktops/xfce/core/thunar-archive-plugin.nix b/pkgs/desktops/xfce/core/thunar-archive-plugin.nix index 4776af3be32..62a90578bd3 100644 --- a/pkgs/desktops/xfce/core/thunar-archive-plugin.nix +++ b/pkgs/desktops/xfce/core/thunar-archive-plugin.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://foo-projects.org/~benny/projects/thunar-archive-plugin/; description = "The Thunar Archive Plugin allows you to create and extract archive files using the file context menus in the Thunar file manager"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.iElectric ]; }; diff --git a/pkgs/desktops/xfce/core/thunar-volman.nix b/pkgs/desktops/xfce/core/thunar-volman.nix index 94fc0e369e5..5ce88921fa8 100644 --- a/pkgs/desktops/xfce/core/thunar-volman.nix +++ b/pkgs/desktops/xfce/core/thunar-volman.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://goodies.xfce.org/projects/thunar-plugins/thunar-volman; description = "Thunar extension for automatic management of removable drives and media"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/thunar.nix b/pkgs/desktops/xfce/core/thunar.nix index 919d19a2302..fdf4211f099 100644 --- a/pkgs/desktops/xfce/core/thunar.nix +++ b/pkgs/desktops/xfce/core/thunar.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://thunar.xfce.org/; description = "Xfce file manager"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/tumbler.nix b/pkgs/desktops/xfce/core/tumbler.nix index 8988d072e2c..fab6152c99a 100644 --- a/pkgs/desktops/xfce/core/tumbler.nix +++ b/pkgs/desktops/xfce/core/tumbler.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { homepage = http://git.xfce.org/xfce/tumbler/; description = "A D-Bus thumbnailer service"; platforms = stdenv.lib.platforms.linux; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/xfce/core/xfce4-appfinder.nix b/pkgs/desktops/xfce/core/xfce4-appfinder.nix index 94a3686bced..01848d66696 100644 --- a/pkgs/desktops/xfce/core/xfce4-appfinder.nix +++ b/pkgs/desktops/xfce/core/xfce4-appfinder.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://docs.xfce.org/xfce/xfce4-appfinder/; description = "Xfce application finder, a tool to locate and launch programs on your system"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix index e56eb3f0a71..671f57faeb3 100644 --- a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix +++ b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://foo-projects.org/~benny/projects/xfce4-dev-tools/; description = "Tools and M4 macros for Xfce4 developers"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix index a5edb8dd560..e654b2f7dfb 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/projects/xfce4-panel; description = "Xfce panel"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix index 3f9be6bc878..81a0aebb75c 100644 --- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix +++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://goodies.xfce.org/projects/applications/xfce4-power-manager; description = "A power manager for the Xfce Desktop Environment"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix index a419f076b6e..d965c296490 100644 --- a/pkgs/desktops/xfce/core/xfce4-session.nix +++ b/pkgs/desktops/xfce/core/xfce4-session.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/projects/xfce4-session; description = "Session manager for Xfce"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/xfce4-settings.nix b/pkgs/desktops/xfce/core/xfce4-settings.nix index 2e76b22510f..ee5ae15fca1 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings.nix +++ b/pkgs/desktops/xfce/core/xfce4-settings.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/projects/xfce4-settings; description = "Settings manager for Xfce"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/pkgs/desktops/xfce/core/xfconf.nix index e608d459106..9ed2be4a740 100644 --- a/pkgs/desktops/xfce/core/xfconf.nix +++ b/pkgs/desktops/xfce/core/xfconf.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://docs.xfce.org/xfce/xfconf/start; description = "Simple client-server configuration storage and query system for Xfce"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/xfce/core/xfdesktop.nix b/pkgs/desktops/xfce/core/xfdesktop.nix index 8067e1841ca..697ff2bfb8a 100644 --- a/pkgs/desktops/xfce/core/xfdesktop.nix +++ b/pkgs/desktops/xfce/core/xfdesktop.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/projects/xfdesktop; description = "Xfce desktop manager"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/xfwm4.nix b/pkgs/desktops/xfce/core/xfwm4.nix index bb235911ba4..4b190889c85 100644 --- a/pkgs/desktops/xfce/core/xfwm4.nix +++ b/pkgs/desktops/xfce/core/xfwm4.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/projects/xfwm4; description = "Window manager for Xfce"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/development/compilers/adobe-flex-sdk/default.nix b/pkgs/development/compilers/adobe-flex-sdk/default.nix index fc4511d896e..69557019f15 100644 --- a/pkgs/development/compilers/adobe-flex-sdk/default.nix +++ b/pkgs/development/compilers/adobe-flex-sdk/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { meta = { description = "Flex SDK for Adobe Flash / ActionScript"; homepage = "http://www.adobe.com/support/documentation/en/flex/3/releasenotes_flex3_sdk.html#installation"; - license = "MPLv1.1"; # Mozilla Public License Version 1.1 + license = stdenv.lib.licenses.mpl11; }; } diff --git a/pkgs/development/compilers/agda/2.4.0.1.nix b/pkgs/development/compilers/agda/2.4.0.2.nix index e472eb1c276..6705419add9 100644 --- a/pkgs/development/compilers/agda/2.4.0.1.nix +++ b/pkgs/development/compilers/agda/2.4.0.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, alex, binary, boxes, dataHash, deepseq, emacs, equivalence , filepath, geniplate, happy, hashable, hashtables, haskeline , haskellSrcExts, mtl, parallel, QuickCheck, STMonadTrans, strict @@ -6,8 +8,8 @@ cabal.mkDerivation (self: { pname = "Agda"; - version = "2.4.0.1"; - sha256 = "11my5k606zvra3w3m1wllc4dy5mfv4lr32fqd579vqcks6wpirjq"; + version = "2.4.0.2"; + sha256 = "13c4ipscnlnbv94k93yajrp32mwzikqa8rhc95h8pmqzhjgwyh8b"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index 1f6a8b6c6e0..8c71138ab78 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ats2-${version}"; - version = "0.0.7"; + version = "0.1.0"; src = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz"; - sha256 = "1cv7caaf9fj6z3kln02ikkbmcy42324v39lzx3cf6qcsywwpm8fx"; + sha256 = "0i7b9v7xki9j2jjjpydz0gl33af94b4jjmk75b9w20bs003v8vd4"; }; buildInputs = [ gmp ]; diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix index b7dcb806b01..16dfa580a19 100644 --- a/pkgs/development/compilers/bigloo/default.nix +++ b/pkgs/development/compilers/bigloo/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www-sop.inria.fr/indes/fp/Bigloo/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/compilers/gcc/4.3/default.nix b/pkgs/development/compilers/gcc/4.3/default.nix index 4446876ab1f..45040c2f375 100644 --- a/pkgs/development/compilers/gcc/4.3/default.nix +++ b/pkgs/development/compilers/gcc/4.3/default.nix @@ -173,7 +173,7 @@ stdenv.mkDerivation ({ meta = { homepage = "http://ghdl.free.fr/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Complete VHDL simulator, using the GCC technology"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/compilers/gcc/4.4/default.nix b/pkgs/development/compilers/gcc/4.4/default.nix index 99c342da780..be2f323fde1 100644 --- a/pkgs/development/compilers/gcc/4.4/default.nix +++ b/pkgs/development/compilers/gcc/4.4/default.nix @@ -251,7 +251,7 @@ stdenv.mkDerivation ({ meta = { homepage = http://gcc.gnu.org/; - license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}"; longDescription = '' @@ -302,7 +302,7 @@ stdenv.mkDerivation ({ meta = { homepage = "http://ghdl.free.fr/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Complete VHDL simulator, using the GCC technology (gcc ${version})"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 9713164711f..fbeea0768ad 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -364,7 +364,7 @@ stdenv.mkDerivation ({ meta = { homepage = http://gcc.gnu.org/; - license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); @@ -432,7 +432,7 @@ stdenv.mkDerivation ({ meta = { homepage = "http://ghdl.free.fr/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Complete VHDL simulator, using the GCC technology (gcc ${version})"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index ef75cf71f58..8528be07729 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -438,7 +438,7 @@ stdenv.mkDerivation ({ meta = { homepage = http://gcc.gnu.org/; - license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); @@ -501,7 +501,7 @@ stdenv.mkDerivation ({ meta = { homepage = "http://ghdl.free.fr/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Complete VHDL simulator, using the GCC technology (gcc ${version})"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 0664cc0ebd5..2fb8f9d73b5 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -508,7 +508,7 @@ stdenv.mkDerivation ({ meta = { homepage = http://gcc.gnu.org/; - license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index ab7732a68eb..8b185d00bcc 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -495,7 +495,7 @@ stdenv.mkDerivation ({ meta = { homepage = http://gcc.gnu.org/; - license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/development/compilers/ghdl/default.nix index 7b103805def..7b2e03f8d57 100644 --- a/pkgs/development/compilers/ghdl/default.nix +++ b/pkgs/development/compilers/ghdl/default.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation rec { description = "Free VHDL simulator, mcode flavour"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/compilers/gnatboot/default.nix b/pkgs/development/compilers/gnatboot/default.nix index 1de0c88a6bc..3cab8379720 100644 --- a/pkgs/development/compilers/gnatboot/default.nix +++ b/pkgs/development/compilers/gnatboot/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = { homepage = http://gentoo.org; - license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index df57364fa08..f0b07f9d0fa 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "idris"; - version = "0.9.14"; - sha256 = "0kfzp89sass93p9zsxq616zfix7ipi1rmjqmcjixihi01k7c0b8b"; + version = "0.9.14.1"; + sha256 = "11x4f0hvd51m9rlf9r0i5xsjmc73kjsayny4xyv0wgb88v9v737b"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -26,7 +26,7 @@ cabal.mkDerivation (self: { buildTools = [ happy ]; extraLibraries = [ boehmgc gmp ]; configureFlags = "-fllvm -fgmp -fffi"; - patches = [ ./trifecta-fix.patch ]; + jailbreak = true; meta = { homepage = "http://www.idris-lang.org/"; description = "Functional Programming Language with Dependent Types"; diff --git a/pkgs/development/compilers/idris/trifecta-fix.patch b/pkgs/development/compilers/idris/trifecta-fix.patch deleted file mode 100644 index a20e482d2c4..00000000000 --- a/pkgs/development/compilers/idris/trifecta-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/Idris/AbsSyntaxTree.hs b/src/Idris/AbsSyntaxTree.hs -index 76df969..076f1ff 100644 ---- a/src/Idris/AbsSyntaxTree.hs -+++ b/src/Idris/AbsSyntaxTree.hs -@@ -194,6 +194,10 @@ data IState = IState { - idris_callswho :: Maybe (M.Map Name [Name]) - } - -+-- Required for parsers library, and therefore trifecta -+instance Show IState where -+ show = const "{internal state}" -+ - data SizeChange = Smaller | Same | Bigger | Unknown - deriving (Show, Eq) - {-! diff --git a/pkgs/development/compilers/ikarus/default.nix b/pkgs/development/compilers/ikarus/default.nix index 4c3845f9ee5..070f29e16f6 100644 --- a/pkgs/development/compilers/ikarus/default.nix +++ b/pkgs/development/compilers/ikarus/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "Ikarus - a Scheme compiler, aiming at R6RS"; homepage = http://ikarus-scheme.org/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/development/compilers/llvm/3.4/dragonegg.nix b/pkgs/development/compilers/llvm/3.4/dragonegg.nix index 577533c2e52..a34fa965f06 100644 --- a/pkgs/development/compilers/llvm/3.4/dragonegg.nix +++ b/pkgs/development/compilers/llvm/3.4/dragonegg.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://dragonegg.llvm.org/; description = "gcc plugin that replaces gcc's optimizers and code generators by those in LLVM"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric shlevy]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index 29950aa9e3d..f6a52b52e1d 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation { homepage = http://www.gnu.org/software/mit-scheme/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix index bab8e66799b..19f8eab482c 100644 --- a/pkgs/development/compilers/opendylan/bin.nix +++ b/pkgs/development/compilers/opendylan/bin.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation { meta = { homepage = http://opendylan.org; description = "Dylan is a multi-paradigm functional and object-oriented programming language."; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix index b1ee1d000c4..e4bdcf7889b 100644 --- a/pkgs/development/compilers/opendylan/default.nix +++ b/pkgs/development/compilers/opendylan/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation { meta = { homepage = http://opendylan.org; description = "Dylan is a multi-paradigm functional and object-oriented programming language."; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 6fd7ad9d65b..6a07c7af69e 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -165,7 +165,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://openjdk.java.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; description = "The open-source Java Development Kit"; maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.shlevy ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 90a64ecd521..657d18070e9 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -180,6 +180,6 @@ let result = stdenv.mkDerivation rec { passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package - meta.license = "unfree"; + meta.license = stdenv.lib.licenses.unfree; }; in result diff --git a/pkgs/development/compilers/oraclejdk/jdk6-linux.nix b/pkgs/development/compilers/oraclejdk/jdk6-linux.nix index 97ec6b56305..9b384c5ae46 100644 --- a/pkgs/development/compilers/oraclejdk/jdk6-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk6-linux.nix @@ -80,5 +80,5 @@ stdenv.mkDerivation { mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; - meta.license = "unfree"; + meta.license = stdenv.lib.licenses.unfree; } diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rustc/0.11.nix index 2c27cf778a1..1c3b09b0985 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rustc/0.11.nix @@ -14,23 +14,25 @@ */ -with if stdenv.system == "i686-linux" then { - platform = "linux-i386"; - snapshot = "84339ea0f796ae468ef86797ef4587274bec19ea"; - target = "i686-unknown-linux-gnu"; -} else if stdenv.system == "x86_64-linux" then { - platform = "linux-x86_64"; - snapshot = "bd8a6bc1f28845b7f4b768f6bfa06e7fbdcfcaae"; - target = "x86_64-unknown-linux-gnu"; -} else if stdenv.system == "x86_64-darwin" then { - platform = "macos-x86_64"; - snapshot = "4a8c2e1b7634d73406bac32a1a97893ec3ed818d"; -} else {}; -let snapshotDate = "2014-06-21"; +with ((import ./common.nix) {inherit stdenv; version = "0.11.0"; }); + +let snapshot = if stdenv.system == "i686-linux" + then "84339ea0f796ae468ef86797ef4587274bec19ea" + else if stdenv.system == "x86_64-linux" + then "bd8a6bc1f28845b7f4b768f6bfa06e7fbdcfcaae" + else if stdenv.system == "i686-darwin" + then "3f25b2680efbab16ad074477a19d49dcce475977" + else if stdenv.system == "x86_64-darwin" + then "4a8c2e1b7634d73406bac32a1a97893ec3ed818d" + else abort "no-snapshot for platform ${stdenv.system}"; + snapshotDate = "2014-06-21"; snapshotRev = "db9af1d"; - snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; in -stdenv.mkDerivation { - name = "rust-0.11.0"; + snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; + +in stdenv.mkDerivation { + inherit name; + inherit version; + inherit meta; src = fetchurl { url = http://static.rust-lang.org/dist/rust-0.11.0.tar.gz; @@ -67,14 +69,4 @@ stdenv.mkDerivation { buildInputs = [ which file perl curl python27 makeWrapper ]; enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = http://www.rust-lang.org/; - description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ madjar cstrahan ]; - license = map (builtins.getAttr "shortName") [ licenses.mit licenses.asl20 ]; - # platforms as per http://static.rust-lang.org/doc/master/tutorial.html#getting-started - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; - }; } - diff --git a/pkgs/development/compilers/rustc/common.nix b/pkgs/development/compilers/rustc/common.nix new file mode 100644 index 00000000000..7af19a40c79 --- /dev/null +++ b/pkgs/development/compilers/rustc/common.nix @@ -0,0 +1,36 @@ +{stdenv, version}: + +{ + inherit version; + + platform = if stdenv.system == "i686-linux" + then "linux-i386" + else if stdenv.system == "x86_64-linux" + then "linux-x86_64" + else if stdenv.system == "i686-darwin" + then "macos-i386" + else if stdenv.system == "x86_64-darwin" + then "macos-x86_64" + else abort "no snapshot to boostrap for this platform (missing platform url suffix)"; + + target = if stdenv.system == "i686-linux" + then "i686-unknown-linux-gnu" + else if stdenv.system == "x86_64-linux" + then "x86_64-unknown-linux-gnu" + else if stdenv.system == "i686-darwin" + then "i686-apple-darwin" + else if stdenv.system == "x86_64-darwin" + then "x86_64-apple-darwin" + else abort "no snapshot to boostrap for this platform (missing target triple"; + + meta = with stdenv.lib; { + homepage = http://www.rust-lang.org/; + description = "A safe, concurrent, practical language"; + maintainers = with maintainers; [ madjar cstrahan ]; + license = map (builtins.getAttr "shortName") [ licenses.mit licenses.asl20 ]; + # platforms as per http://static.rust-lang.org/doc/master/tutorial.html#getting-started + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + }; + + name = "rustc-${version}"; +} diff --git a/pkgs/development/compilers/rust/hardcode_paths.patch b/pkgs/development/compilers/rustc/hardcode_paths.patch index 77e4c3f3788..77e4c3f3788 100644 --- a/pkgs/development/compilers/rust/hardcode_paths.patch +++ b/pkgs/development/compilers/rustc/hardcode_paths.patch diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix new file mode 100644 index 00000000000..ad33906ae6e --- /dev/null +++ b/pkgs/development/compilers/rustc/head.nix @@ -0,0 +1,73 @@ +{stdenv, fetchurl, fetchgit, which, file, perl, curl, python27, makeWrapper}: + +/* Rust's build process has a few quirks : + +- It requires some patched in llvm that haven't landed upstream, so it + compiles its own llvm. This might change in the future, so at some + point we may be able to switch to nix's llvm. + +- The Rust compiler is written is Rust, so it requires a bootstrap + compiler, which is downloaded during the build. To make the build + pure, we download it ourself before and put it where it is + expected. Once the language is stable (1.0) , we might want to + switch it to use nix's packaged rust compiler. + +*/ + +with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-7a25cf3f3"; }); + +let snapshot = if stdenv.system == "i686-linux" + then "a5e1bb723020ac35173d49600e76b0935e257a6a" + else if stdenv.system == "x86_64-linux" + then "1a2407df17442d93d1c34c916269a345658045d7" + else if stdenv.system == "i686-darwin" + then "6648fa88e41ad7c0991a085366e36d56005873ca" + else if stdenv.system == "x86_64-darwin" + then "71b2d1dfd0abe1052908dc091e098ed22cf272c6" + else abort "no-snapshot for platform ${stdenv.system}"; + snapshotDate = "2014-07-17"; + snapshotRev = "9fc8394"; + snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; + +in stdenv.mkDerivation { + inherit name; + inherit version; + inherit meta; + + src = fetchgit { + url = https://github.com/rust-lang/rust; + rev = "7a25cf3f30fa5fae2e868fa910ecc850f5e9ee65"; + sha256 = "1hx8vd4gn5plbdvr0zvdvqyw9x9r2vbmh112h2f5d2xxsf9p7rf1"; + }; + + # We need rust to build rust. If we don't provide it, configure will try to download it. + snapshot = stdenv.mkDerivation { + name = "rust-stage0"; + src = fetchurl { + url = "http://static.rust-lang.org/stage0-snapshots/${snapshotName}"; + sha1 = snapshot; + }; + dontStrip = true; + installPhase = '' + mkdir -p "$out" + cp -r bin "$out/bin" + '' + (if stdenv.isLinux then '' + patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.gcc.dynamicLinker}" \ + --set-rpath "${stdenv.gcc.gcc}/lib/:${stdenv.gcc.gcc}/lib64/" \ + "$out/bin/rustc" + '' else ""); + }; + + configureFlags = [ "--enable-local-rust" "--local-rust-root=$snapshot" ]; + + # The compiler requires cc, so we patch the source to tell it where to find it + patches = [ ./hardcode_paths.patch ./local_stage0.patch ]; + postPatch = '' + substituteInPlace src/librustc/back/link.rs \ + --subst-var-by "ccPath" "${stdenv.gcc}/bin/cc" \ + --subst-var-by "arPath" "${stdenv.gcc.binutils}/bin/ar" + ''; + + buildInputs = [ which file perl curl python27 makeWrapper ]; + enableParallelBuilding = true; +} diff --git a/pkgs/development/compilers/rust/local_stage0.patch b/pkgs/development/compilers/rustc/local_stage0.patch index 1261b2d458d..1261b2d458d 100644 --- a/pkgs/development/compilers/rust/local_stage0.patch +++ b/pkgs/development/compilers/rustc/local_stage0.patch diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 8133ae3ffd3..5ab692ce34e 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -2,14 +2,17 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.2.0"; + version = "1.2.2"; src = fetchurl { - url = mirror://sourceforge/project/sbcl/sbcl/1.2.0/sbcl-1.2.0-source.tar.bz2; - sha256 = "13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2"; + url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; + sha256 = "08jk1bjk7087gq4ibzs1d27r0c6pigbvmff351j9a03kvl652b2v"; }; - buildInputs = [ sbclBootstrap ] ++ stdenv.lib.optional stdenv.isLinux clisp; + buildInputs = [ ] + ++ (stdenv.lib.optional stdenv.isDarwin sbclBootstrap) + ++ (stdenv.lib.optional stdenv.isLinux clisp) + ; patchPhase = '' echo '"${version}.nixos"' > version.lisp-expr @@ -70,5 +73,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.all; + inherit version; + updateWalker = true; }; } diff --git a/pkgs/development/compilers/sbcl/default.upstream b/pkgs/development/compilers/sbcl/default.upstream deleted file mode 100644 index de69a2828c6..00000000000 --- a/pkgs/development/compilers/sbcl/default.upstream +++ /dev/null @@ -1,9 +0,0 @@ -name sbcl -target default.nix -url http://sf.net/projects/sbcl/files/sbcl/ -version_link '/sbcl/[0-9.]+/$' -link "source.tar.bz2" -version '.*/sbcl-([0-9.]+)-source.*' '\1' -redirect -process 'http://[a-z]+[.]dl[.]sourceforge[.]net/' 'mirror://sourceforge/' -process '[?].*' '' diff --git a/pkgs/development/compilers/stalin/default.nix b/pkgs/development/compilers/stalin/default.nix index b488308f5c4..faa281efc7a 100644 --- a/pkgs/development/compilers/stalin/default.nix +++ b/pkgs/development/compilers/stalin/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.ece.purdue.edu/~qobi/software.html; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Stalin, an optimizing Scheme compiler"; maintainers = [ ]; diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 7ad7348925b..1e82e03f16c 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.tinycc.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = [ ]; diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 6663e00c36e..7617e5fb1cd 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { programming environment. ''; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; homepage = http://home.gna.org/guile-cairo/; diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix index 30480844a41..90012bb3ddd 100644 --- a/pkgs/development/guile-modules/guile-gnome/default.nix +++ b/pkgs/development/guile-modules/guile-gnome/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/guile-gnome/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 310c0e92380..2f77c273af7 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.nongnu.org/guile-lib/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix index 1eca6b3a302..175c656859e 100644 --- a/pkgs/development/guile-modules/guile-ncurses/default.nix +++ b/pkgs/development/guile-modules/guile-ncurses/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { form, panel, and menu. ''; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix index 871101ba03e..1167f121e62 100644 --- a/pkgs/development/interpreters/angelscript/default.nix +++ b/pkgs/development/interpreters/angelscript/default.nix @@ -11,10 +11,10 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="angelscript"; - version = "2.29.0"; + version = "2.29.1"; name="${baseName}-${version}"; url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip"; - sha256 = "1g0bi8dx832s3911rr3jymnffaz3q7cnbzl53nmi6hwsr2kpc6mx"; + sha256 = "081a0wnn1hl0hjgrg0nz63ff7k7dgrwsgszka5i7623ny407fkl5"; }; in rec { diff --git a/pkgs/development/interpreters/erlang/R14.nix b/pkgs/development/interpreters/erlang/R14.nix index 4dd32cd806c..1fd101564a3 100644 --- a/pkgs/development/interpreters/erlang/R14.nix +++ b/pkgs/development/interpreters/erlang/R14.nix @@ -22,6 +22,20 @@ stdenv.mkDerivation { configureFlags = "--with-ssl=${openssl}"; + postInstall = let + manpages = fetchurl { + url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz"; + sha256 = "1nh7l7wilyyaxvlwkjxgm3cq7wpd90sk6vxhgpvg7hwai8g52545"; + }; + in '' + tar xf "${manpages}" -C "$out/lib/erlang" + for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do + prefix="''${i%/*}" + ensureDir "$out/share/man/''${prefix##*/}" + ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" + done + ''; + # Some erlang bin/ scripts run sed and awk postFixup = '' wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" diff --git a/pkgs/development/interpreters/erlang/R15.nix b/pkgs/development/interpreters/erlang/R15.nix index e0760db9f58..e9c8380c35a 100644 --- a/pkgs/development/interpreters/erlang/R15.nix +++ b/pkgs/development/interpreters/erlang/R15.nix @@ -28,6 +28,20 @@ stdenv.mkDerivation { configureFlags = "--with-ssl=${openssl}"; + postInstall = let + manpages = fetchurl { + url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz"; + sha256 = "0sqamzbd7qyz3klgl9vm1qvl0rhsfd1dx485pb0m2185qvw02nha"; + }; + in '' + tar xf "${manpages}" -C "$out/lib/erlang" + for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do + prefix="''${i%/*}" + ensureDir "$out/share/man/''${prefix##*/}" + ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" + done + ''; + # Some erlang bin/ scripts run sed and awk postFixup = '' wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix index eaf991ff563..5945cdd8299 100644 --- a/pkgs/development/interpreters/erlang/R16.nix +++ b/pkgs/development/interpreters/erlang/R16.nix @@ -8,10 +8,10 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "erlang-" + version; - version = "R16B03-1"; + version = "16B03-1"; src = fetchurl { - url = "http://www.erlang.org/download/otp_src_${version}.tar.gz"; + url = "http://www.erlang.org/download/otp_src_R${version}.tar.gz"; sha256 = "1rvyfh22g1fir1i4xn7v2md868wcmhajwhfsq97v7kn5kd2m7khp"; }; @@ -28,8 +28,19 @@ stdenv.mkDerivation rec { configureFlags= "--with-ssl=${openssl} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}"; - postInstall = '' + postInstall = let + manpages = fetchurl { + url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz"; + sha256 = "17f3k5j17rdsah18gywjngip6cbfgp6nb9di6il4pahmf9yvqc8g"; + }; + in '' ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call + tar xf "${manpages}" -C "$out/lib/erlang" + for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do + prefix="''${i%/*}" + ensureDir "$out/share/man/''${prefix##*/}" + ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" + done ''; # Some erlang bin/ scripts run sed and awk diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix index 5c59fddc1ef..b7cbfc486f5 100644 --- a/pkgs/development/interpreters/erlang/R17.nix +++ b/pkgs/development/interpreters/erlang/R17.nix @@ -28,8 +28,19 @@ stdenv.mkDerivation rec { configureFlags= "--with-ssl=${openssl} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}"; - postInstall = '' + postInstall = let + manpages = fetchurl { + url = "http://www.erlang.org/download/otp_doc_man_${version}.tar.gz"; + sha256 = "16dkz3w1q4ahy37c8a8r2h8zjcr7cxz7pd9z38chbxf6frc2pxxc"; + }; + in '' ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call + tar xf "${manpages}" -C "$out/lib/erlang" + for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do + prefix="''${i%/*}" + ensureDir "$out/share/man/''${prefix##*/}" + ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" + done ''; # Some erlang bin/ scripts run sed and awk diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix index f44f71020b4..55f1b1840fa 100644 --- a/pkgs/development/interpreters/guile/1.8.nix +++ b/pkgs/development/interpreters/guile/1.8.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/guile/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/interpreters/love/0.9.nix b/pkgs/development/interpreters/love/0.9.nix index 38fdcd2a0a6..f08d1d2ec7e 100644 --- a/pkgs/development/interpreters/love/0.9.nix +++ b/pkgs/development/interpreters/love/0.9.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; - license = "zlib"; + license = stdenv.lib.licenses.zlib; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.raskin ]; diff --git a/pkgs/development/interpreters/love/default.nix b/pkgs/development/interpreters/love/default.nix index 8e7914afb61..fc1f01cb373 100644 --- a/pkgs/development/interpreters/love/default.nix +++ b/pkgs/development/interpreters/love/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; - license = "zlib"; + license = stdenv.lib.licenses.zlib; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.raskin ]; diff --git a/pkgs/development/interpreters/lua-4/default.nix b/pkgs/development/interpreters/lua-4/default.nix index 13f7964769c..51ddcd8f290 100644 --- a/pkgs/development/interpreters/lua-4/default.nix +++ b/pkgs/development/interpreters/lua-4/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { management with incremental garbage collection, making it ideal for configuration, scripting, and rapid prototyping. ''; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = [ ]; }; diff --git a/pkgs/development/interpreters/lua-5/5.0.3.nix b/pkgs/development/interpreters/lua-5/5.0.3.nix index eae2d82d5d0..5ae5b4156a8 100644 --- a/pkgs/development/interpreters/lua-5/5.0.3.nix +++ b/pkgs/development/interpreters/lua-5/5.0.3.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { management with incremental garbage collection, making it ideal for configuration, scripting, and rapid prototyping. ''; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = [ ]; }; diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix index 303ea1d7471..74f80b911a0 100644 --- a/pkgs/development/interpreters/lua-5/5.1.nix +++ b/pkgs/development/interpreters/lua-5/5.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline, makeWrapper }: +{ stdenv, fetchurl, readline }: let dsoPatch = fetchurl { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333"; }; - buildInputs = [ readline makeWrapper ]; + buildInputs = [ readline ]; patches = if stdenv.isDarwin then [ ./5.1.darwin.patch ] else [ dsoPatch ]; @@ -35,9 +35,6 @@ stdenv.mkDerivation rec { sed <"etc/lua.pc" >"$out/lib/pkgconfig/lua.pc" -e "s|^prefix=.*|prefix=$out|" mv "doc/"*.{gif,png,css,html} "$out/share/doc/lua/" rmdir $out/{share,lib}/lua/5.1 $out/{share,lib}/lua - wrapProgram $out/bin/lua \ - --set LUA_PATH '"$HOME/.nix-profile/lib/lua/5.1/?.lua;$HOME/.nix-profile/share/lua/5.1/?.lua"' \ - --set LUA_CPATH '"$HOME/.nix-profile/lib/lua/5.1/?.so;$HOME/.nix-profile/share/lua/5.1/?.so"' ''; meta = { @@ -51,7 +48,7 @@ stdenv.mkDerivation rec { management with incremental garbage collection, making it ideal for configuration, scripting, and rapid prototyping. ''; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.simons ]; }; diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index 3bcc85fb434..eeb447e0e61 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { management with incremental garbage collection, making it ideal for configuration, scripting, and rapid prototyping. ''; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.simons ]; }; diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index 65badeae1dd..e112a5ae43d 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://maude.cs.uiuc.edu/"; description = "Maude -- a high-level specification language"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' Maude is a high-performance reflective language and system diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index eb7e925561c..1addccb4bf8 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -6,13 +6,13 @@ fftw, fftwSinglePrec, zlib, curl, qrupdate }: let - version = "3.8.0"; + version = "3.8.1"; in stdenv.mkDerivation rec { name = "octave-${version}"; src = fetchurl { url = "mirror://gnu/octave/${name}.tar.bz2"; - sha256 = "1yclb8p4mcx9xcjajyynxfnc5spw90lp44d84v56ksrlvp3314si"; + sha256 = "1gcvzbgyz98mxzy3gjkdbdiirafkl73l9ywml11j412amp92wxnn"; }; buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11 @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://octave.org/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric raskin]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/interpreters/octave/hg.nix b/pkgs/development/interpreters/octave/hg.nix index f44efb94358..797fff584f6 100644 --- a/pkgs/development/interpreters/octave/hg.nix +++ b/pkgs/development/interpreters/octave/hg.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation ({ meta = { description = "High-level interactive language for numerical computations"; homepage = http://www.octave.org; - license = "GPL-3"; + license = stdenv.lib.licenses.gpl3; }; } // ( if config.octave.devVersion or false then { diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index ccaa45c6c33..4b5f3bd8b3b 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { meta = { description = "Ren'Py Visual Novel Engine"; homepage = "http://renpy.org/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix index 693b7bf8fe1..bc4b1a778fc 100644 --- a/pkgs/development/libraries/SDL2_gfx/default.nix +++ b/pkgs/development/libraries/SDL2_gfx/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; homepage = https://sourceforge.net/projects/sdlgfx/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix index 49f5fec1da3..3a7fa707284 100644 --- a/pkgs/development/libraries/SDL_gfx/default.nix +++ b/pkgs/development/libraries/SDL_gfx/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; homepage = https://sourceforge.net/projects/sdlgfx/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix index f5b40daaf68..82d0821667d 100644 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ b/pkgs/development/libraries/SDL_mixer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, libogg, libvorbis, enableNativeMidi ? false }: +{ stdenv, fetchurl, SDL, libogg, libvorbis, enableNativeMidi ? false, fluidsynth ? null }: stdenv.mkDerivation rec { pname = "SDL_mixer"; @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { sha256 = "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n"; }; - buildInputs = [SDL libogg libvorbis]; + buildInputs = [SDL libogg libvorbis fluidsynth]; - configureFlags = "--disable-music-ogg-shared" + stdenv.lib.optionalString enableNativeMidi "--enable-music-native-midi-gpl"; + configureFlags = "--disable-music-ogg-shared" + stdenv.lib.optionalString enableNativeMidi " --enable-music-native-midi-gpl"; postInstall = "ln -s $out/include/SDL/SDL_mixer.h $out/include/"; diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix index cbc4e0b8c89..8c9c6a5b9ef 100644 --- a/pkgs/development/libraries/adns/default.nix +++ b/pkgs/development/libraries/adns/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.chiark.greenend.org.uk/~ian/adns/"; description = "Asynchronous DNS Resolver Library"; - license = "LGPL-v2"; + license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix index 59124f011dd..48e96aeea26 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/development/libraries/agg/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { of course, AGG can do much more than that. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.antigrain.com/; }; } diff --git a/pkgs/development/libraries/amrnb/default.nix b/pkgs/development/libraries/amrnb/default.nix index 7790f8e124b..c5514acd1d4 100644 --- a/pkgs/development/libraries/amrnb/default.nix +++ b/pkgs/development/libraries/amrnb/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { # The wrapper code is free, but not the libraries from 3gpp. # It's a source code reference implementation with patents and licenses on # some countries, not redistributable. - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/development/libraries/amrwb/default.nix b/pkgs/development/libraries/amrwb/default.nix index fc8d0415c36..2b5da8de423 100644 --- a/pkgs/development/libraries/amrwb/default.nix +++ b/pkgs/development/libraries/amrwb/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation { # The wrapper code is free, but not the libraries from 3gpp. # It's a source code reference implementation with patents and licenses on # some countries, not redistributable. - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index 6b054aaf44b..734bcc0797c 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Spell checker for many languages"; homepage = http://aspell.net/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 2dca2a8e1ec..ce7f92a2035 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = http://library.gnome.org/devel/atk/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/development/libraries/babl/0_0_22.nix b/pkgs/development/libraries/babl/0_0_22.nix index 2464a09f51a..3983816a8b4 100644 --- a/pkgs/development/libraries/babl/0_0_22.nix +++ b/pkgs/development/libraries/babl/0_0_22.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "Image pixel format conversion library"; homepage = http://gegl.org/babl/; - license = "GPL3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 41280e87253..473df8819c0 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { meta = { description = "Image pixel format conversion library"; homepage = http://gegl.org/babl/; - license = "GPL3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/development/libraries/caelum/default.nix b/pkgs/development/libraries/caelum/default.nix index 808310e326f..823eac14548 100644 --- a/pkgs/development/libraries/caelum/default.nix +++ b/pkgs/development/libraries/caelum/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Add-on for the OGRE, aimed to render atmospheric effects"; homepage = http://code.google.com/p/caelum/; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; broken = true; }; } diff --git a/pkgs/development/libraries/ccrtp/1.8.nix b/pkgs/development/libraries/ccrtp/1.8.nix index 78bf7a678ac..5105bd29876 100644 --- a/pkgs/development/libraries/ccrtp/1.8.nix +++ b/pkgs/development/libraries/ccrtp/1.8.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF"; homepage = "http://www.gnu.org/software/ccrtp/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix index daf36e28919..2111e1b4a55 100644 --- a/pkgs/development/libraries/ccrtp/default.nix +++ b/pkgs/development/libraries/ccrtp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "GNU ccRTP, an implementation of the IETF real-time transport protocol (RTP)"; homepage = http://www.gnu.org/software/ccrtp/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index a0e1bcfa612..4e75cda0c23 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { homepage = http://check.sourceforge.net/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix index 909e8ba7bf2..6c673a7dc02 100644 --- a/pkgs/development/libraries/classads/default.nix +++ b/pkgs/development/libraries/classads/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.cs.wisc.edu/condor/classad/; description = "The Classified Advertisements library provides a generic means for matching resources"; - license = "Apache-2.0"; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix index a6ebbf8dfdc..d84baedf96e 100644 --- a/pkgs/development/libraries/cloog-ppl/default.nix +++ b/pkgs/development/libraries/cloog-ppl/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { # CLooG-PPL is actually a port of GLooG from PolyLib to PPL. homepage = http://www.cloog.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix index c3878ef4b78..205f4d83693 100644 --- a/pkgs/development/libraries/cloog/default.nix +++ b/pkgs/development/libraries/cloog/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = http://www.cloog.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.shlevy ]; diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 8297dc9d5da..59c64b0de9f 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = http://www.clutter-project.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ lethalman ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/libraries/clutter-gtk/0.10.8.nix b/pkgs/development/libraries/clutter-gtk/0.10.8.nix index 00a4edd2a98..e5f5a455c89 100644 --- a/pkgs/development/libraries/clutter-gtk/0.10.8.nix +++ b/pkgs/development/libraries/clutter-gtk/0.10.8.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { homepage = http://www.clutter-project.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 3614d149489..1d085222341 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = http://www.clutter-project.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ urkud ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/libraries/clutter/1.18.nix b/pkgs/development/libraries/clutter/1.18.nix index 898c931f354..7a9d114ce8e 100644 --- a/pkgs/development/libraries/clutter/1.18.nix +++ b/pkgs/development/libraries/clutter/1.18.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { specific needs. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; homepage = http://www.clutter-project.org/; maintainers = with stdenv.lib.maintainers; [ urkud ]; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 808e67cd852..027b90d8e11 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { specific needs. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; homepage = http://www.clutter-project.org/; maintainers = with stdenv.lib.maintainers; [ urkud ]; diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix index f866b2299c1..034d7d658e1 100644 --- a/pkgs/development/libraries/coin3d/default.nix +++ b/pkgs/development/libraries/coin3d/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.coin3d.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "High-level, retained-mode toolkit for effective 3D graphics development"; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/commoncpp2/default.nix b/pkgs/development/libraries/commoncpp2/default.nix index 0b834a5ddb3..348f7bdfb66 100644 --- a/pkgs/development/libraries/commoncpp2/default.nix +++ b/pkgs/development/libraries/commoncpp2/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/commoncpp/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.ludo ]; diff --git a/pkgs/development/libraries/dotconf/default.nix b/pkgs/development/libraries/dotconf/default.nix index 9a71393badd..2c22af1684d 100644 --- a/pkgs/development/libraries/dotconf/default.nix +++ b/pkgs/development/libraries/dotconf/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { description = "A configuration parser library"; homepage = http://www.azzit.de/dotconf/; - license = "LGPLv21+"; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/development/libraries/exosip/3.x.nix b/pkgs/development/libraries/exosip/3.x.nix index 123b53783a6..63afd22bcf8 100644 --- a/pkgs/development/libraries/exosip/3.x.nix +++ b/pkgs/development/libraries/exosip/3.x.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libosip openssl pkgconfig ]; meta = { - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Library that hides the complexity of using the SIP protocol"; }; } diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix index fb13e0b8c6f..02349bc0267 100644 --- a/pkgs/development/libraries/exosip/default.nix +++ b/pkgs/development/libraries/exosip/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libosip openssl pkgconfig ]; meta = { - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Library that hides the complexity of using the SIP protocol"; }; } diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix index fc489f9eb66..99177578c77 100644 --- a/pkgs/development/libraries/faad2/default.nix +++ b/pkgs/development/libraries/faad2/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "An open source MPEG-4 and MPEG-2 AAC decoder"; homepage = http://www.audiocoding.com/faad2.html; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index 92146c12e30..c394fd07028 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://code.google.com/p/ffmpegsource/; description = "Libav/ffmpeg based source library for easy frame accurate access"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 985322790a9..63acc14521c 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms. ''; homepage = "http://fox-toolkit.org"; - license = "LGPLv3"; + license = stdenv.lib.licenses.lgpl3; maintainers = [ stdenv.lib.maintainers.bbenoist ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index 1d986275563..2fe104e849f 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms. ''; homepage = "http://fox-toolkit.org"; - license = "LGPLv3"; + license = stdenv.lib.licenses.lgpl3; maintainers = [ stdenv.lib.maintainers.bbenoist ]; platforms = stdenv.lib.platforms.mesaPlatforms; }; diff --git a/pkgs/development/libraries/freealut/default.nix b/pkgs/development/libraries/freealut/default.nix index 72d19875dec..25ba89994e5 100644 --- a/pkgs/development/libraries/freealut/default.nix +++ b/pkgs/development/libraries/freealut/default.nix @@ -1,10 +1,18 @@ -{stdenv, fetchurl, openal}: +{ stdenv, fetchurl, openal }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "freealut-1.1.0"; + src = fetchurl { - url = http://www.openal.org/openal_webstf/downloads/freealut-1.1.0.tar.gz; + url = "http://www.openal.org/openal_webstf/downloads/${name}.tar.gz"; sha256 = "0kzlil6112x2429nw6mycmif8y6bxr2cwjcvp18vh6s7g63ymlb0"; }; - buildInputs = [openal]; + + buildInputs = [ openal ]; + + meta = { + homepage = "http://openal.org/"; + description = "Free implementation of OpenAL's ALUT standard"; + license = stdenv.lib.licenses.lgpl2; + }; } diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index a641040187a..7c78ca3ed6f 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -27,7 +27,7 @@ composableDerivation.composableDerivation {} (fixed: { meta = { description = "Translator library for raster geospatial data formats"; homepage = http://www.gdal.org/; - license = "X/MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index 2ba49162e2f..1fd6c429dc0 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/gdbm/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/libraries/gdome2/default.nix b/pkgs/development/libraries/gdome2/default.nix index 415a98029cc..516fb932983 100644 --- a/pkgs/development/libraries/gdome2/default.nix +++ b/pkgs/development/libraries/gdome2/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = http://gdome2.cs.unibo.it/; description = "DOM C library developped for the Gnome project"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/libraries/gegl/0_0_22.nix b/pkgs/development/libraries/gegl/0_0_22.nix index b2f2e85a1ea..3f9a619ff6a 100644 --- a/pkgs/development/libraries/gegl/0_0_22.nix +++ b/pkgs/development/libraries/gegl/0_0_22.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation { meta = { description = "Graph-based image processing framework"; homepage = http://www.gegl.org; - license = "GPL3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index 0649775ad21..a589d625273 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { meta = { description = "Graph-based image processing framework"; homepage = http://www.gegl.org; - license = "GPL3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index 3932fa945c8..5ab9cb62443 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "geoclue-2.1.8"; + name = "geoclue-2.1.9"; src = fetchurl { url = "http://www.freedesktop.org/software/geoclue/releases/2.1/${name}.tar.xz"; - sha256 = "05h102110gsxxvmvllssfz7ldjpwrrb5sqg5rbpibys6iy4w1k6m"; + sha256 = "0aq9fqlvvc8jqbshp3mbcc1j5hq4fzjy8hd1yxcl6xrd0jkfw5ml"; }; buildInputs = diff --git a/pkgs/development/libraries/glibc/2.19/common.nix b/pkgs/development/libraries/glibc/2.19/common.nix index 8a461485186..cd1ba747d7c 100644 --- a/pkgs/development/libraries/glibc/2.19/common.nix +++ b/pkgs/development/libraries/glibc/2.19/common.nix @@ -181,7 +181,7 @@ stdenv.mkDerivation ({ most systems with the Linux kernel. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; #platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 6801012e855..66fb0179489 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = http://gtkmm.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [urkud raskin]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index eb653591005..2b1a5b571ef 100644 --- a/pkgs/development/libraries/glpk/default.nix +++ b/pkgs/development/libraries/glpk/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/glpk/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix index f87211195d5..d79293eced1 100644 --- a/pkgs/development/libraries/gmm/default.nix +++ b/pkgs/development/libraries/gmm/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "Generic C++ template library for sparse, dense and skyline matrices"; homepage = http://home.gna.org/getfem/gmm_intro.html; - license = "LGLP2.1"; # or later + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix index f003979c701..d0559c46795 100644 --- a/pkgs/development/libraries/gmp/4.3.2.nix +++ b/pkgs/development/libraries/gmp/4.3.2.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; homepage = http://gmplib.org/; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/gmp/5.0.5.nix b/pkgs/development/libraries/gmp/5.0.5.nix index 461187a509c..c96c830e2f7 100644 --- a/pkgs/development/libraries/gmp/5.0.5.nix +++ b/pkgs/development/libraries/gmp/5.0.5.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ''; homepage = http://gmplib.org/; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/gnutls/3.1.nix b/pkgs/development/libraries/gnutls/3.1.nix index 89306540694..6aea78a3ac5 100644 --- a/pkgs/development/libraries/gnutls/3.1.nix +++ b/pkgs/development/libraries/gnutls/3.1.nix @@ -61,8 +61,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/gnutls/; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; }; } - diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix index ca9c003dfe7..cd48e08a39c 100644 --- a/pkgs/development/libraries/gnutls/3.2.nix +++ b/pkgs/development/libraries/gnutls/3.2.nix @@ -63,9 +63,8 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/gnutls/; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.all; }; } - diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index 70b4ab8639d..383c1a7e223 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/gsasl/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index 9631746691f..da4796fba89 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "The GNU Scientific Library, a large numerical library"; homepage = http://www.gnu.org/software/gsl/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; longDescription = '' The GNU Scientific Library (GSL) is a numerical library for C diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix index 4959a70ca63..207b8248698 100644 --- a/pkgs/development/libraries/gss/default.nix +++ b/pkgs/development/libraries/gss/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/gss/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 466406fbe79..792b6d2e4db 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "GObject-based API for handling resource discovery and announcement over SSDP"; homepage = http://www.gupnp.org/; - license = "LGPL v2"; + license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix index 820e8eb07c9..ff26e727e9f 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gstreamer.freedesktop.org/modules/gnonlin.html"; description = "http://gstreamer.freedesktop.org/modules/gnonlin.html"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix index 49c612f59e7..89b6e73e6b6 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gstreamer.freedesktop.org/releases/gst-ffmpeg"; description = "GStreamer's plug-in using FFmpeg"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix index a433d717039..988d1bba258 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix index a09f8279760..a0cd0a4c646 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix index 769de911fd6..e4411fcefbb 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix index e960aa90421..d01961f5cde 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { description = "Python bindings for GStreamer"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } - diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix index cadef680272..f781c624cea 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { interface. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix index 1427ec866a9..97a4638170f 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ bindings for the GStreamer streaming multimedia library"; homepage = http://www.gtkmm.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = "Philip Lykke Carlsen <plcplc@gmail.com>"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix index 9a526de05b1..d20f06635da 100644 --- a/pkgs/development/libraries/gstreamer/python/default.nix +++ b/pkgs/development/libraries/gstreamer/python/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { description = "Python bindings for GStreamer"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } - diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index ef8f3e39883..09221502e36 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { homepage = http://www.gtk.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/gtkdatabox/default.nix b/pkgs/development/libraries/gtkdatabox/default.nix index 43d0db9755a..69a0341a695 100644 --- a/pkgs/development/libraries/gtkdatabox/default.nix +++ b/pkgs/development/libraries/gtkdatabox/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Gtk+ widget for displaying large amounts of numerical data"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/development/libraries/gtkimageview/default.nix index 17dc5469910..6905adcd71e 100644 --- a/pkgs/development/libraries/gtkimageview/default.nix +++ b/pkgs/development/libraries/gtkimageview/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { interpolation; GIF animation support. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; }; diff --git a/pkgs/development/libraries/gtkmathview/default.nix b/pkgs/development/libraries/gtkmathview/default.nix index eaccf2fb08b..2620d9cc120 100644 --- a/pkgs/development/libraries/gtkmathview/default.nix +++ b/pkgs/development/libraries/gtkmathview/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { homepage = http://helm.cs.unibo.it/mml-widget/; description = "GtkMathView is a C++ rendering engine for MathML documents"; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index 0b59cbfc489..727e4b2185c 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = http://gtkmm.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ raskin vcunat ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 600ea1a0278..47057b819e0 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = http://gtkmm.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ raskin urkud vcunat ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix index 7724bc5cc3a..17ab80ce586 100644 --- a/pkgs/development/libraries/gts/default.nix +++ b/pkgs/development/libraries/gts/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://gts.sourceforge.net/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; description = "GNU Triangulated Surface Library"; longDescription = '' diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 89c6b965161..8340660e392 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -8,11 +8,11 @@ # (icu is a ~30 MB dependency, the rest is very small in comparison) stdenv.mkDerivation rec { - name = "harfbuzz-0.9.32"; + name = "harfbuzz-0.9.33"; src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2"; - sha256 = "1d4x9fcy2p9g67pb4nfzx6p4008dzn7g25lva9pv71rd9rs82323"; + sha256 = "1iql2ghlndqgx9q6p098xf253rjz5rnrv5qniwgd1b5q0jzwa4yk"; }; configureFlags = [ diff --git a/pkgs/development/libraries/haskell/Cabal/1.20.0.1.nix b/pkgs/development/libraries/haskell/Cabal/1.20.0.2.nix index 67faefb7a67..35d0ddfd330 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.20.0.1.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.20.0.2.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "Cabal"; - version = "1.20.0.1"; - sha256 = "0vcpw4rskqlg2swsxk93p77svb007qvpwlpj2ia55avpi4c3xf8m"; + version = "1.20.0.2"; + sha256 = "00mz24fj3qpq6rl3n3i73x6k0jzqix24k9izrlkzg07mpjcj4k93"; buildDepends = [ deepseq filepath time ]; testDepends = [ extensibleExceptions filepath HUnit QuickCheck regexPosix diff --git a/pkgs/development/libraries/haskell/GLUtil/default.nix b/pkgs/development/libraries/haskell/GLUtil/default.nix index 10ab2bf69e6..ce4b41c93e0 100644 --- a/pkgs/development/libraries/haskell/GLUtil/default.nix +++ b/pkgs/development/libraries/haskell/GLUtil/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "GLUtil"; - version = "0.7.5"; - sha256 = "1rbnq1nrs2b06ph60lh0yvygk82vvnm8c4d0anhjrqw9i58nd3iz"; + version = "0.8"; + sha256 = "00r9gmwsb9gx6bcc012rhz0z0hj3my8k1i0yjnaw0jmlqswm45h8"; buildDepends = [ cpphs JuicyPixels linear OpenGL OpenGLRaw transformers vector ]; diff --git a/pkgs/development/libraries/haskell/MFlow/default.nix b/pkgs/development/libraries/haskell/MFlow/default.nix index 8e5969bbf27..bfefa0bead2 100644 --- a/pkgs/development/libraries/haskell/MFlow/default.nix +++ b/pkgs/development/libraries/haskell/MFlow/default.nix @@ -1,29 +1,21 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, acidState, aws, blazeHtml, blazeMarkup, caseInsensitive -, clientsession, conduit, conduitExtra, cpphs, extensibleExceptions -, hamlet, hscolour, httpConduit, httpTypes, monadloc, monadLogger -, mtl, network, parsec, persistent, persistentSqlite -, persistentTemplate, pwstoreFast, random, RefSerialize, resourcet -, safecopy, shakespeare, stm, TCache, tcacheAWS, text, time -, transformers, utf8String, vector, wai, waiExtra, warp, warpTls -, Workflow +{ cabal, blazeHtml, blazeMarkup, caseInsensitive, clientsession +, conduit, conduitExtra, cpphs, extensibleExceptions, httpTypes +, monadloc, mtl, parsec, pwstoreFast, random, RefSerialize +, resourcet, stm, TCache, text, time, transformers, utf8String +, vector, wai, waiExtra, warp, warpTls, Workflow }: cabal.mkDerivation (self: { pname = "MFlow"; - version = "0.4.5.5"; - sha256 = "0ggwzjxhw2xmp2m6a560pn5m0qfn80x5q23vrd2k9aqxh8n2k6i5"; - isLibrary = true; - isExecutable = true; + version = "0.4.5.6"; + sha256 = "12rgp4x2in3r1hf4j1fr5ih0x0mb54x1rdr1mjllbh8c09ricrah"; buildDepends = [ - acidState aws blazeHtml blazeMarkup caseInsensitive clientsession - conduit conduitExtra extensibleExceptions hamlet hscolour - httpConduit httpTypes monadloc monadLogger mtl network parsec - persistent persistentSqlite persistentTemplate pwstoreFast random - RefSerialize resourcet safecopy shakespeare stm TCache tcacheAWS - text time transformers utf8String vector wai waiExtra warp warpTls - Workflow + blazeHtml blazeMarkup caseInsensitive clientsession conduit + conduitExtra extensibleExceptions httpTypes monadloc mtl parsec + pwstoreFast random RefSerialize resourcet stm TCache text time + transformers utf8String vector wai waiExtra warp warpTls Workflow ]; buildTools = [ cpphs ]; meta = { diff --git a/pkgs/development/libraries/haskell/ad/default.nix b/pkgs/development/libraries/haskell/ad/default.nix new file mode 100644 index 00000000000..39c17de2c31 --- /dev/null +++ b/pkgs/development/libraries/haskell/ad/default.nix @@ -0,0 +1,19 @@ +{ cabal, comonad, dataReify, doctest, erf, filepath, free, mtl +, nats, reflection, tagged, transformers +}: + +cabal.mkDerivation (self: { + pname = "ad"; + version = "4.2.0.1"; + sha256 = "06vjllcrnr4dv5h3xkcy5zhnhyamp6b6jahpnh2y0i6mp2bdw0pz"; + buildDepends = [ + comonad dataReify erf free mtl nats reflection tagged transformers + ]; + testDepends = [ doctest filepath mtl ]; + meta = { + homepage = "http://github.com/ekmett/ad"; + description = "Automatic Differentiation"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/adjunctions/default.nix b/pkgs/development/libraries/haskell/adjunctions/default.nix index 5b9cb5703d6..f02aa9df5dd 100644 --- a/pkgs/development/libraries/haskell/adjunctions/default.nix +++ b/pkgs/development/libraries/haskell/adjunctions/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "adjunctions"; - version = "4.1.0.1"; - sha256 = "18p2pabid7dx96qcpd2ywv5mhjp55srhm5g013pn697jcxyq2xiv"; + version = "4.2"; + sha256 = "07r56r6kyd6wlcxxnsnnyv59pyc8s1gsy54kzwmk9yknks5rij9i"; buildDepends = [ comonad contravariant distributive free mtl profunctors semigroupoids semigroups tagged transformers void diff --git a/pkgs/development/libraries/haskell/atomic-primops/default.nix b/pkgs/development/libraries/haskell/atomic-primops/default.nix index 127ee2b326c..466a4429091 100644 --- a/pkgs/development/libraries/haskell/atomic-primops/default.nix +++ b/pkgs/development/libraries/haskell/atomic-primops/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "atomic-primops"; - version = "0.6.0.5"; - sha256 = "0xyvadhmhk2b6y6p52cfbjx1hs3zfcwfa5wx6cypaq4yi3csyl5k"; + version = "0.6.0.6"; + sha256 = "10i9s6d9951z9bf88w1vxcfb9z9axm2q4kf8wy6zd5gcc8hm7wcb"; buildDepends = [ primitive ]; meta = { homepage = "https://github.com/rrnewton/haskell-lockfree/wiki"; diff --git a/pkgs/development/libraries/haskell/base-prelude/default.nix b/pkgs/development/libraries/haskell/base-prelude/default.nix new file mode 100644 index 00000000000..824576293f4 --- /dev/null +++ b/pkgs/development/libraries/haskell/base-prelude/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "base-prelude"; + version = "0.1.3"; + sha256 = "07s5j538zxd0hlazqqbz4nwa82rcrmv25v7jr6nxafmgn83mkqhx"; + meta = { + homepage = "https://github.com/nikita-volkov/base-prelude"; + description = "The most complete prelude formed from only the \"base\" package"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/bencoding/default.nix b/pkgs/development/libraries/haskell/bencoding/default.nix new file mode 100644 index 00000000000..c93def74655 --- /dev/null +++ b/pkgs/development/libraries/haskell/bencoding/default.nix @@ -0,0 +1,15 @@ +{ cabal, attoparsec, deepseq, hspec, mtl, QuickCheck, text }: + +cabal.mkDerivation (self: { + pname = "bencoding"; + version = "0.4.3.0"; + sha256 = "0f6d3g88y7i4s5wa53771n0fbkbs4na8vpy51wk21b563smdcpcc"; + buildDepends = [ attoparsec deepseq mtl text ]; + testDepends = [ attoparsec hspec QuickCheck ]; + meta = { + homepage = "https://github.com/cobit/bencoding"; + description = "A library for encoding and decoding of BEncode data"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/bindings-GLFW/default.nix b/pkgs/development/libraries/haskell/bindings-GLFW/default.nix index 0ed43d79537..08e14a782bf 100644 --- a/pkgs/development/libraries/haskell/bindings-GLFW/default.nix +++ b/pkgs/development/libraries/haskell/bindings-GLFW/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "bindings-GLFW"; - version = "3.0.3.2"; - sha256 = "1w4y2ha5x678fiyan79jd59mjrkf4q25v8049sj20fbmabgdqla9"; + version = "3.0.3.3"; + sha256 = "0w6vqshlk0c4k4q81xw7kg4j62h3wpccpy8qbiq5ks69w7z13fy4"; buildDepends = [ bindingsDSL ]; testDepends = [ HUnit testFramework testFrameworkHunit ]; extraLibraries = [ diff --git a/pkgs/development/libraries/haskell/cgrep/default.nix b/pkgs/development/libraries/haskell/cgrep/default.nix index fa4035b41ab..3563abb0a85 100644 --- a/pkgs/development/libraries/haskell/cgrep/default.nix +++ b/pkgs/development/libraries/haskell/cgrep/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "cgrep"; - version = "6.4.4"; - sha256 = "1czy9skv3jcfljwxml4nprmsxq70pav7mqhk92jg5wj1klgrz21k"; + version = "6.4.5"; + sha256 = "0pp3gfy8dvdbv40vfy3dhqymjp0knnbzv9hmbc18f3s8zpy4lis0"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix index d6f67674db4..28e940f3489 100644 --- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude-conduit"; - version = "0.9.2"; - sha256 = "07qdhha58yl1dq4mpbyrpjwzk2yhn8dbkg2qg2yaq1j780a6dwcv"; + version = "0.9.3"; + sha256 = "0wsl3mhczinxl6ij8dpv5001db740z4jq43l2gpzdylv6pmpldzr"; buildDepends = [ classyPrelude conduit conduitCombinators monadControl resourcet systemFileio transformers void diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index 273147fcc62..e45a6f256b9 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude"; - version = "0.9.2"; - sha256 = "0n006ld2kifh2bmwgbzx282s7xxpcml9g433x132prcblw4axkgr"; + version = "0.9.3"; + sha256 = "06y6zx3mmqjnha5p7y7blzn77bij71kndw2bmi07wz4s4lj9xsiv"; buildDepends = [ basicPrelude chunkedData enclosedExceptions exceptions hashable liftedBase monoTraversable semigroups stm systemFilepath text time diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index 6482751a797..aa9dcb781c0 100644 --- a/pkgs/development/libraries/haskell/cmdargs/default.nix +++ b/pkgs/development/libraries/haskell/cmdargs/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cmdargs"; - version = "0.10.8"; - sha256 = "1gh6g655s5yjf55qlbpn7daw5f67j79znibs4dwrvhj985hb9a7p"; + version = "0.10.9"; + sha256 = "12phn22iri2v65gbxzl580mikkj05rwx4sjn5c31f871wp0538my"; isLibrary = true; isExecutable = true; buildDepends = [ filepath transformers ]; diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix index da990817544..36a0db0b9cc 100644 --- a/pkgs/development/libraries/haskell/comonad/default.nix +++ b/pkgs/development/libraries/haskell/comonad/default.nix @@ -1,15 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, contravariant, distributive, doctest, filepath, semigroups -, tagged, transformers +, tagged, transformers, transformersCompat }: cabal.mkDerivation (self: { pname = "comonad"; - version = "4.2"; - sha256 = "161dgmjfff85sj6yijzgzyb4dvnn1zsm3q5q96qwypynj0am5sr7"; + version = "4.2.2"; + sha256 = "022fcy0ijwsdnjb1b1jrwy2ypzzbzvfgj9ns0c74hrsj08gjh8j8"; buildDepends = [ contravariant distributive semigroups tagged transformers + transformersCompat ]; testDepends = [ doctest filepath ]; meta = { diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix index c1396751f10..17598dda06b 100644 --- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix +++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "conduit-combinators"; - version = "0.2.6.1"; - sha256 = "01q585fwfl7qw5yr7ry1zfwm0lbmizyidifk9jzxdfxppbccfxfc"; + version = "0.2.8.2"; + sha256 = "1x2g333ygiv4jvwx4lw579kwx1z5m80cqfqgzv0pi5xdxcagy1ha"; buildDepends = [ base16Bytestring base64Bytestring chunkedData conduit conduitExtra monadControl monoTraversable mwcRandom primitive resourcet diff --git a/pkgs/development/libraries/haskell/conduit-extra/default.nix b/pkgs/development/libraries/haskell/conduit-extra/default.nix index 5dc139d058f..87fc9f18e76 100644 --- a/pkgs/development/libraries/haskell/conduit-extra/default.nix +++ b/pkgs/development/libraries/haskell/conduit-extra/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "conduit-extra"; - version = "1.1.2"; - sha256 = "1hglg491vgy6hjggi7067rjly3dlnr3byf6xlc20narzr25sxfxi"; + version = "1.1.3"; + sha256 = "1gzvplaxplqia23g6l8z42w0z10y33yz594lxdk82g4i7swaagix"; buildDepends = [ attoparsec blazeBuilder conduit filepath monadControl network primitive resourcet stm streamingCommons text transformers diff --git a/pkgs/development/libraries/haskell/contravariant/default.nix b/pkgs/development/libraries/haskell/contravariant/default.nix index b3c549ecef8..91a586e56b2 100644 --- a/pkgs/development/libraries/haskell/contravariant/default.nix +++ b/pkgs/development/libraries/haskell/contravariant/default.nix @@ -1,12 +1,14 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, tagged, transformers, transformersCompat }: +{ cabal, semigroups, tagged, transformers, transformersCompat }: cabal.mkDerivation (self: { pname = "contravariant"; - version = "0.6"; - sha256 = "031kwn2hpw25p2q0bhfgby0ihxjbcyv6w0v0nsj2zygif9jkfrrh"; - buildDepends = [ tagged transformers transformersCompat ]; + version = "1.1"; + sha256 = "0j2q6gl9f8jgknjqr2qzzxkb4fl7m9n5zjavnzan2arlv4viznhh"; + buildDepends = [ + semigroups tagged transformers transformersCompat + ]; meta = { homepage = "http://github.com/ekmett/contravariant/"; description = "Contravariant functors"; diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix index 8da6475cfb6..60a32ea092f 100644 --- a/pkgs/development/libraries/haskell/dns/default.nix +++ b/pkgs/development/libraries/haskell/dns/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "dns"; - version = "1.4.0"; - sha256 = "1r004wpq0z98f6n3rqqlkqmb799sdldj5087icksi6rxxr3plrs9"; + version = "1.4.1"; + sha256 = "0q5ib797p0ay8lrlywaqyg736qh67mfdqwc53c1qhr5xrbcyvdir"; buildDepends = [ attoparsec binary blazeBuilder conduit conduitExtra iproute mtl network random resourcet diff --git a/pkgs/development/libraries/haskell/easy-file/default.nix b/pkgs/development/libraries/haskell/easy-file/default.nix new file mode 100644 index 00000000000..8ba73d74efe --- /dev/null +++ b/pkgs/development/libraries/haskell/easy-file/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, filepath, time }: + +cabal.mkDerivation (self: { + pname = "easy-file"; + version = "0.2.0"; + sha256 = "0v8skixq15rvyiyky1dcrfl9jrzkbi75vai8np11xy2kg7a8ym2a"; + buildDepends = [ filepath time ]; + meta = { + homepage = "http://github.com/kazu-yamamoto/easy-file"; + description = "Cross-platform File handling"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/equivalence/default.nix b/pkgs/development/libraries/haskell/equivalence/0.2.3.nix index 93446821224..93446821224 100644 --- a/pkgs/development/libraries/haskell/equivalence/default.nix +++ b/pkgs/development/libraries/haskell/equivalence/0.2.3.nix diff --git a/pkgs/development/libraries/haskell/equivalence/0.2.5.nix b/pkgs/development/libraries/haskell/equivalence/0.2.5.nix new file mode 100644 index 00000000000..38de239b821 --- /dev/null +++ b/pkgs/development/libraries/haskell/equivalence/0.2.5.nix @@ -0,0 +1,22 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, mtl, QuickCheck, STMonadTrans, testFramework +, testFrameworkQuickcheck2 +}: + +cabal.mkDerivation (self: { + pname = "equivalence"; + version = "0.2.5"; + sha256 = "014r9v81r7nj5pynfk3wa4lm4hk04123fgxkhb9a945wi6d9m5h3"; + buildDepends = [ mtl STMonadTrans ]; + testDepends = [ + mtl QuickCheck STMonadTrans testFramework testFrameworkQuickcheck2 + ]; + doCheck = false; + meta = { + homepage = "https://bitbucket.org/paba/equivalence/"; + description = "Maintaining an equivalence relation implemented as union-find using STT"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/fay-base/default.nix b/pkgs/development/libraries/haskell/fay-base/default.nix index 9dd38ecda4b..78d099e3100 100644 --- a/pkgs/development/libraries/haskell/fay-base/default.nix +++ b/pkgs/development/libraries/haskell/fay-base/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "fay-base"; - version = "0.19.1.2"; - sha256 = "0y2gpyh0gama6mz0rfvqdgpf7wfwx7r8k0cdfh60kjcxr029dx5i"; + version = "0.19.2"; + sha256 = "08iv3097h877hxbmpmar1p526famm5pb1djq3qwla3bkqrzxgmf4"; buildDepends = [ fay ]; meta = { homepage = "https://github.com/faylang/fay-base"; diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index fd33af07ee3..9fa673fd286 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "filestore"; - version = "0.6.0.2"; - sha256 = "0dbn358gxg13lxlpqyczcn5g5kvzrz7lv17qsmr53hvmxz8mricr"; + version = "0.6.0.3"; + sha256 = "03qmv3cqp1fv7b7pdjdx12cb27bfjbwwjdhkcvkfq89qwk9wh1h0"; buildDepends = [ Diff filepath parsec split time utf8String xml ]; testDepends = [ Diff filepath HUnit mtl time ]; jailbreak = true; diff --git a/pkgs/development/libraries/haskell/folds/default.nix b/pkgs/development/libraries/haskell/folds/default.nix index 41a834dbd84..7e3fb5a2dc6 100644 --- a/pkgs/development/libraries/haskell/folds/default.nix +++ b/pkgs/development/libraries/haskell/folds/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "folds"; - version = "0.6.1"; - sha256 = "13p4kyr48g917ib87n14qpqaka6isp73cwy7mvvsqgprj1fghyj1"; + version = "0.6.2"; + sha256 = "13zdmf7szdy9ka5dw0vgzbfmndm7w8fz7ryz5h2z5hsqg9am2qqa"; buildDepends = [ comonad contravariant lens pointed profunctors reflection semigroupoids tagged transformers vector diff --git a/pkgs/development/libraries/haskell/free-game/1.1.nix b/pkgs/development/libraries/haskell/free-game/1.1.nix deleted file mode 100644 index 76139aa7e5d..00000000000 --- a/pkgs/development/libraries/haskell/free-game/1.1.nix +++ /dev/null @@ -1,25 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, boundingboxes, colors, controlBool, filepath, free -, freetype2, GLFWB, hashable, JuicyPixels, JuicyPixelsUtil, lens -, linear, mtl, OpenGL, OpenGLRaw, random, reflection, transformers -, vector, void -}: - -cabal.mkDerivation (self: { - pname = "free-game"; - version = "1.1"; - sha256 = "0id3vn2j44gd8krl5icacwxgx00h6r89yncjg10nyyb90rymvxzz"; - buildDepends = [ - boundingboxes colors controlBool filepath free freetype2 GLFWB - hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL - OpenGLRaw random reflection transformers vector void - ]; - jailbreak = true; - meta = { - homepage = "https://github.com/fumieval/free-game"; - description = "Create games for free"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/free-game/1.0.5.nix b/pkgs/development/libraries/haskell/free-game/default.nix index 16ee51d139f..d2a0f33892f 100644 --- a/pkgs/development/libraries/haskell/free-game/1.0.5.nix +++ b/pkgs/development/libraries/haskell/free-game/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "free-game"; - version = "1.0.5"; - sha256 = "048hmb4zbn67ycdwy7alhfakdyv405ck79bzrxv2ra6w1v5b3yvf"; + version = "1.1.78"; + sha256 = "11f3ib4nx0madbx58gscaqwc1k5mxw70klrq7z7lac9w61phkws6"; buildDepends = [ boundingboxes colors controlBool filepath free freetype2 GLFWB hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL diff --git a/pkgs/development/libraries/haskell/hackage-db/default.nix b/pkgs/development/libraries/haskell/hackage-db/default.nix index 3164d213870..e09e455d560 100644 --- a/pkgs/development/libraries/haskell/hackage-db/default.nix +++ b/pkgs/development/libraries/haskell/hackage-db/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hackage-db"; - version = "1.7"; - sha256 = "0mf22xxbcbjb7l4jahknp6s7lsfn43ib7z9m2jsg9py92vkacfp1"; + version = "1.8"; + sha256 = "0iav085xq4d6k9z0x7jlnw3r3wwnzbr7ygbaqnblj6mcpnps9r3q"; buildDepends = [ Cabal filepath tar utf8String ]; meta = { homepage = "http://github.com/peti/hackage-db"; diff --git a/pkgs/development/libraries/haskell/haskell-token-utils/default.nix b/pkgs/development/libraries/haskell/haskell-token-utils/default.nix index 378dfe898ea..2abbc8f324d 100644 --- a/pkgs/development/libraries/haskell/haskell-token-utils/default.nix +++ b/pkgs/development/libraries/haskell/haskell-token-utils/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "haskell-token-utils"; - version = "0.0.0.4"; - sha256 = "0bb47g58m76293dw4h349j3fmajmw62rqna2kcgx681a1rsbpb4i"; + version = "0.0.0.5"; + sha256 = "01kyghzbs8w8ds0aczcdg2ib5b919r5vxgwg8iifbf220vlhd8mn"; buildDepends = [ dualTree ghcPaths ghcSybUtils haskellSrcExts monoidExtras mtl rosezipper semigroups syb diff --git a/pkgs/development/libraries/haskell/hflags/default.nix b/pkgs/development/libraries/haskell/hflags/default.nix index c48130c555c..019815fd57c 100644 --- a/pkgs/development/libraries/haskell/hflags/default.nix +++ b/pkgs/development/libraries/haskell/hflags/default.nix @@ -10,7 +10,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://github.com/errge/hflags"; description = "Command line flag parser, very similar to Google's gflags"; - license = "Apache-2.0"; + license = "unknown"; platforms = self.ghc.meta.platforms; }; }) diff --git a/pkgs/development/libraries/haskell/hp2any-graph/default.nix b/pkgs/development/libraries/haskell/hp2any-graph/default.nix index e6607c4e0af..6d0d61a01fe 100644 --- a/pkgs/development/libraries/haskell/hp2any-graph/default.nix +++ b/pkgs/development/libraries/haskell/hp2any-graph/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hp2any-graph"; - version = "0.5.4.1"; - sha256 = "0cvli36lbipi29fw45mfpv35dn7ndbkxhpd3wjy9xn9gy8g0r9xx"; + version = "0.5.4.2"; + sha256 = "1yj1miqn265pxq2dfhx87s20vjnnxmsl3d9xdy88cbzglpx2v9il"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hslua/default.nix b/pkgs/development/libraries/haskell/hslua/default.nix index 980de57605d..e76ff36aab5 100644 --- a/pkgs/development/libraries/haskell/hslua/default.nix +++ b/pkgs/development/libraries/haskell/hslua/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hslua"; - version = "0.3.12"; - sha256 = "1cn6qxhvh8bxr9fisr4m4mqk6qwj69as63fkpf77a1xhmk31qlrf"; + version = "0.3.13"; + sha256 = "02j3hrzq3dgcv4bvf4xz14qxvzlb0vlxrf7lk9wqwdy43b978mz9"; buildDepends = [ mtl ]; pkgconfigDepends = [ lua ]; configureFlags = "-fsystem-lua"; diff --git a/pkgs/development/libraries/haskell/kan-extensions/default.nix b/pkgs/development/libraries/haskell/kan-extensions/default.nix index 5f9aadd6969..c0ffaed799d 100644 --- a/pkgs/development/libraries/haskell/kan-extensions/default.nix +++ b/pkgs/development/libraries/haskell/kan-extensions/default.nix @@ -1,16 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, adjunctions, comonad, contravariant, distributive, free -, mtl, pointed, semigroupoids, speculation, transformers +, mtl, pointed, semigroupoids, transformers }: cabal.mkDerivation (self: { pname = "kan-extensions"; - version = "4.0.3"; - sha256 = "05zqlxm6i66d996jcpjhnmij28a4zwc0l0nc9cyxamfwmyd9754b"; + version = "4.1"; + sha256 = "1dg9q6rahgvsnsnd76r6a3harrllq3pzz9250cakgqip4n02dji1"; buildDepends = [ adjunctions comonad contravariant distributive free mtl pointed - semigroupoids speculation transformers + semigroupoids transformers ]; meta = { homepage = "http://github.com/ekmett/kan-extensions/"; diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index 9b769d41ab5..655525e4d59 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -12,8 +12,8 @@ cabal.mkDerivation (self: { pname = "lens"; - version = "4.3"; - sha256 = "0wvsf0vkqjmmgl3p5lxbypn4p126l927ip7l2iisqzwyk87zfqqy"; + version = "4.3.3"; + sha256 = "0k7qslnh15xnrj86wwsp0mvz6g363ma4g0dxkmvvg4sa1bxljr1f"; buildDepends = [ aeson attoparsec bifunctors comonad contravariant distributive exceptions filepath free hashable mtl parallel primitive diff --git a/pkgs/development/libraries/haskell/liblastfm/default.nix b/pkgs/development/libraries/haskell/liblastfm/default.nix index ea4febaf1d1..8ea830d0c39 100644 --- a/pkgs/development/libraries/haskell/liblastfm/default.nix +++ b/pkgs/development/libraries/haskell/liblastfm/default.nix @@ -1,16 +1,23 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, cereal, contravariant, cryptoApi, httpConduit -, httpTypes, network, pureMD5, semigroups, tagged, text, void +{ cabal, aeson, cereal, contravariant, cryptoApi, hspec +, hspecExpectationsLens, httpClient, httpClientTls, HUnit, lens +, network, profunctors, pureMD5, semigroups, text, void, xmlConduit +, xmlHtmlConduitLens }: cabal.mkDerivation (self: { pname = "liblastfm"; - version = "0.3.2.0"; - sha256 = "09xsjkwknfvdd3zb7a1qbch45ri6knkn33wl6xbi48sw5i79lxnv"; + version = "0.4.0.0"; + sha256 = "0dr1nvb7sxlp1fihvnwz9lyfmaynbj39npah2ndvlgnzz670j0z9"; buildDepends = [ - aeson cereal contravariant cryptoApi httpConduit httpTypes network - pureMD5 semigroups tagged text void + aeson cereal contravariant cryptoApi httpClient httpClientTls + network profunctors pureMD5 semigroups text void xmlConduit + ]; + testDepends = [ + aeson cereal contravariant cryptoApi hspec hspecExpectationsLens + httpClient httpClientTls HUnit lens network profunctors pureMD5 + text void xmlConduit xmlHtmlConduitLens ]; meta = { description = "Lastfm API interface"; diff --git a/pkgs/development/libraries/haskell/lifted-async/default.nix b/pkgs/development/libraries/haskell/lifted-async/default.nix index f5b6f711ab8..04c589b5479 100644 --- a/pkgs/development/libraries/haskell/lifted-async/default.nix +++ b/pkgs/development/libraries/haskell/lifted-async/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "lifted-async"; - version = "0.2.0"; - sha256 = "1s8gz630v9xag0d5pjjwvfff87wvyy1w86ah7mvnylkarbdsac6l"; + version = "0.2.0.1"; + sha256 = "1x3qdgy0jkqx71xndjh769lw3wrwq63k2kc33pxn6x11yyklcf1j"; buildDepends = [ async liftedBase monadControl transformersBase ]; testDepends = [ async HUnit liftedBase monadControl mtl tasty tastyHunit tastyTh diff --git a/pkgs/development/libraries/haskell/mongoDB/default.nix b/pkgs/development/libraries/haskell/mongoDB/default.nix index d156c9c101e..9fd2a441e36 100644 --- a/pkgs/development/libraries/haskell/mongoDB/default.nix +++ b/pkgs/development/libraries/haskell/mongoDB/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "mongoDB"; - version = "2.0.2"; - sha256 = "02xq80jcrrp41gzzg7008spw3npj6iz3gcf1bkj4cf8vjs44nplf"; + version = "2.0.3"; + sha256 = "1blqd30mw9fl861f07zn7az4psl9byjjbd986884p6rx07m28abk"; buildDepends = [ binary bson cryptohash hashtables liftedBase monadControl mtl network parsec random randomShuffle text transformersBase diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix index 73685698f5e..dfc34cc2a6a 100644 --- a/pkgs/development/libraries/haskell/mono-traversable/default.nix +++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "mono-traversable"; - version = "0.6.0.4"; - sha256 = "1svqxc96n2andxcgrv8s29hkq6nw1qigv5p0dw9vx2ynk68pfhww"; + version = "0.6.1"; + sha256 = "066yfffjkd0r6hg3y3zrs13jmyfgpl8ba9yvsbyawimvff7mfk5f"; buildDepends = [ comonad dlist dlistInstances hashable semigroupoids semigroups text transformers unorderedContainers vector vectorAlgorithms diff --git a/pkgs/development/libraries/haskell/network-simple/default.nix b/pkgs/development/libraries/haskell/network-simple/default.nix index 6795da96450..b838e93f7a3 100644 --- a/pkgs/development/libraries/haskell/network-simple/default.nix +++ b/pkgs/development/libraries/haskell/network-simple/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "network-simple"; - version = "0.4"; - sha256 = "1jw0xd53c0mydh6jm6627c0d8w014r1s46fycdhavnimh7bb77cp"; + version = "0.4.0.1"; + sha256 = "113vaxgsfny9iv6hnbywk97qr1y6qkap49p803anakamss4bdmyj"; buildDepends = [ exceptions network transformers ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/optparse-applicative/default.nix b/pkgs/development/libraries/haskell/optparse-applicative/default.nix index 191efd723f7..82bc0fa8a9e 100644 --- a/pkgs/development/libraries/haskell/optparse-applicative/default.nix +++ b/pkgs/development/libraries/haskell/optparse-applicative/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "optparse-applicative"; - version = "0.9.0"; - sha256 = "1nmwrg74wz8k3zwgw5aaf7padkawi0dlrclq6nsr17xz5yx524ay"; + version = "0.9.1.1"; + sha256 = "1fy8839y9dg2a5pj7abjiqkm3qcz8faip32q3x1zi5mrz4v3q2g6"; buildDepends = [ ansiWlPprint transformers transformersCompat ]; testDepends = [ HUnit QuickCheck testFramework testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/parsers/0.12.nix b/pkgs/development/libraries/haskell/parsers/0.12.1.nix index bb383b078aa..5c49d144a10 100644 --- a/pkgs/development/libraries/haskell/parsers/0.12.nix +++ b/pkgs/development/libraries/haskell/parsers/0.12.1.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "parsers"; - version = "0.12"; - sha256 = "0lb1djb2mmlkfqpbz7683i27d3ivv0r99l6w79951wgsqb62xph3"; + version = "0.12.1"; + sha256 = "0g9grf713zhn23vgmb6mdrm8r5snq1xa8jqnj6pghydj6m4rh97v"; buildDepends = [ attoparsec charset parsec text transformers unorderedContainers ]; diff --git a/pkgs/development/libraries/haskell/pipes-network/default.nix b/pkgs/development/libraries/haskell/pipes-network/default.nix index fcd19402648..95345e0513e 100644 --- a/pkgs/development/libraries/haskell/pipes-network/default.nix +++ b/pkgs/development/libraries/haskell/pipes-network/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "pipes-network"; - version = "0.6.3"; - sha256 = "09gihca0hinq3sqsx9753gmas6g22pg792ag6ckdw5z3607razrg"; + version = "0.6.4"; + sha256 = "1wabyv5j4q0wxiz8ry7dq3amlvfh4r0721pd2lksx7hj3a5qzm2p"; buildDepends = [ network networkSimple pipes pipesSafe transformers ]; diff --git a/pkgs/development/libraries/haskell/probability/default.nix b/pkgs/development/libraries/haskell/probability/default.nix new file mode 100644 index 00000000000..bada700ca3d --- /dev/null +++ b/pkgs/development/libraries/haskell/probability/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, random, transformers, utilityHt }: + +cabal.mkDerivation (self: { + pname = "probability"; + version = "0.2.4.1"; + sha256 = "0nh73l03d7niz3a3h2y4i80mlp64ilfkx7krn57skzfi8drwnjvc"; + buildDepends = [ random transformers utilityHt ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/Probabilistic_Functional_Programming"; + description = "Probabilistic Functional Programming"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/profunctors/default.nix b/pkgs/development/libraries/haskell/profunctors/default.nix index f9aa0481d43..00d339fa44e 100644 --- a/pkgs/development/libraries/haskell/profunctors/default.nix +++ b/pkgs/development/libraries/haskell/profunctors/default.nix @@ -1,12 +1,15 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, comonad, semigroupoids, tagged, transformers }: +{ cabal, comonad, distributive, semigroupoids, tagged, transformers +}: cabal.mkDerivation (self: { pname = "profunctors"; - version = "4.0.4"; - sha256 = "1hs6cs6y6zwf0c4jb92wnhp23qaxzw3xy7k07m9z98h8ziyqbqhx"; - buildDepends = [ comonad semigroupoids tagged transformers ]; + version = "4.2.0.1"; + sha256 = "00cfria3zjijx9nm533a25x240c7q0sn9vna6m4y4rz1f7l2gnqc"; + buildDepends = [ + comonad distributive semigroupoids tagged transformers + ]; meta = { homepage = "http://github.com/ekmett/profunctors/"; description = "Profunctors"; diff --git a/pkgs/development/libraries/haskell/repa-algorithms/default.nix b/pkgs/development/libraries/haskell/repa-algorithms/default.nix index 8e9d668e389..977ea58fac6 100644 --- a/pkgs/development/libraries/haskell/repa-algorithms/default.nix +++ b/pkgs/development/libraries/haskell/repa-algorithms/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "repa-algorithms"; - version = "3.2.5.1"; - sha256 = "1pk2w7qx1jfxqra66fflb71v6hmq6g05dss27kwhz0cdidpvcc7l"; + version = "3.3.1.2"; + sha256 = "12fizvma877ws3xiz3k34jg5xh5yhnl0n5aq2za005l9i5angkk9"; buildDepends = [ repa vector ]; extraLibraries = [ llvm ]; jailbreak = true; diff --git a/pkgs/development/libraries/haskell/repa-examples/default.nix b/pkgs/development/libraries/haskell/repa-examples/default.nix index 48678480a35..54d8fe8329c 100644 --- a/pkgs/development/libraries/haskell/repa-examples/default.nix +++ b/pkgs/development/libraries/haskell/repa-examples/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "repa-examples"; - version = "3.2.5.1"; - sha256 = "0xrjfmwbq8mhcim261da7i68mp5jxkqiwjy2mhd1lgkr63m6x18j"; + version = "3.3.1.1"; + sha256 = "0gdkwmdnmvq82zglryxx2ic1nm4g2r4a0bwndiwbj670w03p712p"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/repa-io/default.nix b/pkgs/development/libraries/haskell/repa-io/default.nix index b42d165c512..b679d59d5dc 100644 --- a/pkgs/development/libraries/haskell/repa-io/default.nix +++ b/pkgs/development/libraries/haskell/repa-io/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "repa-io"; - version = "3.2.5.1"; - sha256 = "0aizsr6r1ybydpwqiamcdr4jhvqh0fiq9gbd7n17lrmnagyla5n8"; + version = "3.3.1.2"; + sha256 = "1i58ysk44y7s6z1jmns2fi83flqma4k5nsjh1pblqb2rgl7x0z5p"; buildDepends = [ binary bmp repa vector ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix index 627b0572d98..b2c296a5923 100644 --- a/pkgs/development/libraries/haskell/repa/default.nix +++ b/pkgs/development/libraries/haskell/repa/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "repa"; - version = "3.2.5.1"; - sha256 = "0yrmia3ciagzrmrsmxh56qym4wc0malph7zhiw71gl9c9sp8hzvq"; + version = "3.3.1.2"; + sha256 = "0rsahd6c1mxd8hq9zfx4jqgmcfs4di4askky87y71xy5v4k1x4ai"; buildDepends = [ QuickCheck vector ]; meta = { homepage = "http://repa.ouroborus.net"; diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index 39ea2050cca..fec45e6fcd9 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "resourcet"; - version = "1.1.2.2"; - sha256 = "1j468zkjd7j2xpgzx1i36h3lpamnqpk0rj3miwfr9a0ibm7bz1as"; + version = "1.1.2.3"; + sha256 = "1n1z1q3k8lg3wqdkrmcfl9mvlx1p81gkh5j911w1006rnm8r87im"; buildDepends = [ exceptions liftedBase mmorph monadControl mtl transformers transformersBase diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix index 97389362682..ca625f5eb75 100644 --- a/pkgs/development/libraries/haskell/semigroupoids/default.nix +++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "semigroupoids"; - version = "4.0.2.1"; - sha256 = "00ga4spbnvwnk7j4h7zjw3bkd98glaganhcwq947ffadc0nansb1"; + version = "4.2"; + sha256 = "18zip518f2l2ccmg3hjzy5mq2b8r98crzm10kr77yc4m64w5vac8"; buildDepends = [ comonad contravariant distributive semigroups transformers ]; diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix index 4d39b97bbae..963a83ac527 100644 --- a/pkgs/development/libraries/haskell/semigroups/default.nix +++ b/pkgs/development/libraries/haskell/semigroups/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "semigroups"; - version = "0.15.1"; - sha256 = "1vacnw598pl9acbcjjblrpdmjhmj3wz1ifrn9ki4q7yrsh4ml7mc"; + version = "0.15.2"; + sha256 = "1lh06d0mwivzbfjg635r3m39qcpyjvnwni7mspz96qb3zcm0c5kp"; buildDepends = [ hashable nats text unorderedContainers ]; meta = { homepage = "http://github.com/ekmett/semigroups/"; diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index de6855ee19e..12dc8124ada 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "shakespeare"; - version = "2.0.1"; - sha256 = "1h1b7p4czdzrxb77515vqnck3rj3yw35h2ds6gzxzp7pdxprds27"; + version = "2.0.1.1"; + sha256 = "0xddm8xby19323d9bcd196b1ninlvfkv5b93w1da23m7w0hy509p"; buildDepends = [ aeson blazeHtml blazeMarkup exceptions parsec systemFileio systemFilepath text time transformers diff --git a/pkgs/development/libraries/haskell/snaplet-redis/default.nix b/pkgs/development/libraries/haskell/snaplet-redis/default.nix index e0cb67e120a..d6bfcd260ca 100644 --- a/pkgs/development/libraries/haskell/snaplet-redis/default.nix +++ b/pkgs/development/libraries/haskell/snaplet-redis/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "snaplet-redis"; - version = "0.1.3.2"; - sha256 = "0554farc76ncbynzks4ryi7a2nbahsgnjvazmw5n9b79cp207bjf"; + version = "0.1.3.3"; + sha256 = "17w2b9cnri45m535hyszb1fickhhglid3zy5a4bbljmnwvi4y08l"; buildDepends = [ configurator hedis lens mtl network snap transformers ]; diff --git a/pkgs/development/libraries/haskell/sparse/default.nix b/pkgs/development/libraries/haskell/sparse/default.nix index c2fbf368f53..28389a860c8 100644 --- a/pkgs/development/libraries/haskell/sparse/default.nix +++ b/pkgs/development/libraries/haskell/sparse/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "sparse"; - version = "0.9"; - sha256 = "0v0z7kjgmcdx9ajlhr9pc1i3qqghd60s02xnlmj4hcxby8k0r8mc"; + version = "0.9.1"; + sha256 = "1pa1h21ca710fdjz60b79jg0v2lr0l11avpiynp9n1cw5bz137fk"; buildDepends = [ contravariant deepseq hybridVectors lens primitive transformers vector vectorAlgorithms @@ -20,9 +20,6 @@ cabal.mkDerivation (self: { QuickCheck semigroups simpleReflect testFramework testFrameworkQuickcheck2 testFrameworkTh transformers vector ]; - patchPhase = '' - sed -i -e 's|vector-algorithms >=.*|vector-algorithms|' -e 's|QuickCheck.*,|QuickCheck,|' sparse.cabal - ''; doCheck = false; meta = { homepage = "http://github.com/ekmett/sparse"; diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix index 3d879f12b9d..4bb356a4443 100644 --- a/pkgs/development/libraries/haskell/statistics/default.nix +++ b/pkgs/development/libraries/haskell/statistics/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "statistics"; - version = "0.13.1.0"; - sha256 = "0y46fna0kqs8bsqbf3v1k9ppq3njd5kxf1qlvvmphydpi3x038nd"; + version = "0.13.1.1"; + sha256 = "1ghb2snbacbfzxqcrvdiihvw2iip1m8rq9y62x1ayg6k13agm7r5"; buildDepends = [ aeson binary deepseq erf mathFunctions monadPar mwcRandom primitive vector vectorAlgorithms vectorBinaryInstances diff --git a/pkgs/development/libraries/haskell/stm-containers/default.nix b/pkgs/development/libraries/haskell/stm-containers/default.nix index d93bd1a03a8..91105712a6a 100644 --- a/pkgs/development/libraries/haskell/stm-containers/default.nix +++ b/pkgs/development/libraries/haskell/stm-containers/default.nix @@ -1,17 +1,19 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, focus, free, hashable, HTF, lochTh, mtl, placeholders -, primitive, QuickCheck, unorderedContainers +{ cabal, basePrelude, focus, free, hashable, HTF, lochTh, mtl +, placeholders, primitive, QuickCheck, unorderedContainers }: cabal.mkDerivation (self: { pname = "stm-containers"; - version = "0.1.2"; - sha256 = "1rzxjspf0lzmviixnxv9f2wjxqhwv65fb1nws915ghs1sj774gab"; - buildDepends = [ focus hashable lochTh placeholders primitive ]; + version = "0.1.3"; + sha256 = "0ir2b6y1sqr0i68j0fqmwyysk7x9z18n84dbjppyjzzidcsrkar0"; + buildDepends = [ + basePrelude focus hashable lochTh placeholders primitive + ]; testDepends = [ - focus free hashable HTF lochTh mtl placeholders primitive - QuickCheck unorderedContainers + basePrelude focus free hashable HTF lochTh mtl placeholders + primitive QuickCheck unorderedContainers ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/taggy/default.nix b/pkgs/development/libraries/haskell/taggy/default.nix index 9ddde26cbcf..d94a3b27f2c 100644 --- a/pkgs/development/libraries/haskell/taggy/default.nix +++ b/pkgs/development/libraries/haskell/taggy/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "taggy"; - version = "0.1.1"; - sha256 = "14m02hn5ikw6qv36xxw7j39fm07q2pbs0m504ij7lvaf5c3rngz5"; + version = "0.1.2"; + sha256 = "0sj7da4yawfajyrd2gg2dxzgj5n99mdm5cz3bdhfipas4bb4216y"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix index dbf78bac903..18763701126 100644 --- a/pkgs/development/libraries/haskell/thyme/default.nix +++ b/pkgs/development/libraries/haskell/thyme/default.nix @@ -1,15 +1,14 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, attoparsec, Cabal, deepseq, filepath, mtl +{ cabal, aeson, attoparsec, Cabal, cpphs, deepseq, filepath, mtl , profunctors, QuickCheck, random, systemPosixRedirect, text, time -, vector, vectorSpace, vectorThUnbox, cpphs +, vector, vectorSpace, vectorThUnbox }: cabal.mkDerivation (self: { pname = "thyme"; version = "0.3.5.2"; sha256 = "1vb5qn9m88y9738d9znim5lprb8z10am5yjaksdjl151li8apd6x"; - buildTools = [ cpphs ]; buildDepends = [ aeson attoparsec deepseq mtl profunctors QuickCheck random text time vector vectorSpace vectorThUnbox @@ -18,6 +17,7 @@ cabal.mkDerivation (self: { attoparsec Cabal filepath mtl profunctors QuickCheck random systemPosixRedirect text time vectorSpace ]; + buildTools = [ cpphs ]; doCheck = false; meta = { homepage = "https://github.com/liyang/thyme"; diff --git a/pkgs/development/libraries/haskell/trifecta/default.nix b/pkgs/development/libraries/haskell/trifecta/default.nix index 4710189f913..a73f47afb1c 100644 --- a/pkgs/development/libraries/haskell/trifecta/default.nix +++ b/pkgs/development/libraries/haskell/trifecta/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "trifecta"; - version = "1.4.3"; - sha256 = "0kc8ykvh8m9yhyrkd9kx5xkv5ag99384k06xdi6ynjqv9wj6gfzg"; + version = "1.5.1"; + sha256 = "1fayr6sd9m84rqpcygacafn9vr9zva7rmkpvyzz0bf1p1z7i6b2n"; buildDepends = [ ansiTerminal ansiWlPprint blazeBuilder blazeHtml blazeMarkup charset comonad deepseq fingertree hashable lens mtl parsers diff --git a/pkgs/development/libraries/haskell/tz/default.nix b/pkgs/development/libraries/haskell/tz/default.nix index 3de1fafd582..3f964f2ce3d 100644 --- a/pkgs/development/libraries/haskell/tz/default.nix +++ b/pkgs/development/libraries/haskell/tz/default.nix @@ -7,12 +7,12 @@ cabal.mkDerivation (self: { pname = "tz"; - version = "0.0.0.6"; - sha256 = "0yn2c016fzqwbgdrqp5hjn95gzp4w3gqjgax1w6wkg97bksdlq27"; + version = "0.0.0.8"; + sha256 = "0rabdqwdj8hx17817zsfsih01agx7n3kja8s0axmm0drq22vlflv"; buildDepends = [ binary deepseq time tzdata vector ]; testDepends = [ bindingsPosix HUnit QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 testFrameworkTh time tzdata + testFrameworkQuickcheck2 testFrameworkTh time tzdata vector ]; preConfigure = "export TZDIR=${pkgs_tzdata}/share/zoneinfo"; meta = { diff --git a/pkgs/development/libraries/haskell/tzdata/default.nix b/pkgs/development/libraries/haskell/tzdata/default.nix index b149a59489a..ceae4679247 100644 --- a/pkgs/development/libraries/haskell/tzdata/default.nix +++ b/pkgs/development/libraries/haskell/tzdata/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "tzdata"; - version = "0.1.20140324.0"; - sha256 = "19cw8wag2d5jx9dxia3gr8qjr3bh77a2kp7ksyqp58xxmvmsqdn4"; + version = "0.1.20140612.0"; + sha256 = "03fd3jiw89c8zf2jdz0qps8sb8ipgmjqbbaq4y2aqczv36ha74gh"; buildDepends = [ vector ]; testDepends = [ filemanip filepath HUnit MissingH testFramework testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/vector-algorithms/default.nix b/pkgs/development/libraries/haskell/vector-algorithms/default.nix index 00258e7f3f6..5c8dcc4c5eb 100644 --- a/pkgs/development/libraries/haskell/vector-algorithms/default.nix +++ b/pkgs/development/libraries/haskell/vector-algorithms/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "vector-algorithms"; - version = "0.6.0.2"; - sha256 = "1gn2pvgvm9g0dajx2wv305fxwhkpdj9pybrwrm3j2frl4dnj7dcq"; + version = "0.6.0.3"; + sha256 = "1kz4b41y7swad6mbx0g3adc8lqma8pl3rnzah71cfdvb87gssbn4"; isLibrary = true; isExecutable = true; buildDepends = [ mtl mwcRandom primitive vector ]; diff --git a/pkgs/development/libraries/haskell/vty/5.1.1.nix b/pkgs/development/libraries/haskell/vty/5.1.4.nix index 708eb9581c6..326eaf08d3d 100644 --- a/pkgs/development/libraries/haskell/vty/5.1.1.nix +++ b/pkgs/development/libraries/haskell/vty/5.1.4.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "vty"; - version = "5.1.1"; - sha256 = "043vrazb8w6ljq14i390cwcmavgmbnjbs6sl6w0yx8cwb4f7djr5"; + version = "5.1.4"; + sha256 = "157saacy6lp2ngl0dz9ri4ji1vj191d1239x1xykna8y618r0vqf"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 76094cd0c0e..4d63904a092 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "3.0.1"; - sha256 = "1k6d9p93r7r95i5yi7mvhix94qigkzanqjq5qa6k7qfpnjj727id"; + version = "3.0.1.1"; + sha256 = "099pxahczai6ychsm04bwcvvd9m6lan5nqg159ny4jakpyk67zs8"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder caseInsensitive dataDefaultClass deepseq fastLogger httpTypes liftedBase network diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix index b7c62845cb9..a94742ea2e7 100644 --- a/pkgs/development/libraries/haskell/wai-logger/default.nix +++ b/pkgs/development/libraries/haskell/wai-logger/default.nix @@ -1,16 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, blazeBuilder, byteorder, caseInsensitive, doctest -, fastLogger, httpTypes, network, unixTime, wai, waiTest +, easyFile, fastLogger, httpTypes, network, unixTime, wai, waiTest }: cabal.mkDerivation (self: { pname = "wai-logger"; - version = "2.1.1"; - sha256 = "1cdl5nglb8jghi0yndpabraihgh681m5q1j77wsxzckxisga73j8"; + version = "2.1.2"; + sha256 = "0rfgcq433k5jpdgwyzrzgiy5h66bb38xfqzb63gmqabysr8wa9kl"; buildDepends = [ - blazeBuilder byteorder caseInsensitive fastLogger httpTypes network - unixTime wai + blazeBuilder byteorder caseInsensitive easyFile fastLogger + httpTypes network unixTime wai ]; testDepends = [ doctest waiTest ]; doCheck = false; diff --git a/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix b/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix new file mode 100644 index 00000000000..b6fd82d622c --- /dev/null +++ b/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix @@ -0,0 +1,21 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, doctest, hspec, hspecExpectationsLens, htmlConduit, lens +, text, xmlConduit +}: + +cabal.mkDerivation (self: { + pname = "xml-html-conduit-lens"; + version = "0.3.2.0"; + sha256 = "150b772wkl2k8xcrcbqj3qhndjkl35qzwqdjbgs9mxp867aihiv0"; + buildDepends = [ htmlConduit lens text xmlConduit ]; + testDepends = [ + doctest hspec hspecExpectationsLens lens xmlConduit + ]; + meta = { + homepage = "https://github.com/supki/xml-html-conduit-lens#readme"; + description = "Optics for xml-conduit and html-conduit"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index b439d24afe6..3dcda246688 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -12,8 +12,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.3.1.1"; - sha256 = "0mw04v8gnhv9gnv7kv2v1x5df63zjdmi52r5bv1fzqay1s5b83ir"; + version = "1.3.3"; + sha256 = "05kzsrb49r11yhsrn9j7vx90831qd1jni1h8wdj26qn85anxr10z"; buildDepends = [ aeson attoparsecConduit authenticate base16Bytestring base64Bytestring binary blazeBuilder blazeHtml blazeMarkup byteable diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index 4e02a157e34..864602a3a53 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -12,8 +12,8 @@ cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.11"; - sha256 = "15bxl52ky0ihm7ak71g6cvb9bac4zvmb8sh74fbjkckmpgh8r3m2"; + version = "1.2.12"; + sha256 = "0ksl78k27sshp9l6x7blv5csswv6vb8k632ggj9whnp8akzn37x1"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 96995f24d31..944a60fe29f 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -13,8 +13,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.17"; - sha256 = "199zj9yz5nmk4h2dwz4zlix3wf1z5fl9a8jg8cr4z6ldgskcfis1"; + version = "1.2.19"; + sha256 = "0dlvg8zpr1qyav3svqybsqsrmrl9n8s1kdzxf6zxa3pn582d48il"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit conduitExtra cookie diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 26f0735f723..3ac24f87462 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.11"; - sha256 = "15c4qyvz1mn56pl9add865lm351wjhdhrbzm87py2jliglm905n0"; + version = "1.3.14"; + sha256 = "0a2xlar67f0y48zqml8kqjna33i474j3j04gmgglsfmk1wikr7sh"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable dataDefault emailValidate hamlet network persistent resourcet diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index f537a119a45..1c7eba504cb 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yesod-routes"; - version = "1.2.0.6"; - sha256 = "0hd2f2w9pb865fn9qijh3j73sc1x7gzd4c0q5mgjy9lh9hd4kzix"; + version = "1.2.0.7"; + sha256 = "00i2nysbhmxnq0dvfdjx6nhxy680ya38nx8gcgm13fv2xwdd2p6j"; buildDepends = [ pathPieces text vector ]; testDepends = [ hspec HUnit pathPieces text ]; meta = { diff --git a/pkgs/development/libraries/hawknl/default.nix b/pkgs/development/libraries/hawknl/default.nix index 78206de9f14..290f411cbf4 100644 --- a/pkgs/development/libraries/hawknl/default.nix +++ b/pkgs/development/libraries/hawknl/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { meta = { homepage = http://hawksoft.com/hawknl/; description = "Free, open source, game oriented network API"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix index 55c4dbff296..99a256e48ad 100644 --- a/pkgs/development/libraries/iniparser/default.nix +++ b/pkgs/development/libraries/iniparser/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec{ meta = { homepage = http://ndevilla.free.fr/iniparser; description = "Free standalone ini file parsing library"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index 760ad096fd0..ac67c17218f 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://irrlicht.sourceforge.net/; - license = "zlib"; + license = stdenv.lib.licenses.zlib; description = "Open source high performance realtime 3D engine written in C++"; }; } diff --git a/pkgs/development/libraries/isl/0.12.2.nix b/pkgs/development/libraries/isl/0.12.2.nix index 995cd0510b4..f1da2c06409 100644 --- a/pkgs/development/libraries/isl/0.12.2.nix +++ b/pkgs/development/libraries/isl/0.12.2.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.kotnet.org/~skimo/isl/; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; maintainers = [ stdenv.lib.maintainers.shlevy ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/isl/default.nix b/pkgs/development/libraries/isl/default.nix index 7711d4f170f..7e08c8afe6f 100644 --- a/pkgs/development/libraries/isl/default.nix +++ b/pkgs/development/libraries/isl/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.kotnet.org/~skimo/isl/; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; maintainers = [ stdenv.lib.maintainers.shlevy ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix index 3d4e5f260dc..0f0fa3f775a 100644 --- a/pkgs/development/libraries/jansson/default.nix +++ b/pkgs/development/libraries/jansson/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.digip.org/jansson/"; description = "C library for encoding, decoding and manipulating JSON data"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/development/libraries/java/geoipjava/default.nix index a924e2adfa6..5c83a0ba357 100644 --- a/pkgs/development/libraries/java/geoipjava/default.nix +++ b/pkgs/development/libraries/java/geoipjava/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = { description = "GeoIP Java API"; - license = "LGPL2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/pkgs/development/libraries/java/libmatthew-java/default.nix index 0b77de56987..3924b0cdc22 100644 --- a/pkgs/development/libraries/java/libmatthew-java/default.nix +++ b/pkgs/development/libraries/java/libmatthew-java/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libmatthew-java-0.8"; src = fetchurl { - url = http://www.matthew.ath.cx/projects/java/libmatthew-java-0.8.tar.gz; + url = http://pkgs.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-0.8.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-0.8.tar.gz; sha256 = "1yldkhsdzm0a41a0i881bin2jklhp85y3ah245jd6fz3npcx7l85"; }; JAVA_HOME=jdk; diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index 59f31ac3139..f64edce7b4c 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { # releases of SWT. So we just grab a binary release and extract # "src.zip" from that. src = fetchurl { - url = "http://eclipse.ialto.com/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip"; + url = "http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip"; sha256 = "10si8kmc7c9qmbpzs76609wkfb784pln3qpmra73gb3fbk7z8caf"; }; diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix index e15c5c8d179..83d3149a50f 100644 --- a/pkgs/development/libraries/jbig2dec/default.nix +++ b/pkgs/development/libraries/jbig2dec/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://jbig2dec.sourceforge.net/; description = "Decoder implementation of the JBIG2 image compression format"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/development/libraries/judy/default.nix index 8c45adf4b57..4199becb06d 100644 --- a/pkgs/development/libraries/judy/default.nix +++ b/pkgs/development/libraries/judy/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { homepage = http://judy.sourceforge.net/; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; description = "State-of-the-art C library that implements a sparse dynamic array"; }; } diff --git a/pkgs/development/libraries/lcms/default.nix b/pkgs/development/libraries/lcms/default.nix index 115da78de97..c98a01f6f70 100644 --- a/pkgs/development/libraries/lcms/default.nix +++ b/pkgs/development/libraries/lcms/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "Color management engine"; homepage = http://www.littlecms.com/; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix index 774cc7047e8..521118f3175 100644 --- a/pkgs/development/libraries/lcms2/default.nix +++ b/pkgs/development/libraries/lcms2/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Color management engine"; homepage = http://www.littlecms.com/; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.urkud ]; }; diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index f1f1c7dd909..94dfe871240 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.all; maintainers = [ maintainers.urkud ]; - license = "LGPL3"; + license = stdenv.lib.licenses.lgpl3; description = "An opensource database of photographic lenses and their characteristics"; homepage = http://lensfun.sourceforge.net/; }; diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/development/libraries/levmar/default.nix index 3028ba7367c..4e6dd6d5b02 100644 --- a/pkgs/development/libraries/levmar/default.nix +++ b/pkgs/development/libraries/levmar/default.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { meta = { description = "ANSI C implementations of Levenberg-Marquardt, usable also from C++"; homepage = http://www.ics.forth.gr/~lourakis/levmar/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } - diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index 2fc03e0d67c..f1cc25de39f 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { platforms. ''; homepage = http://xiph.org/ao/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index d9775c25610..f5a3d92d3db 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = http://gnupg.org; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libassuan/git.nix b/pkgs/development/libraries/libassuan/git.nix index 743528d9265..7f77183c843 100644 --- a/pkgs/development/libraries/libassuan/git.nix +++ b/pkgs/development/libraries/libassuan/git.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; homepage = http://gnupg.org; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libassuan1/default.nix b/pkgs/development/libraries/libassuan1/default.nix index 9a161ec170f..2532cec0390 100644 --- a/pkgs/development/libraries/libassuan1/default.nix +++ b/pkgs/development/libraries/libassuan1/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { ''; homepage = http://gnupg.org; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 3c28b95c066..758f86e5f9a 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -18,7 +18,6 @@ in stdenv.mkDerivation { meta = { description = "Common functions found on BSD systems"; homepage = http://libbsd.freedesktop.org/; - license = "BSD3"; + license = stdenv.lib.licenses.bsd3; }; } - diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index c0552845054..e69cd4ed2ac 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = http://0pointer.de/lennart/projects/libcanberra/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix index 34441d8fa7f..d22ce9ae2bf 100644 --- a/pkgs/development/libraries/libcangjie/default.nix +++ b/pkgs/development/libraries/libcangjie/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { libcangjie is a library implementing the Cangjie input method. ''; homepage = http://cangjians.github.io/projects/libcangjie/; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.linquize ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix index 8e4f8a36547..b9823cefd2d 100644 --- a/pkgs/development/libraries/libcddb/default.nix +++ b/pkgs/development/libraries/libcddb/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { description = "Libcddb is a C library to access data on a CDDB server (freedb.org)"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; homepage = http://libcddb.sourceforge.net/; }; } diff --git a/pkgs/development/libraries/libcdio/0.82.nix b/pkgs/development/libraries/libcdio/0.82.nix index fc26fb9aca1..db4af40afbd 100644 --- a/pkgs/development/libraries/libcdio/0.82.nix +++ b/pkgs/development/libraries/libcdio/0.82.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ISO-9660 filesystems (libiso9660), as well as utility programs such as an audio CD player and an extractor. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnu.org/software/libcdio/; }; } diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index 856d5124a3f..ac7b428bfb0 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ISO-9660 filesystems (libiso9660), as well as utility programs such as an audio CD player and an extractor. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnu.org/software/libcdio/; }; } diff --git a/pkgs/development/libraries/libchamplain/0.6.nix b/pkgs/development/libraries/libchamplain/0.6.nix index 79c734dcad6..a2b35a72651 100644 --- a/pkgs/development/libraries/libchamplain/0.6.nix +++ b/pkgs/development/libraries/libchamplain/0.6.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://projects.gnome.org/libchamplain/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; description = "libchamplain, a C library providing a ClutterActor to display maps"; diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 263b34701ee..51b7f7e181d 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://projects.gnome.org/libchamplain/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; description = "libchamplain, a C library providing a ClutterActor to display maps"; diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index 1b16d361c6d..f0d7fbfbeb6 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; homepage = http://nongnu.org/libchop/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ ludo viric ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix index b4cea379bba..a5ff8d409b2 100644 --- a/pkgs/development/libraries/libcue/default.nix +++ b/pkgs/development/libraries/libcue/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { available. ''; homepage = http://sourceforge.net/projects/libcue/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix index 58c150a22d6..ba7e3e47ff7 100644 --- a/pkgs/development/libraries/libdaemon/default.nix +++ b/pkgs/development/libraries/libdaemon/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { homepage = http://0pointer.de/lennart/projects/libdaemon/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; hydraPlatforms = stdenv.lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index f92bc585524..bc5f6a1d7a0 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://sourceforge.net/projects/libdc1394/; description = "Capture and control API for IIDC compliant cameras"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libdc1394avt/default.nix b/pkgs/development/libraries/libdc1394avt/default.nix index 69f66d7f5b7..7565502cc1c 100644 --- a/pkgs/development/libraries/libdc1394avt/default.nix +++ b/pkgs/development/libraries/libdc1394avt/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.alliedvisiontec.com/us/products/software/linux/avt-fire4linux.html; description = "Capture and control API for IIDC cameras with AVT extensions"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; broken = true; diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix index b8f79f2ae69..f9d1fc87870 100644 --- a/pkgs/development/libraries/libdiscid/default.nix +++ b/pkgs/development/libraries/libdiscid/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { meta = { description = "A C library for creating MusicBrainz DiscIDs from audio CDs"; homepage = http://musicbrainz.org/doc/libdiscid; - license = "LGPL-2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libdivsufsort/default.nix b/pkgs/development/libraries/libdivsufsort/default.nix index 21ee2351c58..62c7d432252 100644 --- a/pkgs/development/libraries/libdivsufsort/default.nix +++ b/pkgs/development/libraries/libdivsufsort/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { homepage = http://code.google.com/p/libdivsufsort/; - license = "MIT"; + license = stdenv.lib.licenses.mit; description = "Library to construct the suffix array and the BW transformed string"; }; } diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 69d09fe9fae..d7a6f8d5443 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }: stdenv.mkDerivation rec { - name = "libdrm-2.4.54"; + name = "libdrm-2.4.56"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "1sg45y9yiz9yyp6dkyilqz8rhii9azgy53i2s4iia3p8zgmh2h6r"; + sha256 = "0c20wpfa94d8kww0f2xinmm4axsl4nhq921xj4i88yhpjbhbn3z2"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/development/libraries/libdvbpsi/default.nix index d3ce7082621..6af8e7a415e 100644 --- a/pkgs/development/libraries/libdvbpsi/default.nix +++ b/pkgs/development/libraries/libdvbpsi/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { description = "A simple library designed for decoding and generation of MPEG TS and DVB PSI tables according to standards ISO/IEC 13818 and ITU-T H.222.0"; homepage = http://www.videolan.org/developers/libdvbpsi.html ; platforms = stdenv.lib.platforms.linux; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libdwg/default.nix b/pkgs/development/libraries/libdwg/default.nix index a92a48bf75f..a80c0677a3b 100644 --- a/pkgs/development/libraries/libdwg/default.nix +++ b/pkgs/development/libraries/libdwg/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = { description = "library reading dwg files"; homepage = http://libdwg.sourceforge.net/en/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix index 6b3a16d1c09..8d2d820a230 100644 --- a/pkgs/development/libraries/libeatmydata/default.nix +++ b/pkgs/development/libraries/libeatmydata/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.flamingspork.com/projects/libeatmydata/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; description = "Small LD_PRELOAD library to disable fsync and friends"; }; } diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index ac52876f887..d9436456d0d 100644 --- a/pkgs/development/libraries/libelf/default.nix +++ b/pkgs/development/libraries/libelf/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (rec { homepage = http://www.mr511.de/software/english.html; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix index 48c66cb6070..4843b65c4d3 100644 --- a/pkgs/development/libraries/libexif/default.nix +++ b/pkgs/development/libraries/libexif/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://libexif.sourceforge.net/; description = "A library to read and manipulate EXIF data in digital photographs"; - license = "LGPL 2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index 309816b65e5..6df5ca683f1 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { additional MIME types are detected. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; }; diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index ef7a67b7fcd..6293632452c 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "A library to talk to FTDI chips using libusb"; homepage = http://www.intra2net.com/en/developer/libftdi/; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libgadu/default.nix b/pkgs/development/libraries/libgadu/default.nix index 43056010770..b039c84b2fb 100644 --- a/pkgs/development/libraries/libgadu/default.nix +++ b/pkgs/development/libraries/libgadu/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { description = "A library to deal with gadu-gadu protocol (most popular polish IM protocol)"; homepage = http://toxygen.net/libgadu/; platforms = stdenv.lib.platforms.linux; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libgcrypt/1.6.nix b/pkgs/development/libraries/libgcrypt/1.6.nix index 9dc8b8a2317..ced3b723b13 100644 --- a/pkgs/development/libraries/libgcrypt/1.6.nix +++ b/pkgs/development/libraries/libgcrypt/1.6.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { functions, random numbers and a lot of supporting functions. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; homepage = https://www.gnu.org/software/libgcrypt/; repositories.git = git://git.gnupg.org/libgcrypt.git; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index c53b5479b7b..ba3de49ede8 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (rec { functions, random numbers and a lot of supporting functions. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; homepage = http://gnupg.org/; platforms = stdenv.lib.platforms.all; @@ -38,4 +38,3 @@ stdenv.mkDerivation (rec { // stdenv.lib.optionalAttrs (stdenv.isFreeBSD && stdenv.isi686) { configureFlags = [ "--disable-aesni-support" ]; } ) - diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix index 07e8d2869ce..d07aae3ab80 100644 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ b/pkgs/development/libraries/libgeotiff/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Library implementing attempt to create a tiff based interchange format for georeferenced raster imagery"; homepage = http://www.remotesensing.org/geotiff/geotiff.html; - license = "X11"; + license = stdenv.lib.licenses.mit; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 8ce9a10701e..663bd944fb9 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (rec { homepage = http://gnupg.org; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index b286dcfcd19..7b669cd780a 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/libiconv/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix index cb54f17755c..4cc2f65440c 100644 --- a/pkgs/development/libraries/libid3tag/default.nix +++ b/pkgs/development/libraries/libid3tag/default.nix @@ -1,7 +1,10 @@ -{stdenv, fetchurl, zlib, gperf}: +{stdenv, fetchurl, writeText, zlib, gperf}: + +stdenv.mkDerivation rec { + version = "0.15.1b"; + + name = "libid3tag-${version}"; -stdenv.mkDerivation { - name = "libid3tag-0.15.1b"; src = fetchurl { url = mirror://sourceforge/mad/libid3tag-0.15.1b.tar.gz; sha256 = "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"; @@ -11,6 +14,14 @@ stdenv.mkDerivation { patches = [ ./debian-patches.patch ]; + postInstall = '' + mkdir -p $out/lib/pkgconfig + cp ${./id3tag.pc} $out/lib/pkgconfig/id3tag.pc + substituteInPlace $out/lib/pkgconfig/id3tag.pc \ + --subst-var-by out $out \ + --subst-var-by version "${version}" + ''; + meta = with stdenv.lib; { description = "ID3 tag manipulation library"; homepage = http://mad.sourceforge.net/; diff --git a/pkgs/development/libraries/libid3tag/id3tag.pc b/pkgs/development/libraries/libid3tag/id3tag.pc new file mode 100644 index 00000000000..854f1783cae --- /dev/null +++ b/pkgs/development/libraries/libid3tag/id3tag.pc @@ -0,0 +1,11 @@ +prefix=@out@ +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${exec_prefix}/include + +Name: libid3tag +Description: ID3 tag manipulation library +Version: @version@ + +Libs: -L${libdir} -lid3tag +Cflags: -I${includedir} diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index da8a7d50b67..802ee9e3e88 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { included. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; }; diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index c7513b0a167..1a39e094153 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -37,9 +37,8 @@ in stdenv.mkDerivation rec { meta = { homepage = http://gobby.0x539.de/; description = "An implementation of the Infinote protocol written in GObject-based C"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.phreedom ]; }; } - diff --git a/pkgs/development/libraries/libiptcdata/default.nix b/pkgs/development/libraries/libiptcdata/default.nix index 1094a4e7591..158962d3294 100644 --- a/pkgs/development/libraries/libiptcdata/default.nix +++ b/pkgs/development/libraries/libiptcdata/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { meta = { description = "Library for reading and writing the IPTC metadata in images and other files"; homepage = http://libiptcdata.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/liblo/default.nix b/pkgs/development/libraries/liblo/default.nix index a2235da408e..ab8c696a66c 100644 --- a/pkgs/development/libraries/liblo/default.nix +++ b/pkgs/development/libraries/liblo/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { description = "lightweight library to handle the sending and receiving of messages according to the Open Sound Control (OSC) protocol"; homepage = http://sourceforge.net/projects/liblo; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/liblockfile/default.nix b/pkgs/development/libraries/liblockfile/default.nix index f991fdc2f29..e7e4cd6c75d 100644 --- a/pkgs/development/libraries/liblockfile/default.nix +++ b/pkgs/development/libraries/liblockfile/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Shared library with NFS-safe locking functions"; homepage = http://packages.debian.org/unstable/libs/liblockfile1; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/pkgs/development/libraries/libmatchbox/default.nix index b45b443f6de..38702817734 100644 --- a/pkgs/development/libraries/libmatchbox/default.nix +++ b/pkgs/development/libraries/libmatchbox/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "Library of the matchbox X window manager"; homepage = http://matchbox-project.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index be1f3f2b4b9..959dca47573 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { it easy to run an HTTP server as part of another application. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; homepage = http://www.gnu.org/software/libmicrohttpd/; diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/development/libraries/libmnl/default.nix index fb6eacc366b..94401c30a6b 100644 --- a/pkgs/development/libraries/libmnl/default.nix +++ b/pkgs/development/libraries/libmnl/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { re-inventing the wheel. ''; homepage = http://netfilter.org/projects/libmnl/index.html; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libmrss/default.nix b/pkgs/development/libraries/libmrss/default.nix index b1f7b0071c8..865330fdda7 100644 --- a/pkgs/development/libraries/libmrss/default.nix +++ b/pkgs/development/libraries/libmrss/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.autistici.org/bakunin/libmrss/doc; description = "C library for parsing, writing and creating RSS/ATOM files or streams"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix index a49cd95822f..b78e583fa64 100644 --- a/pkgs/development/libraries/libmspack/default.nix +++ b/pkgs/development/libraries/libmspack/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "A de/compression library for various Microsoft formats"; homepage = http://www.cabextract.org.uk/libmspack; - license = "LGPL2"; + license = stdenv.lib.licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix index 14b50bb5118..da32903c94e 100644 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { by conntrack-tools among many other applications ''; homepage = http://netfilter.org/projects/libnetfilter_conntrack/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/pkgs/development/libraries/libnfnetlink/default.nix index 3bb698e9bf6..c47076014c4 100644 --- a/pkgs/development/libraries/libnfnetlink/default.nix +++ b/pkgs/development/libraries/libnfnetlink/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { It is only used by other netfilter.org projects, like the aforementioned ones. ''; homepage = http://www.netfilter.org/projects/libnfnetlink/index.html; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix index aeb0792dacf..ab6931c63ca 100644 --- a/pkgs/development/libraries/libnih/default.nix +++ b/pkgs/development/libraries/libnih/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "A small library for C application development"; homepage = https://launchpad.net/libnih; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/libnxml/default.nix b/pkgs/development/libraries/libnxml/default.nix index b492a16a205..f34c421a120 100644 --- a/pkgs/development/libraries/libnxml/default.nix +++ b/pkgs/development/libraries/libnxml/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.autistici.org/bakunin/libnxml/; description = "C library for parsing, writing and creating XML 1.0 and 1.1 files or streams"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix index 0d5bdfcc9a7..3782dabc67b 100644 --- a/pkgs/development/libraries/libotr/default.nix +++ b/pkgs/development/libraries/libotr/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.cypherpunks.ca/otr/"; repositories.git = git://git.code.sf.net/p/otr/libotr; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; description = "Library for Off-The-Record Messaging"; }; } diff --git a/pkgs/development/libraries/libpaper/default.nix b/pkgs/development/libraries/libpaper/default.nix index 9505a6cf052..ab8e03b89a0 100644 --- a/pkgs/development/libraries/libpaper/default.nix +++ b/pkgs/development/libraries/libpaper/default.nix @@ -12,6 +12,6 @@ stdenv.mkDerivation rec { meta = { description = "Library for handling paper characteristics"; homepage = "http://packages.debian.org/unstable/source/libpaper"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/development/libraries/libpar2/default.nix index 85e8bad8906..a987768bbc5 100644 --- a/pkgs/development/libraries/libpar2/default.nix +++ b/pkgs/development/libraries/libpar2/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://parchive.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "A library for using Parchives (parity archive volume sets)"; }; } diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix index c968fd352eb..b389176b3da 100644 --- a/pkgs/development/libraries/libqglviewer/default.nix +++ b/pkgs/development/libraries/libqglviewer/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { meta = { description = "trackball-based 3D viewer qt widget including many useful features"; homepage = http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer/installUnix.html; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix index 9b51f694ab3..58ff77480b6 100644 --- a/pkgs/development/libraries/librdf/default.nix +++ b/pkgs/development/libraries/librdf/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight RDF library with special support for LADSPA plugins"; homepage = http://sourceforge.net/projects/lrdf/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index 41445b84143..76daf7d748b 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { homepage = http://librsync.sourceforge.net/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; description = "Implementation of the rsync remote-delta algorithm"; }; } diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index b0a726ed7f3..ae6299286a1 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { more. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index c48c5265fc4..bd38c37a57b 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "Extensible spatial index library in C++"; homepage = http://libspatialindex.github.io/; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix index a819e0cef6f..7d46f9e32ce 100644 --- a/pkgs/development/libraries/libspectre/default.nix +++ b/pkgs/development/libraries/libspectre/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { handling and rendering Postscript documents. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index 5e069655afc..bae22ef220f 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { portable, and only require an ANSI C89 platform. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 81336aed8aa..6741838d33b 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -1,35 +1,50 @@ -{ stdenv, fetchurl, autoconf, libtool, automake, libsodium, ncurses -, libconfig, pkgconfig }: +{ stdenv, fetchurl, autoconf, libtool, automake, libsodium, ncurses, libopus +, libvpx, check, libconfig, pkgconfig }: let - version = "388b1229b"; - date = "20140220"; + version = "e1158be5a6"; + date = "20140728"; in stdenv.mkDerivation rec { name = "tox-core-${date}-${version}"; src = fetchurl { - url = "https://github.com/irungentoo/ProjectTox-Core/tarball/${version}"; + url = "https://github.com/irungentoo/toxcore/tarball/${version}"; name = "${name}.tar.gz"; - sha256 = "12vggiv0gyv8a2rd5qrv04b7yhfhxb7r0yh75gg5n4jdpcbhvgsd"; + sha256 = "1rsh1pbwvngsx5slmd6608b1zqs3jvq70bjr9zyziap9vxka3z1v"; }; + NIX_LDFLAGS = "-lgcc_s"; + + postPatch = '' + # within Nix chroot builds, localhost is unresolvable + sed -i -e '/DEFTESTCASE(addr_resolv_localhost)/d' \ + auto_tests/network_test.c + # takes WAAAY too long (~10 minutes) and would timeout + sed -i -e '/DEFTESTCASE[^(]*(many_clients\>/d' \ + auto_tests/tox_test.c + ''; + preConfigure = '' autoreconf -i ''; - configureFlags = [ "--with-libsodium-headers=${libsodium}/include" - "--with-libsodium-libs=${libsodium}/lib" - "--enable-ntox" ]; + configureFlags = [ + "--with-libsodium-headers=${libsodium}/include" + "--with-libsodium-libs=${libsodium}/lib" + "--enable-ntox" + ]; - buildInputs = [ autoconf libtool automake libsodium ncurses libconfig - pkgconfig ]; + buildInputs = [ + autoconf libtool automake libsodium ncurses libopus + libvpx check libconfig pkgconfig + ]; doCheck = true; meta = { description = "P2P FOSS instant messaging application aimed to replace Skype with crypto"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix index 125cb890008..f60043f18b1 100644 --- a/pkgs/development/libraries/libunique/default.nix +++ b/pkgs/development/libraries/libunique/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://live.gnome.org/LibUnique; description = "A library for writing single instance applications"; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 9bc3cb7f901..b578d895c5f 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (rec { strings as internal in-memory representation. ''; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 5b35d2b24ad..95299cb3fd7 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.freedesktop.org/wiki/Software/vaapi; - license = "MIT"; + license = stdenv.lib.licenses.mit; description = "VAAPI library: Video Acceleration API"; }; } diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index e7923f3df5b..e5682219dba 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config }: +{ stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb }: stdenv.mkDerivation rec { - name = "libxkbcommon-0.3.1"; + name = "libxkbcommon-0.4.2"; src = fetchurl { url = "http://xkbcommon.org/download/${name}.tar.xz"; - sha256 = "13mk335r4dhi9qglzbp46ina1wz4qgcp8r7s06iq7j50pf0kb5ww"; + sha256 = "0mw9ljc5fbqbhnm884w7ns5pf6f2rqj9ww5xcaps9nzdgsq73z50"; }; - buildInputs = [ pkgconfig yacc flex xkeyboard_config ]; + buildInputs = [ pkgconfig yacc flex xkeyboard_config libxcb ]; configureFlags = '' --with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix index ececdabb56c..85f0dbddb0b 100644 --- a/pkgs/development/libraries/libxmi/default.nix +++ b/pkgs/development/libraries/libxmi/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { description = "GNU libxmi, a library for rasterizing 2-D vector graphics"; homepage = http://www.gnu.org/software/libxmi/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index aebb81020b3..61f519dfe51 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://libxmlplusplus.sourceforge.net/; description = "C++ wrapper for the libxml2 XML parser library"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.phreedom ]; }; } \ No newline at end of file diff --git a/pkgs/development/libraries/libyaml-cpp/0.3.x.nix b/pkgs/development/libraries/libyaml-cpp/0.3.x.nix index 4b0acd83fc3..f94ca128228 100644 --- a/pkgs/development/libraries/libyaml-cpp/0.3.x.nix +++ b/pkgs/development/libraries/libyaml-cpp/0.3.x.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = http://code.google.com/p/yaml-cpp/; description = "A YAML parser and emitter for C++"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix index 09860522ef4..fb81dc425f1 100644 --- a/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/pkgs/development/libraries/libyaml-cpp/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = http://code.google.com/p/yaml-cpp/; description = "A YAML parser and emitter for C++"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/libzrtpcpp/1.6.nix b/pkgs/development/libraries/libzrtpcpp/1.6.nix index 767314cdcae..8ca872864bd 100644 --- a/pkgs/development/libraries/libzrtpcpp/1.6.nix +++ b/pkgs/development/libraries/libzrtpcpp/1.6.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU RTP stack for the zrtp protocol developed by Phil Zimmermann"; homepage = "http://www.gnutelephony.org/index.php/GNU_ZRTP"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libzrtpcpp/default.nix b/pkgs/development/libraries/libzrtpcpp/default.nix index b18aa6848bf..9962efa7f1e 100644 --- a/pkgs/development/libraries/libzrtpcpp/default.nix +++ b/pkgs/development/libraries/libzrtpcpp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU RTP stack for the zrtp protocol developed by Phil Zimmermann"; homepage = "http://www.gnutelephony.org/index.php/GNU_ZRTP"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix index 4ffbb9719ca..951627c81c2 100644 --- a/pkgs/development/libraries/lightning/default.nix +++ b/pkgs/development/libraries/lightning/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "lightning-2.0.4"; src = fetchurl { - url = "ftp://alpha.gnu.org/gnu/lightning/${name}.tar.gz"; + url = "ftp://ftp.gnu.org/gnu/lightning/${name}.tar.gz"; sha256 = "1lrckrx51d5hrv66bc99fd4b7g2wwn4vr304hwq3glfzhb8jqcdy"; }; @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { the MIPS and SPARC chips. ''; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; }; } diff --git a/pkgs/development/libraries/log4cpp/default.nix b/pkgs/development/libraries/log4cpp/default.nix index 32424d546b4..d4400d840c0 100644 --- a/pkgs/development/libraries/log4cpp/default.nix +++ b/pkgs/development/libraries/log4cpp/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://log4cpp.sourceforge.net/; description = "A logging framework for C++ patterned after Apache log4j"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix index f153c684629..7fa6194cbca 100644 --- a/pkgs/development/libraries/lzo/default.nix +++ b/pkgs/development/libraries/lzo/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.oberhumer.com/opensource/lzo; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/development/libraries/ming/default.nix b/pkgs/development/libraries/ming/default.nix index 9cfb8afa8eb..f9632dca9d2 100644 --- a/pkgs/development/libraries/ming/default.nix +++ b/pkgs/development/libraries/ming/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { homepage = http://www.libming.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/mpc/default.nix b/pkgs/development/libraries/mpc/default.nix index e5d212dc269..652227d47e8 100644 --- a/pkgs/development/libraries/mpc/default.nix +++ b/pkgs/development/libraries/mpc/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; homepage = http://mpc.multiprecision.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.ludo ]; diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index 8e3281c862a..e3fbaececb9 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -39,10 +39,9 @@ stdenv.mkDerivation rec { floating-point arithmetic (53-bit mantissa). ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; }; } - diff --git a/pkgs/development/libraries/mtdev/default.nix b/pkgs/development/libraries/mtdev/default.nix index f92fe373043..2363f33de07 100644 --- a/pkgs/development/libraries/mtdev/default.nix +++ b/pkgs/development/libraries/mtdev/default.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { See the kernel documentation for further details. ''; - license = "MIT/X11"; + license = stdenv.lib.licenses.mit; }; } - diff --git a/pkgs/development/libraries/muparser/default.nix b/pkgs/development/libraries/muparser/default.nix index 3cc1c6ce43c..9d9a524e86d 100644 --- a/pkgs/development/libraries/muparser/default.nix +++ b/pkgs/development/libraries/muparser/default.nix @@ -12,6 +12,6 @@ stdenv.mkDerivation { meta = { homepage = http://muparser.sourceforge.net; description = "An extensible high performance math expression parser library written in C++"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index 0a2df000384..4aecfa4b01a 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://mygui.info/; description = "Library for creating GUIs for games and 3D applications"; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; }; } diff --git a/pkgs/development/libraries/mygui/svn.nix b/pkgs/development/libraries/mygui/svn.nix index cc20550802e..15da5054291 100644 --- a/pkgs/development/libraries/mygui/svn.nix +++ b/pkgs/development/libraries/mygui/svn.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://mygui.info/; description = "Library for creating GUIs for games and 3D applications"; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; }; } diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix index c1cada63abe..379848b0cb0 100644 --- a/pkgs/development/libraries/mysocketw/default.nix +++ b/pkgs/development/libraries/mysocketw/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 7b502822a18..7627fb79e99 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation (rec { homepage = http://www.gnu.org/software/ncurses/; - license = "X11"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 4208402ab99..57d3732fa6d 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (rec { I/O. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.lysator.liu.se/~nisse/nettle/; diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix index d9369d59c7b..f5f72c006c7 100644 --- a/pkgs/development/libraries/newt/default.nix +++ b/pkgs/development/libraries/newt/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = https://fedorahosted.org/newt/; description = "Library for color text mode, widget based user interfaces"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.viric ]; }; diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix index c9b685aa05b..4f87f2bc230 100644 --- a/pkgs/development/libraries/npth/default.nix +++ b/pkgs/development/libraries/npth/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { that this is a solid way to provide a co-routine based framework. ''; homepage = http://www.gnupg.org; - license = "LGPLv3"; + license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 6bb1916ed0f..527bb25dce1 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation { homepage = http://www.ogre3d.org/; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix index f508637dfef..27193e04545 100644 --- a/pkgs/development/libraries/ogrepaged/default.nix +++ b/pkgs/development/libraries/ogrepaged/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { description = "Paged Geometry for Ogre3D"; homepage = http://code.google.com/p/ogre-paged/; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index b024b518b69..48f5bfc71e5 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { meta = { description = "OpenAL alternative"; homepage = http://kcat.strangesoft.net/openal.html; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/openal/default.nix b/pkgs/development/libraries/openal/default.nix index 75d6033e1cc..b5e390eafa8 100644 --- a/pkgs/development/libraries/openal/default.nix +++ b/pkgs/development/libraries/openal/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { ''; homepage = http://www.openal.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/osip/3.nix b/pkgs/development/libraries/osip/3.nix index 2c1b148251c..b485fa3e947 100644 --- a/pkgs/development/libraries/osip/3.nix +++ b/pkgs/development/libraries/osip/3.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "libosip2-${version}"; meta = { - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; homepage = http://www.gnu.org/software/osip/; description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)"; maintainers = with stdenv.lib.maintainers; [ raskin ]; diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix index 3ec3dac221f..cfa838f5a37 100644 --- a/pkgs/development/libraries/osip/default.nix +++ b/pkgs/development/libraries/osip/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "libosip2-${version}"; meta = { - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; homepage = http://www.gnu.org/software/osip/; description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)"; maintainers = with stdenv.lib.maintainers; [ raskin ]; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 1c62a64d006..40b02c2afbb 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.pango.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/development/libraries/pangox-compat/default.nix b/pkgs/development/libraries/pangox-compat/default.nix index 8518083b4d3..6d79587abcb 100644 --- a/pkgs/development/libraries/pangox-compat/default.nix +++ b/pkgs/development/libraries/pangox-compat/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { description = "A compatibility library for pango>1.30.*"; homepage = http://www.pango.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 7138c44da64..4cf6bd44dd3 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.pcre.org/"; description = "A library for Perl Compatible Regular Expressions"; - license = "BSD-3"; + license = stdenv.lib.licenses.bsd3; longDescription = '' The PCRE library is a set of functions that implement regular diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 5948fd0ef2b..b29deae9260 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://phonon.kde.org/; description = "Multimedia API for Qt"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index d55a86c2908..d93341b81ff 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://pixman.org; description = "A low-level library for pixel manipulation"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix index 5e15a63735e..35262f797e9 100644 --- a/pkgs/development/libraries/plib/default.nix +++ b/pkgs/development/libraries/plib/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { GLUT, or FLTK instead of PLIB's 'PW' windowing library, you can. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; homepage = http://plib.sourceforge.net/; }; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index fd507b3e540..083c9bae6b5 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -4,8 +4,8 @@ }: let - version = "0.26.2"; # even major numbers are stable - sha256 = "09lm1mfpf0p6vzayl2nbwvsj5gl7sz8sfmwziix0p87bh8x9dn8x"; + version = "0.26.3"; # even major numbers are stable + sha256 = "1ca2lrwvhxzq0g4blbvq099vyydfjyz839jki301p1jgazrimjw8"; qtcairo_patches = let qtcairo = fetchgit { # the version for poppler-0.24 @@ -49,7 +49,7 @@ let Poppler is a PDF rendering library based on the xpdf-3.0 code base. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; } merge ]); # poppler_drv diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index b4c8a7f1789..acf760f4f79 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -107,7 +107,7 @@ let meta = { description = "Geographic Objects for PostgreSQL"; homepage = "http://postgis.refractions.net"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; @@ -148,4 +148,3 @@ in rec { }); } - diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index e3b1444b8cb..f93eee674ff 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { homepage = http://bugseng.com/products/ppl/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; }; diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 6e3cc7cac55..17c05ada7a8 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "Cartographic Projections Library"; homepage = http://proj.maptools.org; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/readline/readline6.3.nix b/pkgs/development/libraries/readline/readline6.3.nix index e3f07b3ddc0..9f5c9f7b581 100644 --- a/pkgs/development/libraries/readline/readline6.3.nix +++ b/pkgs/development/libraries/readline/readline6.3.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (rec { homepage = http://savannah.gnu.org/projects/readline/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/libraries/readline/readline6.nix b/pkgs/development/libraries/readline/readline6.nix index e6b49e413b8..0559113285c 100644 --- a/pkgs/development/libraries/readline/readline6.nix +++ b/pkgs/development/libraries/readline/readline6.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (rec { homepage = http://savannah.gnu.org/projects/readline/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/libraries/science/biology/biolib/default.nix b/pkgs/development/libraries/science/biology/biolib/default.nix index 4e4c3c55361..0461e5ebcf5 100644 --- a/pkgs/development/libraries/science/biology/biolib/default.nix +++ b/pkgs/development/libraries/science/biology/biolib/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://biolib.open-bio.org/"; description = "BioLib"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' BioLib brings together a set of opensource libraries written in C/C++ and makes them available for major Bio* languages: diff --git a/pkgs/development/libraries/science/math/liblbfgs/default.nix b/pkgs/development/libraries/science/math/liblbfgs/default.nix index 63de26ee90c..bb33eed6142 100644 --- a/pkgs/development/libraries/science/math/liblbfgs/default.nix +++ b/pkgs/development/libraries/science/math/liblbfgs/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "Library of Limited-memory Broyden-Fletcher-Goldfarb-Shanno (L-BFGS)"; homepage = http://www.chokkan.org/software/liblbfgs/; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index 41a6b8501ec..30c1f4937ec 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://icculus.org/smpeg/; description = "MPEG decoding library"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index 4e1187aa0f7..d7a0b11a8da 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { meta = { description = "The Snack Sound Toolkit (Tcl)"; homepage = http://www.speech.kth.se/snack/; - license = "GPL-2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/sodium/default.nix b/pkgs/development/libraries/sodium/default.nix index 93f2ff0de6b..be52725f2c8 100644 --- a/pkgs/development/libraries/sodium/default.nix +++ b/pkgs/development/libraries/sodium/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="sodium"; - version="0.5.0"; + version="0.6.1"; name="${baseName}-${version}"; - hash="1w7rrnsvhhzhywrr3nhlhppv4kqzdszz3dwy8jrsv8lrj5hs181w"; - url="http://download.dnscrypt.org/libsodium/releases/libsodium-0.5.0.tar.gz"; - sha256="1w7rrnsvhhzhywrr3nhlhppv4kqzdszz3dwy8jrsv8lrj5hs181w"; + hash="151nril3kzkpmy6khvqphk4zk15ri0dqv0isyyhz6n9nsbmzxk04"; + url="http://download.dnscrypt.org/libsodium/releases/libsodium-0.6.1.tar.gz"; + sha256="151nril3kzkpmy6khvqphk4zk15ri0dqv0isyyhz6n9nsbmzxk04"; }; buildInputs = [ ]; diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix index 7d655ae122a..fdad4e21b0b 100644 --- a/pkgs/development/libraries/soqt/default.nix +++ b/pkgs/development/libraries/soqt/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.coin3d.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Glue between Coin high-level 3D visualization library and Qt"; maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index 0e542b353f6..5104532ea91 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "Common interface to speech synthesis"; homepage = http://www.freebsoft.org/speechd; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index e6769285fc8..28afdf85dfb 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/development/libraries/sword/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "A software framework that allows research manipulation of Biblical texts"; homepage = http://www.crosswire.org/sword/; platforms = stdenv.lib.platforms.linux; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.piotr stdenv.lib.maintainers.AndersonTorres ]; }; diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 54db07d0de8..e04363326d0 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "talloc is a hierarchical pool based memory allocator with destructors"; homepage = http://tdb.samba.org/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index b06dffa1202..cb34edb4762 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "Intel Thread Building Blocks C++ Library"; homepage = "http://threadingbuildingblocks.org/"; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; longDescription = '' Intel Threading Building Blocks offers a rich and complete approach to expressing parallelism in a C++ program. It is a library that helps you diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index 02a1008cda5..d0eb8987ea0 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; homepage = http://tdb.samba.org/; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/tokyo-cabinet/default.nix b/pkgs/development/libraries/tokyo-cabinet/default.nix index 82ce734d173..7741549666a 100644 --- a/pkgs/development/libraries/tokyo-cabinet/default.nix +++ b/pkgs/development/libraries/tokyo-cabinet/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { robustness, supports 64-bit architecture. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/tokyo-tyrant/default.nix b/pkgs/development/libraries/tokyo-tyrant/default.nix index ee742487e26..ccd619e8bc1 100644 --- a/pkgs/development/libraries/tokyo-tyrant/default.nix +++ b/pkgs/development/libraries/tokyo-tyrant/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = http://fallabs.com/tokyotyrant/; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice maintainers = [ ]; diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix index a0d607517ac..bdc2b4da6e3 100644 --- a/pkgs/development/libraries/tsocks/default.nix +++ b/pkgs/development/libraries/tsocks/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Transparent SOCKS v4 proxying library"; homepage = http://tsocks.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.phreedom ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/ucl/default.nix b/pkgs/development/libraries/ucl/default.nix index cef853698a8..05acc6f5308 100644 --- a/pkgs/development/libraries/ucl/default.nix +++ b/pkgs/development/libraries/ucl/default.nix @@ -10,6 +10,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.oberhumer.com/opensource/ucl/; description = "Portable lossless data compression library"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index 2ec478d7a76..f3ac325b5a1 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU uCommon C++, C++ library to facilitate using C++ design patterns"; homepage = http://www.gnu.org/software/commoncpp/; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 11dc34176f5..03769815a3e 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -23,7 +23,7 @@ args : with args; meta = { description = "unix odbc driver for postgresql"; homepage = https://projects.commandprompt.com/public/odbcng; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; }; ini = ""; diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index f05c01bf58d..6f1cb572b9b 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://cgit.freedesktop.org/vaapi/intel-driver/; - license = "MIT"; + license = stdenv.lib.licenses.mit; description = "Intel driver for the VAAPI library"; }; } diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix index 9a81b840b35..9b28d0016dd 100644 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://cgit.freedesktop.org/vaapi/vdpau-driver/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "VDPAU driver for the VAAPI library"; }; } diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 97251e15c49..04bef5ef41c 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Novel computer vision C++ library with customizable algorithms and data structures"; homepage = http://hci.iwr.uni-heidelberg.de/vigra; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/development/libraries/vmime/default.nix index c92df5a8bcb..846fc64a91e 100644 --- a/pkgs/development/libraries/vmime/default.nix +++ b/pkgs/development/libraries/vmime/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.vmime.org/; description = "Free mail library for C++"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/libraries/wtk/default.nix b/pkgs/development/libraries/wtk/default.nix index c9e7fb4249d..1ff34d45ba3 100644 --- a/pkgs/development/libraries/wtk/default.nix +++ b/pkgs/development/libraries/wtk/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://java.sun.com/products/sjwtoolkit/download.html; description = "Sun Java Wireless Toolkit 2.5.2_01 for CLDC"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/development/libraries/xapian/1.0.x.nix b/pkgs/development/libraries/xapian/1.0.x.nix index 57240eb7335..b89900d2b05 100644 --- a/pkgs/development/libraries/xapian/1.0.x.nix +++ b/pkgs/development/libraries/xapian/1.0.x.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Xapian Probabilistic Information Retrieval library"; homepage = "http://xapian.org"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.chaoflow ]; }; } diff --git a/pkgs/development/libraries/xapian/bindings/1.0.x.nix b/pkgs/development/libraries/xapian/bindings/1.0.x.nix index b6bc94814e6..9ce5312f69a 100644 --- a/pkgs/development/libraries/xapian/bindings/1.0.x.nix +++ b/pkgs/development/libraries/xapian/bindings/1.0.x.nix @@ -68,7 +68,7 @@ composableDerivation.composableDerivation {} rec { meta = { description = "Bindings for the Xapian library"; homepage = xapian10.meta.homepage; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.chaoflow ]; }; } diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix index 7ea79a62924..1c1426d969e 100644 --- a/pkgs/development/libraries/xercesc/default.nix +++ b/pkgs/development/libraries/xercesc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://xerces.apache.org/xerces-c/; description = "Validating XML parser written in a portable subset of C++"; - license = "ASL2.0"; + license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index afb23e4de35..80f4e2fc860 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.aleksey.com/xmlsec; description = "XML Security Library in C based on libxml2"; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix index afcbcafab11..079b457ab1f 100644 --- a/pkgs/development/libraries/yajl/default.nix +++ b/pkgs/development/libraries/yajl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, ruby }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "yajl-2.0.4"; src = fetchurl { url = http://github.com/lloyd/yajl/tarball/2.0.4; - name = "yajl-2.0.1.tar.gz"; + name = "${name}.tar.gz"; sha256 = "0661bfi4hfvwg3z2pf51wqbf5qd5kfn0dk83v5s2xwhmry8rd6y1"; }; diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix index f79483874f6..a0466091a52 100644 --- a/pkgs/development/misc/avr8-burn-omat/default.nix +++ b/pkgs/development/misc/avr8-burn-omat/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { meta = { description = "GUI tool for avrdude"; homepage = http://avr8-burn-o-mat.brischalle.de/avr8_burn_o_mat_avrdude_gui_en.html; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/development/misc/intelgen4asm/default.nix b/pkgs/development/misc/intelgen4asm/default.nix index d0e2517cdd9..c7365f944e9 100644 --- a/pkgs/development/misc/intelgen4asm/default.nix +++ b/pkgs/development/misc/intelgen4asm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://cgit.freedesktop.org/xorg/app/intel-gen4asm/; - license = "MIT"; + license = stdenv.lib.licenses.mit; description = "Program to compile an assembly language for the Intel 965 Express Chipset"; }; } diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 2443bfe9aed..fa959035a9e 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -2,10 +2,12 @@ { name, src, target, androidPlatformVersions ? [ "8" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null , iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null +, enableWirelessDistribution ? false, installURL ? null }: assert (release && target == "android") -> androidKeyStore != null && androidKeyAlias != null && androidKeyStorePassword != null; assert (release && target == "iphone") -> iosMobileProvisioningProfile != null && iosCertificateName != null && iosCertificate != null && iosCertificatePassword != null; +assert enableWirelessDistribution -> installURL != null; let androidsdkComposition = androidsdk { @@ -132,6 +134,15 @@ stdenv.mkDerivation { cp -av build/iphone/build/* $out mkdir -p $out/nix-support echo "file binary-dist \"$(echo $out/Release-iphoneos/*.ipa)\"" > $out/nix-support/hydra-build-products + + ${stdenv.lib.optionalString enableWirelessDistribution '' + appname=$(basename $out/Release-iphoneos/*.ipa .ipa) + bundleId=$(grep '<id>[a-zA-Z0-9.]*</id>' tiapp.xml | sed -e 's|<id>||' -e 's|</id>||' -e 's/ //g') + version=$(grep '<version>[a-zA-Z0-9.]*</version>' tiapp.xml | sed -e 's|<version>||' -e 's|</version>||' -e 's/ //g') + + sed -e "s|@INSTALL_URL@|${installURL}?bundleId=$bundleId\&version=$version\&title=$appname|" ${../xcodeenv/install.html.template} > $out/$appname.html + echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products + ''} '' else if target == "iphone" then "" else throw "Target: ${target} is not supported!"} diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix index e5b43936453..d595db40817 100644 --- a/pkgs/development/mobile/titaniumenv/examples/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/default.nix @@ -5,6 +5,7 @@ , rename ? false , newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "" , allowUnfree ? false +, enableWirelessDistribution ? false, installURL ? null }: let @@ -90,6 +91,7 @@ rec { release = true; rename = true; inherit newBundleId iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword; + inherit enableWirelessDistribution installURL; }; } diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix index 1725c826a52..95372670969 100644 --- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix @@ -1,5 +1,6 @@ { titaniumenv, fetchgit, target, androidPlatformVersions ? [ "14" ], tiVersion ? "3.2.3.GA", release ? false , rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null +, enableWirelessDistribution ? false, installURL ? null }: assert rename -> (stdenv != null && newBundleId != null && iosMobileProvisioningProfile != null && iosCertificate != null && iosCertificateName != null && iosCertificatePassword != null); @@ -37,4 +38,5 @@ titaniumenv.buildApp { androidKeyStorePassword = "mykeystore"; inherit iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword; + inherit enableWirelessDistribution installURL; } diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index b5766c80552..1b4940b0c3d 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -15,9 +15,15 @@ , provisioningProfile ? null , generateIPA ? false , generateXCArchive ? false +, enableWirelessDistribution ? false +, installURL ? null +, bundleId ? null +, version ? null +, title ? null }: assert release -> codeSignIdentity != null && certificateFile != null && certificatePassword != null && provisioningProfile != null; +assert enableWirelessDistribution -> installURL != null && bundleId != null && version != null && title != null; let # Set some default values here @@ -84,6 +90,12 @@ stdenv.mkDerivation { # Add IPA to Hydra build products mkdir -p $out/nix-support echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products + + ${stdenv.lib.optionalString enableWirelessDistribution '' + appname=$(basename $out/*.ipa .ipa) + sed -e "s|@INSTALL_URL@|${installURL}?bundleId=${bundleId}\&version=${version}\&title=$appname|" ${./install.html.template} > $out/$appname.html + echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products + ''} ''} # Delete our temp keychain diff --git a/pkgs/development/mobile/xcodeenv/install.html.template b/pkgs/development/mobile/xcodeenv/install.html.template new file mode 100644 index 00000000000..833b1994162 --- /dev/null +++ b/pkgs/development/mobile/xcodeenv/install.html.template @@ -0,0 +1,25 @@ +<!DOCTYPE html> + +<html> + <head> + <title>Install IPA</title> + </head> + + <body> + <a id="forwardlink" href="@INSTALL_URL@">Go to the install page or wait a second</a> + + <script type="text/javascript"> + setTimeout(function() { + var link = document.getElementById('forwardlink'); + + if(document.createEvent) { + var eventObj = document.createEvent('MouseEvents'); + eventObj.initEvent('click', true, false); + link.dispatchEvent(eventObj); + } else if(document.createEventObject) { + link.fireEvent('onclick'); + } + }, 1000); + </script> + </body> +</html> diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix index 21610f8f310..ff344ef6f32 100644 --- a/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/pkgs/development/ocaml-modules/camlimages/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = { homepage = http://cristal.inria.fr/camlimages; description = "Image manipulation library"; - license = "GnuGPLV2"; + license = stdenv.lib.licenses.gpl2; # maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix index 7379a62d424..8f18658b0f6 100644 --- a/pkgs/development/ocaml-modules/cryptgps/default.nix +++ b/pkgs/development/ocaml-modules/cryptgps/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { i.e. this is not a binding to some C library, but the implementation itself. ''; - license = "MIT/X11"; + license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix index b2702a5cade..f4837bd047f 100644 --- a/pkgs/development/ocaml-modules/expat/default.nix +++ b/pkgs/development/ocaml-modules/expat/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.xs4all.nl/~mmzeeman/ocaml/; description = "An ocaml wrapper for the Expat XML parsing library"; - license = "MIT/X11"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/gmetadom/default.nix b/pkgs/development/ocaml-modules/gmetadom/default.nix index 4d46bda243f..f1ec69143b0 100644 --- a/pkgs/development/ocaml-modules/gmetadom/default.nix +++ b/pkgs/development/ocaml-modules/gmetadom/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { homepage = http://gmetadom.sourceforge.net/; description = "GMetaDOM is a collection of librares, each library providing a DOM implementation"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/http/default.nix b/pkgs/development/ocaml-modules/http/default.nix index 46398d26114..8b611c65a41 100644 --- a/pkgs/development/ocaml-modules/http/default.nix +++ b/pkgs/development/ocaml-modules/http/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = { homepage = "http://upsilon.cc/~zack/hacking/software/ocaml-http/"; description = "do it yourself (OCaml) HTTP daemon"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index 75c8d7ad224..7cefe26746f 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = { homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html; description = "OpenGL bindings for ocaml"; - license = "GnuGPLV2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.pSub ]; }; } diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 392cf5c9772..c2f50c4e5b8 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation (rec { ]; homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html; description = "LablGTK is is an Objective Caml interface to gtk+"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; }; }) diff --git a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix b/pkgs/development/ocaml-modules/lablgtkmathview/default.nix index 976910aae29..333e86fa3fe 100644 --- a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix +++ b/pkgs/development/ocaml-modules/lablgtkmathview/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { homepage = http://helm.cs.unibo.it/mml-widget/; description = "OCaml bindings for gtkmathview"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix index ed70d1b9c3e..0ae60ab07e4 100644 --- a/pkgs/development/ocaml-modules/mysql/default.nix +++ b/pkgs/development/ocaml-modules/mysql/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { meta = { homepage = http://ocaml-mysql.forge.ocamlcore.org; description = "Bindings for interacting with MySQL databases from ocaml"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index 8f19847680b..94395f601aa 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = { homepage = http://cairographics.org/cairo-ocaml; description = "ocaml bindings for cairo library"; - license = "GnuGPLV2"; + license = stdenv.lib.licenses.gpl2; # maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/pkgs/development/ocaml-modules/ocamlsdl/default.nix index 6361dbd9ae6..51af8d99d69 100644 --- a/pkgs/development/ocaml-modules/ocamlsdl/default.nix +++ b/pkgs/development/ocaml-modules/ocamlsdl/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { meta = { homepage = http://ocamlsdl.sourceforge.net/; description = "OCaml bindings for SDL 1.2"; - license = "LGPL 2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index 63dc06634d7..d92207cd20b 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { homepage = https://bitbucket.org/mmottl/sqlite3-ocaml; description = "OCaml bindings to the SQLite 3 database access library"; - license = "MIT/X11"; + license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z diff --git a/pkgs/development/ocaml-modules/ulex/0.8/default.nix b/pkgs/development/ocaml-modules/ulex/0.8/default.nix index e996b6223b1..77ffa752898 100644 --- a/pkgs/development/ocaml-modules/ulex/0.8/default.nix +++ b/pkgs/development/ocaml-modules/ulex/0.8/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.cduce.org/download.html; description = "ulex is a lexer generator for Unicode and OCaml"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix index 19beeec1ec5..72efaa0606d 100644 --- a/pkgs/development/ocaml-modules/ulex/default.nix +++ b/pkgs/development/ocaml-modules/ulex/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.cduce.org/download.html; description = "ulex is a lexer generator for Unicode and OCaml"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix index 5d22970155b..93cef5d844c 100644 --- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix +++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix @@ -21,6 +21,6 @@ buildPerlPackage rec { doCheck = !stdenv.isDarwin; meta = { - license = "perl5"; + license = "perl"; }; } diff --git a/pkgs/development/perl-modules/maatkit/default.nix b/pkgs/development/perl-modules/maatkit/default.nix index b30e2f12fc6..2b412d518c5 100644 --- a/pkgs/development/perl-modules/maatkit/default.nix +++ b/pkgs/development/perl-modules/maatkit/default.nix @@ -34,7 +34,7 @@ buildPerlPackage rec { In addition to MySQL, there is support for PostgreSQL, Memcached, and a growing variety of other databases and technologies. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.maatkit.org/; }; } diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index 32ef97bf29c..d88504379ed 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = { description = "Python DBus bindings"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index f81adf0bae9..857f002cace 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -26,9 +26,12 @@ wrapPythonProgramsIn() { # dont wrap EGG-INFO scripts since they are called from python if echo "$i" | grep -v EGG-INFO/scripts; then echo "wrapping \`$i'..." - sed -i "$i" -e '1,/#!/ { /^#\!/,/^[^#]/ { - /^[^#]/i import sys; sys.argv[0] = '"'$(basename "$i")'"' - }}' + sed -i "$i" -re '1 { + /^#!/!b; :r + /\\$/{N;b r} + /__future__|^ *(#.*)?$/{n;b r} + /^ *[^# ]/i import sys; sys.argv[0] = '"'$(basename "$i")'"' + }' wrapProgram "$i" \ --prefix PYTHONPATH ":" $program_PYTHONPATH \ --prefix PATH ":" $program_PATH diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index a6efb8bdc2b..93fa70e44bc 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation { meta = { description = "Python library for games"; homepage = "http://www.pygame.org/"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/development/python-modules/pyside/apiextractor.nix index 107bb08759f..e3bcf059c1c 100644 --- a/pkgs/development/python-modules/pyside/apiextractor.nix +++ b/pkgs/development/python-modules/pyside/apiextractor.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchgit, cmake, libxml2, libxslt, python27Packages, qt4 }: +{ stdenv, fetchurl, cmake, libxml2, libxslt, python27Packages, qt4 }: stdenv.mkDerivation { - name = "pyside-apiextractor-0.10.7-6-gdcb1195"; + name = "pyside-apiextractor-0.10.10"; - src = fetchgit { - url = "git://github.com/PySide/Apiextractor.git"; - rev = "dcb11958cabe518630f9f2d2bebd9f8711c2b15b"; - sha256 = "d7b6cb16d11b6134de17a15635d0b5ad7460d31d7870cafe23a690141b9a2274"; + src = fetchurl { + url = "https://github.com/PySide/Apiextractor/archive/0.10.10.tar.gz"; + sha256 = "1zj8yrxy08iv1pk38djxw3faimm226w6wmi0gm32w4yczblylwz3"; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix index dc4f733a4cf..d274283594a 100644 --- a/pkgs/development/python-modules/pyside/default.nix +++ b/pkgs/development/python-modules/pyside/default.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchgit, cmake, pysideGeneratorrunner, pysideShiboken, qt4 }: +{ stdenv, fetchurl, cmake, pysideGeneratorrunner, pysideShiboken, qt4 }: stdenv.mkDerivation { - name = "pyside-1.0.9"; + name = "pyside-1.2.2"; - src = fetchgit { - url = "git://github.com/PySide/PySide.git"; - rev = "4e47b3284fd8715b68342e755cd06ba02b1df0de"; - sha256 = "1fd302e78c5dea8a9c312bd493c04240f2383517ee745d9df2b070f15f0ab515"; + src = fetchurl { + url = "http://download.qt-project.org/official_releases/pyside/pyside-qt4.8+1.2.2.tar.bz2"; + sha256 = "1qbahpcjwl8d7zvvnc18nxpk1lbifpvjk8pi24ifbvvqcdsdzad1"; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix index 12ec5a7ef51..2423cbb0c2e 100644 --- a/pkgs/development/python-modules/pyside/generatorrunner.nix +++ b/pkgs/development/python-modules/pyside/generatorrunner.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchgit, cmake, pysideApiextractor, python27Packages, qt4 }: +{ stdenv, fetchurl, cmake, pysideApiextractor, python27Packages, qt4 }: stdenv.mkDerivation { - name = "pyside-generatorrunner-0.6.15"; + name = "pyside-generatorrunner-0.6.16"; - src = fetchgit { - url = "git://github.com/PySide/Generatorrunner.git"; - rev = "567ca6effaecdf97b33d1d13eada23bafe0f7535"; - sha256 = "182aba79af9fc865337f4befc96faf3eaca1ab9bcb902a57e0a68af49f071c74"; + src = fetchurl { + url = "https://github.com/PySide/Generatorrunner/archive/0.6.16.tar.gz"; + sha256 = "0vzk3cp0pfbhd921r8f1xkcz96znla39dhj074k623x9k26lj2sj"; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix index d8ef2d7b52f..5e266aba7d0 100644 --- a/pkgs/development/python-modules/pyside/shiboken.nix +++ b/pkgs/development/python-modules/pyside/shiboken.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchgit, cmake, pysideApiextractor, pysideGeneratorrunner, python27, python27Packages, qt4 }: +{ stdenv, fetchurl, cmake, pysideApiextractor, pysideGeneratorrunner, python27, python27Packages, qt4 }: stdenv.mkDerivation { - name = "pyside-shiboken-1.0.7-73-g9f110f8"; + name = "pyside-shiboken-1.2.2"; - src = fetchgit { - url = "git://github.com/PySide/Shiboken.git"; - rev = "9f110f83c213867e15b0141a802ebbf74f2ed9f7"; - sha256 = "4618ed113fb20840fd9acb7d08460eb257f630cbca6d61113c16549a6bb651cd"; + src = fetchurl { + url = "http://download.qt-project.org/official_releases/pyside/shiboken-1.2.2.tar.bz2"; + sha256 = "1i75ziljl7rgb88nf26hz6cm8jf5kbs9r33b1j8zs4z33z7vn9bn"; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix index a3153bed217..b5ddec09c03 100644 --- a/pkgs/development/python-modules/pyside/tools.nix +++ b/pkgs/development/python-modules/pyside/tools.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchgit, cmake, pyside, python27, qt4, pysideShiboken }: +{ stdenv, fetchurl, cmake, pyside, python27, qt4, pysideShiboken }: stdenv.mkDerivation { - name = "pyside-tools-0.2.13"; + name = "pyside-tools-0.2.15"; - src = fetchgit { - url = "git://github.com/PySide/Tools.git"; - rev = "23e0712360442e50f34be0d6e4651b8c4c806d47"; - sha256 = "68f059e4936fb8dfae6aa3a463db8c28adcb7bd050b29e8b6fef82431f72da07"; + src = fetchurl { + url = "https://github.com/PySide/Tools/archive/0.2.15.tar.gz"; + sha256 = "0x4z3aq7jgar74gxzwznl3agla9i1dcskw5gh11jnnwwn63ffzwa"; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/pyx/default.nix b/pkgs/development/python-modules/pyx/default.nix index 374158da810..cc36680fcb0 100644 --- a/pkgs/development/python-modules/pyx/default.nix +++ b/pkgs/development/python-modules/pyx/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { plots in publication-ready quality are built out of these primitives. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = http://pyx.sourceforge.net/; }; } diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index 2b0410f0874..dec94a912e0 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qtLib, sdkBuild ? false }: +{ stdenv, fetchurl, qtLib, sdkBuild ? false, withDocumentation ? true }: with stdenv.lib; @@ -36,7 +36,25 @@ stdenv.mkDerivation rec { qmake -spec linux-g++ "QT_PRIVATE_HEADERS=${qtLib}/include" qtcreator.pro ''; - installFlags = "INSTALL_ROOT=$(out)"; + buildFlags = optionalString withDocumentation " docs"; + + installFlags = "INSTALL_ROOT=$(out)" + + optionalString withDocumentation " install_docs"; + + postInstall = '' + # Install desktop file + mkdir -p "$out/share/applications" + cat > "$out/share/applications/qtcreator.desktop" << __EOF__ + [Desktop Entry] + Exec=$out/bin/qtcreator + Name=Qt Creator + GenericName=Cross-platform IDE for Qt + Icon=QtProject-qtcreator.png + Terminal=false + Type=Application + Categories=Qt;Development;IDE; + __EOF__ + ''; meta = { description = "Cross-platform IDE tailored to the needs of Qt developers"; diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index 9ad34097d0b..89a17d28a1b 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/pkgs/development/tools/analysis/lcov/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = http://ltp.sourceforge.net/coverage/lcov.php; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ maintainers.mornfall ]; platforms = platforms.all; diff --git a/pkgs/development/tools/analysis/radare/default.nix b/pkgs/development/tools/analysis/radare/default.nix index d549bd8fb19..2ab8c05ebf8 100644 --- a/pkgs/development/tools/analysis/radare/default.nix +++ b/pkgs/development/tools/analysis/radare/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Free advanced command line hexadecimal editor"; homepage = http://radare.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/development/tools/analysis/radare/ired.nix b/pkgs/development/tools/analysis/radare/ired.nix index f7fb810410d..a2d135d4484 100644 --- a/pkgs/development/tools/analysis/radare/ired.nix +++ b/pkgs/development/tools/analysis/radare/ired.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Interactive Raw Editor"; homepage = http://radare.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index a6ea2c2f59d..a7e55de7d47 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { Valgrind to build new tools. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/development/tools/analysis/valkyrie/default.nix b/pkgs/development/tools/analysis/valkyrie/default.nix index 3a0879d6edf..18481d16f17 100644 --- a/pkgs/development/tools/analysis/valkyrie/default.nix +++ b/pkgs/development/tools/analysis/valkyrie/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { homepage = http://www.valgrind.org/; description = "Qt4-based GUI for the Valgrind 3.6.x series"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/tools/build-managers/buildbot-slave/default.nix b/pkgs/development/tools/build-managers/buildbot-slave/default.nix index f21be7cc48c..870664c252a 100644 --- a/pkgs/development/tools/build-managers/buildbot-slave/default.nix +++ b/pkgs/development/tools/build-managers/buildbot-slave/default.nix @@ -34,7 +34,7 @@ buildPythonPackage (rec { meta = with stdenv.lib; { homepage = http://buildbot.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Continuous integration system that automates the build/test cycle"; diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index 2d7c63fdc7d..ccbf74e528e 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -52,7 +52,7 @@ buildPythonPackage (rec { meta = with stdenv.lib; { homepage = http://buildbot.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; # Of course, we don't really need that on NixOS. :-) description = "Continuous integration system that automates the build/test cycle"; diff --git a/pkgs/development/tools/build-managers/colormake/default.nix b/pkgs/development/tools/build-managers/colormake/default.nix index 25ef7ef0b24..edc901858b8 100644 --- a/pkgs/development/tools/build-managers/colormake/default.nix +++ b/pkgs/development/tools/build-managers/colormake/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { meta = { description = "Simple wrapper around make to colorize the output"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/tools/build-managers/gnumake/3.81/default.nix b/pkgs/development/tools/build-managers/gnumake/3.81/default.nix index 56d2326c916..2a8c80e7db2 100644 --- a/pkgs/development/tools/build-managers/gnumake/3.81/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/3.81/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { homepage = http://www.gnu.org/software/make/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; } diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix index 4f3c7defa48..6b24df39be9 100644 --- a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { homepage = http://www.gnu.org/software/make/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/tools/build-managers/gnumake/4.0/default.nix b/pkgs/development/tools/build-managers/gnumake/4.0/default.nix index 6a76fa0302b..2da17490abf 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.0/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.0/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { homepage = http://www.gnu.org/software/make/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index f8466e5aafd..b7316fc17c4 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { build-by-convention behavior. ''; homepage = http://www.gradle.org/; - license = "ASL2.0"; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index c6856dae565..93f7699481c 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -2,7 +2,7 @@ let name = "scons"; - version = "2.3.1"; + version = "2.3.2"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/scons/${name}-${version}.tar.gz"; - sha256 = "00822ax62cfi2fvz9zhw80hl1273524d97xfycq4q276z1lb86h9"; + sha256 = "1m29lhwz7p6k4f8wc8qjpwa89058lzq3vrycgxbfc5cmbq6354zr"; }; buildInputs = [python makeWrapper]; @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { homepage = "http://scons.org/"; description = "An improved, cross-platform substitute for Make"; - license = "MIT"; + license = stdenv.lib.licenses.mit; longDescription = '' SCons is an Open Source software construction tool. Think of SCons as an improved, cross-platform substitute for the classic diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 9a8979aaa6c..54509178b1a 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = "http://doxygen.org/"; description = "Doxygen, a source code documentation generator tool"; diff --git a/pkgs/development/tools/documentation/haddock/2.7.2.nix b/pkgs/development/tools/documentation/haddock/2.7.2.nix index fd31a96b291..8ceff01aca9 100644 --- a/pkgs/development/tools/documentation/haddock/2.7.2.nix +++ b/pkgs/development/tools/documentation/haddock/2.7.2.nix @@ -5,7 +5,7 @@ cabal.mkDerivation (self : { version = "2.7.2"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0 name = self.fname; sha256 = "4eaaaf62785f0ba3d37ba356cfac4679faef91c0902d8cdbf42837cbe5daab82"; - extraBuildInputs = [alex happy makeWrapper]; + buildTools = [alex happy makeWrapper]; propagatedBuildInputs = [ghcPaths]; doCheck = false; diff --git a/pkgs/development/tools/documentation/haddock/2.9.2.nix b/pkgs/development/tools/documentation/haddock/2.9.2.nix index fcae14d789e..05330b700cc 100644 --- a/pkgs/development/tools/documentation/haddock/2.9.2.nix +++ b/pkgs/development/tools/documentation/haddock/2.9.2.nix @@ -5,7 +5,7 @@ cabal.mkDerivation (self : { version = "2.9.2"; # Haskell Platform 2011.2.0.0 name = self.fname; sha256 = "189vvp173pqc69zgzqqx6vyhvsc13p1s86ql60rs1j5qlhh8ajg8"; - extraBuildInputs = [alex happy makeWrapper]; + buildTools = [alex happy makeWrapper]; propagatedBuildInputs = [ghcPaths xhtml]; doCheck = false; diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix index 8698dc27b40..74e967686f3 100644 --- a/pkgs/development/tools/guile/g-wrap/default.nix +++ b/pkgs/development/tools/guile/g-wrap/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { generating Guile wrappers for C functions. ''; homepage = http://www.nongnu.org/g-wrap/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; } diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 04e9f1cfea1..1e6e69036e2 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.66"; - sha256 = "1is72jfv6snz59jpmg7dfcinpi3q4kdiqchd7zf45rqrszd5h43p"; + version = "1.67"; + sha256 = "1l614lx5l3rhn0jvs45is9m8bil32ms5lb74j30ialv3qnjsvjnv"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index 21825e787a0..83ffd0367e5 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hlint"; - version = "1.9.2"; - sha256 = "1pbcd4rzavhca3vydynasi3lk36pz948mqxp58rlb2j5dan9sw78"; + version = "1.9.3"; + sha256 = "1sdz981yq0amsw9q6hx0aqkd0ayrax5p77s3n3gz4bphpk37n09b"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix index 496ba1d3e48..34bc45e7471 100644 --- a/pkgs/development/tools/haskell/keter/default.nix +++ b/pkgs/development/tools/haskell/keter/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "keter"; - version = "1.3.2"; - sha256 = "1vmn7aaljwg3gv6vbj9z5w2mffsls5d6mzs4rg9s3rh8khb14cr0"; + version = "1.3.3"; + sha256 = "1i4yjzqp8if0h88k8ga0dvqbrh57nvcr9dbfbj1sdw40pd74yb3i"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/java/fastjar/default.nix b/pkgs/development/tools/java/fastjar/default.nix index cfcd8564b4c..c8bb94412ca 100644 --- a/pkgs/development/tools/java/fastjar/default.nix +++ b/pkgs/development/tools/java/fastjar/default.nix @@ -24,7 +24,7 @@ let version = "0.94"; in homepage = http://fastjar.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; }; diff --git a/pkgs/development/tools/misc/autobuild/default.nix b/pkgs/development/tools/misc/autobuild/default.nix index 88246e4bb6e..b35ec4357c4 100644 --- a/pkgs/development/tools/misc/autobuild/default.nix +++ b/pkgs/development/tools/misc/autobuild/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { ''; homepage = http://josefsson.org/autobuild/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/tools/misc/autoconf/2.13.nix b/pkgs/development/tools/misc/autoconf/2.13.nix index f6793e3aeec..c3b44ca5686 100644 --- a/pkgs/development/tools/misc/autoconf/2.13.nix +++ b/pkgs/development/tools/misc/autoconf/2.13.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { can use, in the form of M4 macro calls. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index 05544b22b08..4dca332722b 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { can use, in the form of M4 macro calls. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix index 0af9877c935..2cd80eb4bac 100644 --- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { Standards. Automake requires the use of Autoconf. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/tools/misc/automake/automake-1.12.x.nix b/pkgs/development/tools/misc/automake/automake-1.12.x.nix index 269d423f2fa..6a93cdc78fd 100644 --- a/pkgs/development/tools/misc/automake/automake-1.12.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.12.x.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { Standards. Automake requires the use of Autoconf. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/tools/misc/automake/automake-1.13.x.nix b/pkgs/development/tools/misc/automake/automake-1.13.x.nix index 96a93e8d60b..d4369787f1b 100644 --- a/pkgs/development/tools/misc/automake/automake-1.13.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.13.x.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/automake/"; description = "GNU standard-compliant makefile generator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; longDescription = '' GNU Automake is a tool for automatically generating diff --git a/pkgs/development/tools/misc/automake/automake-1.14.x.nix b/pkgs/development/tools/misc/automake/automake-1.14.x.nix index d20ea2c2e91..0c6ed42825a 100644 --- a/pkgs/development/tools/misc/automake/automake-1.14.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.14.x.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/automake/"; description = "GNU standard-compliant makefile generator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; longDescription = '' GNU Automake is a tool for automatically generating diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 3caeee7287a..8d8fc5d464e 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/binutils/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; /* Give binutils a lower priority than gcc-wrapper to prevent a collision due to the ld/as wrappers/symlinks in the latter. */ diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix index bf927db2793..2cc8e640631 100644 --- a/pkgs/development/tools/misc/cbrowser/default.nix +++ b/pkgs/development/tools/misc/cbrowser/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Tcl/Tk GUI front-end to cscope"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://sourceforge.net/projects/cbrowser/; diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix index d9be5802fa9..53bc8ed78c8 100644 --- a/pkgs/development/tools/misc/cflow/default.nix +++ b/pkgs/development/tools/misc/cflow/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { produced flowcharts in Emacs. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/cflow/; diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix index d313d271afb..09c9325d4ff 100644 --- a/pkgs/development/tools/misc/cgdb/default.nix +++ b/pkgs/development/tools/misc/cgdb/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { repositories.git = git://github.com/cgdb/cgdb.git; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux ++ cygwin; maintainers = with stdenv.lib.maintainers; [ viric ]; diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix index 122c256657f..0bf5bbce692 100644 --- a/pkgs/development/tools/misc/coccinelle/default.nix +++ b/pkgs/development/tools/misc/coccinelle/default.nix @@ -54,7 +54,7 @@ in stdenv.mkDerivation { ''; homepage = http://coccinelle.lip6.fr/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/development/tools/misc/complexity/default.nix index cfdc35f1b34..9f1eca0fa13 100644 --- a/pkgs/development/tools/misc/complexity/default.nix +++ b/pkgs/development/tools/misc/complexity/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { addresses several issues not considered in that scoring scheme. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/complexity/; diff --git a/pkgs/development/tools/misc/cppi/default.nix b/pkgs/development/tools/misc/cppi/default.nix index f9246df9e56..500129c7c9d 100644 --- a/pkgs/development/tools/misc/cppi/default.nix +++ b/pkgs/development/tools/misc/cppi/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { to the level of nesting of that directive. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/development/tools/misc/ddd/default.nix index 0a6895aff6b..91150255bda 100644 --- a/pkgs/development/tools/misc/ddd/default.nix +++ b/pkgs/development/tools/misc/ddd/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/ddd; description = "Graphical front-end for command-line debuggers"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index 9e400cc5c62..bc22752fe7e 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/dejagnu/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.ludo ]; diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index b3a86a03d97..2b5ced78063 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/gdb/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = with platforms; linux ++ cygwin ++ darwin; maintainers = with maintainers; [ pierron ]; diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/development/tools/misc/gengetopt/default.nix index d0efe4e6249..9926dd6cd33 100644 --- a/pkgs/development/tools/misc/gengetopt/default.nix +++ b/pkgs/development/tools/misc/gengetopt/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/gengetopt/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index fdb5f72af83..d6abf8d10bd 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { operating system like GNU and BSD. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/global/; diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index 75e8e2dfe4f..67688254a40 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { compiler or as a macro processor in its own right. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/development/tools/misc/gob2/default.nix b/pkgs/development/tools/misc/gob2/default.nix index 2f35f96e932..a434e54bba9 100644 --- a/pkgs/development/tools/misc/gob2/default.nix +++ b/pkgs/development/tools/misc/gob2/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "Preprocessor for making GObjects with inline C code"; homepage = http://www.jirka.org/gob.html; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/tools/misc/gperf/default.nix b/pkgs/development/tools/misc/gperf/default.nix index 478d2162b33..e25998e5420 100644 --- a/pkgs/development/tools/misc/gperf/default.nix +++ b/pkgs/development/tools/misc/gperf/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { employed by gperf. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/gperf/; }; diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix index b447cf918cf..cd8ad0d64cd 100644 --- a/pkgs/development/tools/misc/gtkdialog/default.nix +++ b/pkgs/development/tools/misc/gtkdialog/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = http://gtkdialog.googlecode.com/; description = "Small utility for fast and easy GUI building from many scripted and compiled languages"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 2d60a06fb3e..23bd35c8739 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/help2man/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index caa277bfbf5..0940bcca191 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation { meta = { description = "Hydra, the Nix-based continuous integration system"; homepage = http://nixos.org/hydra/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/development/tools/misc/indent/default.nix index 0c82c2cd275..17714b7a9d4 100644 --- a/pkgs/development/tools/misc/indent/default.nix +++ b/pkgs/development/tools/misc/indent/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/indent/; description = "A source code reformatter"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix index 0465b6d90a8..086f4b5fed3 100644 --- a/pkgs/development/tools/misc/inotify-tools/default.nix +++ b/pkgs/development/tools/misc/inotify-tools/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { homepage = http://sourceforge.net/projects/inotify-tools/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/tools/misc/jscoverage/default.nix b/pkgs/development/tools/misc/jscoverage/default.nix index c7f790b7d50..07ef5ffc082 100644 --- a/pkgs/development/tools/misc/jscoverage/default.nix +++ b/pkgs/development/tools/misc/jscoverage/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { ''; homepage = http://siliconforks.com/jscoverage/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix index 78cd15e04bd..5eee9ead5d6 100644 --- a/pkgs/development/tools/misc/libtool/default.nix +++ b/pkgs/development/tools/misc/libtool/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/libtool/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 4c3500c65a2..8b0a92c1244 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (rec { homepage = http://www.gnu.org/software/libtool/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 541385d8bec..5758500d86f 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, popt, libuuid, liburcu, lttngUst, kmod }: +{ stdenv, fetchurl, popt, libuuid, liburcu, lttng-ust, kmod }: stdenv.mkDerivation rec { name = "lttng-tools-2.4.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1v9f7a3c2shwgn4g759bblgr27h9ql9sfq71r1mbkf8rd235g2jr"; }; - buildInputs = [ popt libuuid liburcu lttngUst ]; + buildInputs = [ popt libuuid liburcu lttng-ust ]; prePatch = '' sed -e "s|/sbin/modprobe|${kmod}/sbin/modprobe|g" \ diff --git a/pkgs/development/tools/misc/ninka/default.nix b/pkgs/development/tools/misc/ninka/default.nix index a5410204340..dc7eb5cabfd 100644 --- a/pkgs/development/tools/misc/ninka/default.nix +++ b/pkgs/development/tools/misc/ninka/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { meta = { description = "A sentence based license detector"; homepage = "http://ninka.turingmachine.org/"; - license = "AGPLv3+"; + license = stdenv.lib.licenses.agpl3Plus; }; } diff --git a/pkgs/development/tools/misc/pmccabe/default.nix b/pkgs/development/tools/misc/pmccabe/default.nix index 10cf371f13a..a71afd5d472 100644 --- a/pkgs/development/tools/misc/pmccabe/default.nix +++ b/pkgs/development/tools/misc/pmccabe/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "McCabe-style function complexity and line counting for C and C++"; homepage = http://www.parisc-linux.org/~bame/pmccabe/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; longDescription = '' pmccabe calculates McCabe-style cyclomatic complexity for C and diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix index 9dc50abf3f7..455305be749 100644 --- a/pkgs/development/tools/misc/sloccount/default.nix +++ b/pkgs/development/tools/misc/sloccount/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { the Perl CPAN library using this tool suite. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.dwheeler.com/sloccount/; diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix index 6b99a5755e4..6b06bf385b3 100644 --- a/pkgs/development/tools/misc/stm32flash/default.nix +++ b/pkgs/development/tools/misc/stm32flash/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Open source flash program for the STM32 ARM processors using the ST bootloader"; homepage = https://code.google.com/p/stm32flash/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = platforms.all; # Should work on all platforms maintainers = [ maintainers.the-kenny ]; }; diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index e3acf620c73..1b4cab361ce 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Modular, cross-platform and multi-threaded benchmark tool"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/texi2html/default.nix b/pkgs/development/tools/misc/texi2html/default.nix index 7fa604e4af6..1f36a14fa97 100644 --- a/pkgs/development/tools/misc/texi2html/default.nix +++ b/pkgs/development/tools/misc/texi2html/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Perl script which converts Texinfo source files to HTML output"; homepage = http://www.nongnu.org/texi2html/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/tools/misc/texinfo/4.13a.nix b/pkgs/development/tools/misc/texinfo/4.13a.nix index 9a41d296342..5131d381412 100644 --- a/pkgs/development/tools/misc/texinfo/4.13a.nix +++ b/pkgs/development/tools/misc/texinfo/4.13a.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { well-integrated with GNU Emacs. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/texinfo/; }; diff --git a/pkgs/development/tools/misc/uisp/default.nix b/pkgs/development/tools/misc/uisp/default.nix index 732d3ab92c1..234ff82b50a 100644 --- a/pkgs/development/tools/misc/uisp/default.nix +++ b/pkgs/development/tools/misc/uisp/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { description = "Tool for AVR microcontrollers which can interface to many hardware in-system programmers"; - license = "GPL-2"; + license = stdenv.lib.licenses.gpl2; homepage = http://savannah.nongnu.org/projects/uisp; }; } diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix index 303cdf89a05..bba7ef7fad0 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libusb1 ]; meta = { - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/pkgs/development/tools/misc/xxdiff/default.nix index 36047210a92..1d7e6b33042 100644 --- a/pkgs/development/tools/misc/xxdiff/default.nix +++ b/pkgs/development/tools/misc/xxdiff/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://furius.ca/xxdiff/"; description = "graphical file and directories comparator and merge tool"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = []; diff --git a/pkgs/development/tools/node-webkit/default.nix b/pkgs/development/tools/node-webkit/default.nix index 1c891ddf876..1f101776064 100644 --- a/pkgs/development/tools/node-webkit/default.nix +++ b/pkgs/development/tools/node-webkit/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { name = "node-webkit-${version}"; - version = "0.8.4"; + version = "0.9.2"; src = fetchurl { url = "https://s3.amazonaws.com/node-webkit/v${version}/node-webkit-v${version}-linux-${bits}.tar.gz"; sha256 = if bits == "x64" then - "91229edfb03349306c5ce101fdab2de55f7473cc7c36367e9611a0527d2ef591" else - "12axppynangh0q72swzqcmz2blncgm2dw9n489313ybnp2p42hnp"; + "04b9hgrxxnvrzyc7kmlabvrfbzj9d6lif7z69zgsbn3x25nxxd2n" else + "0icwdl564sbx27124js1l4whfld0n6nbysdd522frzk1759dzgri"; }; patchPhase = '' diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 18b03f5923b..4c0176de7e8 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { meta = { homepage = http://projects.camlcity.org/projects/findlib.html; description = "O'Caml library manager"; - license = "MIT/X11"; + license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix new file mode 100644 index 00000000000..c0882439f5c --- /dev/null +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -0,0 +1,21 @@ +{stdenv, fetchurl, ocaml, findlib, easy-format, biniou, yojson, menhir}: +stdenv.mkDerivation { + + name = "merlin-1.6"; + + src = fetchurl { + url = "https://github.com/the-lambda-church/merlin/archive/v1.6.tar.gz"; + sha256 = "0wq75hgffaszazrhkl0nfjxgx8bvazi2sjannd8q64hvax8hxzcy"; + }; + + buildInputs = [ ocaml findlib biniou yojson menhir easy-format ]; + + prefixKey = "--prefix "; + + meta = { + description = "An editor-independant tool to ease the developpement of programs in OCaml"; + homepage = "http://the-lambda-church.github.io/merlin/"; + license = stdenv.lib.licenses.mit; + }; +} + diff --git a/pkgs/development/tools/parsing/bison/2.x.nix b/pkgs/development/tools/parsing/bison/2.x.nix index 5660d51f060..5bf5d7c2e8c 100644 --- a/pkgs/development/tools/parsing/bison/2.x.nix +++ b/pkgs/development/tools/parsing/bison/2.x.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/bison/"; description = "GNU Bison, a Yacc-compatible parser generator"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; longDescription = '' Bison is a general-purpose parser generator that converts an diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index 284223905f6..5947f85343c 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/bison/"; description = "GNU Bison, a Yacc-compatible parser generator"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; longDescription = '' Bison is a general-purpose parser generator that converts an diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index 2dec606254b..247daacf161 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -1,4 +1,4 @@ -{composableDerivation, fetchurl, transfig, texLive}: +{stdenv, composableDerivation, fetchurl, transfig, texLive}: let version = "6.3"; @@ -37,6 +37,6 @@ composableDerivation.composableDerivation {} { meta = { homepage = http://www.complang.org/ragel; description = "State machine compiler"; - license = "GPL-2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index ee464423929..e301fe8431a 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { is profiled: hardware and software interrupt handlers, kernel modules, the kernel, shared libraries, and applications. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = http://oprofile.sourceforge.net/; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index b6750f88937..457a5d1dcaa 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://sysprof.com/; description = "Sysprof, a system-wide profiler for Linux"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; longDescription = '' Sysprof is a sampling CPU profiler for Linux that uses the perf_event_open diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index 884091c1636..66dda8f43ef 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { homepage = http://sourceware.org/systemtap/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/pydb/default.nix b/pkgs/development/tools/pydb/default.nix index 23f0dea4453..baa816589ca 100644 --- a/pkgs/development/tools/pydb/default.nix +++ b/pkgs/development/tools/pydb/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { meta = { description = "Python debugger with GDB-like commands and Emacs bindings"; homepage = http://bashdb.sourceforge.net/pydb/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix index c52ce057df2..3ddbbbdc5bf 100644 --- a/pkgs/games/LambdaHack/default.nix +++ b/pkgs/games/LambdaHack/default.nix @@ -1,26 +1,31 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, assertFailure, binary, deepseq, enummapsetTh, filepath -, gtk, hashable, hsini, keys, miniutter, mtl, prettyShow, random -, stm, text, transformers, unorderedContainers, vector +{ cabal, assertFailure, async, binary, deepseq, enummapsetTh +, filepath, gtk, hashable, hsini, keys, miniutter, mtl, prettyShow +, random, stm, text, transformers, unorderedContainers, vector , vectorBinaryInstances, zlib }: cabal.mkDerivation (self: { pname = "LambdaHack"; - version = "0.2.12"; - sha256 = "0ics1z376qyagkzg58mqqw7cbkjpkik57l8570qmk589nkhck86n"; + version = "0.2.14"; + sha256 = "1nygyzrgzrv7qfr153xvkh50p0sjrbv3jbif7qmpam5jjlw26ahs"; isLibrary = true; isExecutable = true; buildDepends = [ - assertFailure binary deepseq enummapsetTh filepath gtk hashable + assertFailure async binary deepseq enummapsetTh filepath gtk + hashable hsini keys miniutter mtl prettyShow random stm text + transformers unorderedContainers vector vectorBinaryInstances zlib + ]; + testDepends = [ + assertFailure async binary deepseq enummapsetTh filepath hashable hsini keys miniutter mtl prettyShow random stm text transformers unorderedContainers vector vectorBinaryInstances zlib ]; - jailbreak = true; + doCheck = false; meta = { - homepage = "http://github.com/kosmikus/LambdaHack"; - description = "A roguelike game engine in early and active development"; + homepage = "http://github.com/LambdaHack/LambdaHack"; + description = "A roguelike game engine in early development"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix index ec14325e3d9..ae04c57aa26 100644 --- a/pkgs/games/andyetitmoves/default.nix +++ b/pkgs/games/andyetitmoves/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { homepage = http://www.andyetitmoves.net/; - license = "unfree"; + license = stdenv.lib.licenses.unfree; maintainers = with stdenv.lib.maintainers; [bluescreen303]; }; diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 77891f43881..1925c73b2e4 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -6,13 +6,13 @@ let py = pythonPackages; - version = "2.0.26"; + version = "2.0.28"; in stdenv.mkDerivation rec { name = "anki-${version}"; src = fetchurl { url = "http://ankisrs.net/download/mirror/${name}.tgz"; - sha256 = "0w1dn2v6mbyq4dfyjskx51qwfqy6jpskpg4v5pzrv30big274p4q"; + sha256 = "0dj33mlc23y982kcl4h0aganb4fy70rl28mpj2mbcfphykzkv05s"; }; pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy py.pyaudio ] @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { * mastering long poems * even practicing guitar chords! ''; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = stdenv.lib.platforms.mesaPlatforms; }; diff --git a/pkgs/games/asc/default.nix b/pkgs/games/asc/default.nix index bf2fb1e89c2..93297171bcb 100644 --- a/pkgs/games/asc/default.nix +++ b/pkgs/games/asc/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = http://www.asc-hq.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/games/ball-and-paddle/default.nix b/pkgs/games/ball-and-paddle/default.nix index c923f089405..4a7eb9376da 100644 --- a/pkgs/games/ball-and-paddle/default.nix +++ b/pkgs/games/ball-and-paddle/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { with Guile. Follow the example level sets and the documentation. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/ballandpaddle/; diff --git a/pkgs/games/banner/default.nix b/pkgs/games/banner/default.nix index 3bb17b3e02f..b4e61b6d1d1 100644 --- a/pkgs/games/banner/default.nix +++ b/pkgs/games/banner/default.nix @@ -37,7 +37,7 @@ mkDerivation "banner-1.3.2" "0dc0ac0667b2e884a7f5ad3e467af68cd0fd5917f8c9aa19188 meta = { homepage = "http://shh.thathost.com/pub-unix/"; description = "print large banners to ASCII terminals"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' An implementation of the traditional Unix-program used to display diff --git a/pkgs/games/bitsnbots/default.nix b/pkgs/games/bitsnbots/default.nix index 252f881c375..57cd67fbb7b 100644 --- a/pkgs/games/bitsnbots/default.nix +++ b/pkgs/games/bitsnbots/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple puzzle game with moving robots"; homepage = "http://moikmellah.org/blog/?page_id=19"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/games/blackshadeselite/default.nix b/pkgs/games/blackshadeselite/default.nix index 0f4904bfed9..d7e2cf4894d 100644 --- a/pkgs/games/blackshadeselite/default.nix +++ b/pkgs/games/blackshadeselite/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://home.gna.org/blackshadeselite/; description = "Fork of Black Shades"; - license = "GPLv2+"; # Says its gna.org project page + license = stdenv.lib.licenses.gpl2Plus; # Says its gna.org project page maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/games/btanks/default.nix b/pkgs/games/btanks/default.nix index 085c7c4082c..46f5b3d0183 100644 --- a/pkgs/games/btanks/default.nix +++ b/pkgs/games/btanks/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://sourceforge.net/projects/btanks/; description = "Fast 2d tank arcade game"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix index ce3a0c8fa3c..0798173a64d 100644 --- a/pkgs/games/bzflag/default.nix +++ b/pkgs/games/bzflag/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { description = "Multiplayer 3D Tank game"; homepage = http://bzflag.org/; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/games/crack-attack/default.nix b/pkgs/games/crack-attack/default.nix index 99bf2d41fd6..538efebf833 100644 --- a/pkgs/games/crack-attack/default.nix +++ b/pkgs/games/crack-attack/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "A fast-paced puzzle game inspired by the classic Super NES title Tetris Attack!"; homepage = http://www.nongnu.org/crack-attack/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.piotr ]; }; diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix new file mode 100644 index 00000000000..6cb48d85f85 --- /dev/null +++ b/pkgs/games/crawl/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, sqlite, lua, which, zlib, pkgconfig, dejavu_fonts, + libpng, perl, SDL, SDL_image, ncurses, mesa}: + +stdenv.mkDerivation rec { + name = "crawl-0.14.1"; + src = fetchurl { + url = "http://downloads.sourceforge.net/project/crawl-ref/Stone%20Soup/0.14.1/stone_soup-0.14.1-nodeps.tar.xz"; + sha256 = "91726d0224b93ba26b5d4bd3762bc5aabe1f02974ea6c937be89dc6c6ab7a4dd"; + }; + + patches = [ ./makefile_fonts.patch ./makefile_sqlite.patch + ./makefile_rltiles.patch ./makefile_rltiles2.patch + ./makefile_misc.patch ./makefile_prefix.patch + ]; + + buildInputs = [stdenv pkgconfig lua zlib sqlite which libpng perl SDL + dejavu_fonts SDL_image ncurses mesa]; + + preBuild = "cd source"; + + makeFlags = "TILES=y"; + + inherit dejavu_fonts sqlite SDL_image SDL; +} diff --git a/pkgs/games/crawl/makefile_fonts.patch b/pkgs/games/crawl/makefile_fonts.patch new file mode 100644 index 00000000000..6c73407b65c --- /dev/null +++ b/pkgs/games/crawl/makefile_fonts.patch @@ -0,0 +1,20 @@ +--- old/source/Makefile 2013-11-28 01:03:54.000000000 +0000 ++++ new/source/Makefile 2014-02-05 14:04:32.531838188 +0000 +@@ -880,7 +880,7 @@ + INSTALL_FONTS += $(PROPORTIONAL_FONT) + endif + else +- SYS_PROPORTIONAL_FONT = $(shell dir=/usr/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) ++ SYS_PROPORTIONAL_FONT = $(shell dir=${dejavu_fonts}/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) + ifeq (,$(SYS_PROPORTIONAL_FONT)) + SYS_PROPORTIONAL_FONT = $(shell dir=/usr/local/share/fonts ; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) + endif +@@ -903,7 +903,7 @@ + INSTALL_FONTS += $(MONOSPACED_FONT) + endif + else +- SYS_MONOSPACED_FONT = $(shell dir=/usr/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1) ++ SYS_MONOSPACED_FONT = $(shell dir=${dejavu_fonts}/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1) + ifeq (,$(SYS_MONOSPACED_FONT)) + SYS_MONOSPACED_FONT = $(shell dir=/usr/local/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1) + endif diff --git a/pkgs/games/crawl/makefile_misc.patch b/pkgs/games/crawl/makefile_misc.patch new file mode 100644 index 00000000000..3849e79234b --- /dev/null +++ b/pkgs/games/crawl/makefile_misc.patch @@ -0,0 +1,39 @@ +--- old/source/Makefile 2014-05-05 23:22:48.051952484 +0200 ++++ new/source/Makefile 2014-05-05 23:20:46.576617833 +0200 +@@ -71,6 +71,9 @@ + + GAME = crawl + ++ ++CFLAGS := $(NIX_CFLAGS_COMPILE) ++ + # Disable GNU Make implicit rules and variables. Leaving them enabled will slow + # down MinGW and Cygwin builds by a very VERY noticeable degree. Besides, we have + # _explicit_ rules defined for everything. So we don't need them. +@@ -979,7 +983,7 @@ + ifdef ANDROID + CFLAGS := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN) $(CFLAGS) + else +-CFLAGS := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN) ++CFLAGS := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN) $(CFLAGS) + endif + CFLAGS_L := $(CFOPTIMIZE_L) $(DEFINES_L) $(CFWARN_L) $(INCLUDES_L) $(CFOTHERS_L) + ALL_CFLAGS := $(CFLAGS) $(CFLAGS_L) +@@ -1392,7 +1396,7 @@ + $(RM) -r $(DOXYGEN_HTML_GEN) + + $(GAME): $(OBJECTS) $(EXTRA_OBJECTS) $(CONTRIB_LIBS) dat/dlua/tags.lua +- +$(QUIET_LINK)$(CXX) $(LDFLAGS) $(EXTRA_OBJECTS) $(OBJECTS) -o $(GAME) $(LIBS) ++ g++ $(LDFLAGS) $(EXTRA_OBJECTS) $(OBJECTS) -o $(GAME) $(LIBS) + + debug: all + debug-lite: all +@@ -1492,7 +1496,7 @@ + $(QUIET_GEN)util/gen-luatags.pl + + mi-enum.h: mon-info.h util/gen-mi-enum +- $(QUIET_GEN)util/gen-mi-enum ++ perl util/gen-mi-enum + + $(RLTILES)/dc-unrand.txt: art-data.h + diff --git a/pkgs/games/crawl/makefile_prefix.patch b/pkgs/games/crawl/makefile_prefix.patch new file mode 100644 index 00000000000..869d703b125 --- /dev/null +++ b/pkgs/games/crawl/makefile_prefix.patch @@ -0,0 +1,11 @@ +--- old/source/Makefile 2014-05-06 08:52:24.752163702 +0200 ++++ new/source/Makefile 2014-05-06 09:08:01.992018819 +0200 +@@ -344,7 +344,7 @@ + endif + + chroot_prefix := +-prefix := ++prefix := $(out) + + ifeq ($(patsubst %/local,%,$(patsubst %/,%,$(prefix))),/usr) + FHS := yes diff --git a/pkgs/games/crawl/makefile_rltiles.patch b/pkgs/games/crawl/makefile_rltiles.patch new file mode 100644 index 00000000000..e08859c989b --- /dev/null +++ b/pkgs/games/crawl/makefile_rltiles.patch @@ -0,0 +1,21 @@ +--- old/source/rltiles/Makefile 2014-04-17 10:17:31.596400123 +0000 ++++ new/source/rltiles/Makefile 2014-04-17 14:36:07.263108690 +0000 +@@ -20,7 +20,8 @@ + + ifdef TILES + ifndef CONTRIB_SDL +- SDL_CFLAGS := $(shell sdl-config --cflags 2> /dev/null || echo "-I../contrib/install/$(ARCH)/include/SDL") ++ SDL_CFLAGS := $(shell sdl-config --cflags 2> /dev/null) ++ SDL_IMG_CFLAGS := $(shell pkg-config --cflags-only-I SDL_image 2> /dev/null) + SDL_LDFLAGS := $(shell sdl-config --libs 2> /dev/null && echo "-lSDL_image" || echo "../contrib/install/$(ARCH)/lib/libSDL.a ../contrib/install/$(ARCH)/lib/libSDLmain.a ../contrib/install/$(ARCH)/lib/libSDL_image.a") + else + SDL_CFLAGS := -I../contrib/install/$(ARCH)/include/SDL +@@ -35,7 +36,7 @@ + PNG_LIB := ../contrib/install/$(ARCH)/lib/libpng.a ../contrib/install/$(ARCH)/lib/libz.a + endif + +- CFLAGS += $(SDL_CFLAGS) $(PNG_INCLUDE) ++ CFLAGS += $(SDL_CFLAGS) $(SDL_IMG_CFLAGS) $(PNG_INCLUDE) -I$(SDL_image)/include -I$(SDL)/include + LDFLAGS += $(SDL_LDFLAGS) $(PNG_LIB) + + CFLAGS += -DUSE_TILE diff --git a/pkgs/games/crawl/makefile_rltiles2.patch b/pkgs/games/crawl/makefile_rltiles2.patch new file mode 100644 index 00000000000..2508ad0a54c --- /dev/null +++ b/pkgs/games/crawl/makefile_rltiles2.patch @@ -0,0 +1,10 @@ +--- old/source/rltiles/Makefile 2014-05-05 23:22:48.054952469 +0200 ++++ new/source/rltiles/Makefile 2014-05-05 22:45:07.742667726 +0200 +@@ -142,6 +128,6 @@ + $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@ + + $(TILEGEN): $(OBJECTS) +- $(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS) ++ g++ $(OBJECTS) -o $@ $(LDFLAGS) + + .PHONY: all clean distclean diff --git a/pkgs/games/crawl/makefile_sdlimg.patch b/pkgs/games/crawl/makefile_sdlimg.patch new file mode 100644 index 00000000000..e6c7101de72 --- /dev/null +++ b/pkgs/games/crawl/makefile_sdlimg.patch @@ -0,0 +1,19 @@ +--- old/source/Makefile 2014-04-14 13:00:22.331058910 +0000 ++++ new/source/Makefile 2014-04-14 13:02:11.102204544 +0000 +@@ -672,6 +672,7 @@ + FREETYPE_LDFLAGS := $(shell $(PKGCONFIG) freetype2 --libs-only-L) $(shell $(PKGCONFIG) freetype2 --libs-only-l) + + SDL_INCLUDE := $(shell $(PKGCONFIG) sdl --cflags-only-I) ++SDL_IMG_INCLUDE := $(shell $(PKGCONFIG) SDL_image --cflags-only-I) + SDL_CFLAGS := $(shell $(PKGCONFIG) sdl --cflags-only-other) + SDL_LDFLAGS := $(shell $(PKGCONFIG) sdl --libs-only-L) $(shell $(PKGCONFIG) sdl --libs-only-l) + +@@ -694,7 +695,7 @@ + endif + + DEFINES_L += $(PNG_CFLAGS) $(FREETYPE_CFLAGS) $(SDL_CFLAGS) +-INCLUDES_L += $(PNG_INCLUDE) $(FREETYPE_INCLUDE) $(SDL_INCLUDE) ++INCLUDES_L += $(PNG_INCLUDE) $(FREETYPE_INCLUDE) $(SDL_INCLUDE) $(SDL_IMG_INCLUDE) + + endif # TILES + diff --git a/pkgs/games/crawl/makefile_sqlite.patch b/pkgs/games/crawl/makefile_sqlite.patch new file mode 100644 index 00000000000..fbcb925d608 --- /dev/null +++ b/pkgs/games/crawl/makefile_sqlite.patch @@ -0,0 +1,11 @@ +--- old/source/Makefile 2014-04-14 12:46:35.401956673 +0000 ++++ new/source/Makefile 2014-04-14 12:47:12.757006254 +0000 +@@ -259,7 +259,7 @@ + LIBZ := contrib/install/$(ARCH)/lib/libz.a + + ifndef CROSSHOST +- SQLITE_INCLUDE_DIR := /usr/include ++ SQLITE_INCLUDE_DIR := ${sqlite}/include + else + # This is totally wrong, works only with some old-style setups, and + # on some architectures of Debian/new FHS multiarch -- excluding, for diff --git a/pkgs/games/crrcsim/default.nix b/pkgs/games/crrcsim/default.nix index 944b67041c2..b50aa704048 100644 --- a/pkgs/games/crrcsim/default.nix +++ b/pkgs/games/crrcsim/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { description = "A model-airplane flight simulator"; maintainers = with stdenv.lib.maintainers; [ raskin the-kenny ]; platforms = stdenv.lib.platforms.linux; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } - diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix index 6036d7fabd5..f0d885c1f88 100644 --- a/pkgs/games/dhewm3/default.nix +++ b/pkgs/games/dhewm3/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/dhewm/dhewm3; description = "Doom 3 port to SDL"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/games/dwarf-fortress/df2014.nix b/pkgs/games/dwarf-fortress/df2014.nix new file mode 100644 index 00000000000..6a0d30ea89f --- /dev/null +++ b/pkgs/games/dwarf-fortress/df2014.nix @@ -0,0 +1,82 @@ +{ stdenv, fetchurl, SDL, SDL_image, SDL_ttf, gtk, glib, mesa, openal, glibc, libsndfile +, copyDataDirectory ? false }: + +assert stdenv.system == "i686-linux"; + +stdenv.mkDerivation rec { + name = "dwarf-fortress-0.40.05"; + + src = fetchurl { + url = "http://www.bay12games.com/dwarves/df_40_05_linux.tar.bz2"; + sha256 = "1b9nd33yz5a945v9jyqii1k4s71i701m2d0h7fw6f5g9p6nvx43s"; + }; + + phases = "unpackPhase patchPhase installPhase"; + + /* :TODO: Game options should be configurable by patching the default configuration files */ + + permission = ./df_permission; + + installPhase = '' + set -x + mkdir -p $out/bin + mkdir -p $out/share/df_linux + cp -r * $out/share/df_linux + cp $permission $out/share/df_linux/nix_permission + + patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 $out/share/df_linux/libs/Dwarf_Fortress + ln -s ${libsndfile}/lib/libsndfile.so $out/share/df_linux/libs/ + + cat > $out/bin/dwarf-fortress << EOF + #!${stdenv.shell} + export DF_DIR="\$HOME/.config/df_linux" + if [ -n "\$XDG_DATA_HOME" ] + then export DF_DIR="\$XDG_DATA_HOME/df_linux" + fi + + # Recreate a directory structure reflecting the original + # distribution in the user directory (for modding support) + ${if copyDataDirectory then '' + if [ ! -d "\$DF_DIR" ]; + then + mkdir -p \$DF_DIR + cp -r $out/share/df_linux/* \$DF_DIR/ + chmod -R u+rw \$DF_DIR/ + fi + '' else '' + # Link in the static stuff + mkdir -p \$DF_DIR + ln -sf $out/share/df_linux/libs \$DF_DIR/ + ln -sf $out/share/df_linux/raw \$DF_DIR/ + ln -sf $out/share/df_linux/df \$DF_DIR/ + + # Delete old data directory + rm -rf \$DF_DIR/data + + # Link in the static data directory + mkdir \$DF_DIR/data + for i in $out/share/df_linux/data/* + do + ln -s \$i \$DF_DIR/data/ + done + + # link in persistant data + mkdir -p \$DF_DIR/save + ln -s \$DF_DIR/save \$DF_DIR/data/ + ''} + + # now run Dwarf Fortress! + export LD_LIBRARY_PATH=\$DF_DIR/df_linux/libs/:${SDL}/lib:${SDL_image}/lib/:${SDL_ttf}/lib/:${gtk}/lib/:${glib}/lib/:${mesa}/lib/:${openal}/lib/ + \$DF_DIR/df "\$@" + EOF + + chmod +x $out/bin/dwarf-fortress + ''; + + meta = { + description = "control a dwarven outpost or an adventurer in a randomly generated, persistent world"; + homepage = http://www.bay12games.com/dwarves; + license = "unfree-redistributable"; + maintainers = [stdenv.lib.maintainers.roconnor]; + }; +} diff --git a/pkgs/games/dwarf-therapist/default.nix b/pkgs/games/dwarf-therapist/default.nix index 1a026132e52..8cc1b9933cd 100644 --- a/pkgs/games/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-therapist/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = { description = "Tool to manage dwarves in in a running game of Dwarf Fortress"; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; homepage = https://code.google.com/r/splintermind-attributes/; diff --git a/pkgs/games/egoboo/default.nix b/pkgs/games/egoboo/default.nix index 1f879393868..96ff52446ec 100644 --- a/pkgs/games/egoboo/default.nix +++ b/pkgs/games/egoboo/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { description = "3D dungeon crawling adventure"; homepage = http://www.freedink.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; # I take it out of hydra as it does not work as well as I'd like # maintainers = [ stdenv.lib.maintainers.bjg ]; diff --git a/pkgs/games/freedink/default.nix b/pkgs/games/freedink/default.nix index a30ff7e2f87..94451ef8930 100644 --- a/pkgs/games/freedink/default.nix +++ b/pkgs/games/freedink/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { ''; homepage = http://www.freedink.org/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/games/gav/default.nix b/pkgs/games/gav/default.nix index d83358cd69d..d26dfc2401c 100644 --- a/pkgs/games/gav/default.nix +++ b/pkgs/games/gav/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { meta = { description = "Remake of AV Arcade Volleyball"; homepage = http://gav.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/gltron/default.nix b/pkgs/games/gltron/default.nix index b58654f1f42..d925c8810bf 100644 --- a/pkgs/games/gltron/default.nix +++ b/pkgs/games/gltron/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gltron.org/; description = "Game based on the movie Tron"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix index 72270cc312a..90a4a069c2a 100644 --- a/pkgs/games/gnuchess/default.nix +++ b/pkgs/games/gnuchess/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="gnuchess"; - version="6.1.1"; + version="6.1.2"; name="${baseName}-${version}"; - hash="1jckpg1qi1vjr3pqs0dnip3rmn0mgklx63xflrpqiv3cx2qlz8kn"; - url="http://ftp.gnu.org/gnu/chess/gnuchess-6.1.1.tar.gz"; - sha256="1jckpg1qi1vjr3pqs0dnip3rmn0mgklx63xflrpqiv3cx2qlz8kn"; + hash="15k6w9gycp566i0pa7ccajj9v3pw1mz1v62g1ni7czgs3j7i588l"; + url="http://ftp.gnu.org/gnu/chess/gnuchess-6.1.2.tar.gz"; + sha256="15k6w9gycp566i0pa7ccajj9v3pw1mz1v62g1ni7czgs3j7i588l"; }; buildInputs = [ flex diff --git a/pkgs/games/gnugo/default.nix b/pkgs/games/gnugo/default.nix index 21c4195b28b..3f1d52c5fc0 100644 --- a/pkgs/games/gnugo/default.nix +++ b/pkgs/games/gnugo/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "GNU Go - A computer go player"; homepage = "http://http://www.gnu.org/software/gnugo/"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/games/icbm3d/default.nix b/pkgs/games/icbm3d/default.nix index ee792ef1e4d..7bdcc7afecd 100644 --- a/pkgs/games/icbm3d/default.nix +++ b/pkgs/games/icbm3d/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.newbreedsoftware.com/icbm3d/; description = "3D vector-based clone of the atari game Missile Command"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix index 6ab6b8d79d7..8668de26a19 100644 --- a/pkgs/games/instead/default.nix +++ b/pkgs/games/instead/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple text adventure interpreter for Unix and Windows"; homepage = http://instead.syscall.ru/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index cbc445f6216..c7b40db5caf 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Just another free touch typing tutor program"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/kobodeluxe/default.nix b/pkgs/games/kobodeluxe/default.nix index 70288e549a4..8fe7591cde0 100644 --- a/pkgs/games/kobodeluxe/default.nix +++ b/pkgs/games/kobodeluxe/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { meta = { homepage = http://olofson.net/kobodl/; description = "Enhanced version of Akira Higuchi's game XKobo for Un*x systems with X11"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix index 292aa2ff190..cd7478d99c8 100644 --- a/pkgs/games/liquidwar/default.nix +++ b/pkgs/games/liquidwar/default.nix @@ -6,16 +6,16 @@ let expat gettext perl SDL SDL_image SDL_mixer SDL_ttf curl sqlite - libogg libvorbis - libXrender + libogg libvorbis csound + libXrender libcaca cunit ]; in rec { - name = "liquidwar6-0.0.13beta"; + name = "liquidwar6-${meta.version}"; src = a.fetchurl { url = "mirror://gnu/liquidwar6/${name}.tar.gz"; - sha256 = "1jjf7wzb8jf02hl3473vz1q74fhmxn0szbishgi1f1j6a7234wx2"; + sha256 = "1q58liqm5cgp494yjj6rfc2xj5b4gm8r8yvi46jzwqll353mabwl"; }; inherit buildInputs; @@ -35,5 +35,8 @@ rec { ]; platforms = with a.lib.platforms; linux; + homepage = "http://www.gnu.org/software/liquidwar6/"; + version = "0.4.3681"; + updateWalker=true; }; } diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index f2ac737486c..f19596789ce 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -35,6 +35,6 @@ in stdenv.mkDerivation { meta = { homepage = "http://minetest.net/"; description = "Infinite-world block sandbox game"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index c2a7ee90a1f..580b27ab21d 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { description = "2D action/rpg space game"; homepage = http://www.naev.org; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/njam/default.nix b/pkgs/games/njam/default.nix index 4062405407b..88cfbe98851 100644 --- a/pkgs/games/njam/default.nix +++ b/pkgs/games/njam/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://trackballs.sourceforge.net/; description = "Cross-platform pacman-like game"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix index f62570dbd08..49dbb7ba82b 100644 --- a/pkgs/games/oilrush/default.nix +++ b/pkgs/games/oilrush/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation { of Tower Defense. ''; homepage = http://oilrush-game.com/; - license = "unfree"; + license = stdenv.lib.licenses.unfree; #maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/openlierox/default.nix b/pkgs/games/openlierox/default.nix index ede7b6fdac4..2dc4dece75f 100644 --- a/pkgs/games/openlierox/default.nix +++ b/pkgs/games/openlierox/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation { meta = { homepage = http://openlierox.net; description = "Real-time game with Worms-like shooting"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 09a7761326a..1b6b7f26a41 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { - observe as spectators ''; homepage = http://www.openttd.org/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ jcumming the-kenny ]; }; diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index 04d2f2ecb8b..19aff03daca 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { repositories.git = https://github.com/SupSuper/OpenXcom.git; maintainers = [ stdenv.lib.maintainers.page ]; platforms = stdenv.lib.platforms.linux; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/games/pioneers/default.nix b/pkgs/games/pioneers/default.nix index 77e8ab3b92e..af9900cede5 100644 --- a/pkgs/games/pioneers/default.nix +++ b/pkgs/games/pioneers/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://pio.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Addicting game based on The Settlers of Catan"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index 009d07d4456..7c58b4ca1e8 100755 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = http://www.uberent.com/pa/; description = "next-generation RTS that takes the genre to a planetary scale"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; platforms = platforms.linux; maintainers = [ maintainers.iElectric ]; }; diff --git a/pkgs/games/pong3d/default.nix b/pkgs/games/pong3d/default.nix index d5f9ca6ee23..98cf0dbeed8 100644 --- a/pkgs/games/pong3d/default.nix +++ b/pkgs/games/pong3d/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.newbreedsoftware.com/3dpong/; description = "One or two player 3d sports game based on Pong from Atari"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/racer/default.nix b/pkgs/games/racer/default.nix index 8969b613ceb..06e43fd273f 100644 --- a/pkgs/games/racer/default.nix +++ b/pkgs/games/racer/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { meta = { description = "Car racing game"; homepage = http://hippo.nipax.cz/download.en.php; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index 809bcc930d2..26c7e0a3667 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = { description = "3D simulator game where you can drive, fly and sail various vehicles"; homepage = http://rigsofrods.sourceforge.net/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [viric raskin]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix index 934213279fa..fbf47653af9 100644 --- a/pkgs/games/rili/default.nix +++ b/pkgs/games/rili/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = http://ri-li.sourceforge.net; - license = "GPL2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "A children's train game"; longDescription = '' Ri-li is an arcade game licensed under the GPL (General Public License). diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix index 3848f22ed20..cf55bcd597e 100644 --- a/pkgs/games/scorched3d/default.nix +++ b/pkgs/games/scorched3d/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation { meta = { homepage = http://scorched3d.co.uk/; description = "3D Clone of the classic Scorched Earth"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index ca72ac506d7..42fa98e372d 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib }: stdenv.mkDerivation rec { - name = "scummvm-1.6.0"; + name = "scummvm-1.7.0"; src = fetchurl { url = "mirror://sourceforge/scummvm/${name}.tar.bz2"; - sha256 = "1i3ywpq8csi58gdibdn51329vlj800l2laaw0lw18fcgdbd60q1r"; + sha256 = "d9ff0e8cf911afa466d5456d28fef692a17d47ddecfd428bf2fef591237c2e66"; }; buildInputs = [ SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib ]; diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index 196561d1e37..403fc88cb4a 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -94,7 +94,7 @@ let ''; homepage = http://www.simutrans.com/; - license = "Artistic"; + license = "perl"; maintainers = [ stdenv.lib.maintainers.kkallio ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index 7a78235bdff..e6105eab95b 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Car racing game - TORCS fork with more experimental approach"; homepage = http://speed-dreams.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric raskin]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 51149d4f260..1c9cc139343 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { meta = { description = "A digital distribution platform"; homepage = http://store.steampowered.com/; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } */ @@ -119,6 +119,6 @@ stdenv.mkDerivation { meta = { description = "A digital distribution platform"; homepage = http://store.steampowered.com/; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index 31fd25a5150..7b258deef8a 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { meta = { description = "Stunt Rally game with Track Editor, based on VDrift and OGRE"; homepage = http://code.google.com/p/vdrift-ogre/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index cd2698665f6..29d3b4e4557 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { homepage = http://supertuxkart.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/super-tux/default.nix b/pkgs/games/super-tux/default.nix index 72a894b63af..c8e0d3f097f 100644 --- a/pkgs/games/super-tux/default.nix +++ b/pkgs/games/super-tux/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { homepage = http://supertux.lethargik.org/index.html; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/games/teetertorture/default.nix b/pkgs/games/teetertorture/default.nix index 18a911d563b..e5d9e5e9751 100644 --- a/pkgs/games/teetertorture/default.nix +++ b/pkgs/games/teetertorture/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.newbreedsoftware.com/teetertorture/; description = "Simple shooting game with your cannon is sitting atop a teeter totter"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/tennix/default.nix b/pkgs/games/tennix/default.nix index e06aec68b1a..83b2c62870e 100644 --- a/pkgs/games/tennix/default.nix +++ b/pkgs/games/tennix/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://icculus.org/tennix/; description = "Tennix 2009 World Tennis Championship Tour"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix index 979fcd1a48c..44d07cf3ffd 100644 --- a/pkgs/games/the-butterfly-effect/default.nix +++ b/pkgs/games/the-butterfly-effect/default.nix @@ -3,9 +3,9 @@ x@{builderDefsPackage ,fetchsvn , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ ["fetchsvn"]; buildInputs = map (n: builtins.getAttr n x) @@ -54,7 +54,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "GPLv2"; + license = a.stdenv.lib.licenses.gpl2; }; passthru = { inherit srcDrv; @@ -63,4 +63,3 @@ rec { }; }; }) x - diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index 698653784a7..a2355ba9d1e 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { meta = { description = "Top-down MMORPG set in a fantasy world"; homepage = "http://tibia.com"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; platforms = ["i686-linux"]; }; } diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index 47316177115..e6370d6e7c6 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Car racing game"; homepage = http://torcs.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix index 2a25c290b2d..a5ae8ec8b6d 100644 --- a/pkgs/games/trigger/default.nix +++ b/pkgs/games/trigger/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "Rally"; homepage = http://trigger-rally.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix index 2fef444328c..0d909e1c43c 100644 --- a/pkgs/games/ufoai/default.nix +++ b/pkgs/games/ufoai/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://ufoai.org; description = "A squad-based tactical strategy game in the tradition of X-Com"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/ultimatestunts/default.nix b/pkgs/games/ultimatestunts/default.nix index 4b1cab6531c..c90972db66e 100644 --- a/pkgs/games/ultimatestunts/default.nix +++ b/pkgs/games/ultimatestunts/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.ultimatestunts.nl/; description = "Remake of the popular racing DOS-game Stunts"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index dbae3e16724..47fcd2dc4cf 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://ultrastardx.sourceforge.net/; description = "Free and open source karaoke game"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index 07055c41558..9d233d38338 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -102,7 +102,7 @@ in stdenv.mkDerivation rec { - to adapt the code so that people can more easily make their own spin-offs, thereby making zillions more people happy! ''; homepage = http://sc2.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ jcumming aszlig ]; }; } diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index af112c37af4..bba7823f663 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Car racing game"; homepage = http://vdrift.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/vectoroids/default.nix b/pkgs/games/vectoroids/default.nix index 6f0fb48f0a5..f87633e299b 100644 --- a/pkgs/games/vectoroids/default.nix +++ b/pkgs/games/vectoroids/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.newbreedsoftware.com/vectoroids/; description = "Clone of the classic arcade game Asteroids by Atari"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix index d9fcb47bcc3..0b344873734 100644 --- a/pkgs/games/zod/default.nix +++ b/pkgs/games/zod/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { meta = { description = "Multiplayer remake of ZED"; homepage = http://zod.sourceforge.net/; - license = "GPLv3+"; /* Says the web */ + license = stdenv.lib.licenses.gpl3Plus; /* Says the web */ }; } diff --git a/pkgs/misc/beep/default.nix b/pkgs/misc/beep/default.nix index 8f0830be186..b5e4adfa0b9 100644 --- a/pkgs/misc/beep/default.nix +++ b/pkgs/misc/beep/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { meta = { description = "The advanced PC speaker beeper"; homepage = http://www.johnath.com/beep/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/misc/cups/pdf-filter.nix b/pkgs/misc/cups/pdf-filter.nix index 8a08eadc6a4..e99ad03212c 100644 --- a/pkgs/misc/cups/pdf-filter.nix +++ b/pkgs/misc/cups/pdf-filter.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.cups.org/; description = "Image and pdf filters for CUPS"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.urkud ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index fcec3bf2675..a4d2ca621a1 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -56,11 +56,9 @@ stdenv.mkDerivation rec { '' + (stdenv.lib.optionalString withPlugin (let hplip_arch = - if builtins.currentSystem == "i686-linux" - then "x86_32" - else if builtins.currentSystem == "x86_64-linux" - then "x86_64" - else abort "Platform must be i686-linux or x86_64-linux!"; + if stdenv.system == "i686-linux" then "x86_32" + else if stdenv.system == "x86_64-linux" then "x86_64" + else abort "Platform must be i686-linux or x86_64-linux!"; in '' sh ${plugin} --noexec --keep diff --git a/pkgs/misc/emulators/VisualBoyAdvance/default.nix b/pkgs/misc/emulators/VisualBoyAdvance/default.nix index 942bf2c2184..015c61e461e 100644 --- a/pkgs/misc/emulators/VisualBoyAdvance/default.nix +++ b/pkgs/misc/emulators/VisualBoyAdvance/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "A Game Boy/Game Boy Color/Game Boy Advance Emulator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; homepage = http://vba.ngemu.com; broken = true; diff --git a/pkgs/misc/emulators/bsod/default.nix b/pkgs/misc/emulators/bsod/default.nix index a6cb42d5c67..526ea25a04e 100644 --- a/pkgs/misc/emulators/bsod/default.nix +++ b/pkgs/misc/emulators/bsod/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { blue screen of death on the console. Errors and drivers causing the error are selected randomly from a large set of examples."; homepage = "http://www.vanheusden.com/bsod/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.antono ]; }; diff --git a/pkgs/misc/emulators/dlx/default.nix b/pkgs/misc/emulators/dlx/default.nix index c23b60c29b3..60854f8550b 100644 --- a/pkgs/misc/emulators/dlx/default.nix +++ b/pkgs/misc/emulators/dlx/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { meta = { homepage = "http://www.davidviner.com/dlx.php"; description = "DLX Simulator"; - license = "GPL-2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/misc/emulators/fakenes/default.nix b/pkgs/misc/emulators/fakenes/default.nix index e3c9dbc84e5..5462f772703 100644 --- a/pkgs/misc/emulators/fakenes/default.nix +++ b/pkgs/misc/emulators/fakenes/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = http://fakenes.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Portable Open Source NES Emulator"; }; } diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix index 150b45dd727..7ef63f93026 100644 --- a/pkgs/misc/emulators/hatari/default.nix +++ b/pkgs/misc/emulators/hatari/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://hatari.tuxfamily.org/"; description = "Atari ST/STE/TT/Falcon emulator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; all; }; } diff --git a/pkgs/misc/emulators/mupen64plus/1.5.nix b/pkgs/misc/emulators/mupen64plus/1.5.nix index d67121fe430..571e14347b4 100644 --- a/pkgs/misc/emulators/mupen64plus/1.5.nix +++ b/pkgs/misc/emulators/mupen64plus/1.5.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "A Nintendo 64 Emulator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://code.google.com/p/mupen64plus; maintainers = [ stdenv.lib.maintainers.sander ]; }; diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix index d67121fe430..571e14347b4 100644 --- a/pkgs/misc/emulators/mupen64plus/default.nix +++ b/pkgs/misc/emulators/mupen64plus/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "A Nintendo 64 Emulator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://code.google.com/p/mupen64plus; maintainers = [ stdenv.lib.maintainers.sander ]; }; diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix index 9f93c9957d6..0fa5a08d2dc 100644 --- a/pkgs/misc/emulators/uae/default.nix +++ b/pkgs/misc/emulators/uae/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = { description = "Ultimate/Unix/Unusuable Amiga Emulator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.amigaemulator.org; maintainers = [ stdenv.lib.maintainers.sander ]; }; diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index 8323ca082b7..b869143ff1c 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "Commodore 64, 128 and other emulators"; homepage = http://www.viceteam.org; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index 0e19d6ab893..cd5c5a8b479 100644 --- a/pkgs/misc/emulators/wine/unstable.nix +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -7,27 +7,27 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; let - version = "1.7.20"; + version = "1.7.23"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "05azpxrl7364ckvkwy7aa2p0vb4qhbc6wcn2l8khqb92jq5inhww"; + sha256 = "012ww1yifayakw9n2m23sx83dc3i2xiq3bn5n9iprppdhwxpp76v"; }; gecko = fetchurl { - url = "mirror://sourceforge/wine/wine_gecko-2.21-x86.msi"; - sha256 = "1n0zccnvchkg0m896sjx5psk4bxw9if32xyxib1rbfdasykay7zh"; + url = "mirror://sourceforge/wine/wine_gecko-2.24-x86.msi"; + sha256 = "0b10f55q3sldlcywscdlw3kd7vl9izlazw7jx30y4rpahypaqf3f"; }; gecko64 = fetchurl { - url = "mirror://sourceforge/wine/wine_gecko-2.21-x86_64.msi"; - sha256 = "0grc86dkq90i59zw43hakh62ra1ajnk11m64667xjrlzi7f0ndxw"; + url = "mirror://sourceforge/wine/wine_gecko-2.24-x86_64.msi"; + sha256 = "1j4wdlhzvjrabzr9igcnx0ivm5mcb8kp7bwkpfpfsanbifk7sma7"; }; mono = fetchurl { - url = "mirror://sourceforge/wine/wine-mono-0.0.8.msi"; - sha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x"; + url = "mirror://sourceforge/wine/wine-mono-4.5.2.msi"; + sha256 = "1bgasysf3qacxgh5rlk7qlw47ar5zgd1k9gb22pihi5s87dlw4nr"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix index 3dd3d4bc731..8103ff9c43f 100644 --- a/pkgs/misc/emulators/wine/winetricks.nix +++ b/pkgs/misc/emulators/wine/winetricks.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A script to install DLLs needed to work around problems in Wine"; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; homepage = http://code.google.com/p/winetricks/; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix index a85d0fb389e..0366b9dd22c 100644 --- a/pkgs/misc/emulators/wxmupen64plus/default.nix +++ b/pkgs/misc/emulators/wxmupen64plus/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "GUI for the Mupen64Plus 2.0 emulator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = https://bitbucket.org/auria/wxmupen64plus/wiki/Home; }; } diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix index c3bced29200..bca81a4b6b3 100644 --- a/pkgs/misc/emulators/zsnes/default.nix +++ b/pkgs/misc/emulators/zsnes/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "A Super Nintendo Entertainment System Emulator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; homepage = http://www.zsnes.com; }; diff --git a/pkgs/misc/foldingathome/default.nix b/pkgs/misc/foldingathome/default.nix index ef8cb7d0a92..945d6556837 100644 --- a/pkgs/misc/foldingathome/default.nix +++ b/pkgs/misc/foldingathome/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation { meta = { homepage = http://folding.stanford.edu/; description = "Folding@home distributed computing client"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/misc/freestyle/default.nix b/pkgs/misc/freestyle/default.nix index fa2c36cf2c2..bb3520e300a 100644 --- a/pkgs/misc/freestyle/default.nix +++ b/pkgs/misc/freestyle/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation { meta = { description = "Non-Photorealistic Line Drawing rendering from 3D scenes"; homepage = http://freestyle.sourceforge.net; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 142c75aeb0f..275b93e01b8 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -23,7 +23,7 @@ let of output drivers for various file formats and printers. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix index 27b1cdd3e8a..94bfec0a18e 100644 --- a/pkgs/os-specific/gnu/default.nix +++ b/pkgs/os-specific/gnu/default.nix @@ -82,7 +82,7 @@ let mig = callPackage ./mig { # Build natively, but force use of a 32-bit environment because we're # targeting `i586-pc-gnu'. - stdenv = (forceSystem "i686-linux").stdenv; + stdenv = (forceSystem "i686-linux" "i386").stdenv; }; # XXX: Use this one for its `.crossDrv'. Using the one above from diff --git a/pkgs/os-specific/gnu/hurd/default.nix b/pkgs/os-specific/gnu/hurd/default.nix index 0c9059a3008..4bdb6e132fb 100644 --- a/pkgs/os-specific/gnu/hurd/default.nix +++ b/pkgs/os-specific/gnu/hurd/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation ({ kernels (such as Linux). ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnu.org/software/hurd/; diff --git a/pkgs/os-specific/gnu/libpthread/default.nix b/pkgs/os-specific/gnu/libpthread/default.nix index 3eaa6336ec2..4b16652ba05 100644 --- a/pkgs/os-specific/gnu/libpthread/default.nix +++ b/pkgs/os-specific/gnu/libpthread/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation ({ meta = { description = "GNU Hurd's libpthread"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/os-specific/gnu/mach/default.nix b/pkgs/os-specific/gnu/mach/default.nix index 54c6429955b..6d2d20687bc 100644 --- a/pkgs/os-specific/gnu/mach/default.nix +++ b/pkgs/os-specific/gnu/mach/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation ({ were added using glue code, i.e., a Linux emulation layer in Mach. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnu.org/software/hurd/microkernel/mach/gnumach.html; diff --git a/pkgs/os-specific/gnu/mig/default.nix b/pkgs/os-specific/gnu/mig/default.nix index 9ee188b0c8c..34426b45d55 100644 --- a/pkgs/os-specific/gnu/mig/default.nix +++ b/pkgs/os-specific/gnu/mig/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { Mach-based inter-process communication. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnu.org/software/hurd/microkernel/mach/mig/gnu_mig.html; diff --git a/pkgs/os-specific/gnu/smbfs/default.nix b/pkgs/os-specific/gnu/smbfs/default.nix index 4897c0c0af8..6f3d719d816 100644 --- a/pkgs/os-specific/gnu/smbfs/default.nix +++ b/pkgs/os-specific/gnu/smbfs/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { homepage = http://www.nongnu.org/hurdextras/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/os-specific/gnu/unionfs/default.nix b/pkgs/os-specific/gnu/unionfs/default.nix index 946e4c0c109..5e2f428130c 100644 --- a/pkgs/os-specific/gnu/unionfs/default.nix +++ b/pkgs/os-specific/gnu/unionfs/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/hurd/hurd/translator/unionfs.html; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix index a3400ee0823..0fc79922515 100644 --- a/pkgs/os-specific/linux/acpi/default.nix +++ b/pkgs/os-specific/linux/acpi/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { battery and thermal information. ''; homepage = http://sourceforge.net/projects/acpiclient/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = maintainers.mornfall; }; diff --git a/pkgs/os-specific/linux/acpitool/default.nix b/pkgs/os-specific/linux/acpitool/default.nix index c7f96206eab..6fc3bbe7c08 100644 --- a/pkgs/os-specific/linux/acpitool/default.nix +++ b/pkgs/os-specific/linux/acpitool/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { description = "A small, convenient command-line ACPI client with a lot of features"; homepage = http://freeunix.dyndns.org:8000/site2/acpitool.shtml; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.guibert ]; }; } diff --git a/pkgs/os-specific/linux/afuse/default.nix b/pkgs/os-specific/linux/afuse/default.nix index 06af0c9228a..70c8f36105c 100644 --- a/pkgs/os-specific/linux/afuse/default.nix +++ b/pkgs/os-specific/linux/afuse/default.nix @@ -13,9 +13,8 @@ stdenv.mkDerivation { meta = { description = "Automounter in userspace"; homepage = http://sourceforge.net/projects/afuse; - license = "GPL-v2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; } - diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index ed55018e555..0bb96c343df 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Various plugins for ALSA"; homepage = http://alsa-project.org/; - license = licenses.gpl2; + license = licenses.lgpl21; maintainers = [maintainers.marcweber]; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index a7ff782d69e..9de84e228c4 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Audit Library"; homepage = "http://people.redhat.com/sgrubb/audit/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/autofs/autofs-v5.nix b/pkgs/os-specific/linux/autofs/autofs-v5.nix index 81ead8d33d0..5c5c2f026af 100644 --- a/pkgs/os-specific/linux/autofs/autofs-v5.nix +++ b/pkgs/os-specific/linux/autofs/autofs-v5.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = { description="Kernel based automounter"; homepage="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; executables = [ "automount" ]; }; } diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 88c7ffd93ee..6e57e7651c4 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2, control tool"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 0b7b6a0cafb..fee955bcca2 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix index 0cc4e3741c2..43673c899b4 100644 --- a/pkgs/os-specific/linux/blcr/default.nix +++ b/pkgs/os-specific/linux/blcr/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { description = "Berkeley Lab Checkpoint/Restart for Linux (BLCR)"; homepage = https://ftg.lbl.gov/projects/CheckpointRestart/; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ z77z diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 7226acf0e57..98fedb2d3f4 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -28,6 +28,10 @@ let nixConfig = '' CONFIG_PREFIX "$out" CONFIG_INSTALL_NO_USR y + + # Use the external mount.cifs program. + CONFIG_FEATURE_MOUNT_CIFS n + CONFIG_FEATURE_MOUNT_HELPERS y ''; staticConfig = stdenv.lib.optionalString enableStatic '' @@ -49,8 +53,8 @@ stdenv.mkDerivation rec { ${configParser} cat << EOF | parseconfig ${staticConfig} - ${extraConfig} ${nixConfig} + ${extraConfig} $extraCrossConfig EOF make oldconfig @@ -70,7 +74,7 @@ stdenv.mkDerivation rec { meta = { description = "Tiny versions of common UNIX utilities in a single small executable"; homepage = http://busybox.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index 022ea648fea..4ea9295ef4f 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { meta = { description = "Device that allows access to Linux kernel cryptographic drivers"; homepage = http://home.gna.org/cryptodev-linux/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 0f4a1b6985e..d3a0b827ed1 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://code.google.com/p/cryptsetup/; description = "LUKS for dm-crypt"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ viric chaoflow ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/os-specific/linux/disk-indicator/default.nix b/pkgs/os-specific/linux/disk-indicator/default.nix index 57fc9390f61..b60232a9b75 100644 --- a/pkgs/os-specific/linux/disk-indicator/default.nix +++ b/pkgs/os-specific/linux/disk-indicator/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { Small program for Linux that will turn your Scroll, Caps or Num Lock LED or LED on your ThinkPad laptop into a hard disk activity indicator. ''; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix index 138b4ff468f..c95532f1360 100644 --- a/pkgs/os-specific/linux/dstat/default.nix +++ b/pkgs/os-specific/linux/dstat/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://dag.wieers.com/home-made/dstat/; description = "Versatile resource statistics tool"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ ]; }; diff --git a/pkgs/os-specific/linux/frandom/default.nix b/pkgs/os-specific/linux/frandom/default.nix index 1814a72667a..80ad483b367 100644 --- a/pkgs/os-specific/linux/frandom/default.nix +++ b/pkgs/os-specific/linux/frandom/default.nix @@ -40,8 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "A very fast random number generator kernel module"; homepage = http://frandom.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; }; } - diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix index 7667b330f23..0e38d94e1ed 100644 --- a/pkgs/os-specific/linux/google-authenticator/default.nix +++ b/pkgs/os-specific/linux/google-authenticator/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { meta = { homepage = https://code.google.com/p/google-authenticator/; description = "Two-step verification, with pam module"; - license = "ASL2.0"; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/os-specific/linux/hibernate/default.nix b/pkgs/os-specific/linux/hibernate/default.nix index d0e77a3bb70..6c5dd330f65 100644 --- a/pkgs/os-specific/linux/hibernate/default.nix +++ b/pkgs/os-specific/linux/hibernate/default.nix @@ -38,7 +38,7 @@ in it into "hibernation". It works both with Linux swsusp and Tux-on-Ice. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.tuxonice.net/; }; } diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index e701c91019d..325a44f97aa 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { homepage = "https://fedorahosted.org/hwdata/"; description = "Hardware Database, including Monitors, pci.ids, usb.ids, and video cards"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix index 80e43f17b3c..1fe1f48f4ef 100644 --- a/pkgs/os-specific/linux/i7z/default.nix +++ b/pkgs/os-specific/linux/i7z/default.nix @@ -29,8 +29,7 @@ stdenv.mkDerivation rec { description = "A better i7 (and now i3, i5) reporting tool for Linux"; homepage = http://code.google.com/p/i7z; repositories.git = https://github.com/ajaiantilal/i7z.git; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; }; } - diff --git a/pkgs/os-specific/linux/i810switch/default.nix b/pkgs/os-specific/linux/i810switch/default.nix index 63a056712ac..00f27a43e65 100644 --- a/pkgs/os-specific/linux/i810switch/default.nix +++ b/pkgs/os-specific/linux/i810switch/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { meta = { description = "A utility for switching between the LCD and external VGA display on Intel graphics cards"; homepage = "http://www16.plala.or.jp/mano-a-mano/i810switch.html"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/jujuutils/default.nix b/pkgs/os-specific/linux/jujuutils/default.nix index 7c688943ea8..a47b59e9e56 100644 --- a/pkgs/os-specific/linux/jujuutils/default.nix +++ b/pkgs/os-specific/linux/jujuutils/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = "http://code.google.com/p/jujuutils/"; description = "Utilities around FireWire devices connected to a Linux computer"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 9f8c73f6ea7..26938b71578 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.48"; + version = "3.10.51"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "14gz998vr9jb9blbk60phq3hwnl2yipd6fykkl5bd8gai5wph2l3"; + sha256 = "1z1sbk13f5njbmx7vi775i2pp79f6b5r39cp85yzz0byvn6lx885"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 2035eef9321..291e43a98e5 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.25"; + version = "3.12.26"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "16jdqhhi7z6jkprz90cb48cd479zsqlrn9j3yp2xcyqp05nc7n2p"; + sha256 = "1gp6brk2ix30g8dznd5yv1fq7yx82295va6cn7lwv6jj9w287s6c"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index f252080bbac..2d53d06f755 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.12"; + version = "3.14.15"; extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1pzshv7cj87v5na7paqka9v8mbqn04q25r241fha56sm7ilxbnap"; + sha256 = "0wjws67s698zpjj0kd3sxakjvnls91kc6vvz0md4i0qg683ld790"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.15.nix b/pkgs/os-specific/linux/kernel/linux-3.15.nix index 9fa77a7a38e..b59baf9f669 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.15.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.15.5"; + version = "3.15.8"; extraMeta.branch = "3.15"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "09j0ga3nc90fbfl9g3i8x9vp70hq7ddnnlbcazahrz4vn6mngqv2"; + sha256 = "012d793mg2lkxfs6rxqkl22p6899l620ssbsii1szfjhnynh1qjd"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.16.nix b/pkgs/os-specific/linux/kernel/linux-3.16.nix new file mode 100644 index 00000000000..3a7e51a080e --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-3.16.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, ... } @ args: + +import ./generic.nix (args // rec { + version = "3.16"; + modDirVersion = "3.16.0"; + extraMeta.branch = "3.16"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "183p3pz2rfprbp5i4kwk90kjn90v40banwx8759jxnd74xwss4s8"; + }; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 455901932c2..6a232d6450b 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.98"; + version = "3.4.101"; extraMeta.branch = "3.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0kkd6q80w4rh1sjdd4j5a2fmib4mjwhsf5fm555jl2w3zsy0kr45"; + sha256 = "1zmb3dzqjiwb9ckj0gqqvlpdvqrjw17z9sddzxyawfrag6xv24a7"; }; kernelPatches = args.kernelPatches ++ diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 30e2a37cb91..6d9baed7f2d 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -198,7 +198,7 @@ let " (with patches: " + stdenv.lib.concatStrings (stdenv.lib.intersperse ", " (map (x: x.name) kernelPatches)) + ")"); - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = http://www.kernel.org/; repositories.git = https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git; maintainers = [ diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix index fc05fc23452..d1eb38df6da 100644 --- a/pkgs/os-specific/linux/keyutils/default.nix +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "keyutils-1.5.9"; - + src = fetchurl { url = "http://people.redhat.com/dhowells/keyutils/${name}.tar.bz2"; sha256 = "1bl3w03ygxhc0hz69klfdlwqn33jvzxl1zfl2jmnb2v85iawb8jd"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; installPhase = "make install DESTDIR=$out"; - + meta = with stdenv.lib; { homepage = http://people.redhat.com/dhowells/keyutils/; description = "Tools used to control the Linux kernel key management system"; diff --git a/pkgs/os-specific/linux/latencytop/default.nix b/pkgs/os-specific/linux/latencytop/default.nix index eb776dcb86d..163ac189050 100644 --- a/pkgs/os-specific/linux/latencytop/default.nix +++ b/pkgs/os-specific/linux/latencytop/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://latencytop.org; description = "Tool to show kernel reports on latencies (LATENCYTOP option)"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/ldm/default.nix b/pkgs/os-specific/linux/ldm/default.nix index 202831309f0..a4d9e5a866d 100644 --- a/pkgs/os-specific/linux/ldm/default.nix +++ b/pkgs/os-specific/linux/ldm/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { description = "A lightweight device mounter, with libudev as only dependency"; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.the-kenny ]; diff --git a/pkgs/os-specific/linux/libcap-ng/default.nix b/pkgs/os-specific/linux/libcap-ng/default.nix index bbeb2851ea3..3670f06e543 100644 --- a/pkgs/os-specific/linux/libcap-ng/default.nix +++ b/pkgs/os-specific/linux/libcap-ng/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { description = "Library for working with POSIX capabilities"; homepage = http://people.redhat.com/sgrubb/libcap-ng/; platforms = stdenv.lib.platforms.linux; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index f878d284496..bb5dde9a61e 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = http://userspace.selinuxproject.org; platforms = platforms.linux; maintainers = [ maintainers.phreedom ]; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/pkgs/os-specific/linux/lsiutil/default.nix index 700455d5f8b..93cab433c9c 100644 --- a/pkgs/os-specific/linux/lsiutil/default.nix +++ b/pkgs/os-specific/linux/lsiutil/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.lsi.com/; description = "LSI Logic Fusion MPT command line management tool"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix index 9386b50969f..76f4661ecfc 100644 --- a/pkgs/os-specific/linux/net-tools/default.nix +++ b/pkgs/os-specific/linux/net-tools/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.tazenda.demon.co.uk/phil/net-tools/; description = "A set of tools for controlling the network subsystem in Linux"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix index e1cdd919e93..c77faa6a9e7 100644 --- a/pkgs/os-specific/linux/netatop/default.nix +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { description = "Network monitoring module for atop"; homepage = http://www.atoptool.nl/downloadnetatop.php; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 42bacd41be0..bb85acf4dcb 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; homepage = http://nfs.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.ludo ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix index d85c0c1a389..0014a5d2ee5 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.nvidia.com/object/unix.html; description = "X.org driver and kernel module for Legacy NVIDIA graphics cards"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix index f9aa80fba83..9acaee797f0 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.nvidia.com/object/unix.html; description = "X.org driver and kernel module for NVIDIA graphics cards"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index e28593d0252..88ab08e6c3d 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation { meta = { description = "A high performance, transport independent, multi-platform implementation of RFC3720"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.open-iscsi.org; broken = true; }; diff --git a/pkgs/os-specific/linux/otpw/default.nix b/pkgs/os-specific/linux/otpw/default.nix index c270f0dd0c6..27d0510a657 100644 --- a/pkgs/os-specific/linux/otpw/default.nix +++ b/pkgs/os-specific/linux/otpw/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.cl.cam.ac.uk/~mgk25/otpw.html; description = "A one-time password login package"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/os-specific/linux/pam_usb/default.nix index b5672728b53..f5fdc567087 100644 --- a/pkgs/os-specific/linux/pam_usb/default.nix +++ b/pkgs/os-specific/linux/pam_usb/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://pamusb.org/; description = "Authentication using USB Flash Drives"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix index b53c61c754a..787b72fde48 100644 --- a/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/pkgs/os-specific/linux/pcmciautils/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { the PCMCIA subsystem to behave (almost) as every other hotpluggable bus system. "; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix index e3b6168be9b..4fb7fc8cb0b 100644 --- a/pkgs/os-specific/linux/pm-utils/default.nix +++ b/pkgs/os-specific/linux/pm-utils/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://pm-utils.freedesktop.org/wiki/; description = "A small collection of scripts that handle suspend and resume on behalf of HAL"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix index f966180a8b6..c1049d78f42 100644 --- a/pkgs/os-specific/linux/pmount/default.nix +++ b/pkgs/os-specific/linux/pmount/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://pmount.alioth.debian.org/; description = "Mount removable devices as normal user"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/pmtools/default.nix b/pkgs/os-specific/linux/pmtools/default.nix index 13a6e87319e..7fa32ce4c94 100644 --- a/pkgs/os-specific/linux/pmtools/default.nix +++ b/pkgs/os-specific/linux/pmtools/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.lesswatts.org/projects/acpi/utilities.php; description = "Linux ACPI utilities"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/os-specific/linux/pommed/default.nix b/pkgs/os-specific/linux/pommed/default.nix index 89e9ff66342..b4b4569def4 100644 --- a/pkgs/os-specific/linux/pommed/default.nix +++ b/pkgs/os-specific/linux/pommed/default.nix @@ -74,6 +74,6 @@ stdenv.mkDerivation rec { meta = { description = "A tool to handle hotkeys on Apple laptop keyboards"; homepage = http://www.technologeek.org/projects/pommed/index.html; - license = "gplv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index 702ebc5d828..04ab624b86a 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "Analyze power consumption on Intel-based laptops"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.chaoflow ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/psmouse-alps/default.nix b/pkgs/os-specific/linux/psmouse-alps/default.nix index 65f1a5cf6c6..9dd78f5885a 100644 --- a/pkgs/os-specific/linux/psmouse-alps/default.nix +++ b/pkgs/os-specific/linux/psmouse-alps/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = { description = "ALPS dlkm driver with all known touchpads"; homepage = http://www.dahetral.com/public-download/alps-psmouse-dlkm-for-3-2-and-3-5/view; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/os-specific/linux/radeontools/default.nix b/pkgs/os-specific/linux/radeontools/default.nix index 4dbe7e54247..92e00ffad3f 100644 --- a/pkgs/os-specific/linux/radeontools/default.nix +++ b/pkgs/os-specific/linux/radeontools/default.nix @@ -24,9 +24,9 @@ stdenv.mkDerivation { cp radeontool lightwatch.pl $out/bin ''; - meta = { + meta = { description = "Control the backlight and external video output of ATI Radeon Mobility graphics cards"; homepage = http://fdd.com/software/radeon/; - license = "ZLIB"; + license = stdenv.lib.licenses.zlib; }; } diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index c95d27005ef..cc1363156dd 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "SELinux Tools"; homepage = "http://oss.tresys.com/projects/setools/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 10a1d88f234..e9b533f6687 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -3,10 +3,10 @@ let inherit (stdenv.lib) optional optionalString; s = rec { baseName="sysdig"; - version="0.1.83"; + version = "0.1.86"; name="${baseName}-${version}"; url="https://github.com/draios/sysdig/archive/${version}.tar.gz"; - sha256="0d4fw6vba78hqy8plhcq8lkdcxy1fizrr5aiszdsap7cvd0gls6r"; + sha256 = "1bb5whzxmbzr21fxirymhznkgdx01rsqzxd2dlnqvhbf8x2dpzw3"; }; buildInputs = [ cmake zlib luajit @@ -38,5 +38,6 @@ stdenv.mkDerivation { license = licenses.gpl2; maintainers = [maintainers.raskin]; platforms = platforms.linux ++ platforms.darwin; + downloadPage = "https://github.com/draios/sysdig/releases"; }; } diff --git a/pkgs/os-specific/linux/sysdig/default.upstream b/pkgs/os-specific/linux/sysdig/default.upstream index 7071d982500..485de5741d7 100644 --- a/pkgs/os-specific/linux/sysdig/default.upstream +++ b/pkgs/os-specific/linux/sysdig/default.upstream @@ -1,3 +1,8 @@ url https://github.com/draios/sysdig/releases ensure_choice version '.*/([0-9.]+)[.]tar[.].*' '\1' +do_overwrite () { + ensure_hash + set_var_value sha256 $CURRENT_HASH + set_var_value version $CURRENT_VERSION +} diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 2b4888f89cd..ec504bd9235 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://sebastien.godard.pagesperso-orange.fr/; description = "A collection of performance monitoring tools for Linux (such as sar, iostat and pidstat)"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/os-specific/linux/tunctl/default.nix b/pkgs/os-specific/linux/tunctl/default.nix index 8ea3599ff19..fe79c23dc44 100644 --- a/pkgs/os-specific/linux/tunctl/default.nix +++ b/pkgs/os-specific/linux/tunctl/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation { meta = { homepage = http://tunctl.sourceforge.net/; description = "Utility to set up and maintain TUN/TAP network interfaces"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index e7cce315e8c..a0df3d526f5 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -96,6 +96,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.uclibc.org/; description = "A small implementation of the C library"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; }; } diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/os-specific/linux/usermount/default.nix index d2b3632d69a..9bf8692d1ce 100644 --- a/pkgs/os-specific/linux/usermount/default.nix +++ b/pkgs/os-specific/linux/usermount/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/tom5760/usermount; description = "A simple tool to automatically mount removable drives using UDisks2 and D-Bus."; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; diff --git a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix index f84088a9302..a4fd00e4911 100644 --- a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix +++ b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation { description = "An Xorg driver for multitouch trackpads"; - license = "gplv2"; + license = stdenv.lib.licenses.gpl2; }; } - diff --git a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix index ae24e32a157..7abf6d7c828 100644 --- a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix +++ b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation { description = "Brings multitouch gestures to the Linux desktop"; - license = "gplv2"; + license = stdenv.lib.licenses.gpl2; }; } - diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index e59fd695f78..d4786037b5a 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -3,11 +3,11 @@ , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }: stdenv.mkDerivation rec { - name = "xf86-input-wacom-0.23.0"; + name = "xf86-input-wacom-0.25.0"; src = fetchurl { url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2"; - sha256 = "13capyywk4k3z0va8dawvvdbyschwid0075ji67kyabz1y431h6v"; + sha256 = "06kwcxmgja0xwc5glzwmxm237bsv9fk52k2d6ffq4naqfzn2k31k"; }; buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix index 8f8477d1864..4b118a5a7cd 100644 --- a/pkgs/os-specific/windows/jom/default.nix +++ b/pkgs/os-specific/windows/jom/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation { meta = { homepage = http://qt-project.org/wiki/jom; description = "Clone of nmake supporting multiple independent commands in parallel"; - license = "GPLv2+"; # Explicitly, GPLv2 or GPLv3, but not later. + license = stdenv.lib.licenses.gpl2Plus; # Explicitly, GPLv2 or GPLv3, but not later. }; } diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix index cd417eb9ad0..dde4f5d7371 100644 --- a/pkgs/os-specific/windows/pthread-w32/default.nix +++ b/pkgs/os-specific/windows/pthread-w32/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation { homepage = http://sourceware.org/pthreads-win32/; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 5e86d60871d..585228af2b4 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = ""; homepage = http://bird.network.cz; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; }; } diff --git a/pkgs/servers/elasticmq/default.nix b/pkgs/servers/elasticmq/default.nix index 3d0324775f8..0fec6a5fe0e 100644 --- a/pkgs/servers/elasticmq/default.nix +++ b/pkgs/servers/elasticmq/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { $ELASTICMQ_DATA_PREFIX/conf/Default.scala. You can use the Default.scala included in the distribution as a template. ''; - license = "APLv2"; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index 2431c86ddb6..07dff1cf585 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = "http://code.google.com/p/modwsgi/"; description = "Host Python applications in Apache through the WSGI interface"; - license = "ASL2.0"; + license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix index 8c0118912f5..a86f924346b 100644 --- a/pkgs/servers/http/myserver/default.nix +++ b/pkgs/servers/http/myserver/default.nix @@ -35,7 +35,7 @@ let version = "0.11"; in homepage = http://www.gnu.org/software/myserver/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index 40b4ff1f2d7..bbbe54b95fd 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Client library for MPD (music player daemon)"; homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; unix; maintainers = [ stdenv.lib.maintainers.mornfall ]; }; diff --git a/pkgs/servers/news/leafnode/default.nix b/pkgs/servers/news/leafnode/default.nix index 9da83fe891f..56d402397ec 100644 --- a/pkgs/servers/news/leafnode/default.nix +++ b/pkgs/servers/news/leafnode/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://leafnode.sourceforge.net/"; description = "Leafnode implements a store & forward NNTP proxy"; - license = "X11"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 78792c3a4f7..aa9da965d17 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { meta = { description = "a scalable, high-performance, open source NoSQL database"; homepage = http://www.mongodb.org; - license = "AGPLv3"; + license = stdenv.lib.licenses.agpl3; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 67dff3f6572..3694547c2d9 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { and group by, and is easy to setup and learn. ''; homepage = http://www.rethinkdb.com; - license = "AGPLv3"; + license = stdenv.lib.licenses.agpl3; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/servers/pies/default.nix b/pkgs/servers/pies/default.nix index 898bfb711ff..958578138bc 100644 --- a/pkgs/servers/pies/default.nix +++ b/pkgs/servers/pies/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { native utilities). Finally, it can replace the inetd utility! ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/pies/; diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix index a398a3ccdf9..781fca1c33d 100644 --- a/pkgs/servers/prayer/default.nix +++ b/pkgs/servers/prayer/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/; description = "Yet another Webmail interface for IMAP servers on Unix systems written in C"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/servers/radius/default.nix b/pkgs/servers/radius/default.nix index dcd577bb6cb..a8c991e12d3 100644 --- a/pkgs/servers/radius/default.nix +++ b/pkgs/servers/radius/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/radius/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index 76e416d6472..569ec87c4cb 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/pkgs/servers/search/elasticsearch/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "Open Source, Distributed, RESTful Search Engine"; - license = "ASL2.0"; + license = stdenv.lib.licenses.asl20; platforms = platforms.unix; }; } diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix index acff3a84a31..2d827c737d8 100644 --- a/pkgs/servers/shellinabox/default.nix +++ b/pkgs/servers/shellinabox/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = https://code.google.com/p/shellinabox; description = "Web based AJAX terminal emulator"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.tomberek]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/servers/silc-server/default.nix b/pkgs/servers/silc-server/default.nix index 2afec801961..fdb1dcbd1cf 100644 --- a/pkgs/servers/silc-server/default.nix +++ b/pkgs/servers/silc-server/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://silcnet.org/; description = "Secure Internet Live Conferencing server"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix index 90e71f5e47a..14cd91ee141 100644 --- a/pkgs/servers/sip/sipwitch/default.nix +++ b/pkgs/servers/sip/sipwitch/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Secure peer-to-peer VoIP server that uses the SIP protocol"; homepage = http://www.gnu.org/software/sipwitch/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index 00c614021b6..97e98217f8a 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.0.17"; in +let version = "9.0.18"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "d2f6d09cf941e7cbab6ee399f14080dbe822af58fda9fd132efb05c2b7d160ad"; + sha256 = "7c8a07d0ab78fe39522c6bb268a7b357f456d9d4796f57d7b43a004e4a9d3003"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 8d714c6f5a6..92417dc730c 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.1.13"; in +let version = "9.1.14"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "9ee819574dfc8798a448dc23a99510d2d8924c2f8b49f8228cd77e4efc8a6621"; + sha256 = "d0647ce563d18ae02bf68c5dd646a4c75e8b45b3a4fada64d481371fdc16f522"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index 8b0ce0f7bb2..e5dbdd034d3 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.2.8"; in +let version = "9.2.9"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "568ba482340219097475cce9ab744766889692ee7c9df886563e8292d66ed87c"; + sha256 = "94ec6d330f125b6fc725741293073b07d7d20cc3e7b8ed127bc3d14ad2370197"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix index 50ea799099c..6c6ef132e81 100644 --- a/pkgs/servers/sql/postgresql/9.3.x.nix +++ b/pkgs/servers/sql/postgresql/9.3.x.nix @@ -2,14 +2,14 @@ with stdenv.lib; -let version = "9.3.4"; in +let version = "9.3.5"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "9ee819574dfc8798a448dc23a99510d2d8924c2f8b49f8228cd77e4efc8a6621"; + sha256 = "14176ffb1f90a189e7626214365be08ea2bfc26f26994bafb4235be314b9b4b0"; }; buildInputs = [ zlib readline ] ++ optionals (!stdenv.isDarwin) [ libossp_uuid ]; diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix index 642b713daaa..a6552738ea6 100644 --- a/pkgs/servers/squid/squids.nix +++ b/pkgs/servers/squid/squids.nix @@ -16,7 +16,7 @@ rec { meta = { description = "http-proxy"; homepage = "http://www.squid-cache.org"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; }; diff --git a/pkgs/servers/unfs3/default.nix b/pkgs/servers/unfs3/default.nix index 96073645cc1..ee566c32def 100644 --- a/pkgs/servers/unfs3/default.nix +++ b/pkgs/servers/unfs3/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = http://unfs3.sourceforge.net/; - license = "BSD"; # 3-clause BSD + license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 938f6564b52..2f18a4e1020 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -680,11 +680,11 @@ let })) // {inherit xproto ;}; libXext = (stdenv.mkDerivation ((if overrides ? libXext then overrides.libXext else x: x) { - name = "libXext-1.3.2"; + name = "libXext-1.3.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXext-1.3.2.tar.bz2; - sha256 = "1q1j0kjyhmy24wqr6mdkrrciffyqhmc8vn95za2w1ka6qrdhfagq"; + url = mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2; + sha256 = "0dbfn5bznnrhqzvkrcmw4c44yvvpwdcsrvzxf4rk27r36b9x865m"; }; buildInputs = [pkgconfig libX11 xextproto xproto ]; })) // {inherit libX11 xextproto xproto ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 2b17423bae2..417d12ddadc 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -66,7 +66,7 @@ mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2 mirror://xorg/individual/lib/libXcursor-1.1.14.tar.bz2 mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXdmcp-1.1.1.tar.bz2 -mirror://xorg/individual/lib/libXext-1.3.2.tar.bz2 +mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2 mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2 mirror://xorg/individual/lib/libXfont-1.4.8.tar.bz2 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2 diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index f15705d4a11..5868125c97f 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Open-source XMPP application server written in Erlang"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = http://www.ejabberd.im; maintainers = [ lib.maintainers.sander ]; }; diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index 61f6478629d..6a6b8563a55 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { Bash without modification. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.simons ]; }; diff --git a/pkgs/shells/rush/default.nix b/pkgs/shells/rush/default.nix index 4354a3cd0b3..1e1904a29a5 100644 --- a/pkgs/shells/rush/default.nix +++ b/pkgs/shells/rush/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/rush/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/X11/autocutsel/default.nix b/pkgs/tools/X11/autocutsel/default.nix index 1fe3cb646ff..8506c9f38f3 100644 --- a/pkgs/tools/X11/autocutsel/default.nix +++ b/pkgs/tools/X11/autocutsel/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { inherit version; homepage = "http://www.nongnu.org/autocutsel/"; description = "Tracks changes in the server's cutbuffer and CLIPBOARD selection"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; all; updateWalker = true; }; diff --git a/pkgs/tools/X11/bgs/default.nix b/pkgs/tools/X11/bgs/default.nix index b2bdbe8aaea..00cf9a54fb7 100644 --- a/pkgs/tools/X11/bgs/default.nix +++ b/pkgs/tools/X11/bgs/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Extremely fast and small background setter for X"; - license = "MIT"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [pSub]; }; diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix index 96241bd02cd..d91f4bfdf65 100644 --- a/pkgs/tools/X11/hsetroot/default.nix +++ b/pkgs/tools/X11/hsetroot/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation { meta = { description = "hsetroot allows you to compose wallpapers ('root pixmaps') for X"; homepage = http://thegraveyard.org/hsetroot.html; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix index 57417fa7721..0d63c190b05 100644 --- a/pkgs/tools/X11/xbindkeys/default.nix +++ b/pkgs/tools/X11/xbindkeys/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.nongnu.org/xbindkeys/xbindkeys.html; description = "Launch shell commands with your keyboard or your mouse under X Window"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/X11/xchainkeys/default.nix b/pkgs/tools/X11/xchainkeys/default.nix index 42e26825e33..eab21f2d221 100644 --- a/pkgs/tools/X11/xchainkeys/default.nix +++ b/pkgs/tools/X11/xchainkeys/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = "https://code.google.com/p/xchainkeys/"; description = "A standalone X11 program to create chained key bindings"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index ce439d22c21..0e92021b62c 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { "macros", retype a file. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/xnee/; diff --git a/pkgs/tools/X11/xtrace/default.nix b/pkgs/tools/X11/xtrace/default.nix index c9f41b68446..efc0647f5db 100644 --- a/pkgs/tools/X11/xtrace/default.nix +++ b/pkgs/tools/X11/xtrace/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { homepage = http://xtrace.alioth.debian.org/; description = "xtrace, a tool to trace X11 protocol connections"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/admin/analog/default.nix b/pkgs/tools/admin/analog/default.nix index ec139e7240d..54dac32141f 100644 --- a/pkgs/tools/admin/analog/default.nix +++ b/pkgs/tools/admin/analog/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.analog.cx/"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; description = "Powerful tool to generate web server statistics"; maintainers = [ stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix index af634e3fd56..d8c60c0ec3c 100644 --- a/pkgs/tools/admin/sec/default.nix +++ b/pkgs/tools/admin/sec/default.nix @@ -1,11 +1,11 @@ { fetchurl, perl, stdenv }: stdenv.mkDerivation rec { - name = "sec-2.7.5"; + name = "sec-2.7.6"; src = fetchurl { url = "mirror://sourceforge/simple-evcorr/${name}.tar.gz"; - sha256 = "a21dcbb61aa99930f911b79e9412b875af12b08722a78295d210b896f23a0301"; + sha256 = "1lrssln55p3bmn3d2hl8c5l5ix32bn8065w1cgycwsf7r6fww51p"; }; buildInputs = [ perl ]; diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index b2dedf4688d..3d5abd074d9 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.tigervnc.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Fork of tightVNC, made in cooperation with VirtualGL"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix index 187d3345e6b..acb8708ec14 100644 --- a/pkgs/tools/admin/tightvnc/default.nix +++ b/pkgs/tools/admin/tightvnc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { builder = ./builder.sh; meta = { - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = "http://vnc-tight.sourceforge.net/"; description = "TightVNC is an improved version of VNC"; diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 6428fbaa9dc..87324ac80a2 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { archives). ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index ff51b28f34b..cd0cea13a14 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://p7zip.sourceforge.net/; description = "A port of the 7-zip archiver"; - # license = "LGPLv2.1+"; + "unRAR restriction" + # license = stdenv.lib.licenses.lgpl21Plus; + "unRAR restriction" platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index 273b394881b..afd734fbae0 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/sharutils/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 718a80e1406..1ed5866a692 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="zpaq"; - version="652"; + version="655"; name="${baseName}-${version}"; - hash="16qdf0y8jwjp8ymbikz7jm2ldjmbcixvkyrvsx0zy3y7nyylcgky"; - url="http://mattmahoney.net/dc/zpaq652.zip"; - sha256="16qdf0y8jwjp8ymbikz7jm2ldjmbcixvkyrvsx0zy3y7nyylcgky"; + hash="09wjss6vbziwvfmcngb64xd2yih79z1ypgrn4ni7ag8cifx9257c"; + url="http://mattmahoney.net/dc/zpaq655.zip"; + sha256="09wjss6vbziwvfmcngb64xd2yih79z1ypgrn4ni7ag8cifx9257c"; }; buildInputs = [ unzip diff --git a/pkgs/tools/backup/btar/default.nix b/pkgs/tools/backup/btar/default.nix index 0258edb8a19..89f577e93ad 100644 --- a/pkgs/tools/backup/btar/default.nix +++ b/pkgs/tools/backup/btar/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Tar-compatible block-based archiver"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://viric.name/cgi-bin/btar; platforms = with stdenv.lib.platforms; all; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/tools/backup/chunksync/default.nix b/pkgs/tools/backup/chunksync/default.nix index e51d6d6acea..baa0d617016 100644 --- a/pkgs/tools/backup/chunksync/default.nix +++ b/pkgs/tools/backup/chunksync/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Space-efficient incremental backups of large files or block devices"; homepage = "http://chunksync.florz.de/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 8a9db4e5701..45d6cb83739 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "Encrypted bandwidth-efficient backup using the rsync algorithm"; homepage = "http://www.nongnu.org/duplicity"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric simons]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix index be5e0ef4abc..4df142afe3a 100644 --- a/pkgs/tools/backup/httrack/default.nix +++ b/pkgs/tools/backup/httrack/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.httrack.com"; description = "Easy-to-use offline browser utility"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index d58815f6d6d..58affe10e4e 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "backup system trying to combine best a mirror and an incremental backup system"; homepage = http://rdiff-backup.nongnu.org/; - license = "GPL-2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix index 9b147d68230..0bd19e2d6be 100644 --- a/pkgs/tools/backup/rsnapshot/default.nix +++ b/pkgs/tools/backup/rsnapshot/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { meta = { description = "A filesystem snapshot utility for making backups of local and remote systems"; homepage = http://rsnapshot.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/bluetooth/bluedevil/default.nix b/pkgs/tools/bluetooth/bluedevil/default.nix index b8b7510b882..e5a4f83ab0f 100644 --- a/pkgs/tools/bluetooth/bluedevil/default.nix +++ b/pkgs/tools/bluetooth/bluedevil/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Bluetooth manager for KDE"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; inherit (kdelibs.meta) platforms; maintainers = [ maintainers.phreedom ]; }; diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix index 0d44624786b..bcf9ec2c0cc 100644 --- a/pkgs/tools/cd-dvd/cdrkit/default.nix +++ b/pkgs/tools/cd-dvd/cdrkit/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { ''; homepage = http://cdrkit.org/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index 39b7c809858..516f0750807 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation { meta = { homepage = http://unetbootin.sourceforge.net/; description = "A tool to create bootable live USB drives from ISO images"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/cd-dvd/vobcopy/default.nix b/pkgs/tools/cd-dvd/vobcopy/default.nix index fd0f131b8c2..f181ab71edf 100644 --- a/pkgs/tools/cd-dvd/vobcopy/default.nix +++ b/pkgs/tools/cd-dvd/vobcopy/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Copies DVD .vob files to harddisk, decrypting them on the way"; homepage = http://vobcopy.org/projects/c/c.shtml; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index 62a802ebab5..88cca66efb1 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { filesystems. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/xorriso/; diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index b1d127635f6..b7bf9c59f49 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { is just a bonus. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix index 6fd1ae97d96..51f61fcf239 100644 --- a/pkgs/tools/compression/lrzip/default.nix +++ b/pkgs/tools/compression/lrzip/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://ck.kolivas.org/apps/lrzip/; description = "The CK LRZIP compression program (LZMA + RZIP)"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; inherit version; }; } diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/tools/compression/rzip/default.nix index 8c4547753aa..ca8d356abb3 100644 --- a/pkgs/tools/compression/rzip/default.nix +++ b/pkgs/tools/compression/rzip/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { homepage = http://rzip.samba.org/; description = "The RZIP compression program"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index 283b751cf26..c012be7c56d 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation { meta = { homepage = http://upx.sourceforge.net/; description = "The Ultimate Packer for eXecutables"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix index 4c00252fc2a..5a43aa52a0e 100644 --- a/pkgs/tools/filesystems/archivemount/default.nix +++ b/pkgs/tools/filesystems/archivemount/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Gateway between FUSE and libarchive: allows mounting of cpio, .tar.gz, .tar.bz2 archives"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/tools/filesystems/chunkfs/default.nix b/pkgs/tools/filesystems/chunkfs/default.nix index c51837eef18..d91525e348f 100644 --- a/pkgs/tools/filesystems/chunkfs/default.nix +++ b/pkgs/tools/filesystems/chunkfs/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "(Un)ChunkFS is a pair of FUSE filesystems for viewing chunksync-style directory trees as a block device and vice versa."; homepage = "http://chunkfs.florz.de/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/filesystems/ciopfs/default.nix b/pkgs/tools/filesystems/ciopfs/default.nix index f944e591a12..97548442eba 100644 --- a/pkgs/tools/filesystems/ciopfs/default.nix +++ b/pkgs/tools/filesystems/ciopfs/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.brain-dump.org/projects/ciopfs/; description = "A case-insensitive filesystem layered on top of any other filesystem"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/filesystems/fsfs/default.nix b/pkgs/tools/filesystems/fsfs/default.nix index 0e72c45e31a..75e5280d391 100644 --- a/pkgs/tools/filesystems/fsfs/default.nix +++ b/pkgs/tools/filesystems/fsfs/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { meta = { homepage = http://fsfs.sourceforge.net/; description = "Secure distributed file system in user space"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 1c843a66636..69f3f7ef1ef 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -4,10 +4,11 @@ let s = # Generated upstream information rec { baseName="glusterfs"; - version="3.5.0"; + version="3.5.2"; name="${baseName}-${version}"; - url="http://download.gluster.org/pub/gluster/glusterfs/3.5/3.5.0/glusterfs-3.5.0.tar.gz"; - sha256="0d9jlgxg19f2ajf5i4yw4f91n161rsi8fm95442ckci3xnz21zir"; + hash="1hvns9islr5jcy0r1cw5890ra246y12pl5nlhl3bvmhglrkv8n7g"; + url="http://download.gluster.org/pub/gluster/glusterfs/3.5/3.5.2/glusterfs-3.5.2.tar.gz"; + sha256="1hvns9islr5jcy0r1cw5890ra246y12pl5nlhl3bvmhglrkv8n7g"; }; buildInputs = [ fuse bison flex_2_5_35 openssl python ncurses readline diff --git a/pkgs/tools/filesystems/grive/default.nix b/pkgs/tools/filesystems/grive/default.nix index dce7757d23a..c6d2776f437 100644 --- a/pkgs/tools/filesystems/grive/default.nix +++ b/pkgs/tools/filesystems/grive/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "an open source (experimental) Linux client for Google Drive"; homepage = https://github.com/Grive/grive; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/pkgs/tools/filesystems/httpfs/default.nix index 6f68a798ede..b0f7981ebb3 100644 --- a/pkgs/tools/filesystems/httpfs/default.nix +++ b/pkgs/tools/filesystems/httpfs/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = http://httpfs.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix index 4cb09d53adc..2a7d9672843 100644 --- a/pkgs/tools/filesystems/mtdutils/default.nix +++ b/pkgs/tools/filesystems/mtdutils/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "Tools for MTD filesystems"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.linux-mtd.infradead.org/; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix index 2c14bc624ae..0c5ec063b1a 100644 --- a/pkgs/tools/filesystems/reiserfsprogs/default.nix +++ b/pkgs/tools/filesystems/reiserfsprogs/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.namesys.com/; description = "ReiserFS utilities"; - license = "GPL-2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix index 3951a8d8bb7..89e49c9586c 100644 --- a/pkgs/tools/filesystems/s3backer/default.nix +++ b/pkgs/tools/filesystems/s3backer/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://code.google.com/p/s3backer/; description = "FUSE-based single file backing store via Amazon S3"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/pkgs/tools/filesystems/svnfs/default.nix index 4787ed77b59..b6a296e6bc7 100644 --- a/pkgs/tools/filesystems/svnfs/default.nix +++ b/pkgs/tools/filesystems/svnfs/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "SvnFs is a filesystem written using FUSE for accessing Subversion repositories"; homepage = http://www.jmadden.eu/index.php/svnfs/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index ed9ac2da2d2..b8d8dd5f48a 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, libjpeg, lcms, gettext, jasper }: +{stdenv, fetchurl, libjpeg, lcms2, gettext, jasper }: stdenv.mkDerivation rec { - name = "dcraw-9.20"; + name = "dcraw-9.22"; src = fetchurl { url = "http://www.cybercom.net/~dcoffin/dcraw/archive/${name}.tar.gz"; - sha256 = "151xpfmfd1ksjcnpmsnxry1mf2xpx9iaiy9sg1vxgm9i80lkkp5f"; + sha256 = "00dz85fr5r9k3nlwdbdi30fpqr8wihamzpyair7l7zk0vkrax402"; }; - buildInputs = [ libjpeg lcms gettext jasper ]; + buildInputs = [ libjpeg lcms2 gettext jasper ]; patchPhase = '' sed -i -e s@/usr/local@$out@ install diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index b77d63d510d..2d1a6472205 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://enblend.sourceforge.net/; description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index debc340ee4c..dc1a8b3abae 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { meta = { description = "Command-line tool for creating, editing, and getting information about GIF images and animations"; homepage = http://www.lcdf.org/gifsicle/; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix index 10cd9adf2b3..94a613078a4 100644 --- a/pkgs/tools/graphics/icoutils/default.nix +++ b/pkgs/tools/graphics/icoutils/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.nongnu.org/icoutils/; description = "Set of programs to deal with Microsoft Windows(R) icon and cursor files"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index ed69327b752..36a75743ed8 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.mcternan.me.uk/mscgen/; description = "Convert Message Sequence Chart descriptions into PNG, SVG, or EPS images"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' Mscgen is a small program that parses Message Sequence Chart diff --git a/pkgs/tools/graphics/panomatic/default.nix b/pkgs/tools/graphics/panomatic/default.nix index 1a7c3317cf9..f14c16775f8 100644 --- a/pkgs/tools/graphics/panomatic/default.nix +++ b/pkgs/tools/graphics/panomatic/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = http://aorlinsk2.free.fr/panomatic/; description = "Tool that automates the creation of control points in Hugin"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/graphics/ploticus/default.nix b/pkgs/tools/graphics/ploticus/default.nix index 857a86d57af..92dce64dcfd 100644 --- a/pkgs/tools/graphics/ploticus/default.nix +++ b/pkgs/tools/graphics/ploticus/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { statistical capabilities. It allows significant user control over colors, styles, options and details.''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://ploticus.sourceforge.net/; }; } diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix index bb250b9d852..ae0c4d19731 100644 --- a/pkgs/tools/graphics/plotutils/default.nix +++ b/pkgs/tools/graphics/plotutils/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/plotutils/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.ludo diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index 2a4364164dd..b27e5132804 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpng }: stdenv.mkDerivation rec { - name = "pngcrush-1.7.73"; + name = "pngcrush-1.7.76"; src = fetchurl { url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz"; - sha256 = "073y19af0sw36nw7draqw9zfd6n7q7b84kscy26s76fhj5x2gb0l"; + sha256 = "0jbv3ijc0nfhy6pkhv4dwbk2v488rwixd8rv1c7lfs59wblb44hv"; }; configurePhase = '' diff --git a/pkgs/tools/graphics/pngtoico/default.nix b/pkgs/tools/graphics/pngtoico/default.nix index df1046cb750..fe01a9459ec 100644 --- a/pkgs/tools/graphics/pngtoico/default.nix +++ b/pkgs/tools/graphics/pngtoico/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.kernel.org/pub/software/graphics/pngtoico/; description = "Small utility to convert a set of PNG images to Microsoft ICO format"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index 6272bdae780..b4a1d1a7d67 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -1,21 +1,39 @@ -{stdenv, fetchurl}: +{stdenv, fetchgit, autoconf, automake, boost149, zlib, libpng, libjpeg, libtiff}: +let boost = boost149; in stdenv.mkDerivation { - name = "povray-3.6"; + name = "povray-3.7"; - src = fetchurl { - url = http://www.povray.org/ftp/pub/povray/Old-Versions/Official-3.62/Unix/povray-3.6.tar.bz2; - sha256 = "4e8a7fecd44807343b6867e1f2440aa0e09613d6d69a7385ac48f4e5e7737a73"; + src = fetchgit { + url = "https://github.com/POV-Ray/povray.git"; + rev = "39ce8a24e50651904010dda15872d63be15d7c37"; + sha256 = "0d56631d9daacb8967ed359025f56acf0bd505d1d9e752859e8ff8656ae72d20"; }; + + buildInputs = [ autoconf automake boost zlib libpng libjpeg libtiff ]; + # the installPhase wants to put files into $HOME. I let it put the files # to $TMPDIR, so they don't get into the $out - patchPhase = '' - sed -i -e 's/^povconfuser.*/povconfuser=$(TMPDIR)\/povray/' Makefile.{am,in}; + postPatch = '' cd unix + ./prebuild.sh + cd .. + sed -i -e 's/^povconfuser.*/povconfuser=$(TMPDIR)\/povray/' Makefile.{am,in} + sed -i -e 's/^povuser.*/povuser=$(TMPDIR)\/.povray/' Makefile.{am,in} + sed -i -e 's/^povowner.*/povowner=nobody/' Makefile.{am,in} + sed -i -e 's/^povgroup.*/povgroup=nogroup/' Makefile.{am,in} + ''; + + configureFlags = "COMPILED_BY='nix' --with-boost-libdir=${boost}/lib --with-boost-includedir=${boost}/include"; + + preInstall = '' + mkdir "$TMP/bin" + for i in chown chgrp; do + echo '#!/bin/sh' >> "$TMP/bin/$i" + chmod +x "$TMP/bin/$i" + PATH="$TMP/bin:$PATH" + done ''; - # I didn't use configureFlags because I couldn't pass the quotes properly - # for the COMPILED_BY. - configurePhase = "./configure --prefix=$out COMPILED_BY=\"nix\""; meta = { homepage = http://www.povray.org/; diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index 62816705b8f..d4e977128cf 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "translates PostScript and PDF graphics into other vector formats"; homepage = http://www.helga-glunz.homepage.t-online.de/pstoedit; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/inputmethods/fcitx/default.nix b/pkgs/tools/inputmethods/fcitx/default.nix index 747c4b44ac8..2795b0d4d87 100644 --- a/pkgs/tools/inputmethods/fcitx/default.nix +++ b/pkgs/tools/inputmethods/fcitx/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://code.google.com/p/fcitx/"; description = "A Flexible Input Method Framework"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [iyzsong]; }; diff --git a/pkgs/tools/misc/aws-mturk-clt/default.nix b/pkgs/tools/misc/aws-mturk-clt/default.nix index f2fe1d95930..d2d29aae785 100644 --- a/pkgs/tools/misc/aws-mturk-clt/default.nix +++ b/pkgs/tools/misc/aws-mturk-clt/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://requester.mturk.com/developer; description = "Command line tools for interacting with the Amazon Mechanical Turk"; - license = "unfree-redistributable"; + license = "unfree-redistributable"; # Amazon http://aws.amazon.com/asl/ longDescription = '' diff --git a/pkgs/tools/misc/bfr/default.nix b/pkgs/tools/misc/bfr/default.nix index 024798a84e3..78383f4185d 100644 --- a/pkgs/tools/misc/bfr/default.nix +++ b/pkgs/tools/misc/bfr/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { description = "general-purpose command-line pipe buffer"; homepage = http://www.glines.org/wiki/bfr; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix index f7c121d825e..52d80a8812e 100644 --- a/pkgs/tools/misc/bogofilter/default.nix +++ b/pkgs/tools/misc/bogofilter/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { classifications and corrections. It is based on a Bayesian filter. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index b0dbb049cbf..8844fe9c57c 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -75,7 +75,7 @@ let operating system. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; }; diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/tools/misc/cunit/default.nix index 35e4c3ab4d4..ac9685b83f5 100644 --- a/pkgs/tools/misc/cunit/default.nix +++ b/pkgs/tools/misc/cunit/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { homepage = http://cunit.sourceforge.net/; - license = "lgpl"; + license = stdenv.lib.licenses.lgpl2; }; } - diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index ddf30f342d1..49e158ea2d0 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = { description = ''Debian package maintenance scripts''; - license = "GPL (various)"; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... + license = "GPL (various)"; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO maintainers = with stdenv.lib.maintainers; [raskin]; }; } diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index a76a57864d9..16b1858e91d 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation { meta = { description = "Tool to create a Debian system in a chroot"; homepage = http://packages.debian.org/de/lenny/debootstrap; # http://code.erisian.com.au/Wiki/debootstrap - license = "GPL-2"; # gentoo says so.. ? + license = stdenv.lib.licenses.gpl2; # gentoo says so.. ? maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/misc/detox/default.nix b/pkgs/tools/misc/detox/default.nix index 435115ffc59..65a0047738b 100644 --- a/pkgs/tools/misc/detox/default.nix +++ b/pkgs/tools/misc/detox/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { (or CP-1252) characters in them. ''; homepage = "http://detox.sourceforge.net/"; - license = "bsd"; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/tools/misc/fasd/default.nix index 77d1d58c30c..1cbbb9720c9 100644 --- a/pkgs/tools/misc/fasd/default.nix +++ b/pkgs/tools/misc/fasd/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/clvv/fasd"; description = "quick command-line access to files and directories for POSIX shells"; - license = "free"; + license = "free"; # https://github.com/clvv/fasd/blob/master/LICENSE longDescription = '' Fasd is a command-line productivity booster. @@ -33,5 +33,3 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.all; }; } - - diff --git a/pkgs/tools/misc/fdupes/default.nix b/pkgs/tools/misc/fdupes/default.nix index 14e6a2f6681..41c479e414b 100644 --- a/pkgs/tools/misc/fdupes/default.nix +++ b/pkgs/tools/misc/fdupes/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { files within a set of directories. ''; homepage = http://code.google.com/p/fdupes/; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.z77z diff --git a/pkgs/tools/misc/fileschanged/default.nix b/pkgs/tools/misc/fileschanged/default.nix index d0a03f955a8..d6ae74e02b5 100644 --- a/pkgs/tools/misc/fileschanged/default.nix +++ b/pkgs/tools/misc/fileschanged/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.nongnu.org/fileschanged/"; description = "A command-line utility that reports when files have been altered"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; longDescription = '' This utility is a client to FAM (File Alteration Monitor) servers diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 88cb2c313c0..a6ea96b77db 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { * xargs - build and execute command lines from standard input. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 50af2a12c24..16c7f652dec 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Graphical disk partitioning tool"; homepage = http://gparted.sourceforge.net; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 17cd86014dd..b1877bdcf98 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/grub/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = if EFIsupport then [ "i686-linux" "x86_64-linux" ] diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix index a937e96eed5..5f21559d471 100644 --- a/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/pkgs/tools/misc/gsmartcontrol/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { as well as run various tests on it. ''; homepage = http://gsmartcontrol.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [qknight]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/misc/hddtemp/default.nix b/pkgs/tools/misc/hddtemp/default.nix index f3c5dd02c7e..835ceb32881 100644 --- a/pkgs/tools/misc/hddtemp/default.nix +++ b/pkgs/tools/misc/hddtemp/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { meta = { description = "Tool for displaying hard disk temperature"; homepage = https://savannah.nongnu.org/projects/hddtemp/; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix index ab6102cf23c..227fba3d377 100644 --- a/pkgs/tools/misc/heimdall/default.nix +++ b/pkgs/tools/misc/heimdall/default.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.glassechidna.com.au/products/heimdall/; description = "A cross-platform open-source tool suite used to flash firmware onto Samsung Galaxy S devices"; - license = "bsd"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix index e01a28ab185..2b2f3aeaca3 100644 --- a/pkgs/tools/misc/idutils/default.nix +++ b/pkgs/tools/misc/idutils/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/idutils/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix index fe9c46dac64..2fa71223931 100644 --- a/pkgs/tools/misc/jdiskreport/default.nix +++ b/pkgs/tools/misc/jdiskreport/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.jgoodies.com/freeware/jdiskreport/; description = "A graphical utility to visualize disk usage"; - license = "unfree-redistributable"; + license = "unfree-redistributable"; #TODO freedist, libs under BSD-3 }; } diff --git a/pkgs/tools/misc/kermit/default.nix b/pkgs/tools/misc/kermit/default.nix index db2d6cffc40..ee521f04700 100644 --- a/pkgs/tools/misc/kermit/default.nix +++ b/pkgs/tools/misc/kermit/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation { meta = { homepage = "http://www.columbia.edu/kermit/ck80.html"; description = "Portable Scriptable Network and Serial Communication Software"; - license = "free"; + license = "free non-commercial"; #Kermit http://www.columbia.edu/kermit/ckfaq.html#license }; } diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index 2c2a547f2fd..2eb63f09216 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation { meta = { description = "Keychain management tool"; homepage = "http://www.gentoo.org/proj/en/keychain/"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/lockfile-progs/default.nix b/pkgs/tools/misc/lockfile-progs/default.nix index 15c6258e86f..308b5217a6f 100644 --- a/pkgs/tools/misc/lockfile-progs/default.nix +++ b/pkgs/tools/misc/lockfile-progs/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Programs for locking and unlocking files and mailboxes"; homepage = http://packages.debian.org/sid/lockfile-progs; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 594947ba13d..94c08fa9ba9 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { description = "File Manager and User Shell for the GNU Project"; homepage = http://www.midnight-commander.org; repositories.git = git://github.com/MidnightCommander/mc.git; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/tools/misc/mcrypt/default.nix b/pkgs/tools/misc/mcrypt/default.nix index 761b2c5bdbf..ffd8966a80e 100644 --- a/pkgs/tools/misc/mcrypt/default.nix +++ b/pkgs/tools/misc/mcrypt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ever-wider range of algorithms and modes. ''; homepage = http://mcrypt.sourceforge.net; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.qknight ]; }; diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix index ef85c3994a8..7fd6ce966d6 100644 --- a/pkgs/tools/misc/megacli/default.nix +++ b/pkgs/tools/misc/megacli/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { meta = { description = "CLI program for LSI MegaRAID cards, which also works with some Dell PERC RAID cards"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix index f177e9e84c2..3200c7016b6 100644 --- a/pkgs/tools/misc/mktorrent/default.nix +++ b/pkgs/tools/misc/mktorrent/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = http://mktorrent.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Command line utility to create BitTorrent metainfo files"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/tools/misc/most/default.nix b/pkgs/tools/misc/most/default.nix index 941d805a6ff..b7f7842680f 100644 --- a/pkgs/tools/misc/most/default.nix +++ b/pkgs/tools/misc/most/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { windows and can scroll left and right. Why settle for less? ''; homepage = http://www.jedsoft.org/most/index.html; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.gnu; # random choice }; } diff --git a/pkgs/tools/misc/mssys/default.nix b/pkgs/tools/misc/mssys/default.nix index a9d32205cea..6d3634ea7af 100644 --- a/pkgs/tools/misc/mssys/default.nix +++ b/pkgs/tools/misc/mssys/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { homepage = http://ms-sys.sourceforge.net/; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; description = "A program for writing Microsoft compatible boot records"; }; } diff --git a/pkgs/tools/misc/mysql2pgsql/default.nix b/pkgs/tools/misc/mysql2pgsql/default.nix index 5d93ef44b36..0dad6c2d33f 100644 --- a/pkgs/tools/misc/mysql2pgsql/default.nix +++ b/pkgs/tools/misc/mysql2pgsql/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { meta = { description = "converts mysql dump files to psql loadable files "; homepage = http://pgfoundry.org/projects/mysql2pgsql/; - license = "GPL"; + license = "BSD-Original"; }; } diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/tools/misc/pal/default.nix index fbc6d607650..2a081b882ab 100644 --- a/pkgs/tools/misc/pal/default.nix +++ b/pkgs/tools/misc/pal/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://palcal.sourceforge.net/; description = "Command-line calendar program that can keep track of events"; - license = "BSD"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index fa6f147efe4..df360bb9804 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/parallel/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index 54697f98414..d516e50124c 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight GTK+ clipboard manager"; homepage = "http://parcellite.sourceforge.net"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 1d0c4f2a9e7..108d4d5e040 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/parted/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ # Add your name here! diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix index 19a0df26169..156f03dad87 100644 --- a/pkgs/tools/misc/partition-manager/default.nix +++ b/pkgs/tools/misc/partition-manager/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Utility program to help you manage the disk devices"; homepage = http://www.kde-apps.org/content/show.php/KDE+Partition+Manager?content=89595; # ? - license = "GPL"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix index b55c973f60a..303fdb3dbe0 100644 --- a/pkgs/tools/misc/picocom/default.nix +++ b/pkgs/tools/misc/picocom/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Minimal dumb-terminal emulation program"; homepage = http://code.google.com/p/picocom/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/tools/misc/pk2cmd/default.nix index 37636da7235..909ed0856bb 100644 --- a/pkgs/tools/misc/pk2cmd/default.nix +++ b/pkgs/tools/misc/pk2cmd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.microchip.com/pickit2; - license = "nonfree"; + license = "nonfree"; #MicroChip-PK2 description = "Microchip PIC programming software for the PICKit2 programmer"; }; } diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix index 1da0d70a14f..031264f1edd 100644 --- a/pkgs/tools/misc/ponysay/default.nix +++ b/pkgs/tools/misc/ponysay/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Cowsay reimplemention for ponies"; homepage = http://terse.tk/ponysay/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ bodil ]; }; } diff --git a/pkgs/tools/misc/proxytunnel/default.nix b/pkgs/tools/misc/proxytunnel/default.nix index f5be7b8a46d..993a36ea909 100644 --- a/pkgs/tools/misc/proxytunnel/default.nix +++ b/pkgs/tools/misc/proxytunnel/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation { meta = { description = "program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy"; homepage = http://proxytunnel.sourceforge.net/download.php; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index d99fc1960dd..a8b6e046a9b 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.ivarch.com/programs/pv; description = "Tool for monitoring the progress of data through a pipeline"; - license = "free"; + license = "Artistic-2"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix index e798ee669e2..f2f5f37ebe4 100644 --- a/pkgs/tools/misc/recutils/default.nix +++ b/pkgs/tools/misc/recutils/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/recutils/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index b679218db79..fe0f3d646b8 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.roaringpenguin.com/products/remind; description = "Sophisticated calendar and alarm program for the console"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 5270ddad35e..7bc4701bb2f 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = { homepage = http://oss.oetiker.ch/rrdtool/; description = "High performance logging in Round Robin Databases"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/misc/sl/default.nix b/pkgs/tools/misc/sl/default.nix index 2ed8d89d43e..a2dab4e0eb8 100644 --- a/pkgs/tools/misc/sl/default.nix +++ b/pkgs/tools/misc/sl/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/index_e.html; - license = "unfree"; # I couldn't find its license, only a copyright. + license = stdenv.lib.licenses.unfree; # I couldn't find its license, only a copyright. description = "Steam Locomotive runs across your terminal when you type 'sl'"; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/misc/slsnif/default.nix b/pkgs/tools/misc/slsnif/default.nix index c861fc6f73a..f3c1c278c76 100644 --- a/pkgs/tools/misc/slsnif/default.nix +++ b/pkgs/tools/misc/slsnif/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "Serial line sniffer"; homepage = http://slsnif.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/stow/default.nix b/pkgs/tools/misc/stow/default.nix index 58f30a021fa..a6afe475e3b 100644 --- a/pkgs/tools/misc/stow/default.nix +++ b/pkgs/tools/misc/stow/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { as .../share, .../man, and so on. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/stow/; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; diff --git a/pkgs/tools/misc/t1utils/default.nix b/pkgs/tools/misc/t1utils/default.nix index 60767405154..5e473a5cd09 100644 --- a/pkgs/tools/misc/t1utils/default.nix +++ b/pkgs/tools/misc/t1utils/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = http://www.lcdf.org/type/; # README from tarball says "BSD-like" and points to non-existing LICENSE # file... - license = "BSD-like"; + license = "Click"; # MIT with extra clause, https://github.com/kohler/t1utils/blob/master/LICENSE platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/tools/misc/testdisk/default.nix b/pkgs/tools/misc/testdisk/default.nix index 73ac04dd34e..fd237ac15f4 100644 --- a/pkgs/tools/misc/testdisk/default.nix +++ b/pkgs/tools/misc/testdisk/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.cgsecurity.org/wiki/TestDisk; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; longDescription = '' diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/tools/misc/time/default.nix index 05ab7cc7ae7..3a35e9a9f1c 100644 --- a/pkgs/tools/misc/time/default.nix +++ b/pkgs/tools/misc/time/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { `time' reports unavailable information as zero values. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnu.org/software/time/; }; } diff --git a/pkgs/tools/misc/uucp/default.nix b/pkgs/tools/misc/uucp/default.nix index f8ad1fd4d15..bf73dbcbf2f 100644 --- a/pkgs/tools/misc/uucp/default.nix +++ b/pkgs/tools/misc/uucp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/uucp/uucp.html; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/tools/misc/wv2/default.nix b/pkgs/tools/misc/wv2/default.nix index a3938c1af4c..1c2c94ff89c 100644 --- a/pkgs/tools/misc/wv2/default.nix +++ b/pkgs/tools/misc/wv2/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Excellent MS Word filter lib, used in most Office suites"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; homepage = http://wvware.sourceforge.net; }; } diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index cc9f98a94f6..93a2707d1e9 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { description = "Qi tools to access the Ben Nanonote USB_BOOT mode"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; homepage = http://www.linux-mtd.infradead.org/; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix index 1014f11453b..c830f1a3e2e 100644 --- a/pkgs/tools/misc/xclip/default.nix +++ b/pkgs/tools/misc/xclip/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { description = "Tool to access the X clipboard from a console application"; homepage = http://people.debian.org/~kims/xclip/; - license = "GPL-2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index f6d6a2bacfa..79c6a743bce 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -45,7 +45,7 @@ rec { ]; platforms = with a.lib.platforms; linux ++ freebsd; - license = "free"; + license = "free"; #TODO BSD on Gentoo, looks like MIT }; passthru = { updateInfo = { @@ -53,4 +53,3 @@ rec { }; }; }) x - diff --git a/pkgs/tools/misc/xdummy/default.nix b/pkgs/tools/misc/xdummy/default.nix new file mode 100644 index 00000000000..30aba19930c --- /dev/null +++ b/pkgs/tools/misc/xdummy/default.nix @@ -0,0 +1,83 @@ +{ stdenv, writeText, writeScriptBin, xorg, xkeyboard_config }: + +let + xorgConfig = writeText "dummy-xorg.conf" '' + Section "ServerLayout" + Identifier "dummy_layout" + Screen 0 "dummy_screen" + InputDevice "dummy_keyboard" "CoreKeyboard" + InputDevice "dummy_mouse" "CorePointer" + EndSection + + Section "ServerFlags" + Option "DontVTSwitch" "true" + Option "AllowMouseOpenFail" "true" + Option "PciForceNone" "true" + Option "AutoEnableDevices" "false" + Option "AutoAddDevices" "false" + EndSection + + Section "Files" + ModulePath "${xorg.xorgserver}/lib/xorg/modules" + ModulePath "${xorg.xf86videodummy}/lib/xorg/modules" + XkbDir "${xkeyboard_config}/share/X11/xkb" + FontPath "${xorg.fontadobe75dpi}/lib/X11/fonts/75dpi" + FontPath "${xorg.fontadobe100dpi}/lib/X11/fonts/100dpi" + FontPath "${xorg.fontbhlucidatypewriter75dpi}/lib/X11/fonts/75dpi" + FontPath "${xorg.fontbhlucidatypewriter100dpi}/lib/X11/fonts/100dpi" + FontPath "${xorg.fontbh100dpi}/lib/X11/fonts/100dpi" + FontPath "${xorg.fontmiscmisc}/lib/X11/fonts/misc" + FontPath "${xorg.fontcursormisc}/lib/X11/fonts/misc" + EndSection + + Section "Module" + Load "dbe" + Load "extmod" + Load "freetype" + Load "glx" + EndSection + + Section "InputDevice" + Identifier "dummy_mouse" + Driver "void" + EndSection + + Section "InputDevice" + Identifier "dummy_keyboard" + Driver "void" + EndSection + + Section "Monitor" + Identifier "dummy_monitor" + HorizSync 30.0 - 130.0 + VertRefresh 50.0 - 250.0 + Option "DPMS" + EndSection + + Section "Device" + Identifier "dummy_device" + Driver "dummy" + VideoRam 192000 + EndSection + + Section "Screen" + Identifier "dummy_screen" + Device "dummy_device" + Monitor "dummy_monitor" + DefaultDepth 24 + SubSection "Display" + Depth 24 + Modes "1280x1024" + EndSubSection + EndSection + ''; + +in writeScriptBin "xdummy" '' + #!${stdenv.shell} + export XKB_BINDIR="${xorg.xkbcomp}/bin" + exec ${xorg.xorgserver}/bin/Xorg \ + -noreset \ + -logfile /dev/null \ + "$@" \ + -config "${xorgConfig}" +'' diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 1a99cb291c4..64cfadb494a 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, zip }: let - version = "2014.04.02"; + version = "2014.08.02.1"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "1c9d5wjl0aaqfvz868wbkr3dwby9vjkx0hkbnwx0wnpg48nlnwpm"; + sha256 = "0pn8vfzsxp0qbjidhi6pwr1cfinqbr9wcr7sipr97j4ja9m5kkha"; }; buildInputs = [ python ]; diff --git a/pkgs/tools/networking/ahcpd/default.nix b/pkgs/tools/networking/ahcpd/default.nix index 635d94a3e86..df8677bfffa 100644 --- a/pkgs/tools/networking/ahcpd/default.nix +++ b/pkgs/tools/networking/ahcpd/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.pps.univ-paris-diderot.fr/~jch/software/ahcp/"; description = "Autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 networks"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index 475d6775cde..ce2ded24f82 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Wireless encryption crackign tools"; homepage = http://www.aircrack-ng.org/; - license = "GPL2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ maintainers.iElectric maintainers.viric maintainers.garbas maintainers.chaoflow ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix index 34bdd153f3a..cfd72098261 100644 --- a/pkgs/tools/networking/babeld/default.nix +++ b/pkgs/tools/networking/babeld/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.pps.univ-paris-diderot.fr/~jch/software/babel/"; description = "Loop-avoiding distance-vector routing protocol"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/networking/cadaver/default.nix b/pkgs/tools/networking/cadaver/default.nix new file mode 100644 index 00000000000..83073df0a98 --- /dev/null +++ b/pkgs/tools/networking/cadaver/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "cadaver-0.23.3"; + + src = fetchurl { + url = "http://www.webdav.org/cadaver/${name}.tar.gz"; + sha256 = "1jizq69ifrjbjvz5y79wh1ny94gsdby4gdxwjad4bfih6a5fck7x"; + }; + + meta = with stdenv.lib; { + description = "A command-line WebDAV client for Unix"; + homepage = http://www.webdav.org/cadaver; + maintainers = with maintainers; [ ianwookim ]; + license = licenses.gpl2; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index 00e747da7c7..1f7c8a449f3 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://matt.ucc.asn.au/dropbear/dropbear.html; description = "An small footprint implementation of the SSH 2 protocol"; - license = "mit"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index f9efc6815b6..d7d867cc8df 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://viric.name/cgi-bin/filegive; description = "Easy p2p file sending program"; - license = "AGPLv3+"; + license = stdenv.lib.licenses.agpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix index c9bc05658d0..f9322129612 100644 --- a/pkgs/tools/networking/flvstreamer/default.nix +++ b/pkgs/tools/networking/flvstreamer/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { stream audio or video content from all types of flash or rtmp servers. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://savannah.nongnu.org/projects/flvstreamer; diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/tools/networking/gftp/default.nix index e6b5cd9daab..e7aabcd9755 100644 --- a/pkgs/tools/networking/gftp/default.nix +++ b/pkgs/tools/networking/gftp/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { description = "GTK+-based FTP client"; homepage = http://www.gftp.org; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/hyenae/default.nix b/pkgs/tools/networking/hyenae/default.nix index d0821a4f588..557fce6d94b 100644 --- a/pkgs/tools/networking/hyenae/default.nix +++ b/pkgs/tools/networking/hyenae/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = ""; homepage = http://sourceforge.net/projects/hyenae/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/networking/imapproxy/default.nix b/pkgs/tools/networking/imapproxy/default.nix index 7af7f73aad9..29f09b8cc19 100644 --- a/pkgs/tools/networking/imapproxy/default.nix +++ b/pkgs/tools/networking/imapproxy/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://imapproxy.org/; description = "It proxies IMAP transactions caching server connections"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/imapsync/default.nix b/pkgs/tools/networking/imapsync/default.nix index c2c1320988a..1418ad63385 100644 --- a/pkgs/tools/networking/imapsync/default.nix +++ b/pkgs/tools/networking/imapsync/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.linux-france.org/prj/imapsync/"; description = "Mail folder synchronizer between IMAP servers"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 99bc8488248..ce90bed3010 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://inadyn.sourceforge.net/; description = "Free dynamic DNS client"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 295cb0bf139..20ee6da8a30 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/inetutils/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix index 132d1832a9d..49753d189d6 100644 --- a/pkgs/tools/networking/jnettop/default.nix +++ b/pkgs/tools/networking/jnettop/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { ''; homepage = http://jnettop.kubs.info/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/lsh/default.nix b/pkgs/tools/networking/lsh/default.nix index ab43813f923..b7146342b9f 100644 --- a/pkgs/tools/networking/lsh/default.nix +++ b/pkgs/tools/networking/lsh/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.lysator.liu.se/~nisse/lsh/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix index 25dbd634c8c..5c1910f1d6e 100644 --- a/pkgs/tools/networking/megatools/default.nix +++ b/pkgs/tools/networking/megatools/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Command line client for Mega.co.nz"; homepage = http://megatools.megous.com/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index e781af7c235..5209e58ff24 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { Mosh is a replacement for SSH. It's more robust and responsive, especially over Wi-Fi, cellular, and long-distance links. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 1055ef90b12..87f0db1946b 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "A collection of utilties for indexing and searching Maildirs"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = "http://www.djcbsoftware.nl/code/mu/"; platforms = stdenv.lib.platforms.mesaPlatforms; maintainers = with stdenv.lib.maintainers; [ antono the-kenny ]; diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index b2943eb2ace..dffafe5c816 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://nbd.sourceforge.net"; description = "map arbitrary files as block devices over the network"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/networking/netkit/tftp/default.nix b/pkgs/tools/networking/netkit/tftp/default.nix index 16b8a1159b6..5752ff2a63c 100644 --- a/pkgs/tools/networking/netkit/tftp/default.nix +++ b/pkgs/tools/networking/netkit/tftp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Netkit TFTP client and server"; homepage = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"; - license = "BSD"; + license = "BSD-Original"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/networking/ngrep/default.nix b/pkgs/tools/networking/ngrep/default.nix index 361d44eaca7..5c7840034b7 100644 --- a/pkgs/tools/networking/ngrep/default.nix +++ b/pkgs/tools/networking/ngrep/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # <ngrep>/doc/README.txt says that ngrep itself is licensed under a # 'BSD-like' license but that the 'regex' library (in the ngrep tarball) is # GPLv2. - license = "BSD-like"; + license = "ngrep"; # Some custom BSD-style, see LICENSE.txt platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/tools/networking/nss-mdns/default.nix index 7ef5eb17dc1..b3d4ec95e06 100644 --- a/pkgs/tools/networking/nss-mdns/default.nix +++ b/pkgs/tools/networking/nss-mdns/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; homepage = http://0pointer.de/lennart/projects/nss-mdns/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; # Supports both the GNU and FreeBSD NSS. platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.freebsd; diff --git a/pkgs/tools/networking/ntop/default.nix b/pkgs/tools/networking/ntop/default.nix index d5fa2deb68d..11e67ae6333 100644 --- a/pkgs/tools/networking/ntop/default.nix +++ b/pkgs/tools/networking/ntop/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Traffic analysis with NetFlow and sFlow support"; - license = "GLPv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.ntop.org/products/ntop/; platforms = stdenv.lib.platforms.linux; broken = true; diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index c5386553f4f..a97406ac7ed 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://nzbget.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "A command line tool for downloading files from news servers"; }; } diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index 666f3ad8ba7..b81c46c0b61 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "A program to manage /etc/resolv.conf"; homepage = http://roy.marples.name/projects/openresolv; - license = "bsd"; + license = stdenv.lib.licenses.bsd2; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index ea94560219f..fec6679a14b 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://www.openssh.org/"; description = "An implementation of the SSH protocol"; - license = "bsd"; + license = "bsd"; # multi BSD GPL-2 platforms = platforms.unix; maintainers = with maintainers; [ eelco ]; broken = hpnSupport; # cf. https://github.com/NixOS/nixpkgs/pull/1640 diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index f06a36a96f5..591bf26ff0b 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "A robust and highly flexible tunneling application"; homepage = http://openvpn.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index ac848b5d72e..45a73924758 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -61,7 +61,7 @@ mkDerivation rec { applications. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice maintainers = [ stdenv.lib.maintainers.phreedom ]; diff --git a/pkgs/tools/networking/p2p/seeks/default.nix b/pkgs/tools/networking/p2p/seeks/default.nix index 835744c6000..8c707e2fcc7 100644 --- a/pkgs/tools/networking/p2p/seeks/default.nix +++ b/pkgs/tools/networking/p2p/seeks/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { web indexes as users can push content directly to search groups. ''; - license = "AGPLv3+"; + license = stdenv.lib.licenses.agpl3Plus; homepage = http://www.seeks-project.info/; diff --git a/pkgs/tools/networking/pdnsd/default.nix b/pkgs/tools/networking/pdnsd/default.nix index 6058639e412..40d57cd65b6 100644 --- a/pkgs/tools/networking/pdnsd/default.nix +++ b/pkgs/tools/networking/pdnsd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Permanent DNS caching"; homepage = http://www.phys.uu.nl/~rombouts/pdnsd.html; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix index 7a5b6b6c440..fa3fc4472f3 100644 --- a/pkgs/tools/networking/pdsh/default.nix +++ b/pkgs/tools/networking/pdsh/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = { homepage = "http://code.google.com/p/pdsh/"; description = "High-performance, parallel remote shell utility"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' Pdsh is a high-performance, parallel remote shell utility. It has diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/tools/networking/proxychains/default.nix index 6778cf94907..2835c9016ab 100644 --- a/pkgs/tools/networking/proxychains/default.nix +++ b/pkgs/tools/networking/proxychains/default.nix @@ -10,6 +10,6 @@ stdenv.mkDerivation { meta = { description = "Proxifier for SOCKS proxies"; homepage = http://proxychains.sourceforge.net; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/pwnat/default.nix b/pkgs/tools/networking/pwnat/default.nix index 63919edd505..e2da224cfdc 100644 --- a/pkgs/tools/networking/pwnat/default.nix +++ b/pkgs/tools/networking/pwnat/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://samy.pl/pwnat/; description = "ICMP NAT to NAT client-server communication"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/networking/reaver-wps/default.nix b/pkgs/tools/networking/reaver-wps/default.nix index 65d681fdc22..afce95fbd44 100644 --- a/pkgs/tools/networking/reaver-wps/default.nix +++ b/pkgs/tools/networking/reaver-wps/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { meta = { description = "Brute force attack against Wifi Protected Setup"; homepage = http://code.google.com/p/reaver-wps; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/s3sync/default.nix b/pkgs/tools/networking/s3sync/default.nix index 48788d36884..8390c70a4d3 100644 --- a/pkgs/tools/networking/s3sync/default.nix +++ b/pkgs/tools/networking/s3sync/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation { meta = { homepage = http://s3sync.net/; description = "Command-line tools to manipulate Amazon S3 buckets"; - license = "free-non-copyleft"; + license = "free-non-copyleft"; # some custom as-is in file headers }; } diff --git a/pkgs/tools/networking/smbldaptools/default.nix b/pkgs/tools/networking/smbldaptools/default.nix index 74e8a530560..af1849565fe 100644 --- a/pkgs/tools/networking/smbldaptools/default.nix +++ b/pkgs/tools/networking/smbldaptools/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { meta = { homepage = http://gna.org/projects/smbldap-tools/; description = "SAMBA LDAP tools"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix index bf0c2f80694..3e8f3ca3dc5 100644 --- a/pkgs/tools/networking/swec/default.nix +++ b/pkgs/tools/networking/swec/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { (well, not exactly true, SWEC will ignore robots.txt). ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; }; diff --git a/pkgs/tools/networking/udptunnel/default.nix b/pkgs/tools/networking/udptunnel/default.nix index 0cb777b01af..b12ce573d1c 100644 --- a/pkgs/tools/networking/udptunnel/default.nix +++ b/pkgs/tools/networking/udptunnel/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = http://code.google.com/p/udptunnel/; description = "Tunnels TCP over UDP packets"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix index 54390d4f9ee..1da9ca96984 100644 --- a/pkgs/tools/networking/uwimap/default.nix +++ b/pkgs/tools/networking/uwimap/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.washington.edu/imap/; description = "UW IMAP toolkit - IMAP-supporting software developed by the UW"; - license = "Apache2"; + license = stdenv.lib.licenses.asl20; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index 8619cd95409..1386f7133e5 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.unix-ag.uni-kl.de/~massar/vpnc/"; description = "virtual private network (VPN) client for Cisco's VPN concentrators"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/tools/networking/vtun/default.nix b/pkgs/tools/networking/vtun/default.nix index 3f3a0dc8993..e32ee43113e 100644 --- a/pkgs/tools/networking/vtun/default.nix +++ b/pkgs/tools/networking/vtun/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { meta = { description="Virtual Tunnels over TCP/IP with traffic shaping, compression and encryption"; homepage="http://vtun.sourceforge.net/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/networking/wakelan/default.nix b/pkgs/tools/networking/wakelan/default.nix index 837ab3627fa..4f8717e9a11 100644 --- a/pkgs/tools/networking/wakelan/default.nix +++ b/pkgs/tools/networking/wakelan/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { power on. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index c8698215525..6ff5439c4bc 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { scripts, cron jobs, terminals without X-Windows support, etc. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/wget/; diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index 381cb21ec1b..291f7e36ce0 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "A SOAP interface and client for Disnix"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index d89ab7667e8..61e998fd545 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { description = "A distributed deployment extension for Nix"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 7420353499f..65ae91f6e18 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { description = "Provides complementary NixOS infrastructure deployment to Disnix"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index d2f3ae6468c..a1914224dbd 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { meta = { description = "Automated deployment of mutable components and services for Disnix"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/tools/package-management/guix/default.nix b/pkgs/tools/package-management/guix/default.nix index 7c4a098cad8..b4b3c98505e 100644 --- a/pkgs/tools/package-management/guix/default.nix +++ b/pkgs/tools/package-management/guix/default.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { Guix is based on the Nix package manager. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 16a276273cc..b2e86935b50 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = { description = "The Nix Deployment System"; homepage = http://nixos.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index ef673241c7e..afcceb30474 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.8pre3705_71a20d4"; + name = "nix-1.8pre3718_51485dc"; src = fetchurl { - url = "http://hydra.nixos.org/build/12722887/download/5/${name}.tar.xz"; - sha256 = "832905be494280c8dcb377e389fb9c6c77993508bb457e11720ba2b53dd580ae"; + url = "http://hydra.nixos.org/build/13025632/download/5/${name}.tar.xz"; + sha256 = "69f3a0729b6df1adcbfc7c13df405ce7f3f7904b0cbcdd7f6ad3a0af45f4024c"; }; nativeBuildInputs = [ perl pkgconfig ]; @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = { description = "The Nix Deployment System"; homepage = http://nixos.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix index 96de0e0fbe4..dbbdb8e57a6 100644 --- a/pkgs/tools/security/aespipe/default.nix +++ b/pkgs/tools/security/aespipe/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "AES encrypting or decrypting pipe"; homepage = http://loop-aes.sourceforge.net/aespipe.README; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; maintainers = stdenv.lib.maintainers.goibhniu; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index 458111be400..42af2e0b57e 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "ccid drivers for pcsclite"; homepage = http://pcsclite.alioth.debian.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/security/ccrypt/default.nix b/pkgs/tools/security/ccrypt/default.nix index 0d4841bf036..e6a63a2f288 100644 --- a/pkgs/tools/security/ccrypt/default.nix +++ b/pkgs/tools/security/ccrypt/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { homepage = http://ccrypt.sourceforge.net/; description = "Utility for encrypting and decrypting files and streams with AES-256"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/security/gnupg/git.nix b/pkgs/tools/security/gnupg/git.nix index 3d7db862dce..69a0a68319f 100644 --- a/pkgs/tools/security/gnupg/git.nix +++ b/pkgs/tools/security/gnupg/git.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { homepage = http://gnupg.org/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/security/gnupg1/default.nix b/pkgs/tools/security/gnupg1/default.nix index a25ae35b6cc..53f784396a7 100644 --- a/pkgs/tools/security/gnupg1/default.nix +++ b/pkgs/tools/security/gnupg1/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "free implementation of the OpenPGP standard for encrypting and signing data"; homepage = http://www.gnupg.org/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/tools/security/meo/default.nix b/pkgs/tools/security/meo/default.nix index 2dfdf466c28..be678b18dda 100644 --- a/pkgs/tools/security/meo/default.nix +++ b/pkgs/tools/security/meo/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { homepage = http://oss.stamfest.net/wordpress/meo-multiple-eyepairs-only; description = "Tools to use cryptography for things like four-eyes principles"; - license = "AGPLv3+"; + license = stdenv.lib.licenses.agpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/security/muscletool/default.nix b/pkgs/tools/security/muscletool/default.nix index c9648fbe404..ac9ccc59205 100644 --- a/pkgs/tools/security/muscletool/default.nix +++ b/pkgs/tools/security/muscletool/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = { description = "Smart card applications for use with MUSCLE plugins"; homepage = http://muscleapps.alioth.debian.org/; - license = "BSD"; + license = "BSD"; # http://anonscm.debian.org/viewvc/muscleapps/trunk/muscleTool/COPYING?view=markup maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/security/paperkey/default.nix b/pkgs/tools/security/paperkey/default.nix new file mode 100644 index 00000000000..c3b1d64c3a3 --- /dev/null +++ b/pkgs/tools/security/paperkey/default.nix @@ -0,0 +1,28 @@ +{ fetchurl, stdenv }: + +stdenv.mkDerivation rec { + + version = "1.3"; + name = "paperkey-${version}"; + + src = fetchurl { + url = "http://www.jabberwocky.com/software/paperkey/${name}.tar.gz"; + sha256 = "5b57d7522336fb65c4c398eec27bf44ec0aaa35926157b79a76423231792cbfb"; + }; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Store OpenPGP or GnuPG on paper"; + longDescription = '' + A reasonable way to achieve a long term backup of OpenPGP (GnuPG, PGP, etc) + keys is to print them out on paper. Paper and ink have amazingly long + retention qualities - far longer than the magnetic or optical means that + are generally used to back up computer data. + ''; + homepage = "http://www.jabberwocky.com/software/paperkey/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.skeidel ]; + }; +} diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index f9bc0171592..3b44edcf1d3 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -7,12 +7,12 @@ assert withX -> xclip != null; stdenv.mkDerivation rec { - version = "1.6.2"; + version = "1.6.3"; name = "password-store-${version}"; src = fetchurl { url = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz"; - sha256 = "1d32y6k625pv704icmhg46zg02kw5zcyxscgljxgy8bb5wv4lv2j"; + sha256 = "1xs00c7ffqd0093i452kryw9sjip6dkp1pclx69zihb5l45d86fl"; }; patches = [ ./darwin-getopt.patch ]; diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 4d1d55244c0..038044ad681 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gnupg.org/aegypten2/"; description = "GnuPG's interface to passphrase input"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; longDescription = '' Pinentry provides a console and a GTK+ GUI that allows users to diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index e693143e4c4..2a4995f4579 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { to the process. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.gnu; maintainers = [ ]; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 57c4a9c5662..d71bbd891f9 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libevent, openssl, zlib }: stdenv.mkDerivation rec { - name = "tor-0.2.4.22"; + name = "tor-0.2.4.23"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz"; - sha256 = "0k39ppcvld6p08yaf4rpspb34z4f5863j0d605yrm4dqjcp99xvb"; + sha256 = "0a8l6d82hk4wbn7nlphd3c1maxhgdli8338wbg5r9dk6zcy7k8q5"; }; buildInputs = [ libevent openssl zlib ]; diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index 0254b143edf..f8e76c4e83b 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { description = "use socks-friendly applications with Tor"; homepage = http://code.google.com/p/torsocks/; repositories.git = https://git.torproject.org/torsocks.git; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/system/acct/default.nix b/pkgs/tools/system/acct/default.nix index cd9519590cc..071504368b7 100644 --- a/pkgs/tools/system/acct/default.nix +++ b/pkgs/tools/system/acct/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { execution statistics. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/acct/; diff --git a/pkgs/tools/system/ansible/default.nix b/pkgs/tools/system/ansible/default.nix index 7d96092a3ce..b3d40712926 100644 --- a/pkgs/tools/system/ansible/default.nix +++ b/pkgs/tools/system/ansible/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pythonPackages, python }: pythonPackages.buildPythonPackage rec { - version = "1.6.1"; + version = "1.6.10"; name = "ansible-${version}"; namePrefix = ""; src = fetchurl { url = "https://github.com/ansible/ansible/archive/v${version}.tar.gz"; - sha256 = "1iz1q2h0zll4qsxk0pndc59knasw663kv53sm21q57qz7lf30q9z"; + sha256 = "0j133353skzb6ydrqqgfkzbkkj1zaibl1x8sgl0arnfma8qky1g1"; }; prePatch = '' diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix index c7789051365..2964db34e12 100644 --- a/pkgs/tools/system/at/default.nix +++ b/pkgs/tools/system/at/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = { description = ''The classical Unix `at' job scheduling command''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://packages.qa.debian.org/at; }; } diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index bc4bca887c8..4210a0a04a5 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { name = "collectd-5.4.1"; - + src = fetchurl { url = "http://collectd.org/files/${name}.tar.bz2"; sha256 = "1q365zx6d1wyhv7n97bagfxqnqbhj2j14zz552nhmjviy8lj2ibm"; diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index d2ace27b1fd..8117906585c 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/ddrescue/ddrescue.html; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ iElectric ]; diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix index 81206a13296..67b97ea75b1 100644 --- a/pkgs/tools/system/efibootmgr/default.nix +++ b/pkgs/tools/system/efibootmgr/default.nix @@ -27,4 +27,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } - diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix index 1bf18ed867c..9764ae6ce0e 100644 --- a/pkgs/tools/system/fakeroot/default.nix +++ b/pkgs/tools/system/fakeroot/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://fakeroot.alioth.debian.org/; description = "Give a fake root environment through LD_PRELOAD"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/tools/system/fcron/default.nix index 5a70843ff6b..f546cd8f5ff 100644 --- a/pkgs/tools/system/fcron/default.nix +++ b/pkgs/tools/system/fcron/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = { description="A command scheduler with extended capabilities over cron and anacron"; homepage = http://fcron.free.fr; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/system/fdisk/default.nix b/pkgs/tools/system/fdisk/default.nix index e72497cf7c4..9a4ac260ecc 100644 --- a/pkgs/tools/system/fdisk/default.nix +++ b/pkgs/tools/system/fdisk/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cfdisk. It uses GNU Parted. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/fdisk/; diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index b4ddca4371e..c408c0f34ea 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://git.kernel.dk/?p=fio.git;a=summary"; description = "Flexible IO Tester - an IO benchmark tool"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 2bfa77164b8..21a67dba305 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/freeipmi/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ raskin ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index 93dfab9a1a4..0fe4cbc986c 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A set of text-mode partitioning tools for Globally Unique Identifier (GUID) Partition Table (GPT) disks"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = http://www.rodsbooks.com/gdisk/; @@ -32,4 +32,3 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; }; } - diff --git a/pkgs/tools/system/gt5/default.nix b/pkgs/tools/system/gt5/default.nix index ab682c60921..ea121b0e43c 100644 --- a/pkgs/tools/system/gt5/default.nix +++ b/pkgs/tools/system/gt5/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A diff-capable 'du' browser"; homepage = http://gt5.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/system/idle3tools/default.nix b/pkgs/tools/system/idle3tools/default.nix index 1325b52b380..d1631776d39 100644 --- a/pkgs/tools/system/idle3tools/default.nix +++ b/pkgs/tools/system/idle3tools/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { homepage = http://idle3-tools.sourceforge.net/; description = "Tool to get/set the infamous idle3 timer in WD HDDs"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix index 208ff837b34..88c9a4eecd1 100644 --- a/pkgs/tools/system/logcheck/default.nix +++ b/pkgs/tools/system/logcheck/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { Logcheck was part of the Abacus Project of security tools, but this version has been rewritten. ''; homepage = http://logcheck.org; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index b6234009602..964ee217108 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://fedorahosted.org/releases/l/o/logrotate/; description = "Rotates and compresses system logs"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/system/mcron/default.nix b/pkgs/tools/system/mcron/default.nix index 2b4f28fa868..4bf95895996 100644 --- a/pkgs/tools/system/mcron/default.nix +++ b/pkgs/tools/system/mcron/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/mcron/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 3fe05e941b6..d18c2737854 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.rsyslog.com/"; description = "Enhanced syslog implementation"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/system/safecopy/default.nix b/pkgs/tools/system/safecopy/default.nix index a6a5fced879..304d8f21eb2 100644 --- a/pkgs/tools/system/safecopy/default.nix +++ b/pkgs/tools/system/safecopy/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = http://safecopy.sourceforge.net; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; diff --git a/pkgs/tools/system/storebrowse/default.nix b/pkgs/tools/system/storebrowse/default.nix index ccb0f26e435..041dd96e1ca 100644 --- a/pkgs/tools/system/storebrowse/default.nix +++ b/pkgs/tools/system/storebrowse/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://viric.name/cgi-bin/storebrowse; - license = "AGPLv3+"; + license = stdenv.lib.licenses.agpl3Plus; }; } diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 9102482d3d6..89bf0688651 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { meta = { homepage = "http://www.balabit.com/network-security/syslog-ng/"; description = "Next-generation syslogd with advanced networking and filtering capabilities"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index afb6073b539..f14d4affae7 100644 --- a/pkgs/tools/system/tree/default.nix +++ b/pkgs/tools/system/tree/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { meta = { homepage = "http://mama.indstate.edu/users/ice/tree/"; description = "command to produce a depth indented directory listing"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' Tree is a recursive directory listing command that produces a diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix index e056af26877..2865e5b3482 100644 --- a/pkgs/tools/text/catdoc/default.nix +++ b/pkgs/tools/text/catdoc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MS-Word/Excel/PowerPoint to text converter"; platforms = platforms.all; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.urkud ]; }; } diff --git a/pkgs/tools/text/convertlit/default.nix b/pkgs/tools/text/convertlit/default.nix index 05494e54a3e..aaa458b05cb 100644 --- a/pkgs/tools/text/convertlit/default.nix +++ b/pkgs/tools/text/convertlit/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.convertlit.com/; description = "A tool for converting Microsoft Reader ebooks to more open formats"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index dc61723e597..a87901eb5eb 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = http://waterlan.home.xs4all.nl/dos2unix.html; description = "Tools to transform text files from dos to unix formats and vicervesa"; - license = "BSD"; + license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix index 23223572bb2..14014d06052 100644 --- a/pkgs/tools/text/enca/default.nix +++ b/pkgs/tools/text/enca/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { Unicode variants, independently on language. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/text/enscript/default.nix b/pkgs/tools/text/enscript/default.nix index 156ff7aea6b..fe11ec59246 100644 --- a/pkgs/tools/text/enscript/default.nix +++ b/pkgs/tools/text/enscript/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { it has many options that can be used to customize printouts. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/enscript/; diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index f2db91d3036..8866888a736 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { lines of code. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index bdf19161e43..6e83bd357b2 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { prints the matching lines. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index 1ad40a4a5fa..7b38227cfcc 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = http://savannah.gnu.org/projects/patch; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix index cf30169acef..b1c5910029d 100644 --- a/pkgs/tools/text/gnused/default.nix +++ b/pkgs/tools/text/gnused/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { multiple occurrences of a string within a file. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index f4d3169f2fa..97cc3c61173 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/groff/"; description = "GNU Troff, a typesetting package that reads plain text and produces formatted output"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; longDescription = '' diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix index ea06a625550..247cb67da56 100644 --- a/pkgs/tools/text/html-tidy/default.nix +++ b/pkgs/tools/text/html-tidy/default.nix @@ -32,7 +32,7 @@ let date = "2009-07-04"; in used to validate and fix HTML data. ''; - license = "MIT"; + license = stdenv.lib.licenses.mit; homepage = http://tidy.sourceforge.net/; diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index 52781ed3792..eeac7b7f63f 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://kdiff3.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Compares and merges 2 or 3 files or directories"; maintainers = with stdenv.lib.maintainers; [viric urkud]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/text/mairix/default.nix b/pkgs/tools/text/mairix/default.nix index 551d0b9f74a..97fcd062984 100644 --- a/pkgs/tools/text/mairix/default.nix +++ b/pkgs/tools/text/mairix/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.rc0.org.uk/mairix; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Program for indexing and searching email messages stored in maildir, MH or mbox"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; diff --git a/pkgs/tools/text/multitran/data/default.nix b/pkgs/tools/text/multitran/data/default.nix index dbf13a6332b..d0e39add665 100644 --- a/pkgs/tools/text/multitran/data/default.nix +++ b/pkgs/tools/text/multitran/data/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { meta = { homepage = http://multitran.sourceforge.net/; description = "Multitran data english-russian"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/text/multitran/libbtree/default.nix b/pkgs/tools/text/multitran/libbtree/default.nix index 45dcf922d8e..3abe03b2a4e 100644 --- a/pkgs/tools/text/multitran/libbtree/default.nix +++ b/pkgs/tools/text/multitran/libbtree/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = http://multitran.sourceforge.net/; description = "Multitran lib: library for reading Multitran's BTREE database format"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/text/multitran/libfacet/default.nix b/pkgs/tools/text/multitran/libfacet/default.nix index 6dab8f86c32..0f5032c4a17 100644 --- a/pkgs/tools/text/multitran/libfacet/default.nix +++ b/pkgs/tools/text/multitran/libfacet/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { meta = { homepage = http://multitran.sourceforge.net/; description = "Multitran lib: enchanced locale facets"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/text/multitran/libmtquery/default.nix b/pkgs/tools/text/multitran/libmtquery/default.nix index fe3e3b7317d..b3e5f12407d 100644 --- a/pkgs/tools/text/multitran/libmtquery/default.nix +++ b/pkgs/tools/text/multitran/libmtquery/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { meta = { homepage = http://multitran.sourceforge.net/; description = "Multitran lib: main engine to query translations"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/text/multitran/libmtsupport/default.nix b/pkgs/tools/text/multitran/libmtsupport/default.nix index 3c77b50bee8..e73ba43791a 100644 --- a/pkgs/tools/text/multitran/libmtsupport/default.nix +++ b/pkgs/tools/text/multitran/libmtsupport/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = http://multitran.sourceforge.net/; description = "Multitran lib: basic useful functions"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/text/multitran/mtutils/default.nix b/pkgs/tools/text/multitran/mtutils/default.nix index fb3856176d9..b03b1b110c4 100644 --- a/pkgs/tools/text/multitran/mtutils/default.nix +++ b/pkgs/tools/text/multitran/mtutils/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { homepage = http://multitran.sourceforge.net/; description = "Multitran: simple command line utilities for dictionary maintainance"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/tools/text/namazu/default.nix index 21024c4aaad..fba52b69fba 100644 --- a/pkgs/tools/text/namazu/default.nix +++ b/pkgs/tools/text/namazu/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { but also as a personal search system for email or other files. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://namazu.org/; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/tools/text/qshowdiff/default.nix b/pkgs/tools/text/qshowdiff/default.nix index 7c76c7f1bca..a2d6e360a37 100644 --- a/pkgs/tools/text/qshowdiff/default.nix +++ b/pkgs/tools/text/qshowdiff/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://qshowdiff.danfis.cz/; description = "Colourful diff viewer"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/text/sgml/openjade/default.nix b/pkgs/tools/text/sgml/openjade/default.nix index fc7ee9f6f06..a2920345afa 100644 --- a/pkgs/tools/text/sgml/openjade/default.nix +++ b/pkgs/tools/text/sgml/openjade/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "An implementation of DSSSL, an ISO standard for formatting SGML (and XML) documents"; - license = "BSD"; + license = stdenv.lib.licenses.mit; homepage = http://openjade.sourceforge.net/; }; } diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/tools/text/sgml/opensp/default.nix index e30567000dd..59b9b7bc13d 100644 --- a/pkgs/tools/text/sgml/opensp/default.nix +++ b/pkgs/tools/text/sgml/opensp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "A suite of SGML/XML processing tools"; - license = "BSD"; + license = stdenv.lib.licenses.mit; homepage = http://openjade.sourceforge.net/; }; } diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix index 21a866cf87e..a7d1ddb0f3b 100644 --- a/pkgs/tools/text/source-highlight/default.nix +++ b/pkgs/tools/text/source-highlight/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Source code renderer with syntax highlighting"; homepage = http://www.gnu.org/software/src-highlite/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; longDescription = '' diff --git a/pkgs/tools/text/uni2ascii/default.nix b/pkgs/tools/text/uni2ascii/default.nix index c81e02b4399..9e62b2b3d59 100644 --- a/pkgs/tools/text/uni2ascii/default.nix +++ b/pkgs/tools/text/uni2ascii/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { }; meta = { - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; homepage = http://billposer.org/Software/uni2ascii.html; description = "Converts between UTF-8 and many 7-bit ASCII equivalents and back"; diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix index 3981f67aefb..e6fc3510cd4 100644 --- a/pkgs/tools/text/wdiff/default.nix +++ b/pkgs/tools/text/wdiff/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/wdiff/; description = "GNU wdiff, comparing files on a word by word basis"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index b8f2f4696ae..fd5a5dc5f8e 100644 --- a/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "Utilities for manipulating HTML and XML files"; homepage = http://www.w3.org/Tools/HTML-XML-utils/; - license = "free-non-copyleft"; + license = "free-non-copyleft"; #TODO W3C }; } diff --git a/pkgs/tools/text/xml/rxp/default.nix b/pkgs/tools/text/xml/rxp/default.nix index ee66cf92377..6ec9758ed3a 100644 --- a/pkgs/tools/text/xml/rxp/default.nix +++ b/pkgs/tools/text/xml/rxp/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { cp rxp $out/bin ''; meta = { - license = "GPL"; + license = stdenv.lib.licenses.gpl2Plus; description = "a validating XML parser written in C"; homepage = "http://www.cogsci.ed.ac.uk/~richard/rxp.html"; }; diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix index db7ebfbb77a..aea3ab2bd96 100644 --- a/pkgs/tools/text/xml/xmlstarlet/default.nix +++ b/pkgs/tools/text/xml/xmlstarlet/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { meta = { description = "A command line tool for manipulating and querying XML data"; homepage = http://xmlstar.sourceforge.net/; - license = "bsd"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix index d7d3f6f92a2..78dac0c6aa4 100644 --- a/pkgs/tools/typesetting/docbook2x/default.nix +++ b/pkgs/tools/typesetting/docbook2x/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { into the traditional Unix man page format and the GNU Texinfo format. ''; - license = "MIT-style"; + license = stdenv.lib.licenses.mit; homepage = http://docbook2x.sourceforge.net/; }; } diff --git a/pkgs/tools/typesetting/halibut/default.nix b/pkgs/tools/typesetting/halibut/default.nix index 5a2c5fb2e06..48d1ebfc276 100644 --- a/pkgs/tools/typesetting/halibut/default.nix +++ b/pkgs/tools/typesetting/halibut/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { meta = { description = "Documentation production system for software manuals"; homepage = http://www.chiark.greenend.org.uk/~sgtatham/halibut/; - license = "free"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix index ce531a92022..35e609b440a 100644 --- a/pkgs/tools/typesetting/lhs2tex/default.nix +++ b/pkgs/tools/typesetting/lhs2tex/default.nix @@ -18,7 +18,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://www.andres-loeh.de/lhs2tex/"; description = "Preprocessor for typesetting Haskell sources with LaTeX"; - license = "GPL"; + license = self.stdenv.lib.licenses.gpl2; platforms = self.ghc.meta.platforms; hydraPlatforms = self.stdenv.lib.platforms.linux; maintainers = [ self.stdenv.lib.maintainers.andres ]; diff --git a/pkgs/tools/typesetting/lout/default.nix b/pkgs/tools/typesetting/lout/default.nix index 61e94d4d618..c0fc4336297 100644 --- a/pkgs/tools/typesetting/lout/default.nix +++ b/pkgs/tools/typesetting/lout/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # Wiki: http://lout.wiki.sourceforge.net/ homepage = http://savannah.nongnu.org/projects/lout/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.ludo ]; diff --git a/pkgs/tools/typesetting/pdftk/default.nix b/pkgs/tools/typesetting/pdftk/default.nix index 28a43e69598..c71bc3ba77c 100644 --- a/pkgs/tools/typesetting/pdftk/default.nix +++ b/pkgs/tools/typesetting/pdftk/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "Simple tool for doing everyday things with PDF documents"; homepage = http://www.accesspdf.com/pdftk/; - license = "free"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/typesetting/rubber/default.nix b/pkgs/tools/typesetting/rubber/default.nix index 054632533a1..8344735606c 100644 --- a/pkgs/tools/typesetting/rubber/default.nix +++ b/pkgs/tools/typesetting/rubber/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { of pdfLaTeX to produce PDF documents. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.pps.jussieu.fr/~beffara/soft/rubber/; }; diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index 6993158291c..a68ab2d01b9 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -55,6 +55,6 @@ stdenv.mkDerivation rec { meta = { description = "A program to convert DocBook to DVI, PostScript or PDF via LaTeX or ConTeXt"; homepage = http://dblatex.sourceforge.net/; - license = "GPL"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/typesetting/tex/tex4ht/default.nix b/pkgs/tools/typesetting/tex/tex4ht/default.nix index f903ef5792f..69d02a275b3 100644 --- a/pkgs/tools/typesetting/tex/tex4ht/default.nix +++ b/pkgs/tools/typesetting/tex/tex4ht/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://tug.org/tex4ht/"; description = "a system to convert (La)TeX documents to HTML and various other formats"; - license = "LPPL"; # LaTeX Project Public License + license = "LPPL-1.2"; # LaTeX Project Public License }; } diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 94d84fec4ce..b5589cf943b 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -5,16 +5,16 @@ rec { sha256 = "0nh8hfayyf60nm4z8zyclrbc3792c62azgsvrwxnl28iq223200s"; }; - texmfVersion = "2014.20140626"; + texmfVersion = "2014.20140717"; texmfSrc = fetchurl { url = "mirror://debian/pool/main/t/texlive-base/texlive-base_${texmfVersion}.orig.tar.xz"; - sha256 = "1zimavr8nid6425i2k3i34a7xl45lskvsnp55q526i8y6f3zlw3g"; + sha256 = "08vhl6x742r8fl0gags2r6yspz8ynvz26vdjrqb4vyz5h7h3rzc9"; }; - langTexmfVersion = "2014.20140626"; + langTexmfVersion = "2014.20140717"; langTexmfSrc = fetchurl { url = "mirror://debian/pool/main/t/texlive-lang/texlive-lang_${langTexmfVersion}.orig.tar.xz"; - sha256 = "0gwms9jj8x2hp8fbqx420lvzccx3s6wlif7afp176y7ja9i3s17r"; + sha256 = "1x9aa3v2cg4lcb58lwksnfdsgrhi0sg968pjqsbndmbxhr1msbp7"; }; passthru = { inherit texmfSrc langTexmfSrc; }; @@ -120,7 +120,7 @@ rec { configureFlags = [ "--with-x11" "--enable-ipc" "--with-mktexfmt" "--enable-shared" "--disable-native-texlive-build" "--with-system-zziplib" - "--with-system-libgs" "--with-system-t1lib" "--with-system-freetype2" + "--with-system-libgs" "--with-system-t1lib" "--with-system-freetype2" "--with-system-freetype=no" "--disable-ttf2pk" "--enable-ttf2pk2" ] ++ stdenv.lib.optionals stdenv.isDarwin [ # TODO: We should be able to fix these tests diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix index be280c5f483..4644ee3e50e 100644 --- a/pkgs/tools/typesetting/tex/texlive/extra.nix +++ b/pkgs/tools/typesetting/tex/texlive/extra.nix @@ -1,11 +1,11 @@ args: with args; rec { name = "texlive-extra-2014"; - version = "2014.20140626"; + version = "2014.20140717"; src = fetchurl { url = "mirror://debian/pool/main/t/texlive-extra/texlive-extra_${version}.orig.tar.xz"; - sha256 = "1n7n2vssdspzg95qrikl4p8cr6axdpj6bgv2l61px7vp837ma83v"; + sha256 = "1khxqdq9gagm6z8kbpjbraysfzibfjs2cgbrhjpncbd24sxpw13q"; }; buildInputs = [texLive xz]; @@ -20,7 +20,7 @@ rec { description = "Extra components for TeXLive"; maintainers = [ args.lib.maintainers.raskin ]; - # Actually, arch-independent.. + # Actually, arch-independent.. hydraPlatforms = []; }; } diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index bfc5efc7361..1b0602063e9 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { necessary post-processing. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = https://fedorahosted.org/xmlto/; }; } diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix index e4c8e99efdb..faaea6aaffc 100644 --- a/pkgs/tools/video/dvgrab/default.nix +++ b/pkgs/tools/video/dvgrab/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = http://kinodv.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; maintainers = [ ]; }; diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index 2034331c8e0..156fac03d09 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = http://rtmpdump.mplayerhq.hu/; description = "Toolkit for RTMP streams"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/tools/video/swfmill/default.nix index 8e7fbdaeaf3..0f3b5f4d39d 100644 --- a/pkgs/tools/video/swfmill/default.nix +++ b/pkgs/tools/video/swfmill/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "An xml2swf and swf2xml processor with import functionalities"; homepage = "http://swfmill.org"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } - diff --git a/pkgs/tools/video/swftools/default.nix b/pkgs/tools/video/swftools/default.nix index 806a0b21096..0a658a23e1c 100644 --- a/pkgs/tools/video/swftools/default.nix +++ b/pkgs/tools/video/swftools/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { description = "Collection of SWF manipulation and creation utilities"; homepage = http://www.swftools.org/about.html; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/virtualization/aws/default.nix b/pkgs/tools/virtualization/aws/default.nix index 27f4ce4476f..123dbf647f0 100644 --- a/pkgs/tools/virtualization/aws/default.nix +++ b/pkgs/tools/virtualization/aws/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.timkay.com/aws/; description = "Command-line utility for working with Amazon EC2, S3, SQS, ELB, IAM and SDB"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix index e9b62886fce..1f04229c2c8 100644 --- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://developer.amazonwebservices.com/connect/entry.jspa?externalID=368&categoryID=88; description = "Command-line tools to create and manage Amazon EC2 virtual machine images"; - license = "unfree-redistributable"; + license = "unfree-redistributable"; # Amazon || (Ruby GPL-2) }; } diff --git a/pkgs/tools/virtualization/ec2-api-tools/default.nix b/pkgs/tools/virtualization/ec2-api-tools/default.nix index a80ad91c4c3..34cfa662c91 100644 --- a/pkgs/tools/virtualization/ec2-api-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-api-tools/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://developer.amazonwebservices.com/connect/entry.jspa?externalID=351; description = "Command-line tools to create and manage Amazon EC2 virtual machines"; - license = "unfree-redistributable"; + license = "unfree-redistributable"; #Amazon }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bf5b5aca39..3ca773f9801 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -144,15 +144,16 @@ let # Override system. This is useful to build i686 packages on x86_64-linux. - forceSystem = system: (import ./all-packages.nix) { + forceSystem = system: kernel: (import ./all-packages.nix) { inherit system; + platform = platform // { kernelArch = kernel; }; inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config - crossSystem platform; + crossSystem; }; # Used by wine, firefox with debugging version of Flash, ... - pkgsi686Linux = forceSystem "i686-linux"; + pkgsi686Linux = forceSystem "i686-linux" "i386"; callPackage_i686 = lib.callPackageWith (pkgsi686Linux // pkgsi686Linux.xorg); @@ -602,6 +603,8 @@ let cv = callPackage ../tools/misc/cv { }; + crawl = callPackage ../games/crawl { lua = lua5; }; + ditaa = callPackage ../tools/graphics/ditaa { }; direnv = callPackage ../tools/misc/direnv { }; @@ -707,6 +710,8 @@ let cabextract = callPackage ../tools/archivers/cabextract { }; + cadaver = callPackage ../tools/networking/cadaver { }; + cantata = callPackage ../applications/audio/cantata { }; can-utils = callPackage ../os-specific/linux/can-utils { }; @@ -2439,6 +2444,8 @@ let xdelta = callPackage ../tools/compression/xdelta { }; + xdummy = callPackage ../tools/misc/xdummy { }; + xfsprogs = callPackage ../tools/filesystems/xfsprogs { }; xmlroff = callPackage ../tools/typesetting/xmlroff { @@ -3197,6 +3204,8 @@ let menhir = callPackage ../development/ocaml-modules/menhir { }; + merlin = callPackage ../development/tools/ocaml/merlin { }; + mldonkey = callPackage ../applications/networking/p2p/mldonkey { }; mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; @@ -3285,7 +3294,11 @@ let roadsend = callPackage ../development/compilers/roadsend { }; - rust = callPackage ../development/compilers/rust {}; + rustc = callPackage ../development/compilers/rustc/0.11.nix {}; + rustcMaster = callPackage ../development/compilers/rustc/head.nix {}; + + rust = rustc; + sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; sbcl = callPackage ../development/compilers/sbcl { @@ -3987,9 +4000,9 @@ let ltrace = callPackage ../development/tools/misc/ltrace { }; - lttngTools = callPackage ../development/tools/misc/lttng-tools { }; + lttng-tools = callPackage ../development/tools/misc/lttng-tools { }; - lttngUst = callPackage ../development/tools/misc/lttng-ust { }; + lttng-ust = callPackage ../development/tools/misc/lttng-ust { }; lttv = callPackage ../development/tools/misc/lttv { }; @@ -5600,7 +5613,7 @@ let expat gettext perl SDL SDL_image SDL_mixer SDL_ttf curl sqlite - libogg libvorbis + libogg libvorbis libcaca csound cunit ; guile = guile_1_8; libpng = libpng15; # 0.0.13 needs libpng 1.2--1.5 @@ -5837,6 +5850,8 @@ let p11_kit = callPackage ../development/libraries/p11-kit { }; + paperkey = callPackage ../tools/security/paperkey { }; + pangoxsl = callPackage ../development/libraries/pangoxsl { }; pcl = callPackage ../development/libraries/pcl { @@ -7318,6 +7333,15 @@ let ]; }; + linux_3_16 = makeOverridable (import ../os-specific/linux/kernel/linux-3.16.nix) { + inherit fetchurl stdenv perl buildLinux; + kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + linux_testing = makeOverridable (import ../os-specific/linux/kernel/linux-testing.nix) { inherit fetchurl stdenv perl buildLinux; kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") @@ -7392,7 +7416,7 @@ let ktap = callPackage ../os-specific/linux/ktap { }; - lttngModules = callPackage ../os-specific/linux/lttng-modules { }; + lttng-modules = callPackage ../os-specific/linux/lttng-modules { }; broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { }; @@ -7453,8 +7477,8 @@ let linuxPackages = linuxPackages_3_12; # Update this when adding the newest kernel major version! - linux_latest = pkgs.linux_3_15; - linuxPackages_latest = pkgs.linuxPackages_3_15; + linux_latest = pkgs.linux_3_16; + linuxPackages_latest = pkgs.linuxPackages_3_16; # Build the kernel modules for the some of the kernels. linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2); @@ -7466,6 +7490,7 @@ let linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14); linuxPackages_3_15 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_15 linuxPackages_3_15); + linuxPackages_3_16 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_16 linuxPackages_3_16); linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing); # grsecurity flavors @@ -7980,6 +8005,11 @@ let sourceCodePro = callPackage ../data/fonts/source-code-pro {}; + source-han-sans-japanese = callPackage ../data/fonts/source-han-sans/japanese.nix {}; + source-han-sans-korean = callPackage ../data/fonts/source-han-sans/korean.nix {}; + source-han-sans-simplified-chinese = callPackage ../data/fonts/source-han-sans/simplified-chinese.nix {}; + source-han-sans-traditional-chinese = callPackage ../data/fonts/source-han-sans/traditional-chinese.nix {}; + tango-icon-theme = callPackage ../data/icons/tango-icon-theme { }; themes = name: import (../data/misc/themes + ("/" + name + ".nix")) { @@ -9136,6 +9166,8 @@ let mopidy-spotify = callPackage ../applications/audio/mopidy-spotify { }; + mopidy-moped = callPackage ../applications/audio/mopidy-moped { }; + mozilla = callPackage ../applications/networking/browsers/mozilla { inherit (gnome) libIDL; }; @@ -9458,9 +9490,9 @@ let qt = qt4; }; - retroshare06 = callPackage ../applications/networking/p2p/retroshare/0.6.nix { + retroshare06 = lowPrio (callPackage ../applications/networking/p2p/retroshare/0.6.nix { qt = qt4; - }; + }); rsync = callPackage ../applications/networking/sync/rsync { enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD); @@ -9756,6 +9788,8 @@ let uzbl = callPackage ../applications/networking/browsers/uzbl { webkit = webkitgtk2; }; + + uTox = callPackage ../applications/networking/instant-messengers/utox { }; vanitygen = callPackage ../applications/misc/vanitygen { }; @@ -9968,7 +10002,9 @@ let xdotool = callPackage ../tools/X11/xdotool { }; - xen = callPackage ../applications/virtualization/xen { }; + xen = callPackage ../applications/virtualization/xen { + stdenv = overrideGCC stdenv gcc45; + }; xfe = callPackage ../applications/misc/xfe { fox = fox_1_6; @@ -10137,10 +10173,20 @@ let }; }; + dwarf_fortress_2014 = callPackage_i686 ../games/dwarf-fortress/df2014.nix { + SDL_image = pkgsi686Linux.SDL_image.override { + libpng = pkgsi686Linux.libpng12; + }; + }; + dwarf_fortress_modable = appendToName "moddable" (dwarf_fortress.override { copyDataDirectory = true; }); + dwarf_fortress_2014_modable = appendToName "moddable" (dwarf_fortress_2014.override { + copyDataDirectory = true; + }); + dwarf-therapist = callPackage ../games/dwarf-therapist { }; d1x_rebirth = callPackage ../games/d1x-rebirth { }; @@ -11353,6 +11399,8 @@ let # Attributes for backward compatibility. adobeReader = adobe-reader; asciidocFull = asciidoc-full; # added 2014-06-22 + lttngTools = lttng-tools; # added 2014-07-31 + lttngUst = lttng-ust; # added 2014-07-31 }; in self; in pkgs diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index a81f8cae90a..45c3ab9cb95 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -21,8 +21,8 @@ }; ghc783Prefs = self : super : ghcHEADPrefs self super // { - cabalInstall_1_20_0_3 = super.cabalInstall_1_20_0_3.override { Cabal = self.Cabal_1_20_0_1; }; - codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_1; }; }; + cabalInstall_1_20_0_3 = super.cabalInstall_1_20_0_3.override { Cabal = self.Cabal_1_20_0_2; }; + codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_2; }; }; mtl = self.mtl_2_1_2; }; @@ -49,7 +49,6 @@ networkTransport = super.networkTransport.override { binary = self.binary_0_7_2_1; }; distributedProcess = super.distributedProcess.override { binary = self.binary_0_7_2_1; }; singletons = null; # requires base >= 4.7 - vty_5_1_1 = super.vty_5_1_1.override { cabal = self.cabal.override { Cabal = self.Cabal_1_18_1_3; }; }; transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x zipArchive = super.zipArchive_0_2_2_1; # works without binary 0.7.x }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2e587dbf9ab..91ba32a239e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -135,6 +135,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in abstractPar = callPackage ../development/libraries/haskell/abstract-par {}; + ad = callPackage ../development/libraries/haskell/ad {}; + adjunctions = callPackage ../development/libraries/haskell/adjunctions {}; AES = callPackage ../development/libraries/haskell/AES {}; @@ -225,10 +227,14 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in baseUnicodeSymbols = callPackage ../development/libraries/haskell/base-unicode-symbols {}; + basePrelude = callPackage ../development/libraries/haskell/base-prelude {}; + basicPrelude = callPackage ../development/libraries/haskell/basic-prelude {}; benchpress = callPackage ../development/libraries/haskell/benchpress {}; + bencoding = callPackage ../development/libraries/haskell/bencoding {}; + bert = callPackage ../development/libraries/haskell/bert {}; bifunctors = callPackage ../development/libraries/haskell/bifunctors {}; @@ -334,7 +340,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix {}; Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix {}; Cabal_1_18_1_3 = callPackage ../development/libraries/haskell/Cabal/1.18.1.3.nix {}; - Cabal_1_20_0_1 = callPackage ../development/libraries/haskell/Cabal/1.20.0.1.nix {}; + Cabal_1_20_0_2 = callPackage ../development/libraries/haskell/Cabal/1.20.0.2.nix {}; Cabal = null; # core package since forever cabalCargs = callPackage ../development/libraries/haskell/cabal-cargs {}; @@ -692,6 +698,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in dyre = callPackage ../development/libraries/haskell/dyre {}; + easyFile = callPackage ../development/libraries/haskell/easy-file {}; + editDistance = callPackage ../development/libraries/haskell/edit-distance {}; editline_0_2_1_0 = callPackage ../development/libraries/haskell/editline/0.2.1.0.nix {}; @@ -727,7 +735,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in entropy = callPackage ../development/libraries/haskell/entropy {}; - equivalence = callPackage ../development/libraries/haskell/equivalence {}; + equivalence_0_2_3 = callPackage ../development/libraries/haskell/equivalence/0.2.3.nix {}; + equivalence_0_2_5 = callPackage ../development/libraries/haskell/equivalence/0.2.5.nix {}; + equivalence = self.equivalence_0_2_5; erf = callPackage ../development/libraries/haskell/erf {}; @@ -830,11 +840,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in free = callPackage ../development/libraries/haskell/free {}; - freeGame_1_0_5 = callPackage ../development/libraries/haskell/free-game/1.0.5.nix { - boundingboxes = self.boundingboxes_0_1_1; - }; - freeGame_1_1 = callPackage ../development/libraries/haskell/free-game/1.1.nix {}; - freeGame = self.freeGame_1_1; + freeGame = callPackage ../development/libraries/haskell/free-game {}; fsnotify = callPackage ../development/libraries/haskell/fsnotify {}; @@ -1745,8 +1751,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in parsec = self.parsec_3_1_5; parsers_0_10_3 = callPackage ../development/libraries/haskell/parsers/0.10.3.nix {}; - parsers_0_12 = callPackage ../development/libraries/haskell/parsers/0.12.nix {}; - parsers = self.parsers_0_12; + parsers_0_12_1 = callPackage ../development/libraries/haskell/parsers/0.12.1.nix {}; + parsers = self.parsers_0_12_1; parsimony = callPackage ../development/libraries/haskell/parsimony {}; @@ -1863,6 +1869,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in primitive_0_5_3_0 = callPackage ../development/libraries/haskell/primitive/0.5.3.0.nix {}; primitive = self.primitive_0_5_3_0; + probability = callPackage ../development/libraries/haskell/probability {}; + profunctors = callPackage ../development/libraries/haskell/profunctors {}; profunctorExtras = callPackage ../development/libraries/haskell/profunctor-extras {}; @@ -2573,8 +2581,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in void = callPackage ../development/libraries/haskell/void {}; vty_4_7_5 = callPackage ../development/libraries/haskell/vty/4.7.5.nix {}; - vty_5_1_1 = callPackage ../development/libraries/haskell/vty/5.1.1.nix {}; - vty = self.vty_4_7_5; + vty_5_1_4 = callPackage ../development/libraries/haskell/vty/5.1.4.nix {}; + vty = self.vty_5_1_4; vtyUi = callPackage ../development/libraries/haskell/vty-ui {}; @@ -2679,6 +2687,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in xmlhtml = callPackage ../development/libraries/haskell/xmlhtml {}; + xmlHtmlConduitLens = callPackage ../development/libraries/haskell/xml-html-conduit-lens {}; + xmlLens = callPackage ../development/libraries/haskell/xml-lens {}; xmlTypes = callPackage ../development/libraries/haskell/xml-types {}; @@ -2756,17 +2766,14 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in # Compilers. Agda_2_3_2_2 = callPackage ../development/compilers/agda/2.3.2.2.nix {}; - Agda_2_4_0_1 = callPackage ../development/compilers/agda/2.4.0.1.nix { - binary = self.binary_0_7_2_1; - QuickCheck = self.QuickCheck_2_7_5; - }; - Agda = self.Agda_2_4_0_1; + Agda_2_4_0_2 = callPackage ../development/compilers/agda/2.4.0.2.nix {}; + Agda = self.Agda_2_4_0_2; AgdaStdlib_0_7 = callPackage ../development/compilers/agda/stdlib-0.7.nix { Agda = self.Agda_2_3_2_2; }; AgdaStdlib_0_8 = callPackage ../development/compilers/agda/stdlib-0.8.nix { - Agda = self.Agda_2_4_0_1; + Agda = self.Agda_2_4_0_2; }; AgdaStdlib = self.AgdaStdlib_0_8; @@ -2872,10 +2879,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in darcs = callPackage ../applications/version-management/darcs {}; idris_plain = callPackage ../development/compilers/idris { - parsers = self.parsers_0_10_3; - trifecta = self.trifecta.override { - parsers = self.parsers_0_10_3; - }; llvmGeneral = self.llvmGeneral_3_3_8_2; llvmGeneralPure = self.llvmGeneralPure_3_3_8_2; }; @@ -2888,7 +2891,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in taffybar = callPackage ../applications/misc/taffybar {}; - yi = callPackage ../applications/editors/yi/yi.nix {}; + yi = callPackage ../applications/editors/yi/yi.nix { + vty = self.vty_4_7_5; + }; yiContrib = callPackage ../applications/editors/yi/yi-contrib.nix {}; @@ -2932,9 +2937,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cabalDelete = callPackage ../development/tools/haskell/cabal-delete {}; cabalBounds = callPackage ../development/tools/haskell/cabal-bounds { - Cabal = self.Cabal_1_20_0_1; + Cabal = self.Cabal_1_20_0_2; cabalLenses = self.cabalLenses.override { - Cabal = self.Cabal_1_20_0_1; + Cabal = self.Cabal_1_20_0_2; }; }; @@ -2951,7 +2956,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {}; cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix { Cabal = self.Cabal_1_16_0_3; }; cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix { Cabal = self.Cabal_1_18_1_3; }; - cabalInstall_1_20_0_3 = callPackage ../tools/package-management/cabal-install/1.20.0.3.nix { Cabal = self.Cabal_1_20_0_1; }; + cabalInstall_1_20_0_3 = callPackage ../tools/package-management/cabal-install/1.20.0.3.nix { Cabal = self.Cabal_1_20_0_2; }; cabalInstall = self.cabalInstall_1_20_0_3; codex = callPackage ../development/tools/haskell/codex {}; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1e8433cec7f..59da67e5294 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -116,6 +116,19 @@ let self = _self // overrides; _self = with self; { }; }; + AnyEventI3 = buildPerlPackage rec { + name = "AnyEvent-I3-0.15"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MS/MSTPLBG/${name}.tar.gz"; + sha256 = "0x8zi06667bdgaxn7driqx0d71mp6021r51hdzmj5m5qbhi2hvqi"; + }; + propagatedBuildInputs = [ AnyEvent JSONXS ]; + meta = { + description = "Communicate with the i3 window manager"; + license = "perl"; + }; + }; + AnyEventRabbitMQ = buildPerlPackage { name = "AnyEvent-RabbitMQ-1.15"; src = fetchurl { @@ -133,12 +146,12 @@ let self = _self // overrides; _self = with self; { }; AnyMoose = buildPerlPackage rec { - name = "Any-Moose-0.10"; + name = "Any-Moose-0.24"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SA/SARTAK/${name}.tar.gz"; - sha256 = "1kgksln1vykh0xynawv3pc3nw1yp7kjwbxbb5lh2hm21a4l4h61x"; + url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + sha256 = "0g4w11chpnspnksw80jbdn5wp2m5hqzcyjzcy2hsjz9rkk2ncdbk"; }; - propagatedBuildInputs = [Mouse]; + propagatedBuildInputs = [ Mouse ]; }; ApacheLogFormatCompiler = buildPerlModule { @@ -556,6 +569,18 @@ let self = _self // overrides; _self = with self; { }; }; + CarpAlways = buildPerlPackage rec { + name = "Carp-Always-0.13"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FE/FERREIRA/${name}.tar.gz"; + sha256 = "0i2rifkr7ybfcdsqana52487z7vxp2l5qdra0f6ik0ddhn6rzii1"; + }; + meta = { + description = "Warns and dies noisily with stack backtraces"; + license = "perl"; + }; + }; + CarpAssert = buildPerlPackage { name = "Carp-Assert-0.20"; src = fetchurl { @@ -612,6 +637,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Automated REST Method Dispatching"; license = "perl"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -779,6 +805,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Request logging from within Catalyst"; license = "perl"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -816,6 +843,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Role based authorization for Catalyst based on Catalyst::Plugin::Authentication"; license = "perl"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -860,6 +888,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime CatalystPluginSession GDSecurityImage HTTPDate ]; meta = { description = "Create and validate Captcha for Catalyst"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -919,6 +948,9 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ TestMockObject ]; propagatedBuildInputs = [ CatalystRuntime CatalystPluginSession ]; + meta = { + platforms = stdenv.lib.platforms.linux; + }; }; CatalystPluginSessionStoreFastMmap = buildPerlPackage rec { @@ -929,6 +961,9 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ PathClass CatalystPluginSession CacheFastMmap MROCompat ]; + meta = { + platforms = stdenv.lib.platforms.linux; + }; }; CatalystPluginStackTrace = buildPerlPackage { @@ -979,6 +1014,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "JSON view for your data"; license = "perl"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -992,6 +1028,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Template View Class"; license = "perl"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -1827,6 +1864,18 @@ let self = _self // overrides; _self = with self; { makeMakerFlags = "--lib=${pkgs.openssl}/lib"; }; + CwdGuard = buildPerlModule rec { + name = "Cwd-Guard-0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/${name}.tar.gz"; + sha256 = "071k50n1yr48122jjjg50i1s2kwp06dmrisv35f3wjry8m6cqchm"; + }; + meta = { + description = "Temporary changing working directory (chdir)"; + license = "perl"; + }; + }; + DataClone = buildPerlPackage { name = "Data-Clone-0.003"; src = fetchurl { @@ -3077,6 +3126,9 @@ let self = _self // overrides; _self = with self; { sha256 = "0ffmpqys7yph5lb28m2xan0zd837vywg8c6gjjd9p80dahpqknyx"; }; propagatedBuildInputs = [EmailSimple EmailAddress ModulePluggable ReturnValue]; + meta = { + platforms = stdenv.lib.platforms.linux; + }; }; EmailSender = buildPerlPackage { @@ -3390,6 +3442,19 @@ let self = _self // overrides; _self = with self; { }; }; + ExtUtilsPkgConfig = buildPerlPackage rec { + name = "ExtUtils-PkgConfig-1.15"; + src = fetchurl { + url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; + sha256 = "1cxh6w8vmyqmhl6afys2q6z6jkp1m6zvacpk70196zmk48p1kcv9"; + }; + propagatedBuildInputs = [ pkgs.pkgconfig ]; + meta = { + description = "Simplistic interface to pkg-config"; + license = stdenv.lib.licenses.lgpl21Plus; + }; + }; + # From CPAN[1]: # This module exists merely as a compatibility wrapper around # ExtUtils::Typemaps. In a nutshell, ExtUtils::Typemap was renamed to @@ -3705,6 +3770,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Simple and Efficient Reading/Writing/Modifying of Complete Files"; license = "perl"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -4376,6 +4442,7 @@ let self = _self // overrides; _self = with self; { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "IO Interface to compressed data files/buffers"; license = "perl5"; + platforms = stdenv.lib.platforms.linux; }; doCheck = !stdenv.isDarwin; }; @@ -4507,6 +4574,7 @@ let self = _self // overrides; _self = with self; { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "System() and background procs w/ piping, redirs, ptys (Unix, Win32)"; license = "perl5"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -4558,13 +4626,14 @@ let self = _self // overrides; _self = with self; { }; Inline = buildPerlPackage rec { - name = "Inline-0.45"; + name = "Inline-0.64"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SI/SISYPHUS/${name}.tar.gz"; - sha256 = "1k5nrb3nh2y33bs944ri78m1ni60v4cl67ffhxx88azj542y5c9x"; + url = "mirror://cpan/authors/id/E/ET/ETJ/${name}.tar.gz"; + sha256 = "17n3gbc9jigpfwqfhgmxpvbgr9rkdrij8jayxqpzw611ixcxrplw"; }; + buildInputs = [ TestWarn ]; propagatedBuildInputs = [ ParseRecDescent ]; meta = { @@ -4583,6 +4652,28 @@ let self = _self // overrides; _self = with self; { }; }; + InlineC = buildPerlPackage rec { + name = "Inline-C-0.62"; + + src = fetchurl { + url = "mirror://cpan/authors/id/E/ET/ETJ/${name}.tar.gz"; + sha256 = "0clggdpj5mmi35vm2991f9jsgv2a3s8r4f1bd88xxk8akv5b8i3r"; + }; + + postPatch = '' + # this test will fail with chroot builds + rm -f t/08taint.t + ''; + + buildInputs = [ TestWarn FileCopyRecursive ]; + propagatedBuildInputs = [ Inline ]; + + meta = { + description = "Write Perl Subroutines in C"; + license = "perl"; + }; + }; + InlineJava = buildPerlPackage rec { name = "Inline-Java-0.52"; @@ -4682,6 +4773,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CommonSense ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + platforms = stdenv.lib.platforms.linux; }; }; @@ -4962,6 +5054,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "The World-Wide Web library for Perl"; license = "perl"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -4991,6 +5084,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Provide https support for LWP::UserAgent"; license = "perl5"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -5350,6 +5444,19 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExtUtilsXSpp ExtUtilsCppGuess ]; }; + ModuleBuildXSUtil = buildPerlModule rec { + name = "Module-Build-XSUtil-0.10"; + src = fetchurl { + url = "mirror://cpan/authors/id/H/HI/HIDEAKIO/${name}.tar.gz"; + sha256 = "1323vxp8vf5xdz66lbc1wfciaks93mrbqfsjgb9nz1w9bb21xj36"; + }; + buildInputs = [ FileCopyRecursive CwdGuard CaptureTiny ]; + meta = { + description = "A Module::Build class for building XS modules"; + license = "perl"; + }; + }; + ModuleCoreList = buildPerlPackage { name = "Module-CoreList-3.01"; src = fetchurl { @@ -6156,14 +6263,30 @@ let self = _self // overrides; _self = with self; { }; }; - Mouse = buildPerlPackage rec { - name = "Mouse-0.26"; + Mouse = buildPerlModule rec { + name = "Mouse-2.3.0"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz"; - sha256 = "0dpf5qmf1vc8dq5nj6yiriz8v4wl8s9g519v1hnz4yf11n2lnr4x"; + url = "mirror://cpan/authors/id/G/GF/GFUJI/${name}.tar.gz"; + sha256 = "0ycl521mmc5989934502730rzsi9xqihdpnjihrkhflqmrzmaqwq"; + }; + buildInputs = [ + ModuleBuildXSUtil TestException TestLeakTrace TestRequires TestOutput + TestFatal + ]; + }; + + MouseXNativeTraits = buildPerlPackage rec { + name = "MouseX-NativeTraits-1.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GF/GFUJI/${name}.tar.gz"; + sha256 = "0pnbchkxfz9fwa8sniyjqp0mz75b3k2fafq9r09znbbh51dbz9gq"; + }; + buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ AnyMoose ]; + meta = { + description = "Extend attribute interfaces for Mouse"; + license = "perl"; }; - propagatedBuildInputs = [TestException]; - doCheck = false; # check can't find its own Mouse::Tiny module }; MozillaCA = buildPerlPackage { @@ -7168,6 +7291,9 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RO/ROODE/${name}.tar.gz"; sha256 = "1shkyxajh6l87nif47ygnfxjwvqf3d3kjpdvxaff4957vqanii2k"; }; + meta = { + platforms = stdenv.lib.platforms.linux; + }; }; ReadonlyXS = buildPerlPackage rec { @@ -7504,6 +7630,9 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ TestException ]; propagatedBuildInputs = [ ClassAccessor ListMoreUtils RegexpCommon SQLTokenizer ]; + meta = { + platforms = stdenv.lib.platforms.linux; + }; }; SQLTokenizer = buildPerlPackage rec { @@ -7995,6 +8124,9 @@ let self = _self // overrides; _self = with self; { sha256 = "0hy1225zg2yg11xhgj0wbiapzjyf6slx17ln36zqvfm07k6widlx"; }; doCheck = false; # no `hostname' in stdenv + meta = { + platforms = stdenv.lib.platforms.linux; + }; }; TAPParserSourceHandlerpgTAP = buildPerlModule { @@ -8425,6 +8557,18 @@ let self = _self // overrides; _self = with self; { }; }; + TestLeakTrace = buildPerlPackage rec { + name = "Test-LeakTrace-0.14"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GF/GFUJI/${name}.tar.gz"; + sha256 = "06cn4g35l2gi9vbsdi2j49cxsji9fvfi7xp4xgdyxxds9vrxydia"; + }; + meta = { + description = "Traces memory leaks"; + license = "perl"; + }; + }; + TestLongString = buildPerlPackage rec { name = "Test-LongString-0.15"; src = fetchurl { @@ -9045,6 +9189,7 @@ let self = _self // overrides; _self = with self; { homepage = http://www.shlomifish.org/open-source/projects/docmake/; description = "Organize Data in Tables"; license = "bsd"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -9590,6 +9735,41 @@ let self = _self // overrides; _self = with self; { doCheck = false; # requires an X server }; + X11XCB = buildPerlPackage rec { + name = "X11-XCB-0.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MS/MSTPLBG/${name}.tar.gz"; + sha256 = "18i3z1fzw76kl9n5driys12r6vhp3r6rmb2pjn5nc7m9n4bwgh38"; + }; + AUTOMATED_TESTING = false; + buildInputs = [ + ExtUtilsDepends ExtUtilsPkgConfig DataDump + XMLSimple XMLDescent TestDeep TestException + pkgs.xorg.libxcb pkgs.xorg.xcbproto pkgs.xorg.xcbutil pkgs.xorg.xcbutilwm + ]; + propagatedBuildInputs = [ XSObjectMagic Mouse MouseXNativeTraits TryTiny ]; + NIX_CFLAGS_LINK = [ "-lxcb" "-lxcb-util" "-lxcb-xinerama" "-lxcb-icccm" ]; + doCheck = false; # requires an X server + meta = { + description = "XCB bindings for X"; + license = "perl"; + }; + }; + + XMLDescent = buildPerlPackage rec { + name = "XML-Descent-1.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AN/ANDYA/${name}.tar.gz"; + sha256 = "0l5xmw2hd95ypppz3lyvp4sn02ccsikzjwacli3ydxfdz1bbh4d7"; + }; + buildInputs = [ TestDifferences ]; + propagatedBuildInputs = [ XMLTokeParser ]; + meta = { + description = "Recursive descent XML parsing"; + license = "perl"; + }; + }; + XMLDOM = buildPerlPackage { name = "XML-DOM-1.44"; src = fetchurl { @@ -9711,6 +9891,19 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [XMLParser]; }; + XMLTokeParser = buildPerlPackage rec { + name = "XML-TokeParser-0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PO/PODMASTER/${name}.tar.gz"; + sha256 = "1hnpwb3lh6cbgwvjjgqzcp6jm4mp612qn6ili38adc9nhkwv8fc5"; + }; + propagatedBuildInputs = [ XMLParser ]; + meta = { + description = "Simplified interface to XML::Parser"; + license = "perl"; + }; + }; + XMLTwig = buildPerlPackage { name = "XML-Twig-3.44"; src = fetchurl { @@ -9729,6 +9922,19 @@ let self = _self // overrides; _self = with self; { }; }; + XSObjectMagic = buildPerlPackage rec { + name = "XS-Object-Magic-0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; + sha256 = "03fghj7hq0fiicmfdxhmzfm4mzv7s097pgkd32ji7jnljvhm9six"; + }; + buildInputs = [ ExtUtilsDepends TestFatal Testuseok ]; + meta = { + description = "XS pointer backed objects using sv_magic"; + license = "perl"; + }; + }; + YAML = buildPerlPackage { name = "YAML-0.90"; src = fetchurl { diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix index ca980e38637..e76cf4988d0 100644 --- a/pkgs/top-level/python-packages-generated.nix +++ b/pkgs/top-level/python-packages-generated.nix @@ -142,7 +142,7 @@ in BTree-based folder implementation with order support ''; homepage = "http://pypi.python.org/pypi/plone.folder"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -162,7 +162,7 @@ in The Plone Content Management System (core) ''; homepage = "http://plone.org/"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -182,7 +182,7 @@ in Waitress WSGI server ''; homepage = "https://github.com/Pylons/waitress"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -202,7 +202,7 @@ in zope.deferredimport allows you to perform imports names that will only be resolved when used in the code. ''; homepage = "http://pypi.python.org/pypi/zope.deferredimport"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -222,7 +222,7 @@ in Python 2 and 3 compatibility utilities ''; homepage = "http://pypi.python.org/pypi/six/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -242,7 +242,7 @@ in Zope Deprecation Infrastructure ''; homepage = "http://pypi.python.org/pypi/zope.deprecation"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -262,7 +262,7 @@ in Uid product for the Zope Content Management Framework ''; homepage = "http://pypi.python.org/pypi/Products.CMFUid"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -322,7 +322,7 @@ in A referencebrowser implementation for Archetypes ''; homepage = "http://pypi.python.org/pypi/archetypes.referencebrowserwidget"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -342,7 +342,7 @@ in An extension to zope.formlib, which allows to group fields into different fieldsets. ''; homepage = "http://pypi.python.org/pypi/plone.fieldsets"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -362,7 +362,7 @@ in redirection tool ''; homepage = "http://pypi.python.org/pypi/plone.app.redirector"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -402,7 +402,7 @@ in ZODB blob support for Plone ''; homepage = "http://plone.org/products/plone.app.blob"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -444,7 +444,7 @@ in Programmable browser for functional black-box tests ''; homepage = "http://pypi.python.org/pypi/zope.testbrowser"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -464,7 +464,7 @@ in Full text indexing for ZCatalog / Zope 2. ''; homepage = "http://pypi.python.org/pypi/Products.ZCTextIndex"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -504,7 +504,7 @@ in Local registries for zope component architecture ''; homepage = "http://pypi.python.org/pypi/zope.site"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -524,7 +524,7 @@ in Plone's content menu implementation ''; homepage = "http://pypi.python.org/pypi/plone.app.contentmenu"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -584,7 +584,7 @@ in Structured Configuration Library ''; homepage = "http://www.zope.org/Members/fdrake/zconfig/"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -604,7 +604,7 @@ in Zope Deprecation Infrastructure ''; homepage = "http://pypi.python.org/pypi/zope.deprecation"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -664,7 +664,7 @@ in Very basic event publishing system ''; homepage = "http://pypi.python.org/pypi/zope.event"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -704,7 +704,7 @@ in Generic Transparent Proxies ''; homepage = "http://pypi.python.org/pypi/zope.proxy"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -724,7 +724,7 @@ in Component vocabularies ''; homepage = "http://pypi.python.org/pypi/zope.componentvocabulary"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -744,7 +744,7 @@ in Zope Content Management Framework core components ''; homepage = "http://pypi.python.org/pypi/Products.CMFCore"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -824,7 +824,7 @@ in Special MultiMapping objects used in Zope2. ''; homepage = "http://pypi.python.org/pypi/MultiMapping"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -844,7 +844,7 @@ in SQL method support for Zope 2. ''; homepage = "http://pypi.python.org/pypi/Products.ZSQLMethods"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -906,7 +906,7 @@ in Buildout recipe for creating a Zope 2 instance ''; homepage = "http://pypi.python.org/pypi/plone.recipe.zope2instance"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -926,7 +926,7 @@ in Very basic event publishing system ''; homepage = "http://pypi.python.org/pypi/zope.event"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -966,7 +966,7 @@ in Zope process lifetime events ''; homepage = "http://pypi.python.org/pypi/zope.processlifetime"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -986,7 +986,7 @@ in Default product for the Zope Content Management Framework ''; homepage = "http://pypi.python.org/pypi/Products.CMFDefault"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1006,7 +1006,7 @@ in zope.formlib integration for Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.form"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -1106,7 +1106,7 @@ in Load, configure, and compose WSGI applications and servers ''; homepage = "http://pythonpaste.org/deploy/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -1126,7 +1126,7 @@ in The default theme for Plone 4. ''; homepage = "http://pypi.python.org/pypi/plonetheme.sunburst"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -1166,7 +1166,7 @@ in Sequence Sorting ''; homepage = "http://cheeseshop.python.org/pypi/zope.sequencesort"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1206,7 +1206,7 @@ in Interfaces for Python ''; homepage = "http://pypi.python.org/pypi/zope.interface"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1226,7 +1226,7 @@ in Zope publication ''; homepage = "http://pypi.python.org/pypi/zope.app.publication"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1246,7 +1246,7 @@ in Zope Component Architecture ''; homepage = "http://pypi.python.org/pypi/zope.component"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1266,7 +1266,7 @@ in Content Views for Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.content"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -1306,7 +1306,7 @@ in Zope External Editor ''; homepage = "http://pypi.python.org/pypi/Products.ExternalEditor"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1386,7 +1386,7 @@ in A source query widget for z3c.form. ''; homepage = "http://pypi.python.org/pypi/z3c.formwidget.query"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1406,7 +1406,7 @@ in DCWorkflow product for the Zope Content Management Framework ''; homepage = "http://pypi.python.org/pypi/Products.DCWorkflow"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1470,7 +1470,7 @@ in Zope Template Application Language Expression Syntax (TALES) ''; homepage = "http://pypi.python.org/pypi/zope.tales"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1510,7 +1510,7 @@ in This package provides a DateTime data type, as known from Zope 2.Unless you need to communicate with Zope 2 APIs, you're probablybetter off using Python's built-in datetime module. ''; homepage = "http://pypi.python.org/pypi/DateTime"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1530,7 +1530,7 @@ in Special Missing objects used in Zope2. ''; homepage = "http://pypi.python.org/pypi/Missing"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1570,7 +1570,7 @@ in World timezone definitions, modern and historical ''; homepage = "http://pytz.sourceforge.net"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -1590,7 +1590,7 @@ in Zope Configuration Markup Language (ZCML) ''; homepage = "http://pypi.python.org/pypi/zope.configuration"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1610,7 +1610,7 @@ in check-out/check-in staging for Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.iterate"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -1670,7 +1670,7 @@ in zope.sendmail integration for Zope 2. ''; homepage = "http://pypi.python.org/pypi/Products.MailHost"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1690,7 +1690,7 @@ in Zope Broken Object Interfaces ''; homepage = "http://pypi.python.org/pypi/zope.broken"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1710,7 +1710,7 @@ in Document Templating Markup Language (DTML) ''; homepage = "http://pypi.python.org/pypi/DocumentTemplate"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1730,7 +1730,7 @@ in Provides support for restricted execution of Python scripts in Zope 2. ''; homepage = "http://pypi.python.org/pypi/Products.PythonScripts"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1810,7 +1810,7 @@ in Formlib-based controlpanels for Plone. ''; homepage = "http://pypi.python.org/pypi/plone.app.controlpanel"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -1830,7 +1830,7 @@ in Screen-scraping library ''; homepage = "http://www.crummy.com/software/BeautifulSoup/bs4/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -1850,7 +1850,7 @@ in WSGI request and response object ''; homepage = "http://webob.org/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -1870,7 +1870,7 @@ in An error reporting utility for Zope3 ''; homepage = "http://pypi.python.org/pypi/zope.error"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1890,7 +1890,7 @@ in Plone OpenID authentication support ''; homepage = "http://pypi.python.org/pypi/plone.app.openid"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -1930,7 +1930,7 @@ in Plone integration for the basic plone.portlets package ''; homepage = "http://pypi.python.org/pypi/plone.app.portlets"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -1990,7 +1990,7 @@ in Persistent ExtensionClass ''; homepage = "http://pypi.python.org/pypi/Persistence"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2030,7 +2030,7 @@ in Flexible CMF content ''; homepage = "http://code.google.com/p/dexterity"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2050,7 +2050,7 @@ in Recipe for installing Python package distributions as eggs ''; homepage = "http://cheeseshop.python.org/pypi/zc.recipe.egg"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2090,7 +2090,7 @@ in Enhanced emailing handlers for the python logging package. ''; homepage = "http://www.simplistix.co.uk/software/python/mailinglogger"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -2110,7 +2110,7 @@ in A BTree based implementation for Zope 2's OFS. ''; homepage = "http://pypi.python.org/pypi/Products.BTreeFolder2"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2130,7 +2130,7 @@ in webdav locking support ''; homepage = "http://pypi.python.org/pypi/plone.locking"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2150,7 +2150,7 @@ in configurable viewlet manager ''; homepage = "http://pypi.python.org/pypi/plone.app.viewletmanager"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2170,7 +2170,7 @@ in Zope testing framework, including the testrunner script. ''; homepage = "http://pypi.python.org/pypi/zope.testing"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2190,7 +2190,7 @@ in Object life-cycle events ''; homepage = "http://pypi.python.org/pypi/zope.lifecycleevent"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2210,7 +2210,7 @@ in User-configurable, blob-aware image scaling for Plone. ''; homepage = "http://pypi.python.org/pypi/plone.app.imaging"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2230,7 +2230,7 @@ in Plone integration for plone.contentrules ''; homepage = "http://pypi.python.org/pypi/plone.app.contentrules"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2270,7 +2270,7 @@ in Zope Page Templates ''; homepage = "http://pypi.python.org/pypi/zope.pagetemplate"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2290,7 +2290,7 @@ in A package for all things users and groups related (specific to plone) ''; homepage = "http://pypi.python.org/pypi/plone.app.users"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2310,7 +2310,7 @@ in System for managing development buildouts ''; homepage = "http://pypi.python.org/pypi/zc.buildout"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2350,7 +2350,7 @@ in ZODB undo support for Zope2. ''; homepage = "http://pypi.python.org/pypi/ZopeUndo"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2370,7 +2370,7 @@ in Zope 3 Template Application Languate (TAL) ''; homepage = "http://pypi.python.org/pypi/zope.tal"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2390,7 +2390,7 @@ in General Zope 2 help screens. ''; homepage = "http://pypi.python.org/pypi/Products.OFSP"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2452,7 +2452,7 @@ in Zope Container ''; homepage = "http://pypi.python.org/pypi/zope.container"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2492,7 +2492,7 @@ in zope.interface extension for defining data schemas ''; homepage = "http://pypi.python.org/pypi/zope.schema"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2512,7 +2512,7 @@ in zope.interface extension for defining data schemas ''; homepage = "http://pypi.python.org/pypi/zope.schema"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2532,7 +2532,7 @@ in zExceptions contains common exceptions used in Zope2. ''; homepage = "http://pypi.python.org/pypi/zExceptions"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2572,7 +2572,7 @@ in The Zope publisher publishes Python objects on the web. ''; homepage = "http://pypi.python.org/pypi/zope.publisher"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2592,7 +2592,7 @@ in ZCML directives for configuring browser views for Zope. ''; homepage = "http://pypi.python.org/pypi/zope.browserpage/"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2612,7 +2612,7 @@ in Plone specific i18n extensions. ''; homepage = "http://pypi.python.org/pypi/plone.app.i18n"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2632,7 +2632,7 @@ in Zope Security Framework ''; homepage = "http://pypi.python.org/pypi/zope.security"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2652,7 +2652,7 @@ in Cache purging support for Zope 2 applications ''; homepage = "http://pypi.python.org/pypi/plone.cachepurging"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2694,7 +2694,7 @@ in Zope Component Architecture ''; homepage = "http://pypi.python.org/pypi/zope.component"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2714,7 +2714,7 @@ in Acquisition is a mechanism that allows objects to obtain attributes from the containment hierarchy they're in. ''; homepage = "http://pypi.python.org/pypi/Acquisition"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2774,7 +2774,7 @@ in Zope Viewlets ''; homepage = "http://pypi.python.org/pypi/zope.viewlet"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2834,7 +2834,7 @@ in Zope Internationalization Support ''; homepage = "http://pypi.python.org/pypi/zope.i18n"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2876,7 +2876,7 @@ in A backend for ZODB that stores pickles in a relational database. ''; homepage = "http://pypi.python.org/pypi/RelStorage"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2896,7 +2896,7 @@ in zope.formlib integration for Zope 2 ''; homepage = "http://pypi.python.org/pypi/five.formlib"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2978,7 +2978,7 @@ in Upgrade machinery for Plone. ''; homepage = "http://pypi.python.org/pypi/plone.app.upgrade"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3018,7 +3018,7 @@ in Provides transforms from text/x-web-intelligent to text/html and vice versa. ''; homepage = "http://pypi.python.org/pypi/plone.intelligenttext"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3038,7 +3038,7 @@ in Zope contenttype ''; homepage = "http://pypi.python.org/pypi/zope.contenttype"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3058,7 +3058,7 @@ in Generic Transparent Proxies ''; homepage = "http://pypi.python.org/pypi/zope.proxy"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3098,7 +3098,7 @@ in Zope sendmail ''; homepage = "http://pypi.python.org/pypi/zope.sendmail"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3118,7 +3118,7 @@ in Object annotation mechanism ''; homepage = "http://pypi.python.org/pypi/zope.annotation"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3138,7 +3138,7 @@ in Integrate five.customerize into Plone. ''; homepage = "http://pypi.python.org/pypi/plone.app.customerize/"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3218,7 +3218,7 @@ in File-system Representation Interfaces ''; homepage = "http://pypi.python.org/pypi/zope.filerepresentation"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3238,7 +3238,7 @@ in Decorators for caching the values of functions and methods ''; homepage = "http://pypi.python.org/pypi/plone.memoize"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3258,7 +3258,7 @@ in Interfaces for Python ''; homepage = "http://pypi.python.org/pypi/zope.interface"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3278,7 +3278,7 @@ in Interfaces and simple adapter that give the size of an object ''; homepage = "http://pypi.python.org/pypi/zope.size"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3298,7 +3298,7 @@ in TTW customization of template-based Zope views ''; homepage = "http://pypi.python.org/pypi/five.customerize"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3318,7 +3318,7 @@ in Resolver for Python dotted names. ''; homepage = "http://pypi.python.org/pypi/zope.dottedname"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3358,7 +3358,7 @@ in Translation files for Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.locales"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3378,7 +3378,7 @@ in z3c.form date and datetime widgets ''; homepage = "https://github.com/collective/collective.z3cform.datetimewidget"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3398,7 +3398,7 @@ in Listing of content for the Plone CMS ''; homepage = "http://pypi.python.org/pypi/plone.app.contentlisting"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3418,7 +3418,7 @@ in Zope2 application server / web framework ''; homepage = "http://zope2.zope.org"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3458,7 +3458,7 @@ in This package provides support for external Python methods within a Zope 2 environment. ''; homepage = "http://pypi.python.org/pypi/Products.ExternalMethod"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3478,7 +3478,7 @@ in Browser layer management for Zope 2 applications ''; homepage = "http://pypi.python.org/pypi/plone.browserlayer"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3498,7 +3498,7 @@ in workflow and security settings for Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.workflow"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3518,7 +3518,7 @@ in Integration package for `plone.folder` into Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.folder/"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3538,7 +3538,7 @@ in Basic inter-process locks ''; homepage = "http://www.python.org/pypi/zc.lockfile"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3558,7 +3558,7 @@ in Cache managers for Zope 2. ''; homepage = "http://pypi.python.org/pypi/Products.StandardCacheManagers"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3578,7 +3578,7 @@ in RestrictedPython provides a restricted execution environment for Python, e.g. for running untrusted code. ''; homepage = "http://pypi.python.org/pypi/RestrictedPython"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3598,7 +3598,7 @@ in Adaptable string interpolation ''; homepage = "http://pypi.python.org/pypi/plone.stringinterp"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3618,7 +3618,7 @@ in A RAM-based storage for ZODB ''; homepage = "http://pypi.python.org/pypi/tempstorage"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3658,7 +3658,7 @@ in Zope datetime ''; homepage = "http://pypi.python.org/pypi/zope.datetime"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3698,7 +3698,7 @@ in Zope Location ''; homepage = "http://pypi.python.org/pypi/zope.location/"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3718,7 +3718,7 @@ in UNKNOWN ''; homepage = "https://github.com/gawel/WSGIProxy2/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -3738,7 +3738,7 @@ in Zope locale extraction and management utilities ''; homepage = "http://pypi.python.org/pypi/zope.app.locales"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3778,7 +3778,7 @@ in Zope Content Type ''; homepage = "http://cheeseshop.python.org/pypi/zope.app.content"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3818,7 +3818,7 @@ in MIMETools provides the <!--#mime--> tag for DocumentTemplate. ''; homepage = "http://pypi.python.org/pypi/Products.MIMETools"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3878,7 +3878,7 @@ in Advanced i18n/l10n features ''; homepage = "http://pypi.python.org/pypi/plone.i18n"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3938,7 +3938,7 @@ in Zope Object Database: object database and persistence ''; homepage = "UNKNOWN"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3958,7 +3958,7 @@ in jQuery integration for Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.jquery"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3998,7 +3998,7 @@ in Plone ContentRules Engine ''; homepage = "http://pypi.python.org/pypi/plone.contentrules"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4038,7 +4038,7 @@ in Message Identifiers for internationalization ''; homepage = "http://pypi.python.org/pypi/zope.i18nmessageid"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4058,7 +4058,7 @@ in Transaction management for Python ''; homepage = "http://www.zope.org/Products/ZODB"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4078,7 +4078,7 @@ in Method and property caching decorators ''; homepage = "http://pypi.python.org/pypi/zope.cachedescriptors"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4098,7 +4098,7 @@ in Tools for managing themes in CMF and Plone sites ''; homepage = "http://pypi.python.org/pypi/plone.theme"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4138,7 +4138,7 @@ in Zope 2's indexing and search solution. ''; homepage = "http://pypi.python.org/pypi/Products.ZCatalog"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4178,7 +4178,7 @@ in Layout mechanisms for Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.layout"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4246,7 +4246,7 @@ in Plone UI and default rules for plone.caching/z3c.caching ''; homepage = "http://pypi.python.org/pypi/plone.app.caching"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4266,7 +4266,7 @@ in Zope Exceptions ''; homepage = "http://cheeseshop.python.org/pypi/zope.exceptions"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4286,7 +4286,7 @@ in plone.z3cform is a library that allows use of z3c.form with Zope 2 and the CMF. ''; homepage = "http://pypi.python.org/pypi/plone.z3cform"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4306,7 +4306,7 @@ in Security framework for Zope2. ''; homepage = "http://pypi.python.org/pypi/AccessControl"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4326,7 +4326,7 @@ in Special Record objects used in Zope2. ''; homepage = "http://pypi.python.org/pypi/Record"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4386,7 +4386,7 @@ in Registry for managing CSS and JS ''; homepage = "http://pypi.python.org/pypi/Products.ResourceRegistries"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4426,7 +4426,7 @@ in Convenience uid/gid helper function used in Zope2. ''; homepage = "http://pypi.python.org/pypi/initgroups"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4446,7 +4446,7 @@ in Daemon process control library and tools for Unix-based systems ''; homepage = "http://www.python.org/pypi/zdaemon"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4466,7 +4466,7 @@ in UNKNOWN ''; homepage = "http://pypi.python.org/pypi/plone.app.querystring"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4506,7 +4506,7 @@ in Definition of authentication basics for the Zope Framework ''; homepage = "http://pypi.python.org/pypi/zope.authentication"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4566,7 +4566,7 @@ in A portlet that fetches results from a collection ''; homepage = "http://pypi.python.org/pypi/plone.portlet.collection"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4586,7 +4586,7 @@ in Shared Zope Toolkit browser components ''; homepage = "http://pypi.python.org/pypi/zope.browser"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4606,7 +4606,7 @@ in This package adds 'saved search' functionality to Plone. ''; homepage = "http://pypi.python.org/pypi/plone.app.collection"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4626,7 +4626,7 @@ in Calendar product for the Zope Content Management Framework ''; homepage = "http://pypi.python.org/pypi/Products.CMFCalendar"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4648,7 +4648,7 @@ in The Plone Content Management System ''; homepage = "http://plone.org/"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4668,7 +4668,7 @@ in Pluggable Zope2 authentication / authorization framework ''; homepage = "http://pypi.python.org/pypi/Products.PluggableAuthService"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4708,7 +4708,7 @@ in jQuery Tools integration for Plone plus overlay and AJAX form helpers. ''; homepage = "http://pypi.python.org/pypi/plone.app.jquerytools"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4728,7 +4728,7 @@ in Read Zope configuration state from profile dirs / tarballs ''; homepage = "http://pypi.python.org/pypi/Products.GenericSetup"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4748,7 +4748,7 @@ in Metaclass for subclassable extension types ''; homepage = "http://pypi.python.org/pypi/ExtensionClass"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4788,7 +4788,7 @@ in StructuredText parser ''; homepage = "http://pypi.python.org/pypi/zope.structuredtext"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4808,7 +4808,7 @@ in Zope RAM Cache ''; homepage = "http://pypi.python.org/pypi/zope.ramcache"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4828,7 +4828,7 @@ in Resolving paths in the object hierarchy ''; homepage = "http://pypi.python.org/pypi/zope.traversing"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4848,7 +4848,7 @@ in Content Provider Framework for Zope Templates ''; homepage = "http://pypi.python.org/pypi/zope.contentprovider"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4868,7 +4868,7 @@ in The classic Plone 3 default theme. ''; homepage = "http://pypi.python.org/pypi/plonetheme.classic"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4908,7 +4908,7 @@ in A simple static HTML portlet for Plone. ''; homepage = "http://pypi.python.org/pypi/plone.portlet.static"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4948,7 +4948,7 @@ in An extension of zope.viewlet to support dynamic portlets ''; homepage = "http://pypi.python.org/pypi/plone.portlets"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4968,7 +4968,7 @@ in Configure application plugins based on interfaces ''; homepage = "http://pypi.python.org/pypi/Products.PluginRegistry"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5008,7 +5008,7 @@ in A general logging facility ''; homepage = "http://cheeseshop.python.org/pypi/zLOG"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5028,7 +5028,7 @@ in Zope Location ''; homepage = "http://pypi.python.org/pypi/zope.location/"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5068,7 +5068,7 @@ in Form generation and validation library for Zope ''; homepage = "http://pypi.python.org/pypi/zope.formlib"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5088,7 +5088,7 @@ in Pluggable object copying mechanism ''; homepage = "http://pypi.python.org/pypi/zope.copy"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5108,7 +5108,7 @@ in A collection of generally useful vocabularies. ''; homepage = "https://github.com/plone/plone.app.vocabularies"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -5128,7 +5128,7 @@ in UNKNOWN ''; homepage = "http://pypi.python.org/pypi/archetypes.querywidget"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -5168,7 +5168,7 @@ in Zope catalog index for paths ''; homepage = "http://pypi.python.org/pypi/Products.ExtendedPathIndex"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -5188,7 +5188,7 @@ in Subrequests for Zope2 ''; homepage = "http://pypi.python.org/pypi/plone.subrequest/"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -5208,7 +5208,7 @@ in An advanced form and widget framework for Zope 3 ''; homepage = "https://launchpad.net/z3c.form"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5228,7 +5228,7 @@ in Action icons product for the Zope Content Management Framework ''; homepage = "http://pypi.python.org/pypi/Products.CMFActionIcons"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5248,7 +5248,7 @@ in Helper to test WSGI applications ''; homepage = "http://webtest.pythonpaste.org/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -5268,7 +5268,7 @@ in Manage link integrity in Plone. ''; homepage = "http://pypi.python.org/pypi/plone.app.linkintegrity"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -5288,7 +5288,7 @@ in The Original Zope 3 Form Framework ''; homepage = "http://pypi.python.org/pypi/zope.app.form"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5308,10 +5308,9 @@ in Local site manager implementation for Zope 2 ''; homepage = "http://pypi.python.org/pypi/five.localsitemanager"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; } - diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b2f3aca49cc..31f0875b5f2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -474,7 +474,7 @@ rec { meta = { homepage = http://code.google.com/p/argparse/; - license = "Apache License 2.0"; + license = stdenv.lib.licenses.asl20; description = "argparse: Python command line parser"; @@ -577,7 +577,7 @@ rec { meta = { homepage = https://github.com/botocore/bcdoc; - license = "Apache License 2.0"; + license = stdenv.lib.licenses.asl20; description = "ReST document generation tools for botocore"; }; }; @@ -1582,7 +1582,7 @@ rec { homepage = http://code.google.com/p/cssutils/; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; }; }); @@ -2785,7 +2785,7 @@ rec { meta = { homepage = http://freedesktop.org/wiki/Software/pyxdg; description = "Contains implementations of freedesktop.org standards"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.iElectric ]; }; }; @@ -2801,7 +2801,7 @@ rec { meta = { homepage = https://github.com/erikrose/chardet; description = "Universal encoding detector"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.iElectric ]; }; }; @@ -3288,7 +3288,7 @@ rec { ''; # See http://foolscap.lothar.com/trac/browser/LICENSE. - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ ]; }; @@ -3593,11 +3593,11 @@ rec { }; gunicorn = buildPythonPackage rec { - name = "gunicorn-18.0"; + name = "gunicorn-19.1.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/g/gunicorn/${name}.tar.gz"; - md5 = "c7138b9ac7515a42066922d2b6120fbe"; + md5 = "3d759bec3c46a680ff010775258c4c56"; }; buildInputs = [ pytest ]; @@ -4134,7 +4134,7 @@ rec { meta = { description = "Super-fast templating language."; homepage = http://www.makotemplates.org; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.iElectric ]; }; }; @@ -4386,7 +4386,7 @@ rec { homepage = http://moinmo.in/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; }); @@ -4506,7 +4506,7 @@ rec { meta = { description = "Python multimedia tagging library"; homepage = http://code.google.com/p/mutagen; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; }; }); @@ -4525,7 +4525,7 @@ rec { meta = { description = "Utilities for use with console mail clients, like mutt"; homepage = http://www.blacktrash.org/hg/muttils; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; }); @@ -5288,7 +5288,7 @@ rec { meta = { homepage = "http://www.noah.org/wiki/Pexpect"; description = "Automate interactive console applications such as ssh, ftp, etc."; - license = "MIT"; + license = stdenv.lib.licenses.mit; longDescription = '' Pexpect is similar to the Don Libes "Expect" system, but Pexpect @@ -5715,7 +5715,7 @@ rec { description = "Python wrappers for the Crypto++ library"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.linux; @@ -6471,7 +6471,7 @@ rec { homepage = http://allmydata.org/trac/pyutil; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; }); @@ -6920,7 +6920,7 @@ rec { meta = { homepage = http://stuvel.eu/rsa; - license = "Apache License 2.0"; + license = stdenv.lib.licenses.asl20; description = "A pure-Python RSA implementation"; }; }; @@ -7108,7 +7108,7 @@ rec { homepage = http://code.google.com/p/simplejson/; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }); @@ -7790,7 +7790,7 @@ rec { meta = { homepage = http://taskcoach.org/; description = "Todo manager to keep track of personal tasks and todo lists"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; }; @@ -8075,7 +8075,7 @@ rec { meta = { homepage = "urlgrabber.baseurl.org"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; description = "Python module for downloading files"; maintainers = [ stdenv.lib.maintainers.qknight ]; }; @@ -8413,7 +8413,7 @@ rec { homepage = http://python-xlib.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; }); @@ -8523,7 +8523,7 @@ rec { and Haskell API. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; }); @@ -9026,6 +9026,24 @@ rec { }; + tornadokick = buildPythonPackage rec { + name = "tornadokick-2014.07.23"; + + propagatedBuildInputs = [ tornado ]; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/t/tornadokick/${name}.tar.gz"; + md5 = "201d26de2993a554b16140af3b4ee1b6"; + }; + + meta = { + description = "The TornadoKick Web Toolkit for Tornado Web Framework."; + homepage = http://github.com/multoncore/tornadokick; + license = stdenv.lib.licenses.asl20; + }; + }; + + tarman = buildPythonPackage rec { version = "0.1.3"; name = "tarman-${version}"; @@ -9604,7 +9622,7 @@ rec { meta = { description = "Cross-platform system power status information"; homepage = https://github.com/Kentzo/Power; - license = "mit"; + license = stdenv.lib.licenses.mit; }; }; |